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

Andrea Scarpino andrea at archlinux.org
Sun Jan 23 05:53:21 EST 2011


    Date: Sunday, January 23, 2011 @ 05:53:21
  Author: andrea
Revision: 107302

upgpkg: openldap 2.4.23-3
use the config dir schema (FS#22566)

Added:
  openldap/trunk/openldap.install
Modified:
  openldap/trunk/PKGBUILD
  openldap/trunk/slapd

------------------+
 PKGBUILD         |    8 ++++----
 openldap.install |   10 ++++++++++
 slapd            |    1 -
 3 files changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-23 10:29:57 UTC (rev 107301)
+++ PKGBUILD	2011-01-23 10:53:21 UTC (rev 107302)
@@ -4,7 +4,7 @@
 
 pkgname=openldap
 pkgver=2.4.23
-pkgrel=2
+pkgrel=3
 pkgdesc="LDAP Server"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -17,9 +17,8 @@
         'slapd'
         'slapd.default')
 md5sums=('90150b8c0d0192e10b30157e68844ddf'
-         'a9c9d906b2132ee3cb3d100ef1c068ae'
-         '95f50ebf185b1caf299fa4e3970d8ec2')
-options=('!emptydirs')
+         'd245b56b84fae7358e0f3fb3dfa9a558'
+         '6be69f6b7e522cb64cce8703da81ed32')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -90,6 +89,7 @@
 
   cd ../..
 
+  install -d ${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 -dm700 ${pkgdir}/var/lib/openldap

Added: openldap.install
===================================================================
--- openldap.install	                        (rev 0)
+++ openldap.install	2011-01-23 10:53:21 UTC (rev 107302)
@@ -0,0 +1,10 @@
+post_install(){
+    slaptest -f etc/openldap/slapd.conf -F etc/openldap/slapd.d
+    [ $? -eq 0 ] && rm etc/openldap/slapd.conf
+}
+
+post_update(){
+    if [ "$(vercmp $2 2.4.23)" -le 0 ]; then
+        post_install
+    fi
+}

Modified: slapd
===================================================================
--- slapd	2011-01-23 10:29:57 UTC (rev 107301)
+++ slapd	2011-01-23 10:53:21 UTC (rev 107302)
@@ -10,7 +10,6 @@
   start)
     stat_busy "Starting OpenLDAP"
     if [ -z "$PID" ]; then
-      SLAPD_OPTIONS="-f /etc/openldap/slapd.conf $SLAPD_OPTIONS"
       if [ -z "$SLAPD_SERVICES" ]; then
         /usr/sbin/slapd $SLAPD_OPTIONS
       else



More information about the arch-commits mailing list