From 62a24d7d0be38befc0351d6b4061580a9f07584f Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 28 Oct 2007 17:02:44 +0000 Subject: [PATCH] Update patches (offsets only). --- debian/patches/008_su_get_PAM_username | 4 ++-- debian/patches/008_su_no_sanitize_env | 2 +- debian/patches/403_fix_PATH-MAX_hurd | 2 +- debian/patches/405_su_no_pam_end_before_exec | 2 +- debian/patches/407_adduser_disable_PUG_with-n | 4 ++-- debian/patches/431_su_uid_0_not_root | 2 +- debian/patches/480_getopt_args_reorder | 4 ++-- debian/patches/506_relaxed_usernames | 4 ++-- debian/patches/507_32char_grnames.dpatch | 2 +- .../523_su_arguments_are_no_more_concatenated_by_default | 2 +- debian/patches/542_useradd-O_option | 6 +++--- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/debian/patches/008_su_get_PAM_username b/debian/patches/008_su_get_PAM_username index 88cf91e2..758b3d72 100644 --- a/debian/patches/008_su_get_PAM_username +++ b/debian/patches/008_su_get_PAM_username @@ -9,7 +9,7 @@ Index: shadow-4.0.18.1/src/su.c =================================================================== --- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:17:52.483993589 +0200 +++ shadow-4.0.18.1/src/su.c 2006-09-17 12:17:53.099998487 +0200 -@@ -287,6 +287,7 @@ +@@ -304,6 +304,7 @@ struct passwd *pw = 0; char **envp = environ; char *shellstr = 0, *command = 0; @@ -17,7 +17,7 @@ Index: shadow-4.0.18.1/src/su.c #ifdef USE_PAM char **envcp; -@@ -652,6 +653,14 @@ +@@ -669,6 +670,14 @@ su_failure (tty); } } diff --git a/debian/patches/008_su_no_sanitize_env b/debian/patches/008_su_no_sanitize_env index 5514e9d6..f2bccac0 100644 --- a/debian/patches/008_su_no_sanitize_env +++ b/debian/patches/008_su_no_sanitize_env @@ -2,7 +2,7 @@ Index: shadow-4.0.18.1/src/su.c =================================================================== --- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:17:47.383953038 +0200 +++ shadow-4.0.18.1/src/su.c 2006-09-17 12:17:52.483993589 +0200 -@@ -304,7 +304,7 @@ +@@ -321,7 +321,7 @@ #endif #endif /* !USE_PAM */ diff --git a/debian/patches/403_fix_PATH-MAX_hurd b/debian/patches/403_fix_PATH-MAX_hurd index b0d90122..2dfbc6ca 100644 --- a/debian/patches/403_fix_PATH-MAX_hurd +++ b/debian/patches/403_fix_PATH-MAX_hurd @@ -10,7 +10,7 @@ Index: shadow-4.0.18.1/lib/commonio.c =================================================================== --- shadow-4.0.18.1/lib/commonio.c.orig 2006-12-07 06:57:01.000000000 +0000 +++ shadow-4.0.18.1/lib/commonio.c 2006-12-07 06:57:40.000000000 +0000 -@@ -46,17 +47,31 @@ +@@ -47,17 +48,31 @@ int lrename (const char *old, const char *new) { diff --git a/debian/patches/405_su_no_pam_end_before_exec b/debian/patches/405_su_no_pam_end_before_exec index 6f61b136..3601ac32 100644 --- a/debian/patches/405_su_no_pam_end_before_exec +++ b/debian/patches/405_su_no_pam_end_before_exec @@ -13,7 +13,7 @@ Index: shadow-4.0.18.1/src/su.c =================================================================== --- shadow-4.0.18.1.orig/src/su.c 2007-02-25 14:22:54.000000000 +0100 +++ shadow-4.0.18.1/src/su.c 2007-02-25 14:29:01.000000000 +0100 -@@ -197,7 +197,12 @@ +@@ -196,7 +196,12 @@ child = fork (); if (child == 0) { /* child shell */ diff --git a/debian/patches/407_adduser_disable_PUG_with-n b/debian/patches/407_adduser_disable_PUG_with-n index 3bc7c724..9aa7f577 100644 --- a/debian/patches/407_adduser_disable_PUG_with-n +++ b/debian/patches/407_adduser_disable_PUG_with-n @@ -19,7 +19,7 @@ Index: shadow-4.0.18.1/man/useradd.8.xml =================================================================== --- shadow-4.0.18.1.orig/man/useradd.8.xml 2007-04-15 16:16:36.000000000 +0200 +++ shadow-4.0.18.1/man/useradd.8.xml 2007-04-15 16:49:17.000000000 +0200 -@@ -134,8 +134,7 @@ +@@ -145,8 +145,7 @@ The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already @@ -29,7 +29,7 @@ Index: shadow-4.0.18.1/man/useradd.8.xml -@@ -184,6 +183,23 @@ +@@ -195,6 +194,23 @@ diff --git a/debian/patches/431_su_uid_0_not_root b/debian/patches/431_su_uid_0_not_root index deae8f73..ff10f5e0 100644 --- a/debian/patches/431_su_uid_0_not_root +++ b/debian/patches/431_su_uid_0_not_root @@ -10,7 +10,7 @@ Index: shadow-4.0.18.1/src/su.c =================================================================== --- shadow-4.0.18.1.orig/src/su.c 2006-08-01 12:30:02.000000000 +0200 +++ shadow-4.0.18.1/src/su.c 2006-09-17 12:17:47.383953038 +0200 -@@ -427,7 +427,14 @@ +@@ -444,7 +444,14 @@ optind++; } if (!name[0]) /* use default user ID */ diff --git a/debian/patches/480_getopt_args_reorder b/debian/patches/480_getopt_args_reorder index dd1b0dd3..f4c88e13 100644 --- a/debian/patches/480_getopt_args_reorder +++ b/debian/patches/480_getopt_args_reorder @@ -19,7 +19,7 @@ Index: shadow-4.0.18.1/src/su.c =================================================================== --- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:18:07.616113902 +0200 +++ shadow-4.0.18.1/src/su.c 2006-09-17 12:18:08.884123984 +0200 -@@ -374,19 +374,9 @@ +@@ -373,19 +373,9 @@ }; while ((c = @@ -40,7 +40,7 @@ Index: shadow-4.0.18.1/src/su.c case 'c': command = optarg; break; -@@ -408,10 +398,9 @@ +@@ -407,10 +397,9 @@ shellstr = optarg; break; default: diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames index fdd71b89..96161497 100755 --- a/debian/patches/506_relaxed_usernames +++ b/debian/patches/506_relaxed_usernames @@ -52,7 +52,7 @@ Index: shadow-4.0.18.1/man/useradd.8.xml =================================================================== --- shadow-4.0.18.1.orig/man/useradd.8.xml 2006-07-24 06:48:36.000000000 +0100 +++ shadow-4.0.18.1/man/useradd.8.xml 2007-06-18 22:10:15.000000000 +0100 -@@ -172,6 +172,7 @@ +@@ -183,6 +183,7 @@ valid in conjunction with the option. The default is to not create the directory and to not copy any files. @@ -60,7 +60,7 @@ Index: shadow-4.0.18.1/man/useradd.8.xml -@@ -353,9 +354,13 @@ +@@ -360,9 +361,13 @@ diff --git a/debian/patches/507_32char_grnames.dpatch b/debian/patches/507_32char_grnames.dpatch index 9260bb39..3b665604 100755 --- a/debian/patches/507_32char_grnames.dpatch +++ b/debian/patches/507_32char_grnames.dpatch @@ -35,7 +35,7 @@ Index: shadow-4.0.18.1/libmisc/chkname.c =================================================================== --- shadow-4.0.18.1.orig/libmisc/chkname.c 2006-09-17 12:17:59.836052044 +0200 +++ shadow-4.0.18.1/libmisc/chkname.c 2006-09-17 12:18:00.496057292 +0200 -@@ -66,10 +66,10 @@ +@@ -70,10 +70,10 @@ int check_group_name (const char *name) { /* diff --git a/debian/patches/523_su_arguments_are_no_more_concatenated_by_default b/debian/patches/523_su_arguments_are_no_more_concatenated_by_default index 081c605a..30d610b8 100644 --- a/debian/patches/523_su_arguments_are_no_more_concatenated_by_default +++ b/debian/patches/523_su_arguments_are_no_more_concatenated_by_default @@ -32,7 +32,7 @@ Index: shadow-4.0.18.1/src/su.c #ifdef USE_PAM static pam_handle_t *pamh = NULL; static int caught = 0; -@@ -323,6 +336,8 @@ +@@ -322,6 +335,8 @@ #endif #endif /* !USE_PAM */ diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option index 5d8a5491..e5990c4a 100644 --- a/debian/patches/542_useradd-O_option +++ b/debian/patches/542_useradd-O_option @@ -9,7 +9,7 @@ Index: shadow-4.0.18.1/man/useradd.8.xml =================================================================== --- shadow-4.0.18.1.orig/man/useradd.8.xml 2006-09-17 12:17:59.836052044 +0200 +++ shadow-4.0.18.1/man/useradd.8.xml 2006-09-17 12:18:01.136062380 +0200 -@@ -201,6 +201,11 @@ +@@ -212,6 +212,11 @@ UID_MIN=10,UID_MAX=499 doesn't work yet. @@ -25,7 +25,7 @@ Index: shadow-4.0.18.1/src/useradd.c =================================================================== --- shadow-4.0.18.1.orig/src/useradd.c 2006-09-17 12:17:58.252039450 +0200 +++ shadow-4.0.18.1/src/useradd.c 2006-09-17 12:18:01.140062412 +0200 -@@ -1023,7 +1023,7 @@ +@@ -1024,7 +1024,7 @@ {NULL, 0, NULL, '\0'} }; while ((c = @@ -34,7 +34,7 @@ Index: shadow-4.0.18.1/src/useradd.c long_options, NULL)) != -1) { switch (c) { case 'b': -@@ -1142,6 +1142,7 @@ +@@ -1143,6 +1143,7 @@ kflg++; break; case 'K':