openldap: update to 2.4.39. refs #961

1 files changed, 44 insertions, 34 deletions

diff --git a/abs/core/openldap/PKGBUILD b/abs/core/openldap/PKGBUILD
index b7af129..0131552 100644
--- a/abs/core/openldap/PKGBUILD
+++ b/abs/core/openldap/PKGBUILD
@@ -1,39 +1,40 @@
-# $Id: PKGBUILD 162887 2012-07-02 18:03:02Z eric $
+# $Id$
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
-pkgver=2.4.31
-pkgrel=4
+pkgver=2.4.39
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.openldap.org/"
 license=('custom')
-makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
+#options=('!makeflags')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default slapd.service slapd.tmpfiles
-        ntlm.patch
-        mutex-end-of-struct-sigsegv.patch)
-sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765'
-          'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
-          'd89b8a533045123f1ab46c9c430cf132d58a20a4'
-          'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4'
-          'f86a82e35ebe15026980467c9dee4007e686b795'
-          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
-          '694269dad78c7a806649c2d7f57bb7e503df3af1')
+        slapd.service slapd.tmpfiles openldap-ntlm.patch)
+sha1sums=('2b8e8401214867c361f7212e7058f95118b5bd6c'
+          '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
+          '59241a813d7508294e4ef1cec3bfe1f5495e109d'
+          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
 
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i "${srcdir}"/ntlm.patch
-  patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch
+# see http://www.openldap.org/faq/data/cache/756.html
+# there's no proper backend support for anything apart from
+# BerkeleyDB, if we don't want to drop local backend server support 
+# we are forced to keep Berkeley DB here
 
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}"/openldap-ntlm.patch
   sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
   sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
-  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
+  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
   sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
+}
 
-  LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" 
+build() {
+  cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
-    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
+    --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \
     --enable-ipv6 --enable-syslog --enable-local \
     --enable-bdb --enable-hdb \
     --enable-crypt --enable-dynamic \
@@ -42,10 +43,14 @@ build() {
     --enable-spasswd --with-cyrus-sasl \
     --enable-overlays=mod --enable-modules=yes
   make
+
+  cd contrib/slapd-modules/nssov
+  make prefix=/usr libexecdir=/usr/lib sysconfdir=/etc/openldap
+  chrpath -d .libs/nssov.so
 }
 
 check() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make test
 }
 
@@ -53,9 +58,8 @@ package_libldap() {
   pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
   depends=('libsasl' 'e2fsprogs')
   backup=('etc/openldap/ldap.conf')
-  options=('!libtool')
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   for dir in include libraries doc/man/man3 ; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
@@ -74,32 +78,38 @@ package_libldap() {
 
 package_openldap() {
   pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
-  depends=("libldap>=${pkgver}" 'libltdl' 'util-linux')
-  backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
-  options=('!libtool' 'emptydirs')
+  depends=("libldap>=${pkgver}" 'libltdl')
+  backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif')
+  options=('emptydirs')
   install=openldap.install
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in clients servers doc/man/man{1,5,8} ; do
+  cd ${pkgbase}-${pkgver}
+  for dir in clients servers doc/man/man{1,5,8}; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
     popd
   done
+
+  pushd contrib/slapd-modules/nssov
+  install -m755 .libs/nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap
+  ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so
+  ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so.0
+  install -m444 ldapns.schema "${pkgdir}"/etc/openldap/schema
+  popd
+
   rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
   rm -r "${pkgdir}"/run
 
 # get rid of duplicate default conf files
   rm "${pkgdir}"/etc/openldap/*.default
 
-  ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
+  ln -s ../lib/slapd "${pkgdir}"/usr/bin/slapd
 
-  chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-  chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
+  chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
+  chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
 
   install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
   install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
-  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
-  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
   install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service
   install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE