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

[Sébastien Luttringer]

    Date: Sunday, August 16, 2015 @ 12:47:03
  Author: seblu
Revision: 243792

upgpkg: openldap 2.4.42-1

Added:
  openldap/trunk/openldap.sysusers
  openldap/trunk/openldap.tmpfiles
    (from rev 243760, openldap/trunk/slapd.tmpfiles)
Modified:
  openldap/trunk/PKGBUILD
  openldap/trunk/openldap.install
Deleted:
  openldap/trunk/slapd.sysusers
  openldap/trunk/slapd.tmpfiles

-------------------+
 PKGBUILD          |   12 ++++++------
 openldap.install  |   14 ++++++++++++--
 openldap.sysusers |    1 +
 openldap.tmpfiles |    3 +++
 slapd.sysusers    |    1 -
 slapd.tmpfiles    |    1 -
 6 files changed, 22 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-16 09:41:10 UTC (rev 243791)
+++ PKGBUILD	2015-08-16 10:47:03 UTC (rev 243792)
@@ -3,7 +3,7 @@
 
 pkgbase=openldap
 pkgname=('openldap' 'libldap')
-pkgver=2.4.41
+pkgver=2.4.42
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.openldap.org/"
@@ -11,10 +11,10 @@
 makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath' 'unixodbc')
 options=('!makeflags' 'emptydirs')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd.service slapd.tmpfiles slapd.sysusers openldap-ntlm.patch)
-sha1sums=('c6880df9fec928a5f010b78a4285b497e8a12d6b'
+        slapd.service openldap.tmpfiles openldap.sysusers openldap-ntlm.patch)
+sha1sums=('ec03e061bfdb2e6a90827855cf77a72cb3f89cf4'
           '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
-          '59241a813d7508294e4ef1cec3bfe1f5495e109d'
+          '1f68bd85fb50595c4e916db164d8e90e0c6e21ee'
           '2bf64351c32b0bf0a70663bd42de22910998b795'
           'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
 
@@ -112,7 +112,7 @@
 
   install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
   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 "${srcdir}"/slapd.sysusers "${pkgdir}"/usr/lib/sysusers.d/slapd.conf
+  install -Dm644 "${srcdir}"/openldap.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/openldap.conf
+  install -Dm644 "${srcdir}"/openldap.sysusers "${pkgdir}"/usr/lib/sysusers.d/openldap.conf
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }

Modified: openldap.install
===================================================================
--- openldap.install	2015-08-16 09:41:10 UTC (rev 243791)
+++ openldap.install	2015-08-16 10:47:03 UTC (rev 243792)
@@ -1,4 +1,14 @@
+# arg 1: the new package version
 post_install(){
-  systemd-sysusers slapd.conf
-  systemd-tmpfiles --create slapd.conf
+  systemd-sysusers openldap.conf
+  systemd-tmpfiles --create openldap.conf
 }
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+  if (( "$(vercmp $2 2.4.42-1)" < 0 )); then
+    # install placeholder
+    systemd-tmpfiles --create openldap.conf
+  fi
+}

Added: openldap.sysusers
===================================================================
--- openldap.sysusers	                        (rev 0)
+++ openldap.sysusers	2015-08-16 10:47:03 UTC (rev 243792)
@@ -0,0 +1 @@
+u ldap 439 "LDAP Server" /var/lib/openldap

Copied: openldap/trunk/openldap.tmpfiles (from rev 243760, openldap/trunk/slapd.tmpfiles)
===================================================================
--- openldap.tmpfiles	                        (rev 0)
+++ openldap.tmpfiles	2015-08-16 10:47:03 UTC (rev 243792)
@@ -0,0 +1,3 @@
+D /run/openldap 0755 ldap ldap -
+
+f /var/lib/openldap/.placeholder 0644 ldap ldap - "prevent pwcheck error; pacman should not remove ~ldap"

Deleted: slapd.sysusers
===================================================================
--- slapd.sysusers	2015-08-16 09:41:10 UTC (rev 243791)
+++ slapd.sysusers	2015-08-16 10:47:03 UTC (rev 243792)
@@ -1 +0,0 @@
-u ldap 439 "LDAP Server" /var/lib/openldap

Deleted: slapd.tmpfiles
===================================================================
--- slapd.tmpfiles	2015-08-16 09:41:10 UTC (rev 243791)
+++ slapd.tmpfiles	2015-08-16 10:47:03 UTC (rev 243792)
@@ -1 +0,0 @@
-D /run/openldap 0755 ldap ldap -