summaryrefslogtreecommitdiff
path: root/package/openldap
diff options
context:
space:
mode:
Diffstat (limited to 'package/openldap')
-rw-r--r--package/openldap/Makefile31
-rw-r--r--package/openldap/files/libopenldap.conffiles (renamed from package/openldap/ipkg/libopenldap.conffiles)0
-rw-r--r--package/openldap/files/openldap-slapd.postinst (renamed from package/openldap/ipkg/openldap-slapd.postinst)0
-rw-r--r--package/openldap/files/slapd.init4
-rw-r--r--package/openldap/ipkg/libopenldap.control5
-rw-r--r--package/openldap/ipkg/openldap-slapd.control5
-rw-r--r--package/openldap/ipkg/openldap-utils.control5
7 files changed, 23 insertions, 27 deletions
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 267b61d2b..a92bac9b3 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -9,12 +9,30 @@ PKG_NAME:= openldap
PKG_VERSION:= 2.4.16
PKG_RELEASE:= 1
PKG_MD5SUM:= ed5b86e9d2b372d10edfe3bb59fee165
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
-MASTER_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
+PKG_DESCR:= OpenLDAP client libraries
+PKG_SECTION:= libs
+PKG_DEPENDS:= libopenssl libsasl2
+PKG_URL:= http://www.openldap.org
+PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
+PKG_DESCR_1:= OpenLDAP utilities
+PKG_DEPENDS_1:= libopenldap
+PKG_SECTION_1:= net
+PKG_DESCR_2:= OpenLDAP server daemon
+PKG_DEPENDS_2:= libopenldap
+PKG_SECTION_2:= net
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_2},${PKG_DESCR_2},${PKG_SECTION_2}))
+
PKG_CONFIGURE_OPTIONS+= \
--enable-slapd \
--enable-bdb \
@@ -32,12 +50,6 @@ PKG_CONFIGURE_OPTIONS+= \
--with-tls \
--with-yielding_select="yes" \
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE}))
-
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
CPPFLAGS=-D_GNU_SOURCE ./configure \
@@ -70,13 +82,10 @@ post-install:
${INSTALL_DIR} ${IDIR_OPENLDAP_UTILS}/usr/bin
${CP} ${WRKINST}/usr/bin/ldap* ${IDIR_OPENLDAP_UTILS}/usr/bin/
${INSTALL_DIR} ${IDIR_OPENLDAP_SLAPD}/etc/openldap/schema
- ${INSTALL_DIR} ${IDIR_OPENLDAP_SLAPD}/etc/init.d
${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 \
${IDIR_OPENLDAP_SLAPD}/etc/openldap/schema
${INSTALL_DATA} ./files/slapd.conf ${IDIR_OPENLDAP_SLAPD}/etc/openldap
- ${INSTALL_DATA} ./files/slapd.init \
- ${IDIR_OPENLDAP_SLAPD}/etc/init.d/slapd
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openldap/ipkg/libopenldap.conffiles b/package/openldap/files/libopenldap.conffiles
index 25f44c322..25f44c322 100644
--- a/package/openldap/ipkg/libopenldap.conffiles
+++ b/package/openldap/files/libopenldap.conffiles
diff --git a/package/openldap/ipkg/openldap-slapd.postinst b/package/openldap/files/openldap-slapd.postinst
index d6ecee377..d6ecee377 100644
--- a/package/openldap/ipkg/openldap-slapd.postinst
+++ b/package/openldap/files/openldap-slapd.postinst
diff --git a/package/openldap/files/slapd.init b/package/openldap/files/slapd.init
index 814345c44..60f717927 100644
--- a/package/openldap/files/slapd.init
+++ b/package/openldap/files/slapd.init
@@ -1,5 +1,7 @@
#!/bin/sh
-#FWINIT 70
+#PKG openldap-slapd
+#INIT 70
+
. /etc/rc.conf
case $1 in
diff --git a/package/openldap/ipkg/libopenldap.control b/package/openldap/ipkg/libopenldap.control
deleted file mode 100644
index 84b145f58..000000000
--- a/package/openldap/ipkg/libopenldap.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: libopenldap
-Priority: optional
-Section: libs
-Description: OpenLDAP (Lightweight Directory Access Protocol) client libraries
-Depends: libopenssl, libsasl2
diff --git a/package/openldap/ipkg/openldap-slapd.control b/package/openldap/ipkg/openldap-slapd.control
deleted file mode 100644
index c5b9e12d4..000000000
--- a/package/openldap/ipkg/openldap-slapd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: openldap-slapd
-Priority: optional
-Section: admin
-Description: OpenLDAP server
-Depends: libopenldap, libopenssl, libsasl2, libdb, libpthread
diff --git a/package/openldap/ipkg/openldap-utils.control b/package/openldap/ipkg/openldap-utils.control
deleted file mode 100644
index 3a515c69f..000000000
--- a/package/openldap/ipkg/openldap-utils.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: openldap-utils
-Priority: optional
-Section: admin
-Description: OpenLDAP (Lightweight Directory Access Protocol) client utilities
-Depends: libopenldap, libopenssl, libsasl2