Refresh and massage patches to apply

The following needed massaging to apply:
* debian/patches/508_nologin_in_usr_sbin
* debian/patches/401_cppw_src.dpatch

The remaining patches just got trivial quilt refresh updates,
except debian/patches/506_relaxed_usernames which needed
special attention to be correctly refreshed.

7 files changed, 25 insertions, 25 deletions

diff --git a/debian/patches/008_login_log_failure_in_FTMP b/debian/patches/008_login_log_failure_in_FTMP
index 6fa58455..607e3aa6 100644
--- a/debian/patches/008_login_log_failure_in_FTMP
+++ b/debian/patches/008_login_log_failure_in_FTMP
@@ -33,7 +33,7 @@ Notes:
  				         "TOO MANY LOGIN TRIES (%u)%s FOR '%s'",
 --- a/lib/getdef.c
 +++ b/lib/getdef.c
-@@ -57,7 +57,6 @@
+@@ -60,7 +60,6 @@
  	{"ENVIRON_FILE", NULL},			\
  	{"ENV_TZ", NULL},			\
  	{"FAILLOG_ENAB", NULL},			\
@@ -41,7 +41,7 @@ Notes:
  	{"ISSUE_FILE", NULL},			\
  	{"LASTLOG_ENAB", NULL},			\
  	{"LOGIN_STRING", NULL},			\
-@@ -88,6 +87,7 @@
+@@ -91,6 +90,7 @@
  	{"ERASECHAR", NULL},
  	{"FAIL_DELAY", NULL},
  	{"FAKE_SHELL", NULL},
diff --git a/debian/patches/401_cppw_src.dpatch b/debian/patches/401_cppw_src.dpatch
index b29f7d34..2590df14 100644
--- a/debian/patches/401_cppw_src.dpatch
+++ b/debian/patches/401_cppw_src.dpatch
@@ -248,25 +248,25 @@
 +
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -30,6 +30,7 @@
- ubin_PROGRAMS += newgidmap newuidmap
+@@ -33,6 +33,7 @@
+ bin_PROGRAMS  += su
  endif
  usbin_PROGRAMS = \
 +	cppw \
  	chgpasswd \
  	chpasswd \
  	groupadd \
-@@ -94,6 +95,7 @@
- chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT)
- chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD)
- chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
-+cppw_LDADD     = $(LDADD) $(LIBSELINUX)
- gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
- groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
- groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
+@@ -101,6 +102,7 @@
+ chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF)
+ chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF)
+ chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF)
++cppw_LDADD     = $(LDADD) $(LIBSELINUX) $(LIBAUDIT)
+ expiry_LDADD = $(LDADD) $(LIBECONF)
+ gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF)
+ groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF)
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
-@@ -85,6 +85,7 @@
+@@ -90,6 +90,7 @@
  src/chgpasswd.c
  src/chpasswd.c
  src/chsh.c
diff --git a/debian/patches/429_login_FAILLOG_ENAB b/debian/patches/429_login_FAILLOG_ENAB
index 11d564f2..fd691a8d 100644
--- a/debian/patches/429_login_FAILLOG_ENAB
+++ b/debian/patches/429_login_FAILLOG_ENAB
@@ -74,7 +74,7 @@ Note: It could be removed if pam_tally could report the number of failures
  		    && (ll.ll_time != 0)) {
 --- a/lib/getdef.c
 +++ b/lib/getdef.c
-@@ -86,6 +86,7 @@
+@@ -89,6 +89,7 @@
  	{"ENV_SUPATH", NULL},
  	{"ERASECHAR", NULL},
  	{"FAIL_DELAY", NULL},
diff --git a/debian/patches/463_login_delay_obeys_to_PAM b/debian/patches/463_login_delay_obeys_to_PAM
index 7412d447..414571a5 100644
--- a/debian/patches/463_login_delay_obeys_to_PAM
+++ b/debian/patches/463_login_delay_obeys_to_PAM
@@ -87,7 +87,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs
  
 --- a/lib/getdef.c
 +++ b/lib/getdef.c
-@@ -85,7 +85,6 @@
+@@ -88,7 +88,6 @@
  	{"ENV_PATH", NULL},
  	{"ENV_SUPATH", NULL},
  	{"ERASECHAR", NULL},
diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames
index bd5c4b3d..8bddf8a3 100644
--- a/debian/patches/506_relaxed_usernames
+++ b/debian/patches/506_relaxed_usernames
@@ -17,15 +17,15 @@ Details:
 
 --- a/libmisc/chkname.c
 +++ b/libmisc/chkname.c
-@@ -48,6 +48,7 @@
+@@ -54,6 +54,7 @@
+ 		return true;
+ 	}
  
- static bool is_valid_name (const char *name)
- {
 +#if 0
  	/*
  	 * User/group names must match [a-z_][a-z0-9_-]*[$]
  	 */
-@@ -66,6 +67,26 @@
+@@ -73,6 +74,26 @@
  			return false;
  		}
  	}
@@ -54,7 +54,7 @@ Details:
  }
 --- a/man/useradd.8.xml
 +++ b/man/useradd.8.xml
-@@ -651,12 +651,20 @@
+@@ -661,12 +661,20 @@
      </para>
  
      <para>
diff --git a/debian/patches/508_nologin_in_usr_sbin b/debian/patches/508_nologin_in_usr_sbin
index 40c69e8f..d5091b1b 100644
--- a/debian/patches/508_nologin_in_usr_sbin
+++ b/debian/patches/508_nologin_in_usr_sbin
@@ -3,12 +3,12 @@
 @@ -24,7 +24,6 @@
  # $prefix/bin and $prefix/sbin, no install-data hacks...)
  
- bin_PROGRAMS   = groups login su
+ bin_PROGRAMS   = groups login
 -sbin_PROGRAMS  = nologin
  ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
  if ENABLE_SUBIDS
  ubin_PROGRAMS += newgidmap newuidmap
-@@ -42,6 +41,7 @@
+@@ -45,6 +44,7 @@
  	grpunconv \
  	logoutd \
  	newusers \
diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option
index c95b98fa..155a9915 100644
--- a/debian/patches/542_useradd-O_option
+++ b/debian/patches/542_useradd-O_option
@@ -7,7 +7,7 @@ Status wrt upstream: not included as this is just specific
 
 --- a/man/useradd.8.xml
 +++ b/man/useradd.8.xml
-@@ -330,6 +330,11 @@
+@@ -340,6 +340,11 @@
  	    databases are reset to avoid reusing the entry from a previously
  	    deleted user.
  	  </para>
@@ -21,7 +21,7 @@ Status wrt upstream: not included as this is just specific
        <varlistentry>
 --- a/src/useradd.c
 +++ b/src/useradd.c
-@@ -1138,9 +1138,9 @@
+@@ -1143,9 +1143,9 @@
  		};
  		while ((c = getopt_long (argc, argv,
  #ifdef WITH_SELINUX
@@ -33,7 +33,7 @@ Status wrt upstream: not included as this is just specific
  #endif				/* !WITH_SELINUX */
  		                         long_options, NULL)) != -1) {
  			switch (c) {
-@@ -1266,6 +1266,7 @@
+@@ -1274,6 +1274,7 @@
  				kflg = true;
  				break;
  			case 'K':