Ignore:
Timestamp:
2011-11-09T12:20:17+01:00 (5 years ago)
Author:
nico
Message:

[backfire] packages/openldap: merge r28843

Location:
branches/packages_10.03.1/libs/openldap
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.1/libs/openldap/Makefile

    r24589 r28877  
    11#  
    2 # Copyright (C) 2006-2009 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=openldap 
    1111PKG_VERSION:=2.4.23 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz 
     
    137137        $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/slapd.conf $(1)/etc/openldap/ 
    138138        $(INSTALL_DIR) $(1)/usr/sbin 
    139         # OpenLDAP installs slapd into libexecdir, not sbindir: 
     139        # XXX: OpenLDAP installs slapd into libexecdir, not sbindir: 
    140140        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/slapd $(1)/usr/sbin/ 
     141        # XXX: switch default backend to ldif, since bdb is disabled 
     142        $(SED) 's|^\(database\)\([ \t]\+\)bdb|\1\2ldif|g' \ 
     143            -e 's|^\(index\)|#\1|g' \ 
     144            $(1)/etc/openldap/slapd.conf 
    141145endef 
    142146 
  • branches/packages_10.03.1/libs/openldap/files/ldap.init

    r19122 r28877  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2009 OpenWrt.org 
     2# Copyright (C) 2009-2011 OpenWrt.org 
    33 
    44START=60 
    55 
    66start() { 
    7         mkdir -p /var/run/openldap 
     7        mkdir -p /var/openldap-data 
    88         
    99        /usr/sbin/slapd 
Note: See TracChangeset for help on using the changeset viewer.