From 089560d90ec7e32215267ad06d1379ea96771d5c Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Sun, 3 Mar 2019 23:39:47 +0100 Subject: [PATCH] Refresh patches --- debian/patches/401_cppw_src.dpatch | 2 +- debian/patches/501_commonio_group_shadow | 2 +- debian/patches/506_relaxed_usernames | 22 ++++++++-------------- debian/patches/542_useradd-O_option | 12 ++++++------ 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/debian/patches/401_cppw_src.dpatch b/debian/patches/401_cppw_src.dpatch index afd3199d..9a7c0257 100644 --- a/debian/patches/401_cppw_src.dpatch +++ b/debian/patches/401_cppw_src.dpatch @@ -256,7 +256,7 @@ chgpasswd \ chpasswd \ groupadd \ -@@ -90,6 +91,7 @@ +@@ -92,6 +93,7 @@ chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT) chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) diff --git a/debian/patches/501_commonio_group_shadow b/debian/patches/501_commonio_group_shadow index f8bc1d02..0c4537b1 100644 --- a/debian/patches/501_commonio_group_shadow +++ b/debian/patches/501_commonio_group_shadow @@ -12,7 +12,7 @@ Fixes: #166793 #include "nscd.h" #ifdef WITH_TCB #include -@@ -963,12 +964,23 @@ +@@ -983,12 +984,23 @@ goto fail; } } else { diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames index 495d3638..84b829fa 100644 --- a/debian/patches/506_relaxed_usernames +++ b/debian/patches/506_relaxed_usernames @@ -15,10 +15,8 @@ Details: than '-' as the leading character). Thus, the maintenance tools don't anymore. closes: #79682, #166798, #171179 -Index: git/libmisc/chkname.c -=================================================================== ---- git.orig/libmisc/chkname.c -+++ git/libmisc/chkname.c +--- a/libmisc/chkname.c ++++ b/libmisc/chkname.c @@ -48,6 +48,7 @@ static bool is_valid_name (const char *name) @@ -54,11 +52,9 @@ Index: git/libmisc/chkname.c return true; } -Index: git/man/useradd.8.xml -=================================================================== ---- git.orig/man/useradd.8.xml -+++ git/man/useradd.8.xml -@@ -633,12 +633,20 @@ +--- a/man/useradd.8.xml ++++ b/man/useradd.8.xml +@@ -650,12 +650,20 @@ @@ -80,11 +76,9 @@ Index: git/man/useradd.8.xml Usernames may only be up to 32 characters long. -Index: git/man/groupadd.8.xml -=================================================================== ---- git.orig/man/groupadd.8.xml -+++ git/man/groupadd.8.xml -@@ -256,12 +256,18 @@ +--- a/man/groupadd.8.xml ++++ b/man/groupadd.8.xml +@@ -273,12 +273,18 @@ CAVEATS diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option index 21a6942b..d4c409e8 100644 --- a/debian/patches/542_useradd-O_option +++ b/debian/patches/542_useradd-O_option @@ -21,19 +21,19 @@ Status wrt upstream: not included as this is just specific --- a/src/useradd.c +++ b/src/useradd.c -@@ -1059,9 +1059,9 @@ +@@ -1114,9 +1114,9 @@ }; while ((c = getopt_long (argc, argv, #ifdef WITH_SELINUX -- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:UZ:", -+ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:s:u:UZ:", +- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:", ++ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:P:s:u:UZ:", #else /* !WITH_SELINUX */ -- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:U", -+ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:s:u:U", +- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U", ++ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:P:s:u:U", #endif /* !WITH_SELINUX */ long_options, NULL)) != -1) { switch (c) { -@@ -1184,6 +1184,7 @@ +@@ -1239,6 +1239,7 @@ kflg = true; break; case 'K':