From e325393a07094a0605def9fad621b0d45ab140cfb150da5499e004477a697472 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 21 Nov 2012 15:04:27 +0000 Subject: [PATCH] Accepting request 142177 from home:dimstar:branches:Base:System - Change user_group_add macro to not invoke useradd and groupadd with -o parameter. Non-unique does not make sense when not passing -u/-g (useradd/groupadd) and fails on newer pwdutils/ shadowurils implementations. The macro does not allow for a uid/gid being passed. OBS-URL: https://build.opensuse.org/request/show/142177 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=243 --- macrosin.diff | 4 ++-- rpm.changes | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/macrosin.diff b/macrosin.diff index 5508b3d..87f124a 100644 --- a/macrosin.diff +++ b/macrosin.diff @@ -313,7 +313,7 @@ +%service_del_postun() %{restart_on_update %{1}} + +%user_group_add() \ -+/usr/sbin/groupadd -o -r %{1} 2>/dev/null || :\ -+/usr/sbin/useradd -o -r -g %{1} -d %{2} -s %{3} -c %{4} %{1} 2>/dev/null || :\ ++/usr/sbin/groupadd -r %{1} 2>/dev/null || :\ ++/usr/sbin/useradd -r -g %{1} -d %{2} -s %{3} -c %{4} %{1} 2>/dev/null || :\ +%{nil} + diff --git a/rpm.changes b/rpm.changes index 32a7859..2ed053d 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 20 18:47:06 UTC 2012 - dimstar@opensuse.org + +- Change user_group_add macro to not invoke useradd and groupadd + with -o parameter. Non-unique does not make sense when not + passing -u/-g (useradd/groupadd) and fails on newer pwdutils/ + shadowurils implementations. The macro does not allow for a + uid/gid being passed. + ------------------------------------------------------------------- Mon Nov 12 10:29:13 UTC 2012 - coolo@suse.com