summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose V Beneyto <jose.beneyto@eslife.es>2015-01-05 00:36:23 +0000
committerJose V Beneyto <jose.beneyto@eslife.es>2015-01-05 00:54:04 +0000
commit9b183e9156f97c9d38f5ca37112a048eb90cb9d4 (patch)
treefdb4954e9253e0e0455ef3a39877c431db76a194
parente08d493e02481088c7e068f03e0bc62537986960 (diff)
downloadopt-9b183e9156f97c9d38f5ca37112a048eb90cb9d4.tar.gz
opt-9b183e9156f97c9d38f5ca37112a048eb90cb9d4.tar.xz
openldap: cleanup and bumped release
-rw-r--r--openldap/.footprint1
-rw-r--r--openldap/.md5sum1
-rw-r--r--openldap/Pkgfile27
-rwxr-xr-xopenldap/slurpd29
4 files changed, 6 insertions, 52 deletions
diff --git a/openldap/.footprint b/openldap/.footprint
index 31e32b96a..f37262cec 100644
--- a/openldap/.footprint
+++ b/openldap/.footprint
@@ -36,7 +36,6 @@ drwxr-xr-x root/root etc/openldap/schema/
-rw------- root/root etc/openldap/slapd.ldif.default
drwxr-xr-x root/root etc/rc.d/
-rwxr-xr-x root/root etc/rc.d/slapd
--rwxr-xr-x root/root etc/rc.d/slurpd
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
lrwxrwxrwx root/root usr/bin/ldapadd -> ldapmodify
diff --git a/openldap/.md5sum b/openldap/.md5sum
index 41246433d..8d10c2533 100644
--- a/openldap/.md5sum
+++ b/openldap/.md5sum
@@ -1,4 +1,3 @@
423c1f23d2a0cb96b3e9baf7e9d7dda7 openldap-2.4.40.tgz
fb9881e7bfcdfb4e93baeeb8060c254a openldap-config.patch
c9320d172211a2c3172b23d5066e0a60 slapd
-68bf404f5cd3e259bb828d77dd75ba97 slurpd
diff --git a/openldap/Pkgfile b/openldap/Pkgfile
index 304edb2bb..a49743141 100644
--- a/openldap/Pkgfile
+++ b/openldap/Pkgfile
@@ -6,9 +6,9 @@
name=openldap
version=2.4.40
-release=1
+release=2
source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$name-$version.tgz \
- $name-config.patch slurpd slapd)
+ $name-config.patch slapd)
build() {
cd $name-$version
@@ -19,7 +19,6 @@ build() {
--sysconfdir=/etc \
--libexecdir=/usr/sbin \
--localstatedir=/var/openldap \
- --disable-nls \
--enable-syslog \
--with-threads \
--with-tls \
@@ -30,9 +29,6 @@ build() {
--enable-modules \
--enable-crypt \
--enable-rewrite \
- --enable-ldbm \
- --enable-ldbm-api=berkeley \
- --enable-ldbm-type=btree \
--enable-bdb \
--enable-hdb \
--enable-ldap \
@@ -41,10 +37,7 @@ build() {
--enable-dnssrv \
--enable-null \
--enable-perl \
- --with-dyngroup \
- --with-proxycache \
--enable-wrappers \
- --enable-slurpd \
--enable-aci \
--enable-shared
@@ -52,18 +45,10 @@ build() {
make
make DESTDIR=$PKG install
- sed -i -e "s|-L${PKG}/usr/lib||g" $PKG/usr/lib/*.la
- /sbin/ldconfig -n $PKG/usr/lib
-
- # compatiblity links
- (cd $PKG/usr/lib;
- ln -s liblber.so liblber.so.2;
- ln -s libldap.so libldap.so.2;
- ln -s libldap_r.so libldap_r.so.2) || exit 1
-
- mkdir -p $PKG/etc/rc.d
- install -m 755 $SRC/slapd $PKG/etc/rc.d/slapd
- install -m 755 $SRC/slurpd $PKG/etc/rc.d/slurpd
+ ln -sf liblber.so $PKG/usr/lib/liblber.so.2
+ ln -sf libldap.so $PKG/usr/lib/libldap.so.2
+ ln -sf libldap_r.so $PKG/usr/lib/libldap_r.so.2
+ install -D -m 0755 $SRC/slapd $PKG/etc/rc.d/slapd
rm -f $PKG/etc/openldap/schema/README
}
diff --git a/openldap/slurpd b/openldap/slurpd
deleted file mode 100755
index da147ba45..000000000
--- a/openldap/slurpd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# /etc/rc.d/slurpd: start/stop Standalone LDAP Update Replication Daemon
-#
-
-SLURPD_PID=/var/openldap/run/slurpd.pid
-
-case $1 in
-start)
- /usr/sbin/slurpd
- ;;
-stop)
- if [ -f $SLAPD_PID ]; then
- kill -INT `head -1 $SLURPD_PID`
- else
- killall -q /usr/sbin/slurpd
- fi
- ;;
-restart)
- $0 stop
- sleep 2
- $0 start
- ;;
-*)
- echo "usage: $0 [start|stop|restart]"
- ;;
-esac
-
-# End of file

Generated by cgit