[Pkg-shadow-commits] r574 - in trunk/debian: . patches
Christian Perrier
bubulle at costa.debian.org
Sat Oct 8 18:12:35 UTC 2005
Author: bubulle
Date: 2005-10-08 18:12:32 +0000 (Sat, 08 Oct 2005)
New Revision: 574
Modified:
trunk/debian/changelog
trunk/debian/patches/004_configure.in.dpatch
trunk/debian/patches/005_manpages.dpatch
trunk/debian/patches/008_login_log_failure_in_FTMP
trunk/debian/patches/008_su_get_PAM_username
trunk/debian/patches/008_su_no_sanitize_env
trunk/debian/patches/333_shadow.5-typo_312430
trunk/debian/patches/401_cppw_src.dpatch
trunk/debian/patches/403_sg_symlink_162339_163652.dpatch
trunk/debian/patches/404_undef_USE_PAM.dpatch
trunk/debian/patches/405_subsystem_remove_*_in_shell.dpatch
trunk/debian/patches/406_good_name.dpatch
trunk/debian/patches/407_32char_grnames.dpatch
trunk/debian/patches/421_login.1_pishing
trunk/debian/patches/423_su_arguments_are_concatenated
trunk/debian/patches/424_pwck.8_quiet_option
trunk/debian/patches/426_grpck_group-gshadow_members_consistency
trunk/debian/patches/427_chage_expiry_0
trunk/debian/patches/428_grpck_add_prune_option
trunk/debian/patches/429_login_FAILLOG_ENAB
trunk/debian/patches/431_su_uid_0_not_root
trunk/debian/patches/432_login_cancel_timout_after_authentication
trunk/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
trunk/debian/patches/434_login_stop_checking_args_after--
trunk/debian/patches/435_su_addenv_HOME_and_SHELL
trunk/debian/patches/437_su_add_GNU_options_1
trunk/debian/patches/437_su_add_GNU_options_2
trunk/debian/patches/437_su_add_GNU_options_3
trunk/debian/patches/437_su_add_GNU_options_4
trunk/debian/patches/437_su_add_GNU_options_5
trunk/debian/patches/437_su_add_GNU_options_6
trunk/debian/patches/437_su_add_GNU_options_7
trunk/debian/patches/438_su_GNU_origin
trunk/debian/patches/439_su_PAM_session
trunk/debian/patches/440_manpages-login.1
trunk/debian/patches/442_useradd-O_option
trunk/debian/patches/445_su_password_expired
trunk/debian/patches/447_missing_login.defs_variables
trunk/debian/patches/448_enable_man
trunk/debian/patches/450_shadowconfig.8
trunk/debian/patches/451_login_PATH
trunk/debian/patches/series
trunk/debian/rules
Log:
Next release *will* be a 4.0.13, so move this to the trunk
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/changelog 2005-10-08 18:12:32 UTC (rev 574)
@@ -1,6 +1,15 @@
-shadow (1:4.0.12-7) UNRELEASED; urgency=low
+shadow (1:4.0.13-1) UNRELEASED; urgency=low
* The "Maroilles" release
+ * New upstream version:
+ Debian bugs fixed by the new upstream version:
+ - faillog: Do not oversimplify the date of the last unsuccessful login
+ Closes: #89902
+ - login.1: also mention securetty(5). Closes: #325773
+ - chfn.1, chsh.1, groupadd.8, newusers.8, pwconv.8
+ useradd.8, userdel.8, usermod.8:
+ Improved crossreferences with other manpages
+ Closes: #300892
* Debian packaging fixes:
- debian/login.su.pam:
- pam_wheel example moved after pam_rootok in config.
Modified: trunk/debian/patches/004_configure.in.dpatch
===================================================================
--- trunk/debian/patches/004_configure.in.dpatch 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/004_configure.in.dpatch 2005-10-08 18:12:32 UTC (rev 574)
@@ -1,8 +1,8 @@
-Index: shadow-4.0.12/configure.in
+Index: shadow-4.0.13/configure.in
===================================================================
---- shadow-4.0.12.orig/configure.in 2005-08-17 11:49:50.000000000 +0200
-+++ shadow-4.0.12/configure.in 2005-08-17 11:50:32.000000000 +0200
-@@ -255,9 +255,10 @@
+--- shadow-4.0.13.orig/configure.in 2005-10-04 08:06:34.680490047 +0200
++++ shadow-4.0.13/configure.in 2005-10-04 08:07:11.639959261 +0200
+@@ -302,9 +302,10 @@
AC_CHECK_LIB(pam, pam_start,
[AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules])
LIBPAM="-lpam"
Modified: trunk/debian/patches/005_manpages.dpatch
===================================================================
--- trunk/debian/patches/005_manpages.dpatch 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/005_manpages.dpatch 2005-10-08 18:12:32 UTC (rev 574)
@@ -1,15 +1,15 @@
Note: * The small useradd.8.xml change seems to be the only one
not applied upstream
-Index: shadow-4.0.12/man/useradd.8.xml
+Index: shadow-4.0.13/man/useradd.8.xml
===================================================================
---- shadow-4.0.12.orig/man/useradd.8.xml 2005-08-17 11:49:22.000000000 +0200
-+++ shadow-4.0.12/man/useradd.8.xml 2005-08-17 11:50:33.000000000 +0200
-@@ -169,6 +169,7 @@
- <option>-k</option> option is only valid in conjunction with the
- <option>-m</option> option. The default is to not create the
- directory and to not copy any files.
+--- shadow-4.0.13.orig/man/useradd.8.xml 2005-10-04 08:06:34.557515104 +0200
++++ shadow-4.0.13/man/useradd.8.xml 2005-10-04 08:07:12.327819105 +0200
+@@ -172,6 +172,7 @@
+ valid in conjunction with the <option>-m</option> option. The
+ default is to not create the directory and to not copy any
+ files.
+ This option may not function correctly if the username has a / in it.
- </para>
- </listitem>
+ </para>
+ </listitem>
</varlistentry>
Modified: trunk/debian/patches/008_login_log_failure_in_FTMP
===================================================================
--- trunk/debian/patches/008_login_log_failure_in_FTMP 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/008_login_log_failure_in_FTMP 2005-10-08 18:12:32 UTC (rev 574)
@@ -4,11 +4,11 @@
* I'm not sure login should add an entry in the FTMP file when PAM is used.
(but nothing in /etc/login.defs indicates that the failure is not logged)
-Index: shadow-4.0.12/src/login.c
+Index: shadow-4.0.13/src/login.c
===================================================================
---- shadow-4.0.12.orig/src/login.c 2005-08-17 11:50:52.000000000 +0200
-+++ shadow-4.0.12/src/login.c 2005-08-17 11:50:54.000000000 +0200
-@@ -705,6 +705,20 @@
+--- shadow-4.0.13.orig/src/login.c 2005-10-04 08:07:24.390361293 +0200
++++ shadow-4.0.13/src/login.c 2005-10-04 08:07:25.132210138 +0200
+@@ -689,6 +689,20 @@
break;
fprintf(stderr,"Login incorrect\n\n");
@@ -29,11 +29,11 @@
/* Let's give it another go around */
pam_set_item(pamh,PAM_USER,NULL);
-Index: shadow-4.0.12/lib/getdef.c
+Index: shadow-4.0.13/lib/getdef.c
===================================================================
---- shadow-4.0.10.orig/lib/getdef.c 2005-07-11 19:36:42.000000000 +0300
-+++ shadow-4.0.10/lib/getdef.c 2005-07-11 19:41:09.000000000 +0300
-@@ -50,6 +50,7 @@
+--- shadow-4.0.13.orig/lib/getdef.c 2005-10-04 08:06:32.256983859 +0200
++++ shadow-4.0.13/lib/getdef.c 2005-10-04 08:07:25.133209934 +0200
+@@ -57,6 +57,7 @@
{"ERASECHAR", NULL},
{"FAIL_DELAY", NULL},
{"FAKE_SHELL", NULL},
@@ -41,7 +41,7 @@
{"GETPASS_ASTERISKS", NULL},
{"GID_MAX", NULL},
{"GID_MIN", NULL},
-@@ -88,7 +88,6 @@
+@@ -88,7 +89,6 @@
{"ENV_TZ", NULL},
{"ENVIRON_FILE", NULL},
{"FAILLOG_ENAB", NULL},
Modified: trunk/debian/patches/008_su_get_PAM_username
===================================================================
--- trunk/debian/patches/008_su_get_PAM_username 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/008_su_get_PAM_username 2005-10-08 18:12:32 UTC (rev 574)
@@ -5,11 +5,11 @@
I don't know what this patch is used for. IMO, the user name is
already known before calling pam_get_item(pamh, PAM_USER, ...)
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:50:47.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:50:48.000000000 +0200
-@@ -352,6 +352,7 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:20.901072255 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:21.600929655 +0200
+@@ -350,6 +350,7 @@
char **envp = environ;
char *command = 0, *shell = 0, **additional_args = 0;
int optc;
@@ -17,7 +17,7 @@
#ifdef USE_PAM
int ret;
-@@ -646,6 +647,14 @@
+@@ -656,6 +657,14 @@
su_failure (tty);
}
}
Modified: trunk/debian/patches/008_su_no_sanitize_env
===================================================================
--- trunk/debian/patches/008_su_no_sanitize_env 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/008_su_no_sanitize_env 2005-10-08 18:12:32 UTC (rev 574)
@@ -1,8 +1,8 @@
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:50:46.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:50:47.000000000 +0200
-@@ -366,7 +366,7 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:19.503357047 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:20.901072255 +0200
+@@ -364,7 +364,7 @@
#endif
#endif /* !USE_PAM */
Modified: trunk/debian/patches/333_shadow.5-typo_312430
===================================================================
--- trunk/debian/patches/333_shadow.5-typo_312430 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/333_shadow.5-typo_312430 2005-10-08 18:12:32 UTC (rev 574)
@@ -3,16 +3,16 @@
Status wrt upstream: should be reported
-Index: shadow-4.0.12/man/shadow.5.xml
+Index: shadow-4.0.13/man/shadow.5.xml
===================================================================
---- shadow-4.0.12.orig/man/shadow.5.xml 2005-08-17 11:50:34.000000000 +0200
-+++ shadow-4.0.12/man/shadow.5.xml 2005-08-17 11:50:58.000000000 +0200
-@@ -49,7 +49,7 @@
- </itemizedlist>
-
- <para>The password field must be filled. The encrypted password consists
-- of 13 to 24 characters from the 64 characters alphabet a thru z, A
+--- shadow-4.0.13.orig/man/shadow.5.xml 2005-10-04 08:06:31.734090404 +0200
++++ shadow-4.0.13/man/shadow.5.xml 2005-10-04 08:07:28.299564773 +0200
+@@ -51,7 +51,7 @@
+
+ <para>
+ The password field must be filled. The encrypted password consists of
+- 13 to 24 characters from the 64 characters alphabet a thru z, A thru
+ of 13 to 24 characters from the 64 character alphabet a thru z, A
- thru Z, 0 thru 9, \. and /. Optionally it can start with a "$"
- character. This means the encrypted password was generated using
- another (not DES) algorithm. For example if it starts with "$1$" it
+ Z, 0 thru 9, \. and /. Optionally it can start with a "$" character.
+ This means the encrypted password was generated using another (not
+ DES) algorithm. For example if it starts with "$1$" it means the
Modified: trunk/debian/patches/401_cppw_src.dpatch
===================================================================
--- trunk/debian/patches/401_cppw_src.dpatch 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/401_cppw_src.dpatch 2005-10-08 18:12:32 UTC (rev 574)
@@ -5,10 +5,10 @@
## DP: Add cppw / cpgr
@DPATCH@
-Index: shadow-4.0.12/src/cppw.c
+Index: shadow-4.0.13/src/cppw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/src/cppw.c 2005-08-17 11:51:00.000000000 +0200
++++ shadow-4.0.13/src/cppw.c 2005-10-04 08:07:29.005420951 +0200
@@ -0,0 +1,200 @@
+/*
+ cppw, cpgr copy with locking given file over the password or group file
@@ -210,10 +210,10 @@
+
+ return 0;
+}
-Index: shadow-4.0.12/src/Makefile.am
+Index: shadow-4.0.13/src/Makefile.am
===================================================================
---- shadow-4.0.12.orig/src/Makefile.am 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/Makefile.am 2005-08-17 11:51:00.000000000 +0200
+--- shadow-4.0.13.orig/src/Makefile.am 2005-10-04 08:06:31.607116276 +0200
++++ shadow-4.0.13/src/Makefile.am 2005-10-04 08:07:29.006420748 +0200
@@ -23,6 +23,7 @@
bin_PROGRAMS = groups login su
ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
@@ -222,10 +222,10 @@
chpasswd \
groupadd \
groupdel \
-Index: shadow-4.0.12/po/POTFILES.in
+Index: shadow-4.0.13/po/POTFILES.in
===================================================================
---- shadow-4.0.12.orig/po/POTFILES.in 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/po/POTFILES.in 2005-08-17 11:51:00.000000000 +0200
+--- shadow-4.0.13.orig/po/POTFILES.in 2005-10-04 08:06:31.608116072 +0200
++++ shadow-4.0.13/po/POTFILES.in 2005-10-04 08:07:29.007420544 +0200
@@ -62,6 +62,7 @@
src/chpasswd.c
src/chsh.c
Modified: trunk/debian/patches/403_sg_symlink_162339_163652.dpatch
===================================================================
--- trunk/debian/patches/403_sg_symlink_162339_163652.dpatch 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/403_sg_symlink_162339_163652.dpatch 2005-10-08 18:12:32 UTC (rev 574)
@@ -12,11 +12,11 @@
## DP: (We just have to test if sg is linked to newgrp)
@DPATCH@
-Index: shadow-4.0.12/src/Makefile.am
+Index: shadow-4.0.13/src/Makefile.am
===================================================================
---- shadow-4.0.12.orig/src/Makefile.am 2005-08-17 11:51:00.000000000 +0200
-+++ shadow-4.0.12/src/Makefile.am 2005-08-17 11:51:01.000000000 +0200
-@@ -77,7 +77,6 @@
+--- shadow-4.0.13.orig/src/Makefile.am 2005-10-04 08:07:29.006420748 +0200
++++ shadow-4.0.13/src/Makefile.am 2005-10-04 08:07:29.804258184 +0200
+@@ -78,7 +78,6 @@
install-am: all-am
$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
Modified: trunk/debian/patches/404_undef_USE_PAM.dpatch
===================================================================
--- trunk/debian/patches/404_undef_USE_PAM.dpatch 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/404_undef_USE_PAM.dpatch 2005-10-08 18:12:32 UTC (rev 574)
@@ -6,120 +6,111 @@
* If it is kept for 4.0.13, libmisc/salt.c will also require an
#undef USE_PAM
-Index: shadow-4.0.12/src/chage.c
+Index: shadow-cvs/src/chage.c
===================================================================
---- shadow-4.0.12.orig/src/chage.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/chage.c 2005-08-17 11:51:02.000000000 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/chage.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/chage.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: chage.c,v 1.55 2005/08/09 17:20:02 kloczek Exp $")
- #include <ctype.h>
-Index: shadow-4.0.12/src/chpasswd.c
+
+ #ident "$Id: chage.c,v 1.66 2005/10/04 20:26:41 kloczek Exp $"
+
+Index: shadow-cvs/src/chpasswd.c
===================================================================
---- shadow-4.0.12.orig/src/chpasswd.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/chpasswd.c 2005-08-17 11:51:02.000000000 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/chpasswd.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/chpasswd.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: chpasswd.c,v 1.28 2005/08/03 16:00:46 kloczek Exp $")
- #include <fcntl.h>
-Index: shadow-4.0.12/src/groupadd.c
+
+ #ident "$Id: chpasswd.c,v 1.33 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/groupadd.c
===================================================================
---- shadow-4.0.12.orig/src/groupadd.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/groupadd.c 2005-08-17 11:51:02.000000000 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/groupadd.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/groupadd.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: groupadd.c,v 1.40 2005/08/02 18:35:03 kloczek Exp $")
- #include <sys/types.h>
-Index: shadow-4.0.12/src/groupdel.c
+
+ #ident "$Id: groupadd.c,v 1.48 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/groupdel.c
===================================================================
---- shadow-4.0.12.orig/src/groupdel.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/groupdel.c 2005-08-17 11:51:02.000000000 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/groupdel.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/groupdel.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: groupdel.c,v 1.22 2005/08/02 17:49:17 kloczek Exp $")
- #include <sys/types.h>
-Index: shadow-4.0.12/src/groupmod.c
+
+ #ident "$Id: groupdel.c,v 1.29 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/groupmod.c
===================================================================
---- shadow-4.0.12.orig/src/groupmod.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/groupmod.c 2005-08-17 11:51:02.000000000 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/groupmod.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/groupmod.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: groupmod.c,v 1.30 2005/08/02 17:49:17 kloczek Exp $")
- #include <sys/types.h>
-Index: shadow-4.0.12/src/newusers.c
+
+ #ident "$Id: groupmod.c,v 1.36 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/newusers.c
===================================================================
---- shadow-4.0.12.orig/src/newusers.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/newusers.c 2005-08-17 11:51:02.000000000 +0200
-@@ -35,6 +35,8 @@
+--- shadow-cvs.orig/src/newusers.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/newusers.c 2005-10-06 02:44:56.000000000 +0300
+@@ -34,6 +34,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: newusers.c,v 1.25 2005/08/03 16:00:46 kloczek Exp $")
- #include <sys/types.h>
-Index: shadow-4.0.12/src/useradd.c
+
+ #ident "$Id: newusers.c,v 1.30 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/useradd.c
===================================================================
---- shadow-4.0.12.orig/src/useradd.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/useradd.c 2005-08-17 11:51:02.000000000 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/useradd.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/useradd.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: useradd.c,v 1.72 2005/08/07 19:23:33 kloczek Exp $")
- #include <ctype.h>
-Index: shadow-4.0.12/src/userdel.c
+
+ #ident "$Id: useradd.c,v 1.84 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/userdel.c
===================================================================
---- shadow-4.0.12.orig/src/userdel.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/userdel.c 2005-08-17 11:51:02.000000000 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/userdel.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/userdel.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: userdel.c,v 1.44 2005/08/03 16:00:46 kloczek Exp $")
- #include <sys/stat.h>
-Index: shadow-4.0.12/src/usermod.c
+
+ #ident "$Id: userdel.c,v 1.52 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/usermod.c
===================================================================
---- shadow-4.0.12.orig/src/usermod.c 2005-08-17 11:49:16.000000000 +0200
-+++ shadow-4.0.12/src/usermod.c 2005-08-17 11:51:02.000000000 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/usermod.c 2005-10-05 17:04:23.000000000 +0300
++++ shadow-cvs/src/usermod.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: usermod.c,v 1.50 2005/08/09 15:12:41 kloczek Exp $")
- #include <sys/types.h>
+
+ #ident "$Id: usermod.c,v 1.58 2005/10/04 21:05:12 kloczek Exp $"
+
Modified: trunk/debian/patches/405_subsystem_remove_*_in_shell.dpatch
===================================================================
--- trunk/debian/patches/405_subsystem_remove_*_in_shell.dpatch 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/405_subsystem_remove_*_in_shell.dpatch 2005-10-08 18:12:32 UTC (rev 574)
@@ -9,11 +9,11 @@
## DP: Thus, it is no more needed (but does not harm).
@DPATCH@
-Index: shadow-4.0.12/lib/prototypes.h
+Index: shadow-4.0.13/lib/prototypes.h
===================================================================
---- shadow-4.0.12.orig/lib/prototypes.h 2005-08-17 11:49:15.000000000 +0200
-+++ shadow-4.0.12/lib/prototypes.h 2005-08-17 11:51:04.000000000 +0200
-@@ -157,7 +157,7 @@
+--- shadow-4.0.13.orig/lib/prototypes.h 2005-10-04 08:06:31.175204282 +0200
++++ shadow-4.0.13/lib/prototypes.h 2005-10-04 08:07:31.522908001 +0200
+@@ -169,7 +169,7 @@
extern void sulog (const char *, int, const char *, const char *);
/* sub.c */
@@ -22,10 +22,10 @@
/* ttytype.c */
extern void ttytype (const char *);
-Index: shadow-4.0.12/libmisc/sub.c
+Index: shadow-4.0.13/libmisc/sub.c
===================================================================
---- shadow-4.0.12.orig/libmisc/sub.c 2005-08-17 11:49:15.000000000 +0200
-+++ shadow-4.0.12/libmisc/sub.c 2005-08-17 11:51:04.000000000 +0200
+--- shadow-4.0.13.orig/libmisc/sub.c 2005-10-04 08:06:31.175204282 +0200
++++ shadow-4.0.13/libmisc/sub.c 2005-10-04 08:07:31.522908001 +0200
@@ -46,7 +46,7 @@
* directory will be used as the root of a new filesystem which
* the user is actually logged into.
Modified: trunk/debian/patches/406_good_name.dpatch
===================================================================
--- trunk/debian/patches/406_good_name.dpatch 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/406_good_name.dpatch 2005-10-08 18:12:32 UTC (rev 574)
@@ -34,17 +34,17 @@
exit 0
@DPATCH@
-Index: shadow-4.0.12/libmisc/chkname.c
+Index: shadow-4.0.13/libmisc/chkname.c
===================================================================
---- shadow-4.0.12.orig/libmisc/chkname.c 2005-08-17 11:49:15.000000000 +0200
-+++ shadow-4.0.12/libmisc/chkname.c 2005-08-17 11:51:05.000000000 +0200
+--- shadow-4.0.13.orig/libmisc/chkname.c 2005-10-04 08:06:31.017236469 +0200
++++ shadow-4.0.13/libmisc/chkname.c 2005-10-04 08:07:32.351739123 +0200
@@ -17,6 +17,7 @@
#endif
static int good_name (const char *name)
{
+#if 0
/*
- * User/group names must match [a-z_][a-z0-9_-]*
+ * User/group names must match [a-z_][a-z0-9_-]*[$]
*/
@@ -30,6 +31,16 @@
(*name == '$' && *(name + 1) == '\0')))
Modified: trunk/debian/patches/407_32char_grnames.dpatch
===================================================================
--- trunk/debian/patches/407_32char_grnames.dpatch 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/407_32char_grnames.dpatch 2005-10-08 18:12:32 UTC (rev 574)
@@ -31,10 +31,10 @@
@DPATCH@
-Index: shadow-4.0.12/libmisc/chkname.c
+Index: shadow-4.0.13/libmisc/chkname.c
===================================================================
---- shadow-4.0.12.orig/libmisc/chkname.c 2005-08-17 11:51:05.000000000 +0200
-+++ shadow-4.0.12/libmisc/chkname.c 2005-08-17 11:51:06.000000000 +0200
+--- shadow-4.0.13.orig/libmisc/chkname.c 2005-10-04 08:07:32.351739123 +0200
++++ shadow-4.0.13/libmisc/chkname.c 2005-10-04 08:07:33.049596931 +0200
@@ -66,10 +66,10 @@
int check_group_name (const char *name)
{
Modified: trunk/debian/patches/421_login.1_pishing
===================================================================
--- trunk/debian/patches/421_login.1_pishing 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/421_login.1_pishing 2005-10-08 18:12:32 UTC (rev 574)
@@ -3,11 +3,11 @@
Status wrt upstream: Not applied
-Index: shadow-4.0.12/man/login.1.xml
+Index: shadow-4.0.13/man/login.1.xml
===================================================================
---- shadow-4.0.12.orig/man/login.1.xml 2005-08-17 11:50:35.000000000 +0200
-+++ shadow-4.0.12/man/login.1.xml 2005-08-17 11:51:08.000000000 +0200
-@@ -175,6 +175,14 @@
+--- shadow-4.0.13.orig/man/login.1.xml 2005-10-04 08:07:13.018678338 +0200
++++ shadow-4.0.13/man/login.1.xml 2005-10-04 08:07:33.744455350 +0200
+@@ -184,6 +184,14 @@
will continue to appear to be logged in even after you log out of the
"subsession".
</para>
@@ -20,5 +20,5 @@
+ </para>
+
</refsect1>
-
+
<refsect1 id='files'>
Modified: trunk/debian/patches/423_su_arguments_are_concatenated
===================================================================
--- trunk/debian/patches/423_su_arguments_are_concatenated 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/423_su_arguments_are_concatenated 2005-10-08 18:12:32 UTC (rev 574)
@@ -9,11 +9,11 @@
Note: the fix of the man page is still missing.
(to be taken from the trunk)
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:51:09.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:51:11.000000000 +0200
-@@ -214,6 +214,8 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:27.298768690 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:34.443312955 +0200
+@@ -213,6 +213,8 @@
int status;
int ret;
int argno = 0;
@@ -22,7 +22,7 @@
/* There is at most 4 arguments (arg0, '-c', <command>, NULL) + the
* number of arguments in the additional_args array. */
-@@ -239,6 +241,16 @@
+@@ -238,6 +240,16 @@
if (command) {
args[argno++] = "-c";
args[argno++] = command;
@@ -39,7 +39,7 @@
}
if (additional_args) {
-@@ -249,6 +261,30 @@
+@@ -248,6 +260,30 @@
args[argno] = NULL;
Modified: trunk/debian/patches/424_pwck.8_quiet_option
===================================================================
--- trunk/debian/patches/424_pwck.8_quiet_option 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/424_pwck.8_quiet_option 2005-10-08 18:12:32 UTC (rev 574)
@@ -6,10 +6,10 @@
Status wrt upstream: It should be forwarded to upstream.
-Index: shadow-4.0.12/man/pwck.8.xml
+Index: shadow-4.0.13/man/pwck.8.xml
===================================================================
---- shadow-4.0.12.orig/man/pwck.8.xml 2005-08-17 11:49:14.000000000 +0200
-+++ shadow-4.0.12/man/pwck.8.xml 2005-08-17 11:51:12.000000000 +0200
+--- shadow-4.0.13.orig/man/pwck.8.xml 2005-10-04 08:06:30.495342810 +0200
++++ shadow-4.0.13/man/pwck.8.xml 2005-10-04 08:07:35.150168930 +0200
@@ -28,6 +28,7 @@
</cmdsynopsis>
<cmdsynopsis>
@@ -17,15 +17,15 @@
+ <arg choice='opt'>-q </arg>
<arg choice='opt'>-r </arg>
<arg choice='opt'>
- <arg choice='plain'>
-@@ -101,8 +102,8 @@
- </term>
- <listitem>
- <para>
+ <arg choice='plain'>
+@@ -104,8 +105,8 @@
+ </term>
+ <listitem>
+ <para>
- Report errors only. Using this option will not require an action
- from the user.
+ Report errors only. The warnings which do not require any
+ action from the user won't be displayed.
- </para>
- </listitem>
+ </para>
+ </listitem>
</varlistentry>
Modified: trunk/debian/patches/426_grpck_group-gshadow_members_consistency
===================================================================
--- trunk/debian/patches/426_grpck_group-gshadow_members_consistency 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/426_grpck_group-gshadow_members_consistency 2005-10-08 18:12:32 UTC (rev 574)
@@ -7,11 +7,11 @@
files (/etc/shadow for pwck or /etc/gshadow for grpck) when this entry is
present in non-shadowed file and not present in the shadowed file.
-Index: shadow-4.0.12/src/grpck.c
+Index: shadow-4.0.13/src/grpck.c
===================================================================
---- shadow-4.0.12.orig/src/grpck.c 2005-08-17 11:50:50.000000000 +0200
-+++ shadow-4.0.12/src/grpck.c 2005-08-17 11:51:14.000000000 +0200
-@@ -143,7 +143,7 @@
+--- shadow-4.0.13.orig/src/grpck.c 2005-10-04 08:07:22.997645067 +0200
++++ shadow-4.0.13/src/grpck.c 2005-10-04 08:07:35.859024497 +0200
+@@ -136,7 +136,7 @@
{
int arg;
int errors = 0;
@@ -20,7 +20,7 @@
int i;
int prune = 0;
struct commonio_entry *gre, *tgre;
-@@ -333,7 +333,7 @@
+@@ -316,7 +316,7 @@
delete_gr:
SYSLOG ((LOG_INFO, "delete group line `%s'",
gre->line));
@@ -29,7 +29,7 @@
__gr_del_entry (gre);
continue;
-@@ -427,11 +427,78 @@
+@@ -401,11 +401,78 @@
SYSLOG ((LOG_INFO, "delete member `%s' group `%s'",
grp->gr_mem[i], grp->gr_name));
@@ -109,7 +109,7 @@
}
#ifdef SHADOWGRP
-@@ -478,7 +545,7 @@
+@@ -447,7 +514,7 @@
delete_sg:
SYSLOG ((LOG_INFO, "delete shadow line `%s'",
sge->line));
@@ -118,10 +118,10 @@
__sgr_del_entry (sge);
continue;
-@@ -536,12 +603,32 @@
+@@ -498,12 +565,32 @@
+ /*
* Make sure this entry exists in the /etc/group file.
*/
-
- if (!gr_locate (sgr->sg_name)) {
- printf (_("no matching group file entry\n"));
+ grp = (struct group *)gr_locate (sgr->sg_name);
@@ -153,7 +153,7 @@
}
/*
-@@ -569,7 +656,7 @@
+@@ -529,7 +616,7 @@
SYSLOG ((LOG_INFO,
"delete admin `%s' from shadow group `%s'",
sgr->sg_adm[i], sgr->sg_name));
@@ -162,7 +162,7 @@
delete_member (sgr->sg_adm, sgr->sg_adm[i]);
sge->changed = 1;
__sgr_set_changed ();
-@@ -598,7 +685,7 @@
+@@ -556,7 +643,7 @@
SYSLOG ((LOG_INFO,
"delete member `%s' from shadow group `%s'",
sgr->sg_mem[i], sgr->sg_name));
@@ -171,7 +171,7 @@
delete_member (sgr->sg_mem, sgr->sg_mem[i]);
sge->changed = 1;
__sgr_set_changed ();
-@@ -609,11 +696,11 @@
+@@ -567,10 +654,10 @@
#endif /* SHADOWGRP */
/*
@@ -179,34 +179,33 @@
+ * All done. If there were no change we can just abandon any
* changes to the files.
*/
-
- if (deleted) {
+ if (changed) {
write_and_bye:
if (!gr_close ()) {
fprintf (stderr, _("%s: cannot update file %s\n"),
-@@ -646,7 +733,7 @@
+@@ -601,7 +688,7 @@
+ * Tell the user what we did and exit.
*/
-
if (errors)
- printf (deleted ?
+ printf (changed ?
_("%s: the files have been updated\n") :
_("%s: no changes\n"), Prog);
-Index: shadow-4.0.12/src/pwck.c
+Index: shadow-4.0.13/src/pwck.c
===================================================================
---- shadow-4.0.12.orig/src/pwck.c 2005-08-17 11:49:13.000000000 +0200
-+++ shadow-4.0.12/src/pwck.c 2005-08-17 11:51:14.000000000 +0200
-@@ -44,6 +44,7 @@
- extern struct commonio_entry *__pw_get_head (void);
-
+--- shadow-4.0.13.orig/src/pwck.c 2005-10-04 08:06:30.360370312 +0200
++++ shadow-4.0.13/src/pwck.c 2005-10-04 08:07:35.861024090 +0200
+@@ -41,6 +41,7 @@
+ #include "prototypes.h"
+ #include "pwio.h"
#include "shadowio.h"
+#include "getdef.h"
- extern void __spw_del_entry (const struct commonio_entry *);
- extern struct commonio_entry *__spw_get_head (void);
+ extern void __pw_del_entry (const struct commonio_entry *);
+ extern struct commonio_entry *__pw_get_head (void);
-@@ -119,7 +120,7 @@
+@@ -115,7 +116,7 @@
{
int arg;
int errors = 0;
@@ -215,7 +214,7 @@
struct commonio_entry *pfe, *tpfe;
struct passwd *pwd;
int sort_mode = 0;
-@@ -288,7 +289,7 @@
+@@ -271,7 +272,7 @@
delete_pw:
SYSLOG ((LOG_INFO, "delete passwd line `%s'",
pfe->line));
@@ -224,7 +223,7 @@
__pw_del_entry (pfe);
continue;
-@@ -395,6 +396,55 @@
+@@ -366,6 +367,55 @@
pwd->pw_name, pwd->pw_shell);
errors++;
}
@@ -280,8 +279,8 @@
}
if (!is_shadow)
-@@ -406,6 +456,13 @@
-
+@@ -376,6 +426,13 @@
+ */
for (spe = __spw_get_head (); spe; spe = spe->next) {
/*
+ * Do not treat lines which were missing in gshadow
@@ -294,7 +293,7 @@
* If this is a NIS line, skip it. You can't "know" what NIS
* is going to do without directly asking NIS ...
*/
-@@ -447,7 +504,7 @@
+@@ -411,7 +468,7 @@
delete_spw:
SYSLOG ((LOG_INFO, "delete shadow line `%s'",
spe->line));
@@ -303,17 +302,17 @@
__spw_del_entry (spe);
continue;
-@@ -512,7 +569,8 @@
+@@ -467,7 +524,8 @@
+ * Tell the user this entry has no matching
* /etc/passwd entry and ask them to delete it.
*/
-
- printf (_("no matching password file entry\n"));
+ printf (_("no matching password file entry in %s\n"),
+ pwd_file);
printf (_("delete line `%s'? "), spe->line);
errors++;
-@@ -539,11 +597,11 @@
+@@ -492,10 +550,10 @@
shadow_done:
/*
@@ -321,15 +320,14 @@
+ * All done. If there were no change we can just abandon any
* changes to the files.
*/
-
- if (deleted) {
+ if (changed) {
write_and_bye:
if (!pw_close ()) {
fprintf (stderr, _("%s: cannot update file %s\n"),
-@@ -576,7 +634,7 @@
+@@ -526,7 +584,7 @@
+ * Tell the user what we did and exit.
*/
-
if (errors)
- printf (deleted ?
+ printf (changed ?
Modified: trunk/debian/patches/427_chage_expiry_0
===================================================================
--- trunk/debian/patches/427_chage_expiry_0 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/427_chage_expiry_0 2005-10-08 18:12:32 UTC (rev 574)
@@ -3,13 +3,13 @@
Status wrt upstream: It should be forwarded to upstream.
-Index: shadow-4.0.12/src/chage.c
+Index: shadow-cvs/src/chage.c
===================================================================
---- shadow-4.0.12.orig/src/chage.c 2005-08-17 11:51:09.000000000 +0200
-+++ shadow-4.0.12/src/chage.c 2005-08-17 11:51:15.000000000 +0200
-@@ -239,8 +239,10 @@
+--- shadow-cvs.orig/src/chage.c 2005-10-06 02:48:24.000000000 +0300
++++ shadow-cvs/src/chage.c 2005-10-06 02:48:44.000000000 +0300
+@@ -234,8 +234,10 @@
+ * was last modified. The date is the number of days since 1/1/1970.
*/
-
printf (_("Last password change\t\t\t\t\t: "));
- if (lastday <= 0) {
+ if (lastday < 0) {
Modified: trunk/debian/patches/428_grpck_add_prune_option
===================================================================
--- trunk/debian/patches/428_grpck_add_prune_option 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/428_grpck_add_prune_option 2005-10-08 18:12:32 UTC (rev 574)
@@ -5,11 +5,11 @@
Status wrt upstream: It could certainly be submitted to upstream.
-Index: shadow-4.0.12/src/grpck.c
+Index: shadow-4.0.13/src/grpck.c
===================================================================
---- shadow-4.0.12.orig/src/grpck.c 2005-08-17 11:49:18.000000000 +0200
-+++ shadow-4.0.12/src/grpck.c 2005-08-17 11:50:50.000000000 +0200
-@@ -145,6 +145,7 @@
+--- shadow-4.0.13.orig/src/grpck.c 2005-10-04 08:06:32.656902372 +0200
++++ shadow-4.0.13/src/grpck.c 2005-10-04 08:07:22.997645067 +0200
+@@ -138,6 +138,7 @@
int errors = 0;
int deleted = 0;
int i;
@@ -17,16 +17,16 @@
struct commonio_entry *gre, *tgre;
struct group *grp;
int sort_mode = 0;
-@@ -171,7 +172,7 @@
+@@ -162,7 +163,7 @@
+ /*
* Parse the command line arguments
*/
-
- while ((arg = getopt (argc, argv, "qrs")) != EOF) {
+ while ((arg = getopt (argc, argv, "qprs")) != EOF) {
switch (arg) {
case 'q':
/* quiet - ignored for now */
-@@ -182,6 +183,9 @@
+@@ -173,6 +174,9 @@
case 's':
sort_mode = 1;
break;
@@ -36,11 +36,10 @@
default:
usage ();
}
-@@ -311,9 +315,13 @@
+@@ -295,8 +299,13 @@
/*
* prompt the user to delete the entry or not
*/
--
- if (!yes_or_no ())
+ if (!prune) {
+ if (!yes_or_no ())
Modified: trunk/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- trunk/debian/patches/429_login_FAILLOG_ENAB 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/429_login_FAILLOG_ENAB 2005-10-08 18:12:32 UTC (rev 574)
@@ -7,11 +7,11 @@
Note: It could be removed if pam_tally could report the number of failures
preceding a successful login.
-Index: shadow-4.0.12/src/login.c
+Index: shadow-4.0.13/src/login.c
===================================================================
---- shadow-4.0.12.orig/src/login.c 2005-08-17 11:50:54.000000000 +0200
-+++ shadow-4.0.12/src/login.c 2005-08-17 11:50:55.000000000 +0200
-@@ -130,11 +130,11 @@
+--- shadow-4.0.13.orig/src/login.c 2005-10-04 08:07:25.132210138 +0200
++++ shadow-4.0.13/src/login.c 2005-10-04 08:07:25.859062038 +0200
+@@ -133,11 +133,11 @@
static void setup_tty (void);
static void check_flags (int, char *const *);
@@ -25,7 +25,7 @@
static void bad_time_notify (void);
static void check_nologin (void);
#endif
-@@ -683,6 +683,8 @@
+@@ -667,6 +667,8 @@
SYSLOG ((LOG_NOTICE,
"TOO MANY LOGIN TRIES (%d)%s FOR `%s'",
failcount, fromhost, failent_user));
@@ -34,7 +34,7 @@
fprintf(stderr,
_("Maximum number of tries exceeded (%d)\n"),
failcount);
-@@ -700,11 +702,20 @@
+@@ -684,11 +686,20 @@
pam_strerror (pamh, retcode)));
failed = 1;
}
@@ -55,7 +55,7 @@
if (getdef_str("FTMP_FILE") != NULL) {
#if HAVE_UTMPX_H
failent = utxent;
-@@ -1056,6 +1067,7 @@
+@@ -1036,6 +1047,7 @@
*/
#ifndef USE_PAM
motd (); /* print the message of the day */
@@ -63,7 +63,7 @@
if (getdef_bool ("FAILLOG_ENAB")
&& faillog.fail_cnt != 0) {
failprint (&faillog);
-@@ -1069,6 +1081,7 @@
+@@ -1049,6 +1061,7 @@
username, (int) faillog.fail_cnt));
}
}
@@ -71,19 +71,19 @@
if (getdef_bool ("LASTLOG_ENAB")
&& lastlog.ll_time != 0) {
time_t ll_time = lastlog.ll_time;
-Index: shadow-4.0.12/lib/getdef.c
+Index: shadow-4.0.13/lib/getdef.c
===================================================================
---- shadow-4.0.12.orig/lib/getdef.c 2005-08-17 11:50:54.000000000 +0200
-+++ shadow-4.0.12/lib/getdef.c 2005-08-17 11:50:55.000000000 +0200
+--- shadow-4.0.13.orig/lib/getdef.c 2005-10-04 08:07:25.133209934 +0200
++++ shadow-4.0.13/lib/getdef.c 2005-10-04 08:07:25.860061834 +0200
@@ -56,6 +56,7 @@
{"ENV_SUPATH", NULL},
{"ERASECHAR", NULL},
{"FAIL_DELAY", NULL},
+ {"FAILLOG_ENAB", NULL},
{"FAKE_SHELL", NULL},
+ {"FTMP_FILE", NULL},
{"GETPASS_ASTERISKS", NULL},
- {"GID_MAX", NULL},
-@@ -87,7 +88,6 @@
+@@ -88,7 +89,6 @@
{"ENV_HZ", NULL},
{"ENV_TZ", NULL},
{"ENVIRON_FILE", NULL},
Modified: trunk/debian/patches/431_su_uid_0_not_root
===================================================================
--- trunk/debian/patches/431_su_uid_0_not_root 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/431_su_uid_0_not_root 2005-10-08 18:12:32 UTC (rev 574)
@@ -6,11 +6,11 @@
upstream (multiple uid 0 accounts).
http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2005-June/001287.html
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:50:38.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:50:39.000000000 +0200
-@@ -378,7 +378,14 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:14.573361562 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:15.267220184 +0200
+@@ -373,7 +373,14 @@
argv++; /* shift ... */
}
if (!name[0]) /* use default user ID */
Modified: trunk/debian/patches/432_login_cancel_timout_after_authentication
===================================================================
--- trunk/debian/patches/432_login_cancel_timout_after_authentication 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/432_login_cancel_timout_after_authentication 2005-10-08 18:12:32 UTC (rev 574)
@@ -5,11 +5,11 @@
Status wrt upstream: It should be forwarded to upstream.
-Index: shadow-4.0.12/src/login.c
+Index: shadow-4.0.13/src/login.c
===================================================================
---- shadow-4.0.12.orig/src/login.c 2005-08-17 11:50:55.000000000 +0200
-+++ shadow-4.0.12/src/login.c 2005-08-17 11:50:56.000000000 +0200
-@@ -736,6 +736,7 @@
+--- shadow-4.0.13.orig/src/login.c 2005-10-04 08:07:25.859062038 +0200
++++ shadow-4.0.13/src/login.c 2005-10-04 08:07:26.592912512 +0200
+@@ -720,6 +720,7 @@
}
/* We don't get here unless they were authenticated above */
Modified: trunk/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
===================================================================
--- trunk/debian/patches/433_login_more_LOG_UNKFAIL_ENAB 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/433_login_more_LOG_UNKFAIL_ENAB 2005-10-08 18:12:32 UTC (rev 574)
@@ -18,14 +18,14 @@
open, we don't have to close it.
* a HAVE_PAM_FAIL_DELAY is missing
-Index: shadow-4.0.12/src/login.c
+Index: shadow-4.0.13/src/login.c
===================================================================
---- shadow-4.0.12.orig/src/login.c 2005-08-17 11:50:51.000000000 +0200
-+++ shadow-4.0.12/src/login.c 2005-08-17 11:50:52.000000000 +0200
-@@ -649,47 +649,68 @@
+--- shadow-4.0.13.orig/src/login.c 2005-10-04 08:07:23.690503893 +0200
++++ shadow-4.0.13/src/login.c 2005-10-04 08:07:24.390361293 +0200
+@@ -633,47 +633,68 @@
+ * pay attention to failure count and get rid of
* MAX_LOGIN_TRIES?
*/
-
- retcode = pam_authenticate (pamh, 0);
- while ((failcount++ < retries) &&
- ((retcode == PAM_AUTH_ERR) ||
@@ -35,13 +35,13 @@
- pam_get_item (pamh, PAM_USER,
- (const void **) &pam_user);
- SYSLOG ((LOG_NOTICE,
-- "FAILED LOGIN %d FROM %s FOR %s, %s",
-- failcount, hostname, pam_user,
-- pam_strerror (pamh, retcode)));
+- "FAILED LOGIN %d FROM %s FOR %s, %s",
+- failcount, hostname, pam_user,
+- pam_strerror (pamh, retcode)));
-#ifdef HAVE_PAM_FAIL_DELAY
- pam_fail_delay (pamh, 1000000 * delay);
-#endif
-- fprintf (stderr, "Login incorrect\n\n");
+- fprintf (stderr, _("\nLogin incorrect\n"));
- pam_set_item (pamh, PAM_USER, NULL);
- retcode = pam_authenticate (pamh, 0);
- }
@@ -52,15 +52,15 @@
-
- if (retcode == PAM_MAXTRIES)
- SYSLOG ((LOG_NOTICE,
-- "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s",
-- failcount, hostname,
-- pam_user,
-- pam_strerror (pamh, retcode)));
+- "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s",
+- failcount, hostname,
+- pam_user,
+- pam_strerror (pamh, retcode)));
- else
- SYSLOG ((LOG_NOTICE,
-- "FAILED LOGIN SESSION FROM %s FOR %s, %s",
-- hostname, pam_user,
-- pam_strerror (pamh, retcode)));
+- "FAILED LOGIN SESSION FROM %s FOR %s, %s",
+- hostname, pam_user,
+- pam_strerror (pamh, retcode)));
-
- fprintf (stderr, "\nLogin incorrect\n");
- pam_end (pamh, retcode);
Modified: trunk/debian/patches/434_login_stop_checking_args_after--
===================================================================
--- trunk/debian/patches/434_login_stop_checking_args_after-- 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/434_login_stop_checking_args_after-- 2005-10-08 18:12:32 UTC (rev 574)
@@ -3,11 +3,11 @@
Status wrt upstream: It could certainly be submitted to upstream.
-Index: shadow-4.0.12/src/login.c
+Index: shadow-4.0.13/src/login.c
===================================================================
---- shadow-4.0.12.orig/src/login.c 2005-08-17 11:49:18.000000000 +0200
-+++ shadow-4.0.12/src/login.c 2005-08-17 11:50:51.000000000 +0200
-@@ -258,6 +258,8 @@
+--- shadow-4.0.13.orig/src/login.c 2005-10-04 08:06:32.527928651 +0200
++++ shadow-4.0.13/src/login.c 2005-10-04 08:07:23.690503893 +0200
+@@ -256,6 +256,8 @@
for (arg = 1; arg < argc; arg++) {
if (argv[arg][0] == '-' && strlen (argv[arg]) > 2)
usage ();
Modified: trunk/debian/patches/435_su_addenv_HOME_and_SHELL
===================================================================
--- trunk/debian/patches/435_su_addenv_HOME_and_SHELL 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/435_su_addenv_HOME_and_SHELL 2005-10-08 18:12:32 UTC (rev 574)
@@ -3,11 +3,11 @@
Status wrt upstream: It should be proposed to upstream.
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:49:21.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:50:38.000000000 +0200
-@@ -677,8 +677,11 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:06:34.164595165 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:14.573361562 +0200
+@@ -668,8 +668,11 @@
if (fakelogin)
setup_env (&pwent);
#if 1 /* Suggested by Joey Hess. XXX - is this right? */
Modified: trunk/debian/patches/437_su_add_GNU_options_1
===================================================================
--- trunk/debian/patches/437_su_add_GNU_options_1 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/437_su_add_GNU_options_1 2005-10-08 18:12:32 UTC (rev 574)
@@ -5,14 +5,14 @@
Broken:
* additional_args is set, but not used.
* !doshell is broken (argv is not incremented)
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-29 21:45:05.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-29 21:46:17.000000000 +0200
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:15.267220184 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:15.966077788 +0200
@@ -31,6 +31,7 @@
- #include "rcsid.h"
- RCSID (PKG_VER "$Id: su.c,v 1.41 2005/08/04 19:13:43 kloczek Exp $")
+ #ident "$Id: su.c,v 1.45 2005/09/07 15:00:45 kloczek Exp $"
+
+#include <getopt.h>
#include <grp.h>
#include <pwd.h>
@@ -36,7 +36,7 @@
#ifndef USE_PAM
static RETSIGTYPE die (int);
-@@ -259,6 +272,8 @@
+@@ -257,6 +270,8 @@
uid_t my_uid;
struct passwd *pw = 0;
char **envp = environ;
@@ -45,7 +45,7 @@
#ifdef USE_PAM
int ret;
-@@ -279,6 +294,8 @@
+@@ -277,6 +292,8 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
@@ -54,12 +54,17 @@
/*
* Get the program name. The program name is used as a prefix to
* most error messages.
-@@ -322,15 +339,56 @@
+@@ -317,15 +334,57 @@
+ /*
* Process the command line arguments.
*/
-
- argc--;
- argv++; /* shift out command name */
+
+- if (argc > 0 && strcmp (argv[0], "-") == 0) {
+- fakelogin = 1;
+- argc--;
+- argv++; /* shift ... */
+ while ((optc = getopt_long (argc, argv, "c:mps:h", longopts, NULL)) != -1) {
+ switch (optc) {
+ case 0:
@@ -89,12 +94,9 @@
+ exit(1);
+ }
+ }
-
-- if (argc > 0 && strcmp (argv[0], "-") == 0) {
++
+ if (optind < argc && !strcmp (argv[optind], "-")) {
- fakelogin = 1;
-- argc--;
-- argv++; /* shift ... */
++ fakelogin = 1;
+ ++optind;
+ }
+
@@ -116,7 +118,7 @@
/*
* If a new login is being set up, the old environment will be
* ignored and a new one created later on.
-@@ -365,29 +423,7 @@
+@@ -361,28 +420,7 @@
addenv (*envp++, NULL);
}
@@ -126,7 +128,6 @@
- * doesn't start with a "-" unless you specify the new user name.
- * Any remaining arguments will be passed to the user's login shell.
- */
--
- if (argc > 0 && argv[0][0] != '-') {
- STRFCPY (name, argv[0]); /* use this login id */
- argc--;
@@ -147,7 +148,7 @@
/*
* Get the user's real name. The current UID is used to determine
-@@ -509,6 +545,23 @@
+@@ -501,6 +539,23 @@
if (pwent.pw_shell[0] == '\0')
pwent.pw_shell = "/bin/sh"; /* XXX warning: const */
@@ -171,7 +172,7 @@
signal (SIGINT, SIG_IGN);
signal (SIGQUIT, SIG_IGN);
#ifdef USE_PAM
-@@ -687,7 +740,7 @@
+@@ -678,7 +733,7 @@
else {
addenv ("HOME", pwent.pw_dir);
addenv ("USER", pwent.pw_name);
Modified: trunk/debian/patches/437_su_add_GNU_options_2
===================================================================
--- trunk/debian/patches/437_su_add_GNU_options_2 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/437_su_add_GNU_options_2 2005-10-08 18:12:32 UTC (rev 574)
@@ -7,11 +7,11 @@
* arg0 is computed in run_shell.
* There is no more need for doshell. We know that we only need to
execute a shell when there is no additional arguments.
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:50:40.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:50:41.000000000 +0200
-@@ -128,6 +128,24 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:15.966077788 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:16.698928465 +0200
+@@ -127,6 +127,24 @@
}
#endif /* !USE_PAM */
@@ -36,7 +36,7 @@
static void su_failure (const char *tty)
{
-@@ -150,23 +168,70 @@
+@@ -149,23 +167,70 @@
{
++caught;
}
@@ -109,7 +109,7 @@
shell (shellstr, (char *) args[0]);
else
(void) execv (shellstr, (char **) args);
-@@ -244,8 +309,8 @@
+@@ -243,8 +308,8 @@
}
exit (WEXITSTATUS (status));
@@ -119,7 +119,7 @@
/*
* su - switch user id
-@@ -266,7 +331,6 @@
+@@ -264,7 +329,6 @@
char *cp;
char **envcp;
const char *tty = 0; /* Name of tty SU is run from */
@@ -127,7 +127,7 @@
int fakelogin = 0;
int amroot = 0;
uid_t my_uid;
-@@ -388,7 +452,6 @@
+@@ -384,7 +448,6 @@
if (optind < argc)
additional_args = argv + optind;
@@ -135,7 +135,7 @@
/*
* If a new login is being set up, the old environment will be
* ignored and a new one created later on.
-@@ -423,8 +486,6 @@
+@@ -420,8 +483,6 @@
addenv (*envp++, NULL);
}
@@ -144,7 +144,7 @@
/*
* Get the user's real name. The current UID is used to determine
* who has executed su. That user ID must exist.
-@@ -753,48 +814,7 @@
+@@ -746,45 +807,7 @@
*/
closelog ();
@@ -152,7 +152,6 @@
- * See if the user has extra arguments on the command line. In that
- * case they will be provided to the new user's shell as arguments.
- */
--
- if (fakelogin) {
- char *arg0;
-
@@ -168,12 +167,10 @@
- cp = Basename (pwent.pw_shell);
-
- if (!doshell) {
--
- /*
- * Use new user's shell from /etc/passwd and create an argv
- * with the rest of the command line included.
- */
--
- argv[-1] = pwent.pw_shell;
-#ifndef USE_PAM
- (void) execv (pwent.pw_shell, &argv[-1]);
Modified: trunk/debian/patches/437_su_add_GNU_options_3
===================================================================
--- trunk/debian/patches/437_su_add_GNU_options_3 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/437_su_add_GNU_options_3 2005-10-08 18:12:32 UTC (rev 574)
@@ -2,11 +2,11 @@
* add -c ability to run_shell.
* only change environment if the user did not requested to preserve
the environment, or if the user has a restricted shell.
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-29 21:49:10.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-29 21:49:11.000000000 +0200
-@@ -185,7 +185,10 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:16.698928465 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:17.407784032 +0200
+@@ -184,7 +184,10 @@
* have been applied. Some work was needed to get it integrated into
* su.c from shadow.
*/
@@ -18,7 +18,7 @@
{
const char **args;
int child;
-@@ -194,8 +197,10 @@
+@@ -193,8 +196,10 @@
int ret;
int argno = 0;
@@ -30,7 +30,7 @@
if (fakelogin) {
char *arg0;
-@@ -213,11 +218,17 @@
+@@ -212,11 +217,17 @@
args[0] = Basename (shellstr);
argno = 1;
@@ -48,18 +48,7 @@
args[argno] = NULL;
#ifndef USE_PAM
-@@ -716,7 +727,9 @@
- addenv ("PATH", cp);
- }
-
-- environ = newenvp; /* make new environment active */
-+ if (change_environment || restricted_shell(pwent.pw_shell)) {
-+ environ = newenvp; /* make new environment active */
-+ }
-
- if (getenv ("IFS")) /* don't export user IFS ... */
- addenv ("IFS= \t\n", NULL); /* ... instead, set a safe IFS */
-@@ -766,18 +779,20 @@
+@@ -759,18 +770,20 @@
exit (1);
}
@@ -68,20 +57,19 @@
- * run, and we cannot access /etc/shadow and co
- */
- environ = newenvp; /* make new environment active */
--
-- /* update environment with all pam set variables */
-- envcp = pam_getenvlist (pamh);
-- if (envcp) {
-- while (*envcp) {
-- addenv (*envcp, NULL);
-- envcp++;
+ if (change_environment || restricted_shell(pwent.pw_shell)) {
+ /* we need to setup the environment *after* pam_open_session(),
+ * else the UID is changed before stuff like pam_xauth could
+ * run, and we cannot access /etc/shadow and co
+ */
+ environ = newenvp; /* make new environment active */
-+
+
+- /* update environment with all pam set variables */
+- envcp = pam_getenvlist (pamh);
+- if (envcp) {
+- while (*envcp) {
+- addenv (*envcp, NULL);
+- envcp++;
+ /* update environment with all pam set variables */
+ envcp = pam_getenvlist (pamh);
+ if (envcp) {
@@ -92,7 +80,7 @@
}
}
-@@ -795,15 +810,17 @@
+@@ -788,15 +801,17 @@
exit (1);
#endif /* !USE_PAM */
@@ -117,7 +105,7 @@
/*
* This is a workaround for Linux libc bug/feature (?) - the
-@@ -814,7 +831,7 @@
+@@ -807,7 +822,7 @@
*/
closelog ();
Modified: trunk/debian/patches/437_su_add_GNU_options_4
===================================================================
--- trunk/debian/patches/437_su_add_GNU_options_4 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/437_su_add_GNU_options_4 2005-10-08 18:12:32 UTC (rev 574)
@@ -11,11 +11,11 @@
* if fakelogin, some env variables are set. This must not be done if
--preserve-environment wasspecified (for users whose shell is not
restricted)
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-09-01 15:09:58.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-09-01 15:10:39.000000000 +0200
-@@ -208,14 +208,14 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:17.407784032 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:18.106641636 +0200
+@@ -207,14 +207,14 @@
shell_basename = getdef_str ("SU_NAME");
if (!shell_basename)
@@ -32,7 +32,7 @@
argno = 1;
if (command) {
-@@ -232,20 +232,14 @@
+@@ -231,20 +231,14 @@
args[argno] = NULL;
#ifndef USE_PAM
@@ -55,14 +55,13 @@
{
int exit_status = (errno == ENOENT ? 127 : 126);
-@@ -464,40 +458,6 @@
+@@ -460,41 +454,6 @@
additional_args = argv + optind;
/*
- * If a new login is being set up, the old environment will be
- * ignored and a new one created later on.
- */
--
- if (fakelogin) {
- /*
- * The terminal type will be left alone if it is present in
@@ -73,11 +72,13 @@
-#ifndef USE_PAM
- if ((cp = getdef_str ("ENV_TZ")))
- addenv (*cp == '/' ? tz (cp) : cp, NULL);
+-
- /*
- * The clock frequency will be reset to the login value if required
- */
- if ((cp = getdef_str ("ENV_HZ")))
- addenv (cp, NULL); /* set the default $HZ, if one */
+-
- /*
- * Also leave DISPLAY and XAUTHORITY if present, else
- * pam_xauth will not work.
@@ -96,7 +97,7 @@
* Get the user's real name. The current UID is used to determine
* who has executed su. That user ID must exist.
*/
-@@ -564,6 +524,40 @@
+@@ -559,6 +518,40 @@
#endif /* !USE_PAM */
pwent = *pw;
Modified: trunk/debian/patches/437_su_add_GNU_options_5
===================================================================
--- trunk/debian/patches/437_su_add_GNU_options_5 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/437_su_add_GNU_options_5 2005-10-08 18:12:32 UTC (rev 574)
@@ -2,11 +2,11 @@
Also, return a 126 or 127 exit status when !USE_PAM (was mising
from another patch.
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:50:43.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:50:44.000000000 +0200
-@@ -233,6 +233,13 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:18.106641636 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:18.807498832 +0200
+@@ -232,6 +232,13 @@
#ifndef USE_PAM
(void) execv (shellstr, args);
@@ -20,7 +20,7 @@
/* NOT REACHED */
#else
child = fork ();
-@@ -240,6 +247,8 @@
+@@ -239,6 +246,8 @@
pam_end (pamh, PAM_SUCCESS);
(void) execv (shellstr, (char **) args);
Modified: trunk/debian/patches/437_su_add_GNU_options_6
===================================================================
--- trunk/debian/patches/437_su_add_GNU_options_6 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/437_su_add_GNU_options_6 2005-10-08 18:12:32 UTC (rev 574)
@@ -1,13 +1,13 @@
Goal: I'm not sure if the pw_shell can be NULL, but checking can't arm.
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-29 21:49:22.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-29 21:49:24.000000000 +0200
-@@ -617,7 +617,7 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:18.807498832 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:19.503357047 +0200
+@@ -610,7 +610,7 @@
+ /*
* Set the default shell.
*/
-
- if (pwent.pw_shell[0] == '\0')
+ if (pwent.pw_shell == NULL || pwent.pw_shell[0] == '\0')
pwent.pw_shell = "/bin/sh"; /* XXX warning: const */
Modified: trunk/debian/patches/437_su_add_GNU_options_7
===================================================================
--- trunk/debian/patches/437_su_add_GNU_options_7 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/437_su_add_GNU_options_7 2005-10-08 18:12:32 UTC (rev 574)
@@ -1,9 +1,9 @@
Note: * Document the changes from the other 437_ patches
-Index: shadow-4.0.12/man/su.1.xml
+Index: shadow-4.0.13/man/su.1.xml
===================================================================
---- shadow-4.0.12.orig/man/su.1.xml 2005-07-21 16:36:32.000000000 +0200
-+++ shadow-4.0.12/man/su.1.xml 2005-09-01 11:51:13.000000000 +0200
+--- shadow-4.0.13.orig/man/su.1.xml 2005-10-04 08:06:33.161799494 +0200
++++ shadow-4.0.13/man/su.1.xml 2005-10-04 08:07:20.207213632 +0200
@@ -15,6 +15,7 @@
<refsynopsisdiv id='synopsis'>
<cmdsynopsis>
@@ -11,26 +11,25 @@
+ <arg choice='opt'>OPTS </arg>
<arg choice='opt'>- </arg>
<arg choice='opt'>
- <arg choice='plain'>
-@@ -36,26 +37,39 @@
+ <arg choice='plain'>
+@@ -37,24 +38,24 @@
expect had the user logged in directly.
</para>
-
-- <para>Additional arguments may be provided after the username, in which
-- case they are supplied to the user´s login shell. In particular,
-- an argument of <option>-c</option> will cause the next argument to be
+
+- <para>
+- Additional arguments may be provided after the username, in which case
+- they are supplied to the user´s login shell. In particular, an
+- argument of <option>-c</option> will cause the next argument to be
- treated as a command by most command interpreters. The command will be
- executed by the shell specified in <filename>/etc/passwd</filename>
- for the target user.
- </para>
--
+-
<para>The user will be prompted for a password, if appropriate. Invalid
passwords will produce an error message. All attempts, both valid and
invalid, are logged to detect abuses of the system.
</para>
-
-- <para>The current environment is passed to the new shell. The value of
-- <emphasis remap='B'>$PATH</emphasis> is reset to
+
+ <para>An optional command can be executed. This is done by the shell
+ specified in <filename>/etc/passwd</filename> for the target user
+ unless the <option>-s</option> or <option>-m</option>
@@ -40,104 +39,19 @@
+ command to be passed to it).
+ </para>
+
-+ <para>
+ <para>
+- The current environment is passed to the new shell. The value of
+- <emphasis>$PATH</emphasis> is reset to
+- <filename>/bin:/usr/bin</filename> for normal users, or
+ Unless the <option>-m</option> or <option>-p</option> options are used,
+ the current environment is passed to the new shell with alterations.
+ The value of <emphasis remap='B'>$PATH</emphasis> is reset to
- <filename>/bin:/usr/bin</filename> for normal users, or
-- <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the super user.
-+ <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the super user.
- This may be changed with the <emphasis remap='B'>ENV_PATH</emphasis>
- and <emphasis remap='B'>ENV_SUPATH</emphasis> definitions in
- <filename>/etc/login.defs</filename>.
-+ <emphasis remap='B'>$IFS</emphasis>, if is set, is reset to contain
-+ space, tab, and newline.
-+ <emphasis remap='B'>$USER</emphasis> is set to the name of the target
-+ user,
-+ <emphasis remap='B'>$HOME</emphasis> is set to the home directory of
-+ the target user, and
-+ <emphasis remap='B'>$SHELL</emphasis> is set to the shell of the target
-+ user.
-+ When using the <option>-m</option> or <option>-p</option> options,
-+ the user's environment is not changed.
- </para>
-
- <para>A subsystem login is indicated by the presence of a "*" as the
-@@ -65,6 +79,71 @@
- </para>
- </refsect1>
-
-+ <refsect1 id='options'>
-+ <title>OPTIONS</title>
-+ <variablelist remap='IP'>
-+ <varlistentry>
-+ <term>
-+ <option>-</option>
-+ </term>
-+ <listitem>
-+ <para>make this a login shell</para>
-+ </listitem>
-+ </varlistentry>
-+ <varlistentry>
-+ <term>
-+ <option>-c</option>, <option>--command</option>=
-+ <replaceable>command</replaceable>
-+ </term>
-+ <listitem>
-+ <para>pass <emphasis remap='I'>command</emphasis> to the invoked
-+ shell using its <option>-c</option> option</para>
-+ </listitem>
-+ </varlistentry>
-+ <varlistentry>
-+ <term>
-+ <option>-m</option>, <option>-p</option>,
-+ <option>--preserve-environment</option>
-+ </term>
-+ <listitem>
-+ <para>do not reset environment variables, and keep the same shell
-+ </para>
-+ </listitem>
-+ </varlistentry>
-+ <varlistentry>
-+ <term>
-+ <option>-s</option>, <option>--shell</option>=
-+ <replaceable>shell</replaceable>
-+ </term>
-+ <listitem>
-+ <para>use <emphasis remap='I'>shell</emphasis> instead of the
-+ default in <filename>/etc/passwd</filename>
-+ </para>
-+ </listitem>
-+ </varlistentry>
-+ </variablelist>
-+ </refsect1>
-+
-+ <refsect1 id='notes'>
-+ <title>NOTES</title>
-+ <para>The <option>-m</option>, <option>-p</option> and <option>-s</option>
-+ options are restricted by the target user's shell being listed in
-+ <filename>/etc/shells</filename>. If it's not listed, then it's assumed
-+ to be a restricted account, a normal su is performed, and those options
-+ are ignored silently.
-+ </para>
-+
-+ <para>A subsystem login is indicated by the presence of a "*" as the first
-+ character of the login shell. The given home directory will be used as
-+ the root of a new filesystem which the user is actually logged into.
-+ </para>
-+
-+ <para>Much of the behavior of this command can be altered via its pam
-+ configuration - see <citerefentry><refentrytitle>pam</refentrytitle>
-+ <manvolnum>7</manvolnum></citerefentry>.
-+ </para>
-+ </refsect1>
-+
- <refsect1 id='caveats'>
- <title>CAVEATS</title>
- <para>
-@@ -84,6 +163,14 @@
- <term><filename>/etc/shadow</filename></term>
- <listitem>secure user account information</listitem>
+ <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the super user.
+ This may be changed with the <emphasis>ENV_PATH</emphasis> and
+ <emphasis>ENV_SUPATH</emphasis> definitions in
+@@ -91,6 +92,14 @@
+ <para>secure user account information</para>
+ </listitem>
</varlistentry>
+ <varlistentry>
+ <term><filename>/etc/shells</filename></term>
@@ -149,23 +63,4 @@
+ </varlistentry>
</variablelist>
</refsect1>
-
-@@ -101,11 +188,17 @@
- <citerefentry>
- <refentrytitle>suauth</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>
-+ <citerefentry>
-+ <refentrytitle>shells</refentrytitle><manvolnum>5</manvolnum>
-+ </citerefentry>
-+ <citerefentry>
-+ <refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum>
-+ </citerefentry>
- </para>
- </refsect1>
-
- <refsect1 id='author'>
- <title>AUTHOR</title>
-- <para>Julianne Frances Haugh <jockgrrl at ix.netcom.com></para>
-+ <para>Julianne Frances Haugh (jfh at austin.ibm.com)</para>
- </refsect1>
- </refentry>
+
Modified: trunk/debian/patches/438_su_GNU_origin
===================================================================
--- trunk/debian/patches/438_su_GNU_origin 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/438_su_GNU_origin 2005-10-08 18:12:32 UTC (rev 574)
@@ -4,10 +4,10 @@
Status wrt upstream: It must be forwarded upstream.
Upstream also uses some bits from the GNU shellutils.
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:50:49.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:50:57.000000000 +0200
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:22.296787870 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:27.298768690 +0200
@@ -26,6 +26,24 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
Modified: trunk/debian/patches/439_su_PAM_session
===================================================================
--- trunk/debian/patches/439_su_PAM_session 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/439_su_PAM_session 2005-10-08 18:12:32 UTC (rev 574)
@@ -5,19 +5,19 @@
One difference may be that the session is not closed as root (changing
this will require a major rewrite of su).
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:50:48.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:50:49.000000000 +0200
-@@ -787,6 +790,7 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:21.600929655 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:22.296787870 +0200
+@@ -777,6 +777,7 @@
SYSLOG ((LOG_ERR, "pam_open_session: %s",
pam_strerror (pamh, ret)));
- fprintf (stderr, "%s: %s\n", Prog, pam_strerror (pamh, ret));
+ fprintf (stderr, _("%s: %s\n"), Prog, pam_strerror (pamh, ret));
+ pam_setcred(pamh, PAM_DELETE_CRED);
pam_end (pamh, ret);
exit (1);
}
-@@ -810,6 +814,7 @@
+@@ -800,6 +801,7 @@
/* become the new user */
if (change_uid (&pwent)) {
Modified: trunk/debian/patches/440_manpages-login.1
===================================================================
--- trunk/debian/patches/440_manpages-login.1 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/440_manpages-login.1 2005-10-08 18:12:32 UTC (rev 574)
@@ -6,11 +6,11 @@
Note:
* Is it still the case if the pam session is closed?
-Index: shadow-4.0.12/man/login.1.xml
+Index: shadow-4.0.13/man/login.1.xml
===================================================================
---- shadow-4.0.12.orig/man/login.1.xml 2005-08-17 11:49:22.000000000 +0200
-+++ shadow-4.0.12/man/login.1.xml 2005-08-17 11:50:35.000000000 +0200
-@@ -163,6 +163,18 @@
+--- shadow-4.0.13.orig/man/login.1.xml 2005-10-04 08:06:34.433540365 +0200
++++ shadow-4.0.13/man/login.1.xml 2005-10-04 08:07:13.018678338 +0200
+@@ -172,6 +172,18 @@
<para>The location of files is subject to differences in system
configuration.
</para>
@@ -27,5 +27,5 @@
+ "subsession".
+ </para>
</refsect1>
-
+
<refsect1 id='files'>
Modified: trunk/debian/patches/442_useradd-O_option
===================================================================
--- trunk/debian/patches/442_useradd-O_option 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/442_useradd-O_option 2005-10-08 18:12:32 UTC (rev 574)
@@ -2,11 +2,11 @@
Note: useradd.8 needs to be regenerated.
-Index: shadow-4.0.12/man/useradd.8.xml
+Index: shadow-cvs/man/useradd.8.xml
===================================================================
---- shadow-4.0.12.orig/man/useradd.8.xml 2005-08-17 11:50:33.000000000 +0200
-+++ shadow-4.0.12/man/useradd.8.xml 2005-08-17 11:51:16.000000000 +0200
-@@ -194,6 +194,11 @@
+--- shadow-cvs.orig/man/useradd.8.xml 2005-10-06 02:48:22.000000000 +0300
++++ shadow-cvs/man/useradd.8.xml 2005-10-06 02:48:57.000000000 +0300
+@@ -201,6 +201,11 @@
<replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
doesn't work yet.
</para>
@@ -15,14 +15,14 @@
+ <command>useradd</command>, the <option>-O</option> option is
+ also supported.
+ </para>
- </listitem>
+ </listitem>
</varlistentry>
<varlistentry>
-Index: shadow-4.0.12/src/useradd.c
+Index: shadow-cvs/src/useradd.c
===================================================================
---- shadow-4.0.12.orig/src/useradd.c 2005-08-17 11:51:09.000000000 +0200
-+++ shadow-4.0.12/src/useradd.c 2005-08-17 11:51:16.000000000 +0200
-@@ -965,7 +965,7 @@
+--- shadow-cvs.orig/src/useradd.c 2005-10-06 02:48:22.000000000 +0300
++++ shadow-cvs/src/useradd.c 2005-10-06 02:48:57.000000000 +0300
+@@ -949,7 +949,7 @@
{NULL, 0, NULL, '\0'}
};
while ((c =
@@ -31,7 +31,7 @@
long_options, NULL)) != -1) {
switch (c) {
case 'b':
-@@ -1084,6 +1084,7 @@
+@@ -1068,6 +1068,7 @@
kflg++;
break;
case 'K':
Modified: trunk/debian/patches/445_su_password_expired
===================================================================
--- trunk/debian/patches/445_su_password_expired 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/445_su_password_expired 2005-10-08 18:12:32 UTC (rev 574)
@@ -7,11 +7,11 @@
Note: When su is not compiled with PAM, there is no syslog messages.
-Index: shadow-4.0.12/src/su.c
+Index: shadow-4.0.13/src/su.c
===================================================================
---- shadow-4.0.12.orig/src/su.c 2005-08-17 11:51:18.000000000 +0200
-+++ shadow-4.0.12/src/su.c 2005-08-17 11:51:20.000000000 +0200
-@@ -697,6 +697,16 @@
+--- shadow-4.0.13.orig/src/su.c 2005-10-04 08:07:34.443312955 +0200
++++ shadow-4.0.13/src/su.c 2005-10-04 08:07:38.039580199 +0200
+@@ -702,6 +702,16 @@
if (amroot) {
fprintf (stderr, _("%s: %s\n(Ignored)\n"), Prog,
pam_strerror (pamh, ret));
@@ -28,7 +28,7 @@
} else {
SYSLOG ((LOG_ERR, "pam_acct_mgmt: %s",
pam_strerror (pamh, ret)));
-@@ -745,10 +755,11 @@
+@@ -747,10 +757,11 @@
if (!spwd)
spwd = pwd_to_spwd (&pwent);
Modified: trunk/debian/patches/447_missing_login.defs_variables
===================================================================
--- trunk/debian/patches/447_missing_login.defs_variables 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/447_missing_login.defs_variables 2005-10-08 18:12:32 UTC (rev 574)
@@ -7,10 +7,10 @@
Status wrt upstream: submitted
-Index: shadow-4.0.12/lib/getdef.c
+Index: shadow-4.0.13/lib/getdef.c
===================================================================
---- shadow-4.0.12.orig/lib/getdef.c 2005-09-01 00:24:54.000000000 +0200
-+++ shadow-4.0.12/lib/getdef.c 2005-09-01 00:34:21.000000000 +0200
+--- shadow-4.0.13.orig/lib/getdef.c 2005-10-04 08:07:25.860061834 +0200
++++ shadow-4.0.13/lib/getdef.c 2005-10-04 08:07:38.742436989 +0200
@@ -69,6 +69,8 @@
{"LOG_OK_LOGINS", NULL},
{"LOG_UNKFAIL_ENAB", NULL},
Modified: trunk/debian/patches/448_enable_man
===================================================================
--- trunk/debian/patches/448_enable_man 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/448_enable_man 2005-10-08 18:12:32 UTC (rev 574)
@@ -1,7 +1,6 @@
Goal: permit the man pages generation from the XML files.
-Status wrt upstream: comes from upstream CVS (will be in 4.0.13)
- CLEANFILES is commented. This is Debian specific.
+Status wrt upstream: CLEANFILES is commented. This is Debian specific.
(to avoid problems when debuild is used twice in the
same directory, or debuild then debclean then
debuild)
@@ -11,27 +10,13 @@
* The extra inforamtion (date and User Commands) are not displayed in
the headers and footers.
-Index: shadow-4.0.12/configure.in
+Index: shadow-4.0.13/configure.in
===================================================================
---- shadow-4.0.12.orig/configure.in 2005-09-01 11:14:57.000000000 +0200
-+++ shadow-4.0.12/configure.in 2005-09-01 11:14:59.000000000 +0200
-@@ -211,6 +211,13 @@
- [enable_shadowgrp="yes"]
- )
-
-+AC_ARG_ENABLE(man,
-+ [AC_HELP_STRING([--enable-man],
-+ [regenerate roff man pages from Docbook (default=no)])],
-+ [enable_man=yes],
-+ [enable_man=no]
-+)
-+
- AC_ARG_WITH(libcrack, [ --with-libcrack try to use libcrack (default if found)])
- AC_ARG_WITH(libpam, [ --with-libpam use libpam for PAM support])
- AC_ARG_WITH(selinux, [ --with-selinux use SELinux support])
-@@ -228,6 +235,23 @@
- AC_DEFINE(SHADOWGRP, 1, [Define to support the shadow group file.])
+--- shadow-4.0.13.orig/configure.in 2005-10-04 08:07:11.639959261 +0200
++++ shadow-4.0.13/configure.in 2005-10-04 08:07:39.450292761 +0200
+@@ -263,6 +263,23 @@
fi
+ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
+if test "$enable_man" = "yes"; then
+ dnl
@@ -53,189 +38,3 @@
AC_SUBST(LIBCRYPT)
AC_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt],
[AC_MSG_ERROR([crypt() not found])])
-Index: shadow-4.0.12/man/Makefile.am
-===================================================================
---- shadow-4.0.12.orig/man/Makefile.am 2005-07-10 20:03:57.000000000 +0200
-+++ shadow-4.0.12/man/Makefile.am 2005-09-01 11:24:04.000000000 +0200
-@@ -94,6 +94,121 @@
-
- all:
-
--shadow-man-pages.pot:
-+shadow-man-pages.pot: $(man_XMANS)
- xml2po -o $@ $(man_XMANS)
-
-+if ENABLE_REGENERATE_MAN
-+
-+chage.1: chage.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+chfn.1: chfn.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+chpasswd.8: chpasswd.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+chsh.1: chsh.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+expiry.1: expiry.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+faillog.5: faillog.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+faillog.8: faillog.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+gpasswd.1: gpasswd.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+groupadd.8: groupadd.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+groupdel.8: groupdel.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+groupmems.8: groupmems.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+groupmod.8: groupmod.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+groups.1: groups.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+grpck.8: grpck.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+gshadow.5: gshadow.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+lastlog.8: lastlog.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+limits.5: limits.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+login.1: login.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+login.access.5: login.access.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+login.defs.5: login.defs.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+logoutd.8: logoutd.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+#newgrp.1: newgrp.1.xml
-+# $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+newusers.8: newusers.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+passwd.1: passwd.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+passwd.5: passwd.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+porttime.5: porttime.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+pwck.8: pwck.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+grpconv.8 grpunconv.8 pwconv.8 pwunconv.8: pwconv.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+shadow.3 getspnam.3: shadow.3.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+shadow.5: shadow.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+su.1: su.1.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+suauth.5: suauth.5.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+useradd.8: useradd.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+userdel.8: userdel.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+usermod.8: usermod.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+vigr.8 vipw.8: vipw.8.xml
-+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+# shadow is distributed with the groff man pages generated. We do not
-+# remove them to avoid problems when the packages are built twice
-+#CLEANFILES = $(man_MANS)
-+
-+endif
-Index: shadow-4.0.12/acinclude.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/acinclude.m4 2005-09-01 11:14:59.000000000 +0200
-@@ -0,0 +1,54 @@
-+# Checks the location of the XML Catalog
-+# Usage:
-+# JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
-+AC_DEFUN([JH_PATH_XML_CATALOG],
-+[
-+ # check for the presence of the XML catalog
-+ AC_ARG_WITH([xml-catalog],
-+ AC_HELP_STRING([--with-xml-catalog=CATALOG],
-+ [path to xml catalog to use]),,
-+ [with_xml_catalog=/etc/xml/catalog])
-+ jh_found_xmlcatalog=true
-+ XML_CATALOG_FILE="$with_xml_catalog"
-+ AC_SUBST([XML_CATALOG_FILE])
-+ AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
-+ if test -f "$XML_CATALOG_FILE"; then
-+ AC_MSG_RESULT([found])
-+ else
-+ jh_found_xmlcatalog=false
-+ AC_MSG_RESULT([not found])
-+ fi
-+
-+ # check for the xmlcatalog program
-+ AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
-+ if test "x$XMLCATALOG" = xno; then
-+ jh_found_xmlcatalog=false
-+ fi
-+
-+ if $jh_found_xmlcatalog; then
-+ ifelse([$1],,[:],[$1])
-+ else
-+ ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
-+ fi
-+])
-+
-+# Checks if a particular URI appears in the XML catalog
-+# Usage:
-+# JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+AC_DEFUN([JH_CHECK_XML_CATALOG],
-+[
-+ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
-+ AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
-+ if $jh_found_xmlcatalog && \
-+ AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
-+ AC_MSG_RESULT([found])
-+ ifelse([$3],,,[$3
-+])dnl
-+ else
-+ AC_MSG_RESULT([not found])
-+ ifelse([$4],,
-+ [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
-+ [$4])
-+ fi
-+])
Modified: trunk/debian/patches/450_shadowconfig.8
===================================================================
--- trunk/debian/patches/450_shadowconfig.8 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/450_shadowconfig.8 2005-10-08 18:12:32 UTC (rev 574)
@@ -3,10 +3,10 @@
Status wrt upstream: The shadowconfig utility is debian specific.
It's man page also (but it used to be distributed)
-Index: shadow-4.0.12/man/shadowconfig.8
+Index: shadow-4.0.13/man/shadowconfig.8
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/man/shadowconfig.8 2005-08-17 11:50:36.000000000 +0200
++++ shadow-4.0.13/man/shadowconfig.8 2005-10-04 08:07:13.711537164 +0200
@@ -0,0 +1,41 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
@@ -49,10 +49,10 @@
+.PP
+Note that turning shadow passwords off and on again will lose all password aging information\&.
+
-Index: shadow-4.0.12/man/shadowconfig.8.xml
+Index: shadow-4.0.13/man/shadowconfig.8.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/man/shadowconfig.8.xml 2005-08-17 11:50:36.000000000 +0200
++++ shadow-4.0.13/man/shadowconfig.8.xml 2005-10-04 08:07:13.712536961 +0200
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -106,10 +106,10 @@
+ </para>
+ </refsect1>
+</refentry>
-Index: shadow-4.0.12/man/fr/shadowconfig.8
+Index: shadow-4.0.13/man/fr/shadowconfig.8
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/man/fr/shadowconfig.8 2005-08-17 11:50:36.000000000 +0200
++++ shadow-4.0.13/man/fr/shadowconfig.8 2005-10-04 08:07:13.713536757 +0200
@@ -0,0 +1,26 @@
+.\" This file was generated with po4a. Translate the source file.
+.\"
@@ -137,10 +137,10 @@
+.SH TRADUCTION
+Nicolas FRANÇOIS, 2004.
+Veuillez signaler toute erreur à <\fIdebian\-l10\-french at lists.debian.org\fR>.
-Index: shadow-4.0.12/man/ja/shadowconfig.8
+Index: shadow-4.0.13/man/ja/shadowconfig.8
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/man/ja/shadowconfig.8 2005-08-17 11:50:36.000000000 +0200
++++ shadow-4.0.13/man/ja/shadowconfig.8 2005-10-04 08:07:13.714536553 +0200
@@ -0,0 +1,25 @@
+.\" all right reserved,
+.\" Translated Tue Oct 30 11:59:11 JST 2001
@@ -167,10 +167,10 @@
+
+.I /usr/share/doc/passwd/README.debian.gz
+¤Ë¤Ï shadow ¥Ñ¥¹¥ï¡¼¥É¤È¤½¤ì¤Ë´Ø¤¹¤ëÆÃħ¤Î´Êñ¤Ê¾Ò²ð¤¬½ñ¤«¤ì¤Æ¤¤¤ë¡£
-Index: shadow-4.0.12/man/pl/shadowconfig.8
+Index: shadow-4.0.13/man/pl/shadowconfig.8
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/man/pl/shadowconfig.8 2005-08-17 11:50:36.000000000 +0200
++++ shadow-4.0.13/man/pl/shadowconfig.8 2005-10-04 08:07:13.715536349 +0200
@@ -0,0 +1,27 @@
+.\" $Id: shadowconfig.8,v 1.3 2001/08/23 23:10:51 kloczek Exp $
+.\" {PTM/WK/1999-09-14}
Modified: trunk/debian/patches/451_login_PATH
===================================================================
--- trunk/debian/patches/451_login_PATH 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/451_login_PATH 2005-10-08 18:12:32 UTC (rev 574)
@@ -4,11 +4,11 @@
Status wrt upstream:
-Index: shadow-4.0.12/libmisc/setupenv.c
+Index: shadow-4.0.13/libmisc/setupenv.c
===================================================================
---- shadow-4.0.12.orig/libmisc/setupenv.c 2005-09-29 23:22:38.000000000 +0200
-+++ shadow-4.0.12/libmisc/setupenv.c 2005-09-29 23:25:25.000000000 +0200
-@@ -243,7 +243,6 @@
+--- shadow-4.0.13.orig/libmisc/setupenv.c 2005-10-04 08:06:29.498545917 +0200
++++ shadow-4.0.13/libmisc/setupenv.c 2005-10-04 08:07:40.148150569 +0200
+@@ -242,7 +242,6 @@
addenv ("USER", info->pw_name);
addenv ("LOGNAME", info->pw_name);
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/patches/series 2005-10-08 18:12:32 UTC (rev 574)
@@ -1,7 +1,5 @@
004_configure.in.dpatch
005_manpages.dpatch
-# 336_chfn.1
-441_manpages-shadow.5
440_manpages-login.1
450_shadowconfig.8
435_su_addenv_HOME_and_SHELL
@@ -16,7 +14,6 @@
008_su_no_sanitize_env
008_su_get_PAM_username
439_su_PAM_session
-# 008_login_MAXHOSTNAMELEN # It should probably be dropped.
428_grpck_add_prune_option
434_login_stop_checking_args_after--
433_login_more_LOG_UNKFAIL_ENAB
@@ -34,9 +31,8 @@
# 204_pt_BR-manpages.dpatch
# 205_it-manpages.dpatch
# 206_ko-manpages.dpatch
+# 207_id-manpages
#
-# 311_high-uids.dpatch # upstream uses AC_SYS_LARGEFILE in configure.in
-#
# 319_time_structures.dpatch # must be checked another time
333_shadow.5-typo_312430
401_cppw_src.dpatch
@@ -46,25 +42,18 @@
406_good_name.dpatch
407_32char_grnames.dpatch
421_login.1_pishing
-010_more-i18ned-messages
# NOTE: you must use only one of these 423
# See bug #317264, #276419
# 423_su_pass_args_without_concatenation # upstream don't suffer from this
423_su_arguments_are_concatenated
424_pwck.8_quiet_option
-357_newgrp-stop_cont-proxy
426_grpck_group-gshadow_members_consistency
427_chage_expiry_0
442_useradd-O_option
-449_comment_missplaced
-443_chage_exit_values
-365_PAM_copy_environ_later
445_su_password_expired
-446_newgrp.1_no_SHADOWPWD
447_missing_login.defs_variables
448_enable_man
451_login_PATH
-#207_id-manpages
# 999-2 is about using cdbs. It does not patch upstream files
# so shouldn't be here, but we keep it for the future
# 999-2_build_using_cdbs
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-10-08 10:12:09 UTC (rev 573)
+++ trunk/debian/rules 2005-10-08 18:12:32 UTC (rev 574)
@@ -11,7 +11,7 @@
endif
export CFLAGS
-config_options := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man
+config_options := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man --without-selinux
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
More information about the Pkg-shadow-commits
mailing list