From 54efc1f1f2857c3eae532f083d0681189141ef177e57da9c8f162065d4bedafb Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 16 Nov 2012 10:00:05 +0000 Subject: [PATCH] Accepting request 141388 from home:a_jaeger:FactoryFix Fix useradd/groupadd invocation. OBS-URL: https://build.opensuse.org/request/show/141388 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=81 --- pcsc-lite.changes | 6 ++++++ pcsc-lite.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pcsc-lite.changes b/pcsc-lite.changes index 2a54a34..ca777ff 100644 --- a/pcsc-lite.changes +++ b/pcsc-lite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 15 08:44:18 UTC 2012 - aj@suse.de + +- Fix useradd/groupadd invocation: -o is useless without -u and newer + versions of pwdutils/shadowutils fail on this now. + ------------------------------------------------------------------- Fri Aug 31 16:17:47 UTC 2012 - wr@rosenauer.org diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 1f1efe0..0aefb50 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -158,8 +158,8 @@ cp -a AUTHORS ChangeLog ChangeLog.svn COPYING DRIVERS HELP NEWS README README.SU rm -rf $RPM_BUILD_ROOT %pre -getent group %{GROUP} >/dev/null || groupadd -r -o %{GROUP} -getent passwd %{USER} >/dev/null || useradd -r -o -g %{GROUP} -s /bin/nologin -c "Smart Card Reader" -d /var/run/pcscd %{USER} +getent group %{GROUP} >/dev/null || groupadd -r %{GROUP} +getent passwd %{USER} >/dev/null || useradd -r -g %{GROUP} -s /bin/nologin -c "Smart Card Reader" -d /var/run/pcscd %{USER} %if %suse_version > 1140 %service_add_pre pcscd.service pcscd.socket %endif