diff options
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | package/openldap/Makefile | 9 | ||||
| -rw-r--r-- | package/openldap/files/slapd.conf | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk index c27c5d936..dc79691af 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -20,7 +20,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_OPENJDK=n \ - ADK_PACKAGE_RUBY=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_PCMANFM=n \ ADK_PACKAGE_GPSD=n \ diff --git a/package/openldap/Makefile b/package/openldap/Makefile index bd2492ad0..04470007a 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.4.25 +PKG_VERSION:= 2.4.26 PKG_RELEASE:= 1 -PKG_MD5SUM:= ec63f9c2add59f323a0459128846905b +PKG_MD5SUM:= f36f3086031dd56ae94f722ffae8df5e PKG_DESCR:= OpenLDAP client libraries PKG_SECTION:= libs -PKG_DEPENDS:= libopenssl libsasl2 +PKG_DEPENDS:= libopenssl libsasl2 libdb libpthread PKG_BUILDDEP:= cyrus-sasl openssl db PKG_URL:= http://www.openldap.org/ PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ @@ -93,6 +93,7 @@ libopenldap-dev-install: ${IDIR_LIBOPENLDAP_DEV}/usr/include openldap-utils-install: + ${INSTALL_DIR} ${IDIR_OPENLDAP_UTILS}/etc/openldap-data ${INSTALL_DIR} ${IDIR_OPENLDAP_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/ldap* ${IDIR_OPENLDAP_UTILS}/usr/bin/ @@ -100,7 +101,7 @@ openldap-slapd-install: ${INSTALL_DIR} ${IDIR_OPENLDAP_SLAPD}/etc/openldap/schema ${INSTALL_DIR} ${IDIR_OPENLDAP_SLAPD}/usr/sbin ${CP} ${WRKINST}/usr/sbin/slap* ${IDIR_OPENLDAP_SLAPD}/usr/sbin - ${INSTALL_DATA} ${WRKINST}/etc/openldap/schema/core.schema \ + ${INSTALL_DATA} ${WRKINST}/etc/openldap/schema/*.schema \ ${IDIR_OPENLDAP_SLAPD}/etc/openldap/schema ${INSTALL_DATA} ./files/slapd.conf ${IDIR_OPENLDAP_SLAPD}/etc/openldap diff --git a/package/openldap/files/slapd.conf b/package/openldap/files/slapd.conf index d458fc495..3a065043b 100644 --- a/package/openldap/files/slapd.conf +++ b/package/openldap/files/slapd.conf @@ -16,15 +16,15 @@ argsfile /var/run/slapd.args # BDB database definitions ####################################################################### database bdb -suffix "dc=my-domain,dc=com" -rootdn "cn=Manager,dc=my-domain,dc=com" +suffix "o=openadk" +rootdn "cn=admin,o=openadk" # Cleartext passwords, especially for the rootdn, should # be avoid. See slappasswd(8) and slapd.conf(5) for details. # Use of strong authentication encouraged. -rootpw secret +rootpw linux123 # The database directory MUST exist prior to running slapd AND # should only be accessible by the slapd and slap tools. # Mode 700 recommended. -directory /var/openldap-data +directory /etc/openldap-data # Indices to maintain index objectClass eq |