[arch-commits] Commit in openldap/trunk (PKGBUILD)

Allan McRae allan at archlinux.org
Wed Sep 16 05:27:08 UTC 2009


    Date: Wednesday, September 16, 2009 @ 01:27:08
  Author: allan
Revision: 52101

upgpkg: openldap 2.4.18-1
    upstream update

Modified:
  openldap/trunk/PKGBUILD

----------+
 PKGBUILD |   67 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-16 05:26:12 UTC (rev 52100)
+++ PKGBUILD	2009-09-16 05:27:08 UTC (rev 52101)
@@ -1,40 +1,43 @@
 # $Id$
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
+
 pkgname=openldap
-pkgver=2.3.43
+pkgver=2.4.18
 pkgrel=1
 pkgdesc="LDAP Server"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.openldap.org/"
 backup=(etc/openldap/slapd.conf etc/default/slapd)
-depends=('db4.5' 'tcp_wrappers' "libldap>=${pkgver}")
+depends=("libldap>=${pkgver}" 'db' 'tcp_wrappers' 'libfetch' 'util-linux-ng')
+provides=('openldap-clients')
+replaces=('openldap-clients')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz
         slapd 
-        slapd.default
-        openldap-2.3.41-r1-fixed-peercred-error.patch)
-md5sums=('1b25281086eb146b8e11ebd33de086dc' 'a9c9d906b2132ee3cb3d100ef1c068ae'\
-         '95f50ebf185b1caf299fa4e3970d8ec2' 'a68214b19bee704992d80322cac3ce49')
-options=('!makeflags' '!emptydirs')
+        slapd.default)
+md5sums=('fecd7a64b6d9a0eb79b817d2562956ed'
+         'a9c9d906b2132ee3cb3d100ef1c068ae'
+         '95f50ebf185b1caf299fa4e3970d8ec2')
+options=('!emptydirs')
 
-
 build() {
-  cd ${startdir}/src/openldap-${pkgver}
-  export CPPFLAGS="-I/usr/include/db4.5 $CPPFLAGS"
-  patch -p1 < ../openldap-2.3.41-r1-fixed-peercred-error.patch
+  cd ${srcdir}/openldap-${pkgver}
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --libexecdir=/usr/sbin \
               --sysconfdir=/etc \
               --localstatedir=/var/lib/openldap \
-              --enable-crypt --enable-dynamic \
-              --with-threads --enable-wrappers \
-	      --enable-spasswd --with-cyrus-sasl
+              --enable-crypt \
+              --enable-dynamic \
+              --with-threads \
+              --enable-wrappers \
+	      --enable-spasswd \
+	      --with-cyrus-sasl
   
   find . -name 'Makefile' -exec \
-  	sed -e 's|$(LDAP_LIBDIR)/liblber/liblber.la|/usr/lib/liblber-2.3.so.0|g' \
-	    -e 's|$(LDAP_LIBDIR)/libldap/libldap.la|/usr/lib/libldap-2.3.so.0|g' \
-	    -e 's|$(LDAP_LIBDIR)/libldap_r/libldap_r.la|/usr/lib/libldap_r-2.3.so.0|g' \
+  	sed -e 's|$(LDAP_LIBDIR)/liblber/liblber.la|/usr/lib/liblber-2.4.so.2|g' \
+	    -e 's|$(LDAP_LIBDIR)/libldap/libldap.la|/usr/lib/libldap-2.4.so.2|g' \
+	    -e 's|$(LDAP_LIBDIR)/libldap_r/libldap_r.la|/usr/lib/libldap_r-2.4.so.2|g' \
 	    -i {} \;
 
   cd include
@@ -47,33 +50,39 @@
     make || return 1
     popd
   done
+
   cd ../servers
   make depend || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 
+  cd ../clients
+  make depend || return 1
+  make || return 1
+  make DESTDIR=${pkgdir} install
+
   cd ../doc/man
-  for dir in man5 man8; do
+  for dir in man{1,5,8}; do
     pushd ${dir}
-    rm -f ldap.conf.5
     make || return 1
-    make DESTDIR=${startdir}/pkg install
+    make DESTDIR=${pkgdir} install
     popd
   done
+  rm ${pkgdir}/usr/share/man/man5/ldap.conf.5
 
   cd ../..
 
-  mkdir -p ${startdir}/pkg/etc/rc.d
-  mkdir -p ${startdir}/pkg/etc/default
-  install -m 755 ../slapd ${startdir}/pkg/etc/rc.d/slapd
-  install -m 644 ../slapd.default ${startdir}/pkg/etc/default/slapd
-  install -d -m 700 ${startdir}/pkg/var/lib/openldap
+  install -Dm755 ${srcdir}/slapd ${pkgdir}/etc/rc.d/slapd
+  install -Dm644 ${srcdir}/slapd.default ${pkgdir}/etc/default/slapd
+  install -dm700 ${pkgdir}/var/lib/openldap
   
   # get rid of duplicate default conf files
-  rm ${startdir}/pkg/etc/openldap/*.default
+  rm ${pkgdir}/etc/openldap/*.default
+
   # hack to fix screwed up dirs
   sed -e 's|^pidfile[[:space:]].*$|pidfile   /var/run/slapd.pid|g' \
       -e 's|^argsfile[[:space:]].*$|argsfile  /var/run/slapd.args|g' \
-      -i ${startdir}/pkg/etc/openldap/slapd.conf
-  install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+      -i ${pkgdir}/etc/openldap/slapd.conf
+      
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }




More information about the arch-commits mailing list