From 3dc2357a4120c4693ff24b1ea23364fc84192f7c59902dab06129c1add37494e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 7 Dec 2017 10:37:08 +0000 Subject: [PATCH] Accepting request 554799 from home:vitezslav_cizek:branches:network - Use getent when adding user/group - update changelog to mention removed options * Remove no longer recognized --enable-rrl OBS-URL: https://build.opensuse.org/request/show/554799 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=226 --- bind.changes | 7 +++++++ bind.spec | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bind.changes b/bind.changes index fac0ee1..8575bc0 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 6 13:35:59 UTC 2017 - vcizek@suse.com + +- Use getent when adding user/group +- update changelog to mention removed options + ------------------------------------------------------------------- Sat Nov 25 15:31:18 UTC 2017 - meissner@suse.com @@ -26,6 +32,7 @@ Thu Nov 21 13:41:38 UTC 2017 - tchvatal@suse.com * Enable python3 * Enable gssapi * Enable dnssec scripts + * Remove no longer recognized --enable-rrl ------------------------------------------------------------------- Thu Nov 21 12:54:35 UTC 2017 - tchvatal@suse.com diff --git a/bind.spec b/bind.spec index cdae91b..0b1f237 100644 --- a/bind.spec +++ b/bind.spec @@ -40,9 +40,9 @@ %define NAMED_COMMENT Name server daemon %define NAMED_HOMEDIR %{_localstatedir}/lib/named %define NAMED_SHELL /bin/false -%define GROUPADD_NAMED %{_sbindir}/groupadd -g %{NAMED_GID} -o -r %{NAMED_GID_NAME} 2> /dev/null || : -%define USERADD_NAMED %{_sbindir}/useradd -r -o -g %{NAMED_GID_NAME} -u %{NAMED_UID} -s %{NAMED_SHELL} -c "%{NAMED_COMMENT}" -d %{NAMED_HOMEDIR} %{NAMED_UID_NAME} 2> /dev/null || : -%define USERMOD_NAMED %{_sbindir}/usermod -s %{NAMED_SHELL} -d %{NAMED_HOMEDIR} %{NAMED_UID_NAME} 2>/dev/null || : +%define GROUPADD_NAMED getent group %{NAMED_GID_NAME} >/dev/null || %{_sbindir}/groupadd -g %{NAMED_GID} -o -r %{NAMED_GID_NAME} +%define USERADD_NAMED getent passwd %{NAMED_UID_NAME} >/dev/null || %{_sbindir}/useradd -r -o -g %{NAMED_GID_NAME} -u %{NAMED_UID} -s %{NAMED_SHELL} -c "%{NAMED_COMMENT}" -d %{NAMED_HOMEDIR} %{NAMED_UID_NAME} +%define USERMOD_NAMED getent passwd %{NAMED_UID_NAME} >/dev/null || %{_sbindir}/usermod -s %{NAMED_SHELL} -d %{NAMED_HOMEDIR} %{NAMED_UID_NAME} %define with_systemd 0 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir}