From 5eb07eefb8647472a32b0abd8495aa5b53340339fe3f5a530222936901384cce Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 13 Nov 2012 09:36:56 +0000 Subject: [PATCH] - Fix default group value in /etc/default/useradd (useradd-default.diff) OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=3 --- shadow.changes | 6 ++++++ shadow.spec | 43 ++++++++++++++++++++++--------------------- useradd-default.diff | 9 +++++++++ 3 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 useradd-default.diff diff --git a/shadow.changes b/shadow.changes index a7de446..883b5fe 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 13 10:36:28 CET 2012 - kukuk@suse.de + +- Fix default group value in /etc/default/useradd + (useradd-default.diff) + ------------------------------------------------------------------- Thu Sep 27 15:20:44 CEST 2012 - kukuk@suse.de diff --git a/shadow.spec b/shadow.spec index ab404b4..76683f4 100644 --- a/shadow.spec +++ b/shadow.spec @@ -1,5 +1,5 @@ # -# spec file for package shadow-utils +# spec file for package shadow # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,31 +17,33 @@ Summary: Utilities to Manage User and Group Accounts +License: BSD-3-Clause and GPL-2.0+ +Group: System/Base Name: shadow Version: 4.1.5.1 -Release: 1 -License: BSD-3-Clause ; GPL-2.0+ -Group: System/Base +Release: 0 Url: http://pkg-shadow.alioth.debian.org/ Source: http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2 -Source1: pamd.tar.bz2 -Source2: README.changes-pwdutils -Source3: useradd.local -Source4: userdel-pre.local -Source5: userdel-post.local -Patch: shadow-login_defs.diff -Patch1: userdel-scripts.diff -Patch2: useradd-script.diff -Patch3: chkname-regex.diff -BuildRequires: pam-devel -BuildRequires: libselinux-devel +Source1: pamd.tar.bz2 +Source2: README.changes-pwdutils +Source3: useradd.local +Source4: userdel-pre.local +Source5: userdel-post.local +Patch: shadow-login_defs.diff +Patch1: userdel-scripts.diff +Patch2: useradd-script.diff +Patch3: chkname-regex.diff +Patch4: useradd-default.diff BuildRequires: audit-devel +BuildRequires: libacl-devel +BuildRequires: libattr-devel +BuildRequires: libselinux-devel BuildRequires: libsemanage-devel -BuildRequires: libacl-devel libattr-devel +BuildRequires: pam-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: permissions -Provides: pwdutils = 3.2.20 -Obsoletes: pwdutils <= 3.2.19 +PreReq: permissions +Provides: pwdutils = 3.2.20 +Obsoletes: pwdutils <= 3.2.19 %description This package includes the necessary programs for converting plain @@ -54,6 +56,7 @@ group accounts. %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 mv -v doc/HOWTO.utf8 doc/HOWTO @@ -86,7 +89,6 @@ install -m 0755 %SOURCE3 $RPM_BUILD_ROOT/%{_sbindir}/ install -m 0755 %SOURCE4 $RPM_BUILD_ROOT/%{_sbindir}/ install -m 0755 %SOURCE5 $RPM_BUILD_ROOT/%{_sbindir}/ - # Remove binaries we don't use. rm $RPM_BUILD_ROOT/%{_bindir}/groups rm $RPM_BUILD_ROOT/%{_mandir}/man1/groups.* @@ -143,7 +145,6 @@ rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/passwd.5* rm $RPM_BUILD_ROOT/%{_mandir}/man5/shadow.5* rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/shadow.5* - rm -rf $RPM_BUILD_ROOT%{_mandir}/{??,??_??} %find_lang shadow diff --git a/useradd-default.diff b/useradd-default.diff new file mode 100644 index 0000000..9ec3288 --- /dev/null +++ b/useradd-default.diff @@ -0,0 +1,9 @@ +--- etc/useradd ++++ etc/useradd 2012/11/13 09:29:57 +@@ -1,5 +1,5 @@ + # useradd defaults file +-GROUP=1000 ++GROUP=100 + HOME=/home + INACTIVE=-1 + EXPIRE=