[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (92382bbf88fd50875e2fd2f299327a28c12b19a4)

Ladislav Hagara scm at sourcemage.org
Tue Nov 13 17:52:47 EST 2007


GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 security/shadow/BUILD                                 |    1 
 security/shadow/DETAILS                               |    8 
 security/shadow/HISTORY                               |    8 
 security/shadow/shadow-4.0.18.1-useradd-usermod.patch |   42 +
 security/shadow/su.patch                              |  467 +++++++++---------
 5 files changed, 310 insertions(+), 216 deletions(-)

New commits:
commit 451818a5f7b793ff11ca2aa2db425b8e6a649847
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    shadow: added patch from Gentoo [Bug 13601]

commit d6482245989b36e7ec3d20fdb3bd06ff6cef6886
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    Revert "Revert "shadow 4.0.18.1""
    
    This reverts commit 201a8002859697aa67986669f15331a61a2bfc0d.

diff --git a/security/shadow/BUILD b/security/shadow/BUILD
index 6b6be26..954f142 100755
--- a/security/shadow/BUILD
+++ b/security/shadow/BUILD
@@ -1,6 +1,7 @@
 # Do not compile/install su, coreutils provides that
 # Bug #4008
 patch  -p1  <  ${SCRIPT_DIRECTORY}/su.patch  &&
+patch  -p1  <  ${SCRIPT_DIRECTORY}/shadow-4.0.18.1-useradd-usermod.patch  &&
 
 # Do not install default pam configuration files
 sedit 's|pam.d||' etc/Makefile.in  &&
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index ebe63b0..2198a6a 100755
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -1,12 +1,12 @@
            SPELL=shadow
-         VERSION=4.0.17
-     SOURCE_HASH=sha512:6bd3fa9d027cfb4168b0f8403cab259f8c1d80da017021392ad914414ad9da36feb0363a0e31d4ff535fe410c8eaa6d8af35d7a574a961ce4f9e99edffc54766
+         VERSION=4.0.18.1
+     SOURCE_HASH=sha512:dc4be79f7e64540129f3c16be392e1d022f771020e5e69b2f03a6db4e73cab780068bd8485609cc65bb46a84316c5d87eefec9ff2c86d718488f3195b5e742c8
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://ftp.pld.org.pl/software/$SPELL/$SOURCE
+   SOURCE_URL[0]=http://cross-lfs.org/files/packages/svn/$SOURCE
         WEB_SITE=http://shadow.pld.org.pl/
          ENTERED=20050303
-      PATCHLEVEL=3
+      PATCHLEVEL=1
   SECURITY_PATCH=3
         KEYWORDS="security password"
            SHORT="Shadow password file utilities"
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index bd27884..e3dc2c7 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,11 @@
+2007-11-13 Ladislav Hagara <hgr at vabo.cz>
+	* BUILD, shadow-4.0.18.1-useradd-usermod.patch: added patch from Gentoo
+	  [Bug 13601]
+
+2007-10-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.0.18.1, new SOURCE_URL[0] [Bug 13601]
+	* su.patch: recreated
+
 2007-03-31 Thomas Orgis <sobukus at sourcemage.org>
 	* INSTALL: prevent make install from overwriting config files, install
 	  /etc/defaults/useradd as config file (issues still open with this one,
diff --git a/security/shadow/shadow-4.0.18.1-useradd-usermod.patch b/security/shadow/shadow-4.0.18.1-useradd-usermod.patch
new file mode 100644
index 0000000..8fe1432
--- /dev/null
+++ b/security/shadow/shadow-4.0.18.1-useradd-usermod.patch
@@ -0,0 +1,42 @@
+--- shadow-4.0.18.1.orig/src/useradd.c	2006-07-28 19:42:48.000000000 +0200
++++ shadow-4.0.18.1/src/useradd.c	2006-08-04 09:24:34.000000000 +0200
+@@ -203,13 +203,17 @@
+ 	long gid;
+ 	char *errptr;
+ 
++	struct group* grp = getgrnam (grname);
++	if (grp)
++		return grp;
++
+ 	gid = strtol (grname, &errptr, 10);
+ 	if (*errptr || errno == ERANGE || gid < 0) {
+ 		fprintf (stderr,
+ 			 _("%s: invalid numeric argument '%s'\n"), Prog, grname);
+ 		exit (E_BAD_ARG);
+ 	}
+-	return getgrnam (grname);
++	return getgrgid (gid);
+ }
+ 
+ static long get_number (const char *numstr)
+--- shadow-4.0.18.1.orig/src/usermod.c	2006-07-28 19:42:48.000000000 +0200
++++ shadow-4.0.18.1/src/usermod.c	2006-08-04 09:24:21.000000000 +0200
+@@ -165,13 +165,17 @@
+ 	long val;
+ 	char *errptr;
+ 
++	struct group* grp = getgrnam (grname);
++	if (grp)
++		return grp;
++
+ 	val = strtol (grname, &errptr, 10);
+ 	if (*errptr || errno == ERANGE || val < 0) {
+ 		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+ 			 grname);
+ 		exit (E_BAD_ARG);
+ 	}
+-	return getgrnam (grname);
++	return getgrgid (val);
+ }
+ 
+ /*
diff --git a/security/shadow/su.patch b/security/shadow/su.patch
index eda9e13..e859c3e 100644
--- a/security/shadow/su.patch
+++ b/security/shadow/su.patch
@@ -1,6 +1,70 @@
-diff -ur shadow-4.0.17/man/cs/Makefile.am shadow-4.0.17.cp/man/cs/Makefile.am
---- shadow-4.0.17/man/cs/Makefile.am	2006-06-04 18:14:28.000000000 +0200
-+++ shadow-4.0.17.cp/man/cs/Makefile.am	2006-07-12 09:59:09.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/man/Makefile.am shadow-4.0.18.1/man/Makefile.am
+--- shadow-4.0.18.1.ori/man/Makefile.am	2006-08-03 12:04:22.000000000 +0200
++++ shadow-4.0.18.1/man/Makefile.am	2007-10-16 21:16:16.000000000 +0200
+@@ -43,8 +43,6 @@
+ 	shadow.3.xml \
+ 	shadow.5.xml \
+ 	sg.1.xml \
+-	su.1.xml \
+-	suauth.5.xml \
+ 	useradd.8.xml \
+ 	userdel.8.xml \
+ 	usermod.8.xml \
+@@ -86,8 +84,6 @@
+ 	sg.1 \
+ 	shadow.3 \
+ 	shadow.5 \
+-	su.1 \
+-	suauth.5 \
+ 	useradd.8 \
+ 	userdel.8 \
+ 	usermod.8 \
+@@ -108,9 +104,7 @@
+ 	$(man_XMANS) \
+ 	$(man_nopam) \
+ 	id.1 \
+-	id.1.xml \
+-	sulogin.8 \
+-	sulogin.8.xml
++	id.1.xml
+ 
+ if ENABLE_REGENERATE_MAN
+ 
+diff -ur shadow-4.0.18.1.ori/man/Makefile.in shadow-4.0.18.1/man/Makefile.in
+--- shadow-4.0.18.1.ori/man/Makefile.in	2006-08-03 12:25:10.000000000 +0200
++++ shadow-4.0.18.1/man/Makefile.in	2007-10-16 21:17:08.000000000 +0200
+@@ -242,8 +242,6 @@
+ 	shadow.3.xml \
+ 	shadow.5.xml \
+ 	sg.1.xml \
+-	su.1.xml \
+-	suauth.5.xml \
+ 	useradd.8.xml \
+ 	userdel.8.xml \
+ 	usermod.8.xml \
+@@ -254,7 +252,7 @@
+ 	groupdel.8 groupmems.8 groupmod.8 groups.1 grpck.8 grpconv.8 \
+ 	grpunconv.8 gshadow.5 lastlog.8 login.1 login.defs.5 logoutd.8 \
+ 	newgrp.1 newusers.8 nologin.8 passwd.1 passwd.5 pwck.8 \
+-	pwconv.8 pwunconv.8 sg.1 shadow.3 shadow.5 su.1 suauth.5 \
++	pwconv.8 pwunconv.8 sg.1 shadow.3 shadow.5 \
+ 	useradd.8 userdel.8 usermod.8 vigr.8 vipw.8 $(am__append_1)
+ man_nopam = \
+ 	limits.5 \
+@@ -266,9 +264,7 @@
+ 	$(man_XMANS) \
+ 	$(man_nopam) \
+ 	id.1 \
+-	id.1.xml \
+-	sulogin.8 \
+-	sulogin.8.xml
++	id.1.xml
+ 
+ @ENABLE_REGENERATE_MAN_TRUE at CLEANFILES = $(man_MANS) $(ALL_TRANSLATED_XMLS)
+ @ENABLE_REGENERATE_MAN_TRUE at POFILES = $(foreach lang, $(LINGUAS), $(lang)/$(lang).po)
+diff -ur shadow-4.0.18.1.ori/man/cs/Makefile.am shadow-4.0.18.1/man/cs/Makefile.am
+--- shadow-4.0.18.1.ori/man/cs/Makefile.am	2006-08-03 12:00:56.000000000 +0200
++++ shadow-4.0.18.1/man/cs/Makefile.am	2007-10-16 21:08:23.000000000 +0200
 @@ -16,7 +16,6 @@
  	nologin.8 \
  	passwd.5 \
@@ -9,10 +73,10 @@ diff -ur shadow-4.0.17/man/cs/Makefile.am shadow-4.0.17.cp/man/cs/Makefile.am
  	vipw.8
  
  EXTRA_DIST = $(man_MANS) \
-diff -ur shadow-4.0.17/man/cs/Makefile.in shadow-4.0.17.cp/man/cs/Makefile.in
---- shadow-4.0.17/man/cs/Makefile.in	2006-06-25 14:31:38.000000000 +0200
-+++ shadow-4.0.17.cp/man/cs/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -200,7 +200,6 @@
+diff -ur shadow-4.0.18.1.ori/man/cs/Makefile.in shadow-4.0.18.1/man/cs/Makefile.in
+--- shadow-4.0.18.1.ori/man/cs/Makefile.in	2006-08-03 12:25:11.000000000 +0200
++++ shadow-4.0.18.1/man/cs/Makefile.in	2007-10-16 21:07:30.000000000 +0200
+@@ -207,7 +207,6 @@
  	nologin.8 \
  	passwd.5 \
  	shadow.5 \
@@ -20,9 +84,9 @@ diff -ur shadow-4.0.17/man/cs/Makefile.in shadow-4.0.17.cp/man/cs/Makefile.in
  	vipw.8
  
  EXTRA_DIST = $(man_MANS) \
-diff -ur shadow-4.0.17/man/es/Makefile.am shadow-4.0.17.cp/man/es/Makefile.am
---- shadow-4.0.17/man/es/Makefile.am	2005-12-13 12:34:59.000000000 +0100
-+++ shadow-4.0.17.cp/man/es/Makefile.am	2006-07-12 09:59:09.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/man/es/Makefile.am shadow-4.0.18.1/man/es/Makefile.am
+--- shadow-4.0.18.1.ori/man/es/Makefile.am	2006-08-03 12:00:56.000000000 +0200
++++ shadow-4.0.18.1/man/es/Makefile.am	2007-10-16 21:08:57.000000000 +0200
 @@ -6,7 +6,6 @@
  	newgrp.1 \
  	passwd.1 \
@@ -31,10 +95,10 @@ diff -ur shadow-4.0.17/man/es/Makefile.am shadow-4.0.17.cp/man/es/Makefile.am
  	vigr.8 \
  	vipw.8
  
-diff -ur shadow-4.0.17/man/es/Makefile.in shadow-4.0.17.cp/man/es/Makefile.in
---- shadow-4.0.17/man/es/Makefile.in	2006-06-25 14:31:38.000000000 +0200
-+++ shadow-4.0.17.cp/man/es/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -190,7 +190,6 @@
+diff -ur shadow-4.0.18.1.ori/man/es/Makefile.in shadow-4.0.18.1/man/es/Makefile.in
+--- shadow-4.0.18.1.ori/man/es/Makefile.in	2006-08-03 12:25:11.000000000 +0200
++++ shadow-4.0.18.1/man/es/Makefile.in	2007-10-16 21:09:05.000000000 +0200
+@@ -197,7 +197,6 @@
  	newgrp.1 \
  	passwd.1 \
  	passwd.5 \
@@ -42,9 +106,9 @@ diff -ur shadow-4.0.17/man/es/Makefile.in shadow-4.0.17.cp/man/es/Makefile.in
  	vigr.8 \
  	vipw.8
  
-diff -ur shadow-4.0.17/man/fi/Makefile.am shadow-4.0.17.cp/man/fi/Makefile.am
---- shadow-4.0.17/man/fi/Makefile.am	2005-11-12 18:01:00.000000000 +0100
-+++ shadow-4.0.17.cp/man/fi/Makefile.am	2006-07-12 09:59:09.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/man/fi/Makefile.am shadow-4.0.18.1/man/fi/Makefile.am
+--- shadow-4.0.18.1.ori/man/fi/Makefile.am	2006-08-03 12:00:56.000000000 +0200
++++ shadow-4.0.18.1/man/fi/Makefile.am	2007-10-16 21:09:41.000000000 +0200
 @@ -4,7 +4,6 @@
  man_MANS = \
  	chfn.1 \
@@ -54,10 +118,10 @@ diff -ur shadow-4.0.17/man/fi/Makefile.am shadow-4.0.17.cp/man/fi/Makefile.am
 +	passwd.1
  
  EXTRA_DIST = $(man_MANS)
-diff -ur shadow-4.0.17/man/fi/Makefile.in shadow-4.0.17.cp/man/fi/Makefile.in
---- shadow-4.0.17/man/fi/Makefile.in	2006-06-25 14:31:39.000000000 +0200
-+++ shadow-4.0.17.cp/man/fi/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -185,8 +185,7 @@
+diff -ur shadow-4.0.18.1.ori/man/fi/Makefile.in shadow-4.0.18.1/man/fi/Makefile.in
+--- shadow-4.0.18.1.ori/man/fi/Makefile.in	2006-08-03 12:25:11.000000000 +0200
++++ shadow-4.0.18.1/man/fi/Makefile.in	2007-10-16 21:09:52.000000000 +0200
+@@ -192,8 +192,7 @@
  man_MANS = \
  	chfn.1 \
  	chsh.1 \
@@ -67,22 +131,10 @@ diff -ur shadow-4.0.17/man/fi/Makefile.in shadow-4.0.17.cp/man/fi/Makefile.in
  
  EXTRA_DIST = $(man_MANS)
  all: all-am
-diff -ur shadow-4.0.17/man/fr/Makefile.am shadow-4.0.17.cp/man/fr/Makefile.am
---- shadow-4.0.17/man/fr/Makefile.am	2006-05-20 04:25:42.000000000 +0200
-+++ shadow-4.0.17.cp/man/fr/Makefile.am	2006-07-12 09:59:09.000000000 +0200
-@@ -43,8 +43,6 @@
- 	sg.1 \
- 	shadow.3 \
- 	shadow.5 \
--	su.1 \
--	suauth.5 \
- 	useradd.8 \
- 	userdel.8 \
- 	usermod.8 \
-diff -ur shadow-4.0.17/man/fr/Makefile.in shadow-4.0.17.cp/man/fr/Makefile.in
---- shadow-4.0.17/man/fr/Makefile.in	2006-06-25 14:31:39.000000000 +0200
-+++ shadow-4.0.17.cp/man/fr/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -225,8 +225,6 @@
+diff -ur shadow-4.0.18.1.ori/man/fr/Makefile.am shadow-4.0.18.1/man/fr/Makefile.am
+--- shadow-4.0.18.1.ori/man/fr/Makefile.am	2006-08-03 12:25:46.000000000 +0200
++++ shadow-4.0.18.1/man/fr/Makefile.am	2007-10-16 21:10:26.000000000 +0200
+@@ -33,8 +33,6 @@
  	sg.1 \
  	shadow.3 \
  	shadow.5 \
@@ -91,9 +143,21 @@ diff -ur shadow-4.0.17/man/fr/Makefile.in shadow-4.0.17.cp/man/fr/Makefile.in
  	useradd.8 \
  	userdel.8 \
  	usermod.8 \
-diff -ur shadow-4.0.17/man/hu/Makefile.am shadow-4.0.17.cp/man/hu/Makefile.am
---- shadow-4.0.17/man/hu/Makefile.am	2005-12-13 12:34:59.000000000 +0100
-+++ shadow-4.0.17.cp/man/hu/Makefile.am	2006-07-12 09:59:09.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/man/fr/Makefile.in shadow-4.0.18.1/man/fr/Makefile.in
+--- shadow-4.0.18.1.ori/man/fr/Makefile.in	2006-08-03 12:30:17.000000000 +0200
++++ shadow-4.0.18.1/man/fr/Makefile.in	2007-10-16 21:10:59.000000000 +0200
+@@ -199,7 +199,7 @@
+ 	groupmod.8 groups.1 grpck.8 grpconv.8 grpunconv.8 gshadow.5 \
+ 	lastlog.8 login.1 login.defs.5 logoutd.8 newgrp.1 newusers.8 \
+ 	passwd.1 passwd.5 pwck.8 pwconv.8 pwunconv.8 sg.1 shadow.3 \
+-	shadow.5 su.1 suauth.5 useradd.8 userdel.8 usermod.8 vigr.8 \
++	shadow.5 useradd.8 userdel.8 usermod.8 vigr.8 \
+ 	vipw.8 $(am__append_1)
+ man_nopam = \
+ 	limits.5 \
+diff -ur shadow-4.0.18.1.ori/man/hu/Makefile.am shadow-4.0.18.1/man/hu/Makefile.am
+--- shadow-4.0.18.1.ori/man/hu/Makefile.am	2006-08-03 12:00:56.000000000 +0200
++++ shadow-4.0.18.1/man/hu/Makefile.am	2007-10-16 21:11:30.000000000 +0200
 @@ -10,8 +10,7 @@
  	newgrp.1 \
  	passwd.1 \
@@ -103,12 +167,13 @@ diff -ur shadow-4.0.17/man/hu/Makefile.am shadow-4.0.17.cp/man/hu/Makefile.am
 +	sg.1
  
  EXTRA_DIST = $(man_MANS)
-  
+- 
 \ No newline at end of file
-diff -ur shadow-4.0.17/man/hu/Makefile.in shadow-4.0.17.cp/man/hu/Makefile.in
---- shadow-4.0.17/man/hu/Makefile.in	2006-06-25 14:31:39.000000000 +0200
-+++ shadow-4.0.17.cp/man/hu/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -194,8 +194,7 @@
++ 
+diff -ur shadow-4.0.18.1.ori/man/hu/Makefile.in shadow-4.0.18.1/man/hu/Makefile.in
+--- shadow-4.0.18.1.ori/man/hu/Makefile.in	2006-08-03 12:25:12.000000000 +0200
++++ shadow-4.0.18.1/man/hu/Makefile.in	2007-10-16 21:11:40.000000000 +0200
+@@ -201,8 +201,7 @@
  	newgrp.1 \
  	passwd.1 \
  	passwd.5 \
@@ -118,10 +183,10 @@ diff -ur shadow-4.0.17/man/hu/Makefile.in shadow-4.0.17.cp/man/hu/Makefile.in
  
  EXTRA_DIST = $(man_MANS)
  all: all-am
-diff -ur shadow-4.0.17/man/it/Makefile.am shadow-4.0.17.cp/man/it/Makefile.am
---- shadow-4.0.17/man/it/Makefile.am	2006-05-25 15:48:53.000000000 +0200
-+++ shadow-4.0.17.cp/man/it/Makefile.am	2006-07-12 09:59:09.000000000 +0200
-@@ -38,7 +38,6 @@
+diff -ur shadow-4.0.18.1.ori/man/it/Makefile.am shadow-4.0.18.1/man/it/Makefile.am
+--- shadow-4.0.18.1.ori/man/it/Makefile.am	2006-08-03 12:11:59.000000000 +0200
++++ shadow-4.0.18.1/man/it/Makefile.am	2007-10-16 21:12:13.000000000 +0200
+@@ -30,7 +30,6 @@
  	sg.1 \
  	shadow.3 \
  	shadow.5 \
@@ -129,21 +194,22 @@ diff -ur shadow-4.0.17/man/it/Makefile.am shadow-4.0.17.cp/man/it/Makefile.am
  	useradd.8 \
  	userdel.8 \
  	usermod.8 \
-diff -ur shadow-4.0.17/man/it/Makefile.in shadow-4.0.17.cp/man/it/Makefile.in
---- shadow-4.0.17/man/it/Makefile.in	2006-06-25 14:31:40.000000000 +0200
-+++ shadow-4.0.17.cp/man/it/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -220,7 +220,6 @@
- 	sg.1 \
- 	shadow.3 \
- 	shadow.5 \
--	su.1 \
- 	useradd.8 \
- 	userdel.8 \
- 	usermod.8 \
-diff -ur shadow-4.0.17/man/ja/Makefile.am shadow-4.0.17.cp/man/ja/Makefile.am
---- shadow-4.0.17/man/ja/Makefile.am	2006-05-13 16:16:59.000000000 +0200
-+++ shadow-4.0.17.cp/man/ja/Makefile.am	2006-07-12 10:01:46.000000000 +0200
-@@ -40,8 +40,6 @@
+diff -ur shadow-4.0.18.1.ori/man/it/Makefile.in shadow-4.0.18.1/man/it/Makefile.in
+--- shadow-4.0.18.1.ori/man/it/Makefile.in	2006-08-03 12:25:12.000000000 +0200
++++ shadow-4.0.18.1/man/it/Makefile.in	2007-10-16 21:12:29.000000000 +0200
+@@ -198,7 +198,7 @@
+ 	faillog.8 getspnam.3 gpasswd.1 groupadd.8 groupdel.8 \
+ 	groupmod.8 groups.1 grpck.8 grpconv.8 grpunconv.8 lastlog.8 \
+ 	login.1 newgrp.1 newusers.8 passwd.1 passwd.5 pwck.8 pwconv.8 \
+-	pwunconv.8 sg.1 shadow.3 shadow.5 su.1 useradd.8 userdel.8 \
++	pwunconv.8 sg.1 shadow.3 shadow.5 useradd.8 userdel.8 \
+ 	usermod.8 vigr.8 vipw.8 $(am__append_1)
+ man_nopam = \
+ 	porttime.5
+diff -ur shadow-4.0.18.1.ori/man/ja/Makefile.am shadow-4.0.18.1/man/ja/Makefile.am
+--- shadow-4.0.18.1.ori/man/ja/Makefile.am	2006-08-03 12:12:36.000000000 +0200
++++ shadow-4.0.18.1/man/ja/Makefile.am	2007-10-16 21:14:14.000000000 +0200
+@@ -30,8 +30,6 @@
  	pwunconv.8 \
  	sg.1 \
  	shadow.5 \
@@ -152,39 +218,38 @@ diff -ur shadow-4.0.17/man/ja/Makefile.am shadow-4.0.17.cp/man/ja/Makefile.am
  	useradd.8 \
  	userdel.8 \
  	usermod.8 \
-@@ -52,5 +50,4 @@
+@@ -51,5 +49,4 @@
  	$(man_MANS) \
- 	$(man_nonpam) \
+ 	$(man_nopam) \
  	id.1 \
 -	shadow.3 \
 -	sulogin.8
 +	shadow.3
-diff -ur shadow-4.0.17/man/ja/Makefile.in shadow-4.0.17.cp/man/ja/Makefile.in
---- shadow-4.0.17/man/ja/Makefile.in	2006-06-25 14:31:40.000000000 +0200
-+++ shadow-4.0.17.cp/man/ja/Makefile.in	2006-07-12 10:03:14.000000000 +0200
-@@ -221,8 +221,6 @@
- 	pwunconv.8 \
- 	sg.1 \
- 	shadow.5 \
--	su.1 \
--	suauth.5 \
- 	useradd.8 \
- 	userdel.8 \
- 	usermod.8 \
-@@ -233,9 +231,7 @@
+diff -ur shadow-4.0.18.1.ori/man/ja/Makefile.in shadow-4.0.18.1/man/ja/Makefile.in
+--- shadow-4.0.18.1.ori/man/ja/Makefile.in	2006-08-03 12:25:12.000000000 +0200
++++ shadow-4.0.18.1/man/ja/Makefile.in	2007-10-16 21:13:48.000000000 +0200
+@@ -197,7 +197,7 @@
+ 	faillog.8 gpasswd.1 groupadd.8 groupdel.8 groupmod.8 groups.1 \
+ 	grpck.8 grpconv.8 grpunconv.8 lastlog.8 login.1 login.defs.5 \
+ 	logoutd.8 newgrp.1 newusers.8 passwd.1 passwd.5 pwck.8 \
+-	pwconv.8 pwunconv.8 sg.1 shadow.5 su.1 suauth.5 useradd.8 \
++	pwconv.8 pwunconv.8 sg.1 shadow.5 useradd.8 \
+ 	userdel.8 usermod.8 vigr.8 vipw.8 $(am__append_1)
+ man_nopam = \
+ 	limits.5 \
+@@ -208,8 +208,7 @@
  	$(man_MANS) \
- 	$(man_nonpam) \
+ 	$(man_nopam) \
  	id.1 \
 -	shadow.3 \
 -	sulogin.8
--
 +	shadow.3
+ 
  all: all-am
  
- .SUFFIXES:
-diff -ur shadow-4.0.17/man/ko/Makefile.am shadow-4.0.17.cp/man/ko/Makefile.am
---- shadow-4.0.17/man/ko/Makefile.am	2005-12-13 12:34:59.000000000 +0100
-+++ shadow-4.0.17.cp/man/ko/Makefile.am	2006-07-12 09:59:09.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/man/ko/Makefile.am shadow-4.0.18.1/man/ko/Makefile.am
+--- shadow-4.0.18.1.ori/man/ko/Makefile.am	2006-08-03 12:00:56.000000000 +0200
++++ shadow-4.0.18.1/man/ko/Makefile.am	2007-10-16 21:14:34.000000000 +0200
 @@ -7,7 +7,6 @@
  	groups.1 \
  	login.1 \
@@ -193,10 +258,10 @@ diff -ur shadow-4.0.17/man/ko/Makefile.am shadow-4.0.17.cp/man/ko/Makefile.am
  	vigr.8 \
  	vipw.8
  # newgrp.1 must be updated
-diff -ur shadow-4.0.17/man/ko/Makefile.in shadow-4.0.17.cp/man/ko/Makefile.in
---- shadow-4.0.17/man/ko/Makefile.in	2006-06-25 14:31:40.000000000 +0200
-+++ shadow-4.0.17.cp/man/ko/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -191,7 +191,6 @@
+diff -ur shadow-4.0.18.1.ori/man/ko/Makefile.in shadow-4.0.18.1/man/ko/Makefile.in
+--- shadow-4.0.18.1.ori/man/ko/Makefile.in	2006-08-03 12:25:13.000000000 +0200
++++ shadow-4.0.18.1/man/ko/Makefile.in	2007-10-16 21:14:44.000000000 +0200
+@@ -198,7 +198,6 @@
  	groups.1 \
  	login.1 \
  	passwd.5 \
@@ -204,74 +269,10 @@ diff -ur shadow-4.0.17/man/ko/Makefile.in shadow-4.0.17.cp/man/ko/Makefile.in
  	vigr.8 \
  	vipw.8
  
-diff -ur shadow-4.0.17/man/Makefile.am shadow-4.0.17.cp/man/Makefile.am
---- shadow-4.0.17/man/Makefile.am	2006-07-07 19:08:36.000000000 +0200
-+++ shadow-4.0.17.cp/man/Makefile.am	2006-07-12 10:07:41.000000000 +0200
-@@ -43,8 +43,6 @@
- 	shadow.3.xml \
- 	shadow.5.xml \
- 	sg.1.xml \
--	su.1.xml \
--	suauth.5.xml \
- 	useradd.8.xml \
- 	userdel.8.xml \
- 	usermod.8.xml \
-@@ -94,8 +92,6 @@
- 	sg.1 \
- 	shadow.3 \
- 	shadow.5 \
--	su.1 \
--	suauth.5 \
- 	useradd.8 \
- 	userdel.8 \
- 	usermod.8 \
-@@ -107,9 +103,7 @@
- 	$(man_XMANS) \
- 	$(man_nonpam) \
- 	id.1 \
--	id.1.xml \
--	sulogin.8 \
--	sulogin.8.xml
-+	id.1.xml 
- 
- if ENABLE_REGENERATE_MAN
- 
-diff -ur shadow-4.0.17/man/Makefile.in shadow-4.0.17.cp/man/Makefile.in
---- shadow-4.0.17/man/Makefile.in	2006-07-10 16:00:56.000000000 +0200
-+++ shadow-4.0.17.cp/man/Makefile.in	2006-07-12 10:08:05.000000000 +0200
-@@ -234,8 +234,6 @@
- 	shadow.3.xml \
- 	shadow.5.xml \
- 	sg.1.xml \
--	su.1.xml \
--	suauth.5.xml \
- 	useradd.8.xml \
- 	userdel.8.xml \
- 	usermod.8.xml \
-@@ -282,8 +280,6 @@
- 	sg.1 \
- 	shadow.3 \
- 	shadow.5 \
--	su.1 \
--	suauth.5 \
- 	useradd.8 \
- 	userdel.8 \
- 	usermod.8 \
-@@ -295,9 +291,7 @@
- 	$(man_XMANS) \
- 	$(man_nonpam) \
- 	id.1 \
--	id.1.xml \
--	sulogin.8 \
--	sulogin.8.xml
-+	id.1.xml
- 
- @ENABLE_REGENERATE_MAN_TRUE at CLEANFILES = $(man_MANS) $(ALL_TRANSLATED_XMLS)
- @ENABLE_REGENERATE_MAN_TRUE at POFILES = $(foreach lang, $(LINGUAS), $(lang)/$(lang).po)
-diff -ur shadow-4.0.17/man/pl/Makefile.am shadow-4.0.17.cp/man/pl/Makefile.am
---- shadow-4.0.17/man/pl/Makefile.am	2006-05-13 16:15:46.000000000 +0200
-+++ shadow-4.0.17.cp/man/pl/Makefile.am	2006-07-12 10:09:50.000000000 +0200
-@@ -40,8 +40,6 @@
+diff -ur shadow-4.0.18.1.ori/man/pl/Makefile.am shadow-4.0.18.1/man/pl/Makefile.am
+--- shadow-4.0.18.1.ori/man/pl/Makefile.am	2006-08-03 12:08:58.000000000 +0200
++++ shadow-4.0.18.1/man/pl/Makefile.am	2007-10-16 21:17:43.000000000 +0200
+@@ -30,8 +30,6 @@
  	pwunconv.8 \
  	sg.1 \
  	shadow.5 \
@@ -280,28 +281,28 @@ diff -ur shadow-4.0.17/man/pl/Makefile.am shadow-4.0.17.cp/man/pl/Makefile.am
  	useradd.8 \
  	userdel.8 \
  	usermod.8 \
-@@ -52,5 +50,4 @@
+@@ -51,5 +49,4 @@
  	$(man_MANS) \
- 	$(man_nonpam) \
+ 	$(man_nopam) \
  	id.1 \
 -	shadow.3 \
 -	sulogin.8
 +	shadow.3
-diff -ur shadow-4.0.17/man/pl/Makefile.in shadow-4.0.17.cp/man/pl/Makefile.in
---- shadow-4.0.17/man/pl/Makefile.in	2006-06-25 14:31:41.000000000 +0200
-+++ shadow-4.0.17.cp/man/pl/Makefile.in	2006-07-12 10:10:09.000000000 +0200
-@@ -221,8 +221,6 @@
- 	pwunconv.8 \
- 	sg.1 \
- 	shadow.5 \
--	su.1 \
--	suauth.5 \
- 	useradd.8 \
- 	userdel.8 \
- 	usermod.8 \
-@@ -233,8 +231,7 @@
+diff -ur shadow-4.0.18.1.ori/man/pl/Makefile.in shadow-4.0.18.1/man/pl/Makefile.in
+--- shadow-4.0.18.1.ori/man/pl/Makefile.in	2006-08-03 12:25:13.000000000 +0200
++++ shadow-4.0.18.1/man/pl/Makefile.in	2007-10-16 21:18:18.000000000 +0200
+@@ -197,7 +197,7 @@
+ 	faillog.8 gpasswd.1 groupadd.8 groupdel.8 groupmod.8 groups.1 \
+ 	grpck.8 grpconv.8 grpunconv.8 lastlog.8 login.1 login.defs.5 \
+ 	logoutd.8 newgrp.1 newusers.8 passwd.1 passwd.5 pwck.8 \
+-	pwconv.8 pwunconv.8 sg.1 shadow.5 su.1 suauth.5 useradd.8 \
++	pwconv.8 pwunconv.8 sg.1 shadow.5 useradd.8 \
+ 	userdel.8 usermod.8 vigr.8 vipw.8 $(am__append_1)
+ man_nopam = \
+ 	limits.5 \
+@@ -208,8 +208,7 @@
  	$(man_MANS) \
- 	$(man_nonpam) \
+ 	$(man_nopam) \
  	id.1 \
 -	shadow.3 \
 -	sulogin.8
@@ -309,32 +310,74 @@ diff -ur shadow-4.0.17/man/pl/Makefile.in shadow-4.0.17.cp/man/pl/Makefile.in
  
  all: all-am
  
-diff -ur shadow-4.0.17/man/ru/Makefile.am shadow-4.0.17.cp/man/ru/Makefile.am
---- shadow-4.0.17/man/ru/Makefile.am	2006-05-25 15:49:28.000000000 +0200
-+++ shadow-4.0.17.cp/man/ru/Makefile.am	2006-07-12 10:11:28.000000000 +0200
-@@ -56,5 +56,4 @@
+diff -ur shadow-4.0.18.1.ori/man/ru/Makefile.am shadow-4.0.18.1/man/ru/Makefile.am
+--- shadow-4.0.18.1.ori/man/ru/Makefile.am	2006-08-03 12:09:45.000000000 +0200
++++ shadow-4.0.18.1/man/ru/Makefile.am	2007-10-16 21:19:20.000000000 +0200
+@@ -36,8 +36,6 @@
+ 	sg.1 \
+ 	shadow.3 \
+ 	shadow.5 \
+-	su.1 \
+-	suauth.5 \
+ 	useradd.8 \
+ 	userdel.8 \
+ 	usermod.8 \
+@@ -56,5 +54,4 @@
  EXTRA_DIST = \
  	$(man_MANS) \
- 	$(man_nonpam) \
+ 	$(man_nopam) \
 -	id.1 \
 -	sulogin.8
 +	id.1
-diff -ur shadow-4.0.17/man/ru/Makefile.in shadow-4.0.17.cp/man/ru/Makefile.in
---- shadow-4.0.17/man/ru/Makefile.in	2006-06-25 14:31:41.000000000 +0200
-+++ shadow-4.0.17.cp/man/ru/Makefile.in	2006-07-12 10:11:46.000000000 +0200
-@@ -239,8 +239,7 @@
+diff -ur shadow-4.0.18.1.ori/man/ru/Makefile.in shadow-4.0.18.1/man/ru/Makefile.in
+--- shadow-4.0.18.1.ori/man/ru/Makefile.in	2006-08-03 12:25:13.000000000 +0200
++++ shadow-4.0.18.1/man/ru/Makefile.in	2007-10-16 21:19:45.000000000 +0200
+@@ -199,7 +199,7 @@
+ 	groupdel.8 groupmems.8 groupmod.8 groups.1 grpck.8 grpconv.8 \
+ 	grpunconv.8 gshadow.5 lastlog.8 login.1 login.defs.5 logoutd.8 \
+ 	newgrp.1 newusers.8 nologin.8 passwd.1 passwd.5 pwck.8 \
+-	pwconv.8 pwunconv.8 sg.1 shadow.3 shadow.5 su.1 suauth.5 \
++	pwconv.8 pwunconv.8 sg.1 shadow.3 shadow.5 \
+ 	useradd.8 userdel.8 usermod.8 vigr.8 vipw.8 $(am__append_1)
+ man_nopam = \
+ 	limits.5 \
+@@ -209,8 +209,7 @@
  EXTRA_DIST = \
  	$(man_MANS) \
- 	$(man_nonpam) \
+ 	$(man_nopam) \
 -	id.1 \
 -	sulogin.8
 +	id.1
  
  all: all-am
  
-diff -ur shadow-4.0.17/man/tr/Makefile.am shadow-4.0.17.cp/man/tr/Makefile.am
---- shadow-4.0.17/man/tr/Makefile.am	2005-12-07 21:20:18.000000000 +0100
-+++ shadow-4.0.17.cp/man/tr/Makefile.am	2006-07-12 09:59:09.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/man/sv/Makefile.am shadow-4.0.18.1/man/sv/Makefile.am
+--- shadow-4.0.18.1.ori/man/sv/Makefile.am	2006-08-03 12:13:27.000000000 +0200
++++ shadow-4.0.18.1/man/sv/Makefile.am	2007-10-16 21:32:38.000000000 +0200
+@@ -35,8 +35,6 @@
+ 	sg.1 \
+ 	shadow.3 \
+ 	shadow.5 \
+-	su.1 \
+-	suauth.5 \
+ 	useradd.8 \
+ 	userdel.8 \
+ 	usermod.8 \
+diff -ur shadow-4.0.18.1.ori/man/sv/Makefile.in shadow-4.0.18.1/man/sv/Makefile.in
+--- shadow-4.0.18.1.ori/man/sv/Makefile.in	2006-08-03 12:25:14.000000000 +0200
++++ shadow-4.0.18.1/man/sv/Makefile.in	2007-10-16 21:32:52.000000000 +0200
+@@ -199,7 +199,7 @@
+ 	groupmems.8 groupmod.8 groups.1 grpck.8 grpconv.8 grpunconv.8 \
+ 	gshadow.5 lastlog.8 login.1 login.defs.5 logoutd.8 newgrp.1 \
+ 	newusers.8 nologin.8 passwd.1 passwd.5 pwck.8 pwconv.8 \
+-	pwunconv.8 sg.1 shadow.3 shadow.5 su.1 suauth.5 useradd.8 \
++	pwunconv.8 sg.1 shadow.3 shadow.5 useradd.8 \
+ 	userdel.8 usermod.8 vigr.8 vipw.8 $(am__append_1)
+ man_nopam = \
+ 	limits.5 \
+diff -ur shadow-4.0.18.1.ori/man/tr/Makefile.am shadow-4.0.18.1/man/tr/Makefile.am
+--- shadow-4.0.18.1.ori/man/tr/Makefile.am	2006-08-03 12:00:56.000000000 +0200
++++ shadow-4.0.18.1/man/tr/Makefile.am	2007-10-16 21:20:08.000000000 +0200
 @@ -10,7 +10,6 @@
  	passwd.1 \
  	passwd.5 \
@@ -343,10 +386,10 @@ diff -ur shadow-4.0.17/man/tr/Makefile.am shadow-4.0.17.cp/man/tr/Makefile.am
  	useradd.8 \
  	userdel.8 \
  	usermod.8
-diff -ur shadow-4.0.17/man/tr/Makefile.in shadow-4.0.17.cp/man/tr/Makefile.in
---- shadow-4.0.17/man/tr/Makefile.in	2006-06-25 14:31:41.000000000 +0200
-+++ shadow-4.0.17.cp/man/tr/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -195,7 +195,6 @@
+diff -ur shadow-4.0.18.1.ori/man/tr/Makefile.in shadow-4.0.18.1/man/tr/Makefile.in
+--- shadow-4.0.18.1.ori/man/tr/Makefile.in	2006-08-03 12:25:14.000000000 +0200
++++ shadow-4.0.18.1/man/tr/Makefile.in	2007-10-16 21:20:15.000000000 +0200
+@@ -202,7 +202,6 @@
  	passwd.1 \
  	passwd.5 \
  	shadow.5 \
@@ -354,9 +397,9 @@ diff -ur shadow-4.0.17/man/tr/Makefile.in shadow-4.0.17.cp/man/tr/Makefile.in
  	useradd.8 \
  	userdel.8 \
  	usermod.8
-diff -ur shadow-4.0.17/man/zh_CN/Makefile.am shadow-4.0.17.cp/man/zh_CN/Makefile.am
---- shadow-4.0.17/man/zh_CN/Makefile.am	2005-12-13 12:34:59.000000000 +0100
-+++ shadow-4.0.17.cp/man/zh_CN/Makefile.am	2006-07-12 09:59:09.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/man/zh_CN/Makefile.am shadow-4.0.18.1/man/zh_CN/Makefile.am
+--- shadow-4.0.18.1.ori/man/zh_CN/Makefile.am	2006-08-03 12:00:56.000000000 +0200
++++ shadow-4.0.18.1/man/zh_CN/Makefile.am	2007-10-16 21:20:40.000000000 +0200
 @@ -10,7 +10,6 @@
  	groupdel.8 \
  	groupmod.8 \
@@ -365,10 +408,10 @@ diff -ur shadow-4.0.17/man/zh_CN/Makefile.am shadow-4.0.17.cp/man/zh_CN/Makefile
  	useradd.8 \
  	userdel.8 \
  	usermod.8
-diff -ur shadow-4.0.17/man/zh_CN/Makefile.in shadow-4.0.17.cp/man/zh_CN/Makefile.in
---- shadow-4.0.17/man/zh_CN/Makefile.in	2006-06-25 14:31:42.000000000 +0200
-+++ shadow-4.0.17.cp/man/zh_CN/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -196,7 +196,6 @@
+diff -ur shadow-4.0.18.1.ori/man/zh_CN/Makefile.in shadow-4.0.18.1/man/zh_CN/Makefile.in
+--- shadow-4.0.18.1.ori/man/zh_CN/Makefile.in	2006-08-03 12:25:14.000000000 +0200
++++ shadow-4.0.18.1/man/zh_CN/Makefile.in	2007-10-16 21:20:48.000000000 +0200
+@@ -203,7 +203,6 @@
  	groupdel.8 \
  	groupmod.8 \
  	passwd.5 \
@@ -376,9 +419,9 @@ diff -ur shadow-4.0.17/man/zh_CN/Makefile.in shadow-4.0.17.cp/man/zh_CN/Makefile
  	useradd.8 \
  	userdel.8 \
  	usermod.8
-diff -ur shadow-4.0.17/man/zh_TW/Makefile.am shadow-4.0.17.cp/man/zh_TW/Makefile.am
---- shadow-4.0.17/man/zh_TW/Makefile.am	2005-12-13 12:34:59.000000000 +0100
-+++ shadow-4.0.17.cp/man/zh_TW/Makefile.am	2006-07-12 09:59:09.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/man/zh_TW/Makefile.am shadow-4.0.18.1/man/zh_TW/Makefile.am
+--- shadow-4.0.18.1.ori/man/zh_TW/Makefile.am	2006-08-03 12:00:56.000000000 +0200
++++ shadow-4.0.18.1/man/zh_TW/Makefile.am	2007-10-16 21:21:05.000000000 +0200
 @@ -10,7 +10,6 @@
  	groupdel.8 \
  	groupmod.8 \
@@ -387,10 +430,10 @@ diff -ur shadow-4.0.17/man/zh_TW/Makefile.am shadow-4.0.17.cp/man/zh_TW/Makefile
  	useradd.8 \
  	userdel.8 \
  	usermod.8
-diff -ur shadow-4.0.17/man/zh_TW/Makefile.in shadow-4.0.17.cp/man/zh_TW/Makefile.in
---- shadow-4.0.17/man/zh_TW/Makefile.in	2006-06-25 14:31:42.000000000 +0200
-+++ shadow-4.0.17.cp/man/zh_TW/Makefile.in	2006-07-12 09:59:09.000000000 +0200
-@@ -196,7 +196,6 @@
+diff -ur shadow-4.0.18.1.ori/man/zh_TW/Makefile.in shadow-4.0.18.1/man/zh_TW/Makefile.in
+--- shadow-4.0.18.1.ori/man/zh_TW/Makefile.in	2006-08-03 12:25:14.000000000 +0200
++++ shadow-4.0.18.1/man/zh_TW/Makefile.in	2007-10-16 21:21:13.000000000 +0200
+@@ -203,7 +203,6 @@
  	groupdel.8 \
  	groupmod.8 \
  	passwd.5 \
@@ -398,10 +441,10 @@ diff -ur shadow-4.0.17/man/zh_TW/Makefile.in shadow-4.0.17.cp/man/zh_TW/Makefile
  	useradd.8 \
  	userdel.8 \
  	usermod.8
-diff -ur shadow-4.0.17/src/Makefile.am shadow-4.0.17.cp/src/Makefile.am
---- shadow-4.0.17/src/Makefile.am	2006-06-24 13:34:44.000000000 +0200
-+++ shadow-4.0.17.cp/src/Makefile.am	2006-07-12 09:59:09.000000000 +0200
-@@ -43,9 +43,9 @@
+diff -ur shadow-4.0.18.1.ori/src/Makefile.am shadow-4.0.18.1/src/Makefile.am
+--- shadow-4.0.18.1.ori/src/Makefile.am	2006-07-18 18:52:23.000000000 +0200
++++ shadow-4.0.18.1/src/Makefile.am	2007-10-16 21:22:18.000000000 +0200
+@@ -44,9 +44,9 @@
  	vipw
  
  # id and groups are from gnu, sulogin from sysvinit
@@ -413,9 +456,9 @@ diff -ur shadow-4.0.17/src/Makefile.am shadow-4.0.17.cp/src/Makefile.am
  suidubins      = chage chfn chsh expiry gpasswd newgrp passwd
  
  LDADD 	       = $(top_builddir)/libmisc/libmisc.a \
-diff -ur shadow-4.0.17/src/Makefile.in shadow-4.0.17.cp/src/Makefile.in
---- shadow-4.0.17/src/Makefile.in	2006-06-25 14:31:43.000000000 +0200
-+++ shadow-4.0.17.cp/src/Makefile.in	2006-07-12 10:13:57.000000000 +0200
+diff -ur shadow-4.0.18.1.ori/src/Makefile.in shadow-4.0.18.1/src/Makefile.in
+--- shadow-4.0.18.1.ori/src/Makefile.in	2006-08-03 12:25:15.000000000 +0200
++++ shadow-4.0.18.1/src/Makefile.in	2007-10-16 21:23:31.000000000 +0200
 @@ -36,7 +36,7 @@
  POST_UNINSTALL = :
  build_triplet = @build@
@@ -425,7 +468,7 @@ diff -ur shadow-4.0.17/src/Makefile.in shadow-4.0.17.cp/src/Makefile.in
  sbin_PROGRAMS = nologin$(EXEEXT)
  ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
  	chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \
-@@ -361,7 +361,7 @@
+@@ -373,7 +373,7 @@
  	-I${top_srcdir}/lib \
  	-I$(top_srcdir)/libmisc
  



More information about the SM-Commit mailing list