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

[Andrea Scarpino]

    Date: Sunday, January 23, 2011 @ 11:27:22
  Author: andrea
Revision: 107325

upgpkg: openldap 2.4.23-4
remove useless option in slapd.default; source /etc/conf.d/slapd in the rc script

Modified:
  openldap/trunk/PKGBUILD
  openldap/trunk/slapd
  openldap/trunk/slapd.default
Deleted:
  openldap/trunk/openldap.install

------------------+
 PKGBUILD         |    8 ++++----
 openldap.install |   10 ----------
 slapd            |    2 +-
 slapd.default    |    2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-23 13:37:10 UTC (rev 107324)
+++ PKGBUILD	2011-01-23 16:27:22 UTC (rev 107325)
@@ -4,7 +4,7 @@
 
 pkgname=openldap
 pkgver=2.4.23
-pkgrel=3
+pkgrel=4
 pkgdesc="LDAP Server"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -17,8 +17,8 @@
         'slapd'
         'slapd.default')
 md5sums=('90150b8c0d0192e10b30157e68844ddf'
-         'd245b56b84fae7358e0f3fb3dfa9a558'
-         '62c8c407d210e38f2f923efd4ac0ccfa')
+         '832354417c495f29affd2c772808959d'
+         '6be69f6b7e522cb64cce8703da81ed32')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -89,7 +89,7 @@
 
   cd ../..
 
-  install -d ${pkgdir}/etc/openldap/slapd.d
+  install -dm700 ${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

Deleted: openldap.install
===================================================================
--- openldap.install	2011-01-23 13:37:10 UTC (rev 107324)
+++ openldap.install	2011-01-23 16:27:22 UTC (rev 107325)
@@ -1,10 +0,0 @@
-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 13:37:10 UTC (rev 107324)
+++ slapd	2011-01-23 16:27:22 UTC (rev 107325)
@@ -3,7 +3,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-[ -f "/etc/default/slapd" ] && . /etc/default/slapd
+[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
 
 PID=`pidof -o %PPID /usr/sbin/slapd`
 case "$1" in

Modified: slapd.default
===================================================================
--- slapd.default	2011-01-23 13:37:10 UTC (rev 107324)
+++ slapd.default	2011-01-23 16:27:22 UTC (rev 107325)
@@ -3,4 +3,4 @@
 # sockets.
 # Example usage:
 #SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-SLAPD_OPTIONS="-F /etc/openldap/slapd.d/"
+SLAPD_OPTIONS=""