* rebuild with e2fsprogs

openldap/PKGBUILD

@@ -4,12 +4,11 @@
 pkgbase=openldap
 pkgname=('openldap' 'libldap')
 pkgver=2.4.47
-pkgrel=1
-arch=('x86_64' 'powerpc64le')
+pkgrel=2
+arch=(x86_64 powerpc64le)
 url="https://www.openldap.org/"
 license=('custom')
-#makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath' 'unixodbc')
-makedepends=('libltdl' 'libsasl' 'chrpath' 'unixodbc' 'e2fsprogs')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath' 'unixodbc')
 options=('!makeflags' 'emptydirs')
 source=(https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
         slapd.service openldap.tmpfiles openldap.sysusers openldap-ntlm.patch)
@@ -38,10 +37,10 @@ build() {
   autoconf
   ./configure --prefix=/usr --libexecdir=/usr/lib \
     --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \
-    --enable-dynamic --enable-syslog --enable-ipv6 --enable-local --build=$CHOST \
+    --enable-dynamic --enable-syslog --enable-ipv6 --enable-local \
     --enable-crypt --enable-spasswd --enable-modules \
     --enable-backends --disable-ndb --enable-overlays=mod \
-    --with-cyrus-sasl --with-threads
+    --with-cyrus-sasl --with-threads --build=$CHOST
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
@@ -60,13 +59,13 @@ check() {
 
 package_libldap() {
   pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl') # 'e2fsprogs')
+  depends=('libsasl' 'e2fsprogs')
   backup=('etc/openldap/ldap.conf')
 
   cd ${pkgbase}-${pkgver}
   for dir in include libraries doc/man/man3 ; do
     pushd ${dir}
-    make DESTDIR="${pkgdir}" install -j1
+    make DESTDIR="${pkgdir}" install
     popd
   done
   install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
@@ -101,7 +100,7 @@ package_openldap() {
   install -m644 contrib/slapd-modules/lastbind/slapo-lastbind.5 "${pkgdir}"/usr/share/man/man5/slapo-lastbind.5
 
   rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  rm -rf "${pkgdir}"/run
+  rm -r "${pkgdir}"/run
 
 # get rid of duplicate default conf files
   rm "${pkgdir}"/etc/openldap/*.default

openldap/openldap.sysusers

@@ -0,0 +1 @@
+u ldap 439 "LDAP Server" /var/lib/openldap

openldap/openldap.tmpfiles

@@ -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"

openldap/slapd.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenLDAP server daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/slapd -u ldap -g ldap
+
+[Install]
+WantedBy=multi-user.target