diff --git a/.cvsignore b/.cvsignore index fa9f073..4f484b4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -shadow-4.0.15.tar.bz2 +shadow-4.0.16.tar.bz2 diff --git a/shadow-4.0.16-lOption.patch b/shadow-4.0.16-lOption.patch new file mode 100644 index 0000000..03bfd9c --- /dev/null +++ b/shadow-4.0.16-lOption.patch @@ -0,0 +1,59 @@ +--- shadow-4.0.16/man/useradd.8.lOption 2006-06-06 10:41:47.000000000 +0200 ++++ shadow-4.0.16/man/useradd.8 2006-06-06 10:42:59.000000000 +0200 +@@ -96,6 +96,9 @@ + \fB\-m\fR + option. The default is to not create the directory and to not copy any files. + .TP 3n ++\fB-l\fR ++Do not add the user to the last login log file. This is an option added by Red Hat. ++.TP 3n + \fB-n\fR + A group having the same name as the user being added to the system will be created by default. This option will turn off this Red Hat Linux specific behavior. When this option is used, users by default will be placed in whatever group is specified in \fI/etc/default/useradd\fR. If no default group is defined, group 1 will be used. + .TP 3n +--- shadow-4.0.16/src/useradd.c.lOption 2006-06-06 10:41:47.000000000 +0200 ++++ shadow-4.0.16/src/useradd.c 2006-06-06 10:41:47.000000000 +0200 +@@ -124,6 +124,7 @@ + Gflg = 0, /* secondary group set for new account */ + kflg = 0, /* specify a directory to fill new user directory */ + mflg = 0, /* create user's home directory if it doesn't exist */ ++ lflg = 0; /* do not add user to lastlog database file */ + Mflg = 0, /* do NOT create user's home directory no matter what */ + nflg = 0, /* do NOT create a group having the same name as the user */ + oflg = 0, /* permit non-unique user ID to be specified with -u */ +@@ -630,6 +631,7 @@ + " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" + " -m, --create-home create home directory for the new user\n" + " account\n" ++ " -l, do not add user to lastlog database file\n" + " -M, do not create user's home directory(overrides /etc/login.defs)\n" + " -r, create system account\n" + " -o, --non-unique allow create user with duplicate\n" +@@ -1035,7 +1037,7 @@ + {NULL, 0, NULL, '\0'} + }; + while ((c = +- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnrop:s:u:", ++ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:", + long_options, NULL)) != -1) { + switch (c) { + case 'b': +@@ -1175,6 +1177,9 @@ + case 'm': + mflg++; + break; ++ case 'l': ++ lflg++; ++ break; + case 'o': + oflg++; + break; +@@ -1540,7 +1545,8 @@ + */ + if (!getpwuid (user_id)) { + faillog_reset (user_id); +- lastlog_reset (user_id); ++ if (!lflg) ++ lastlog_reset (user_id); + } + + /* diff --git a/shadow-utils.spec b/shadow-utils.spec index b9c2ebf..0fbb633 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -4,21 +4,19 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils -Version: 4.0.15 -Release: 3 +Version: 4.0.16 +Release: 1 Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 Source1: shadow-4.0.15-login.defs Source2: shadow-970616.useradd -Patch0: shadow-4.0.15-redhat.patch +Patch0: shadow-4.0.16-redhat.patch Patch1: shadow-4.0.3-noinst.patch Patch2: shadow-4.0.11.1-vipw.patch Patch3: shadow-4.0.14-goodname.patch Patch4: shadow-4.0.13-newgrpPwd.patch -Patch5: shadow-4.0.12-lOption.patch -Patch6: shadow-4.0.14-symlinks.patch -Patch7: shadow-4.0.15-nscdFlushCash.patch +Patch5: shadow-4.0.16-lOption.patch License: BSD Group: System Environment/Base @@ -50,8 +48,6 @@ are used for managing group accounts. %patch3 -p1 -b .goodname %patch4 -p1 -b .newgrpPwd %patch5 -p1 -b .lOption -%patch6 -p1 -b .symlinks -%patch7 -p1 -b .nscdFlushCash rm po/*.gmo rm po/stamp-po @@ -97,12 +93,13 @@ rm $RPM_BUILD_ROOT/%{_bindir}/groups rm $RPM_BUILD_ROOT/%{_bindir}/login rm $RPM_BUILD_ROOT/%{_bindir}/passwd rm $RPM_BUILD_ROOT/%{_bindir}/su +rm $RPM_BUILD_ROOT/etc/login.access +rm $RPM_BUILD_ROOT/etc/limits rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd rm $RPM_BUILD_ROOT/%{_sbindir}/vipw rm $RPM_BUILD_ROOT/%{_sbindir}/vigr rm $RPM_BUILD_ROOT/%{_sbindir}/nologin rm $RPM_BUILD_ROOT/%{_sbindir}/chgpasswd -rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/id.* rm $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.* rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chfn.* rm $RPM_BUILD_ROOT/%{_mandir}/man1/chsh.* @@ -135,8 +132,8 @@ rm $RPM_BUILD_ROOT/%{_mandir}/man8/nologin.* rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/nologin.* rm $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.* rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vigr.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/sulogin.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man3/pw_auth.* +rm $RPM_BUILD_ROOT/%{_mandir}/man8/chgpasswd.* +rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/chgpasswd.* %find_lang shadow @@ -147,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc NEWS doc/HOWTO README %dir /etc/default -%attr(0644,root,root) %config /etc/login.defs +%attr(0644,root,root) %config(noreplace) /etc/login.defs %attr(0600,root,root) %config /etc/default/useradd %{_bindir}/sg %{_bindir}/chage @@ -205,6 +202,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/man8/faillog.8* %changelog +* Tue Jun 06 2006 Peter Vrabec 2:4.0.16-1 +- upgrade +- do not replace login.defs file (#190014) + * Sat Apr 08 2006 Peter Vrabec 2:4.0.15-3 - fix typo in shadow-4.0.15-login.defs (#188263) diff --git a/sources b/sources index 812132f..5f9ba57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0452fa989f8ba45023cc5a08136568e shadow-4.0.15.tar.bz2 +1d91f7479143d1d705b94180c0d4874b shadow-4.0.16.tar.bz2