rpms/shadow-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

upgrade

Browse Source
This commit is contained in:
Peter Vrabec 2005-08-05 11:48:41 +00:00
parent 9b37362f1e
commit 13b824f3e6
5 changed files with 156 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
shadow-4.0.7.tar.bz2 shadow-4.0.11.1.tar.bz2

6
Makefile
View File

@ -1,6 +0,0 @@
# Makefile for source rpm: shadow-utils
# $Id$
NAME := shadow-utils
SPECFILE = $(firstword $(wildcard *.spec))
include ../common/Makefile.common

133
shadow-4.0.11.1-vipw.patch Normal file
View File

@ -0,0 +1,133 @@
--- shadow-4.0.11.1/src/groupadd.c.vipw 2005-07-19 11:50:45.000000000 +0000
+++ shadow-4.0.11.1/src/groupadd.c 2005-08-04 15:14:58.000000000 +0000
@@ -438,6 +451,7 @@
int main (int argc, char **argv)
{
+ struct stat s;
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
struct passwd *pampw;
@@ -492,6 +506,11 @@
OPENLOG ("groupadd");
#endif /* USE_PAM */
+ if (stat("/etc/gtmp", &s) == 0) {
+ fputs("vigr lockfile (/etc/gtmp) is present.\n", stderr);
+ fail_exit(1);
+ }
+
#ifdef SHADOWGRP
is_shadow_grp = sgr_file_present ();
#endif
--- shadow-4.0.11.1/src/userdel.c.vipw 2005-08-04 15:16:06.000000000 +0000
+++ shadow-4.0.11.1/src/userdel.c 2005-08-04 15:18:15.000000000 +0000
@@ -577,6 +577,7 @@
struct group *grp;
int arg;
int errors = 0;
+ struct stat s;
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
@@ -637,6 +638,11 @@
OPENLOG ("userdel");
+ if (stat("/etc/ptmp", &s) == 0) {
+ fputs("vipw lockfile (/etc/ptmp) is present.\n", stderr);
+ fail_exit(1);
+ }
+
is_shadow_pwd = spw_file_present ();
#ifdef SHADOWGRP
is_shadow_grp = sgr_file_present ();
--- shadow-4.0.11.1/src/groupmod.c.vipw 2005-08-04 15:20:09.000000000 +0000
+++ shadow-4.0.11.1/src/groupmod.c 2005-08-04 15:21:27.000000000 +0000
@@ -407,6 +407,7 @@
int main (int argc, char **argv)
{
struct group *grp;
+ struct stat s;
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
@@ -458,6 +459,11 @@
}
#endif /* USE_PAM */
+ if (stat("/etc/gtmp", &s) == 0) {
+ fputs("vigr lockfile (/etc/gtmp) is present.\n", stderr);
+ exit(1);
+ }
+
OPENLOG ("groupmod");
#ifdef SHADOWGRP
--- shadow-4.0.11.1/src/groupdel.c.vipw 2005-08-04 15:22:00.000000000 +0000
+++ shadow-4.0.11.1/src/groupdel.c 2005-08-04 15:23:10.000000000 +0000
@@ -222,6 +222,7 @@
int main (int argc, char **argv)
{
struct group *grp;
+ struct stat s;
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
@@ -276,6 +277,11 @@
}
#endif /* USE_PAM */
+ if (stat("/etc/gtmp", &s) == 0) {
+ fputs("vigr lockfile (/etc/gtmp) is present.\n", stderr);
+ exit(1);
+ }
+
OPENLOG ("groupdel");
#ifdef SHADOWGRP
--- shadow-4.0.11.1/src/usermod.c.vipw 2005-08-04 15:23:30.000000000 +0000
+++ shadow-4.0.11.1/src/usermod.c 2005-08-04 15:25:31.000000000 +0000
@@ -1224,6 +1224,7 @@
int main (int argc, char **argv)
{
int grp_err = 0;
+ struct stat s;
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
@@ -1245,6 +1246,12 @@
user_groups[0] = (char *) 0;
OPENLOG ("usermod");
+
+ if (stat("/etc/ptmp", &s) == 0) {
+ fputs("vipw lockfile (/etc/ptmp) is present.\n", stderr);
+ fail_exit(1);
+ }
+
is_shadow_pwd = spw_file_present ();
#ifdef SHADOWGRP
--- shadow-4.0.11.1/src/useradd.c.vipw 2005-08-04 15:25:54.000000000 +0000
+++ shadow-4.0.11.1/src/useradd.c 2005-08-04 15:28:42.000000000 +0000
@@ -1651,6 +1651,7 @@
int main (int argc, char **argv)
{
+ struct stat s;
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
struct passwd *pampw;
@@ -1669,6 +1670,11 @@
OPENLOG ("useradd");
+ if (stat("/etc/ptmp", &s) == 0) {
+ fputs("vipw lockfile (/etc/ptmp) is present.\n", stderr);
+ fail_exit(1);
+ }
+
sys_ngroups = sysconf (_SC_NGROUPS_MAX);
user_groups = malloc ((1 + sys_ngroups) * sizeof (char *));

81
shadow-utils.spec
View File

@ -6,42 +6,22 @@
Summary: Utilities for managing accounts and shadow password files. Summary: Utilities for managing accounts and shadow password files.
Name: shadow-utils Name: shadow-utils
Version: 4.0.7 Version: 4.0.11.1
Release: 9 Release: 1
Epoch: 2 Epoch: 2
URL: http://shadow.pld.org.pl/ URL: http://shadow.pld.org.pl/
Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
Source1: shadow-970616.login.defs Source1: shadow-970616.login.defs
Source2: shadow-970616.useradd Source2: shadow-970616.useradd
Patch0: shadow-4.0.7-redhat.patch Patch0: shadow-4.0.11.1-redhat.patch
Patch1: shadow-4.0.3-noinst.patch Patch1: shadow-4.0.3-noinst.patch
#Patch2: shadow-4.0.3-nscd.patch Patch2: shadow-4.0.11.1-vipw.patch
#Patch3: shadow-19990827-group.patch Patch3: shadow-4.0.3-goodname.patch
Patch4: shadow-4.0.3-vipw.patch Patch4: shadow-4.0.11.1-lOption.patch
#Patch5: shadow-4.0.3-mailspool.patch Patch5: shadow-4.0.11.1-newgrpPwd.patch
#Patch6: shadow-20000902-usg.patch Patch6: shadow-4.0.11.1-uniqueGroup.patch
#Patch7: shadow-4.0.3-shadow-man.patch Patch7: shadow-4.0.11.1-chageList.patch
#Patch8: shadow-utils-selinux.patch Patch8: shadow-4.0.11.1-isSelinuxEnabled.patch
#Patch9: shadow-4.0.3-lastlog-size.patch
#Patch10: shadow-4.0.3-largefile.patch
#Patch11: shadow-4.0.3-fixref.patch
#Patch12: shadow-4.0.3-uninitialized.patch
#Patch13: shadow-4.0.3-removemalloc.patch
Patch14: shadow-4.0.3-useradd-unlock.patch
Patch15: shadow-4.0.3-chage-selinux.patch
Patch16: shadow-4.0.3-goodname.patch
Patch17: shadow-4.0.3-pl-n_useradd.8.patch
#Patch18: shadow-4.0.3-skellink.patch
#Patch19: shadow-4.0.3-matchpathcon.patch
Patch20: shadow-4.0.3-selinux_context.patch
Patch21: shadow-4.0.3-lastlog.patch
Patch22: shadow-4.0.3-maxmem.patch
Patch23: shadow-4.0.7-gcc4.patch
Patch24: shadow-4.0.7-newgrp-pwd.patch
Patch25: shadow-4.0.7-uniqueGroup.patch
Patch26: shadow-4.0.7-chageList.patch
Patch27: shadow-utils-4.0.7-selinuxenabled.patch
Patch28: shadow-4.0.7-nscd-socket-path.patch
License: BSD License: BSD
Group: System Environment/Base Group: System Environment/Base
@ -66,33 +46,13 @@ are used for managing group accounts.
%setup -q -n shadow-%{version} %setup -q -n shadow-%{version}
%patch0 -p1 -b .redhat %patch0 -p1 -b .redhat
%patch1 -p1 -b .noinst %patch1 -p1 -b .noinst
#%patch2 -p1 -b .nscd %patch2 -p1 -b .vipw
#%patch3 -p1 -b .group %patch3 -p1 -b .goodname
%patch4 -p1 -b .vipw %patch4 -p1 -b .lOption
#%patch5 -p1 -b .mailspool %patch5 -p1 -b .newgrpPwd
#%patch6 -p1 -b .usg %patch6 -p1 -b .uniqueGroup
#%patch7 -p1 -b .shadow-man %patch7 -p1 -b .chageList
#%patch8 -p1 -b .selinux %patch8 -p1 -b .isSelinuxEnabled
#%patch9 -p1 -b .lastlog-size
#%patch10 -p1 -b .largefile
#%patch11 -p1 -b .fixref
#%patch12 -p1 -b .uninitialized
#%patch13 -p1 -b .removemalloc
%patch14 -p1 -b .useradd-unlock
%patch15 -p1 -b .chage-selinux
%patch16 -p1 -b .goodname
%patch17 -p1 -b .pl-n
#%patch18 -p1 -b .skellink
#%patch19 -p1 -b .matchpathcon
%patch20 -p1 -b .selinux_context
%patch21 -p1 -b .lastlog
%patch22 -p1 -b .maxmem
%patch23 -p1 -b .gcc4
%patch24 -p1 -b .newgrp-pwd
%patch25 -p1 -b .uniqueGroup
%patch26 -p1 -b .chageList
%patch27 -p1 -b .selenabled
%patch28 -p1 -b .nscdSocketPath
rm po/*.gmo rm po/*.gmo
rm po/stamp-po rm po/stamp-po
@ -172,7 +132,6 @@ rm $RPM_BUILD_ROOT/%{_bindir}/login
rm $RPM_BUILD_ROOT/%{_bindir}/passwd rm $RPM_BUILD_ROOT/%{_bindir}/passwd
rm $RPM_BUILD_ROOT/%{_bindir}/su rm $RPM_BUILD_ROOT/%{_bindir}/su
rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd
rm $RPM_BUILD_ROOT/%{_sbindir}/mkpasswd
rm $RPM_BUILD_ROOT/%{_sbindir}/vipw rm $RPM_BUILD_ROOT/%{_sbindir}/vipw
rm $RPM_BUILD_ROOT/%{_sbindir}/vigr rm $RPM_BUILD_ROOT/%{_sbindir}/vigr
@ -206,8 +165,6 @@ rm $RPM_BUILD_ROOT/%{_mandir}/man5/suauth.*
rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/suauth.* rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/suauth.*
rm $RPM_BUILD_ROOT/%{_mandir}/man8/logoutd.* rm $RPM_BUILD_ROOT/%{_mandir}/man8/logoutd.*
rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/logoutd.* rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/logoutd.*
rm $RPM_BUILD_ROOT/%{_mandir}/man8/mkpasswd.*
rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/mkpasswd.*
rm $RPM_BUILD_ROOT/%{_mandir}/man8/vipw.* rm $RPM_BUILD_ROOT/%{_mandir}/man8/vipw.*
rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vipw.* rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vipw.*
rm $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.* rm $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.*
@ -248,6 +205,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/man1/newgrp.1* %{_mandir}/*/man1/newgrp.1*
%{_mandir}/man3/shadow.3* %{_mandir}/man3/shadow.3*
%{_mandir}/man5/shadow.5* %{_mandir}/man5/shadow.5*
%{_mandir}/man5/gshadow.5*
%{_mandir}/*/man5/shadow.5* %{_mandir}/*/man5/shadow.5*
%{_mandir}/man5/faillog.5* %{_mandir}/man5/faillog.5*
%{_mandir}/*/man5/faillog.5* %{_mandir}/*/man5/faillog.5*
@ -273,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/man8/faillog.8* %{_mandir}/*/man8/faillog.8*
%changelog %changelog
* Fri Aug 05 2005 Peter Vrabec <pvrabec@redhat.com> 2:4.0.11.1-1
- upgrade
* Mon May 23 2005 Peter Vrabec <pvrabec@redhat.com> 2:4.0.7-9 * Mon May 23 2005 Peter Vrabec <pvrabec@redhat.com> 2:4.0.7-9
- remove vigr binary - remove vigr binary

2
sources
View File

@ -1 +1 @@
89ebec0d1c0d861a5bd5c4c63e5cb0cc shadow-4.0.7.tar.bz2 e60b7b16128b9e00576073389a0ff1e6 shadow-4.0.11.1.tar.bz2