Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ac7e69d631e300eb568e468b7816eba9d097da9
commit 4ac7e69d631e300eb568e468b7816eba9d097da9 Author: crazy <cr...@frugalware.org> Date: Sat Aug 12 13:48:39 2017 +0200 openldap-2.4.45-2-x86_64 * use getent and absolute PATHs for adding/removing system user(s) diff --git a/source/network-extra/openldap/FrugalBuild b/source/network-extra/openldap/FrugalBuild index 93ab441..c7b5d1d 100644 --- a/source/network-extra/openldap/FrugalBuild +++ b/source/network-extra/openldap/FrugalBuild @@ -3,7 +3,7 @@ pkgname=openldap pkgver=2.4.45 -pkgrel=1 +pkgrel=2 pkgdesc="A suite of the Lightweight Directory Access Protocol servers" url="http://www.openldap.org/"; groups=('network-extra') diff --git a/source/network-extra/openldap/openldap.install b/source/network-extra/openldap/openldap.install index e67c531..3b89ecd 100644 --- a/source/network-extra/openldap/openldap.install +++ b/source/network-extra/openldap/openldap.install @@ -2,16 +2,16 @@ systemd_units=(@_F_systemd_units@) post_install() { - [ -z "`grep '^openldap:' /etc/group`" ] && \ - groupadd -g 49 openldap >& /dev/null - [ -z "`grep '^openldap:' /etc/passwd`" ] && \ - useradd -M -u 49 -d /var/openldap/openldap-data -r -s /bin/false -g openldap openldap + + /usr/bin/getent group openldap > /dev/null 2>&1 || /usr/sbin/groupadd -g 49 openldap + /usr/bin/getent passwd openldap > /dev/null 2>&1 || /usr/sbin/useradd -c -M -u 49 -d /var/openldap/openldap-data -r -s /bin/false -g openldap openldap chown -R openldap:openldap var/openldap chown -R openldap:openldap etc/openldap local unit local op + local i for i in ${systemd_units[@]}; do unit=$(echo $i | cut -f 1 -d '=') @@ -27,11 +27,10 @@ post_install() post_upgrade() { - [ -z "`grep '^openldap:' /etc/group`" ] && \ - groupadd -g 49 openldap >& /dev/null - [ -z "`grep '^openldap:' /etc/passwd`" ] && \ - useradd -M -u 49 -d /var/openldap/openldap-data -r -s /bin/false -g openldap openldap + /usr/bin/getent group openldap > /dev/null 2>&1 || /usr/sbin/groupadd -g 49 openldap + /usr/bin/getent passwd openldap > /dev/null 2>&1 || /usr/sbin/useradd -c -M -u 49 -d /var/openldap/openldap-data -r -s /bin/false -g openldap openldap + chown -R openldap:openldap var/openldap chown -R openldap:openldap etc/openldap @@ -40,10 +39,11 @@ post_upgrade() pre_remove() { - userdel openldap &> /dev/null - groupdel openldap &> /dev/null + /usr/bin/getent passwd openldap > /dev/null 2>&1 && /usr/sbin/userdel openldap + /usr/bin/getent group openldap > /dev/null 2>&1 && /usr/sbin/groupdel openldap local unit + local i for i in ${systemd_units[@]}; do unit=$(echo $i | cut -f 1 -d '=') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
