commit d42806b90881f5351cbb44c85730b797f75011a6 Author: Danny Rawlins <monster.romster@gmail.com> Date: Wed May 27 23:04:24 2020 +1000 [notify] openldap-32: removed dependency cyrus-sasl-32 new dependency openssl-32 diff --git a/openldap-32/.footprint b/openldap-32/.footprint index 5d528c9..135cf2b 100644 --- a/openldap-32/.footprint +++ b/openldap-32/.footprint @@ -2,19 +2,10 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ lrwxrwxrwx root/root usr/lib32/liblber-2.4.so.2 -> liblber-2.4.so.2.10.12 -rw-r--r-- root/root usr/lib32/liblber-2.4.so.2.10.12 --rw-r--r-- root/root usr/lib32/liblber.a --rw-r--r-- root/root usr/lib32/liblber.la lrwxrwxrwx root/root usr/lib32/liblber.so -> liblber-2.4.so.2.10.12 -lrwxrwxrwx root/root usr/lib32/liblber.so.2 -> liblber.so lrwxrwxrwx root/root usr/lib32/libldap-2.4.so.2 -> libldap-2.4.so.2.10.12 -rw-r--r-- root/root usr/lib32/libldap-2.4.so.2.10.12 --rw-r--r-- root/root usr/lib32/libldap.a --rw-r--r-- root/root usr/lib32/libldap.la lrwxrwxrwx root/root usr/lib32/libldap.so -> libldap-2.4.so.2.10.12 -lrwxrwxrwx root/root usr/lib32/libldap.so.2 -> libldap.so lrwxrwxrwx root/root usr/lib32/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.10.12 -rw-r--r-- root/root usr/lib32/libldap_r-2.4.so.2.10.12 --rw-r--r-- root/root usr/lib32/libldap_r.a --rw-r--r-- root/root usr/lib32/libldap_r.la lrwxrwxrwx root/root usr/lib32/libldap_r.so -> libldap_r-2.4.so.2.10.12 -lrwxrwxrwx root/root usr/lib32/libldap_r.so.2 -> libldap_r.so diff --git a/openldap-32/.signature b/openldap-32/.signature index 5188632..bce536a 100644 --- a/openldap-32/.signature +++ b/openldap-32/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXbCyWG64eIvYsBMrd4gS+rsBgnOlWPfOfo2L1ZB10422yC0zvxwf9c8ckjXH6RRh/FVnMCGx2gx5nnj3Y3yRnAk= -SHA256 (Pkgfile) = b92e7ef4830cf71384bba2b77e0840db642e0b733a14bc72762c3f7744743d45 -SHA256 (.footprint) = 44fe0c7399b06a2a46fd91c5f28ea0ccd11e32ea094165b1c1256f0a22f6c13e +RWSwxGo/zH7eXWdl1nf0knyMXBRygPTfUCsXBlMPBMLi+dogO3oYrKwA0FqOPVjeswNU2YAIgT6gZ0Cs9j8A/cYg2sYGahCAOA8= +SHA256 (Pkgfile) = b269c9b1ad8aa10333c16b2f87dbf4d9211d2050135ee198a3fba04211aa5a99 +SHA256 (.footprint) = 3450569caf6769033332b6f06b6b77928c9c2e8780a5028496c3180eec4c8d3d SHA256 (openldap-2.4.49.tgz) = e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e -SHA256 (openldap-config.patch) = 4cc73b3acb468926f372b34e83ce9905ea026377b76cb5412d62ed4f483ff20c diff --git a/openldap-32/Pkgfile b/openldap-32/Pkgfile index 61f260a..0b465b1 100644 --- a/openldap-32/Pkgfile +++ b/openldap-32/Pkgfile @@ -1,17 +1,15 @@ # Description: Lightweight Directory Access Protocol (LDAP) Toolkit # URL: https://www.openldap.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: cyrus-sasl-32 openldap +# Depends on: openldap openssl-32 name=openldap-32 version=2.4.49 -release=1 -source=(https://www.openldap.org/software/download/OpenLDAP/openldap-release/openlda... - openldap-config.patch) +release=2 +source=(https://www.openldap.org/software/download/OpenLDAP/openldap-release/openlda...) build() { cd openldap-$version - patch -p0 -i $SRC/openldap-config.patch export CC="gcc -m32" export CXX="g++ -m32" @@ -20,24 +18,28 @@ build() { --libdir=/usr/lib32 \ --sysconfdir=/etc \ --libexecdir=/usr/sbin \ - --localstatedir=/var/openldap \ + --localstatedir=/var/lib/openldap \ --with-threads \ + --without-cyrus-sasl \ --enable-dynamic \ --enable-ipv6 \ --enable-shared \ --enable-crypt \ + --disable-static \ --disable-wrappers \ --disable-spasswd \ --disable-bdb \ --disable-hdb - make depend + # This is need to not get fatal error: ldap_config.h: No such file or directory + cd include make make DESTDIR=$PKG install - ln -sf liblber.so $PKG/usr/lib32/liblber.so.2 - ln -sf libldap.so $PKG/usr/lib32/libldap.so.2 - ln -sf libldap_r.so $PKG/usr/lib32/libldap_r.so.2 + cd ../libraries + make depend + make + make DESTDIR=$PKG install - rm -r $PKG/{etc,var} $PKG/usr/{include,share,bin,sbin} + rm -r $PKG/etc $PKG/usr/include $PKG/usr/lib32/*.la } diff --git a/openldap-32/openldap-config.patch b/openldap-32/openldap-config.patch deleted file mode 100644 index ba18435..0000000 --- a/openldap-32/openldap-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: servers/slapd/slapd.conf ---- servers/slapd/slapd.conf.orig 2003-05-25 01:19:14.000000000 +0200 -+++ servers/slapd/slapd.conf 2003-12-05 10:43:58.000000000 +0100 -@@ -64,4 +64,21 @@ - # Mode 700 recommended. - directory %LOCALSTATEDIR%/openldap-data - # Indices to maintain -+ - index objectClass eq -+ -+####################################################################### -+# replication via slurpd(8) -+####################################################################### -+ -+# master server configuration -+#replogfile %LOCALSTATEDIR%/openldap-slurp -+#replica-pidfile %LOCALSTATEDIR%/slurpd.pid -+#replica host=slave.example.com:389 -+# binddn="cn=admin,dc=example,dc=org" -+# bindmethod=simple credentials=secret -+ -+# slave server(s) configuration -+#updatedn "cn=admin,dc=example,dc=org" -+#updateref ldap://master.example.org -+