Refresh patches

6 files changed, 4 insertions, 37 deletions

diff --git a/debian/patches/008_login_log_failure_in_FTMP b/debian/patches/008_login_log_failure_in_FTMP
index 607e3aa6..cc2bc725 100644
--- a/debian/patches/008_login_log_failure_in_FTMP
+++ b/debian/patches/008_login_log_failure_in_FTMP
@@ -48,4 +48,4 @@ Notes:
 +	{"FTMP_FILE", NULL},
  	{"GID_MAX", NULL},
  	{"GID_MIN", NULL},
- 	{"HUSHLOGIN_FILE", NULL},
+ 	{"HOME_MODE", NULL},
diff --git a/debian/patches/505_useradd_recommend_adduser b/debian/patches/505_useradd_recommend_adduser
index 883f89c9..448def46 100644
--- a/debian/patches/505_useradd_recommend_adduser
+++ b/debian/patches/505_useradd_recommend_adduser
@@ -6,7 +6,7 @@ Status wrt upstream: Debian specific patch.
 
 --- a/man/useradd.8.xml
 +++ b/man/useradd.8.xml
-@@ -106,6 +106,12 @@
+@@ -107,6 +107,12 @@
    <refsect1 id='description'>
      <title>DESCRIPTION</title>
        <para>
diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames
index 8bddf8a3..8eb1792b 100644
--- a/debian/patches/506_relaxed_usernames
+++ b/debian/patches/506_relaxed_usernames
@@ -54,7 +54,7 @@ Details:
  }
 --- a/man/useradd.8.xml
 +++ b/man/useradd.8.xml
-@@ -661,12 +661,20 @@
+@@ -662,12 +662,20 @@
      </para>
  
      <para>
diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option
index 155a9915..f9ea5a06 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
-@@ -340,6 +340,11 @@
+@@ -341,6 +341,11 @@
  	    databases are reset to avoid reusing the entry from a previously
  	    deleted user.
  	  </para>
diff --git a/debian/patches/git_revert_bindir.patch b/debian/patches/git_revert_bindir.patch
deleted file mode 100644
index 5099c11c..00000000
--- a/debian/patches/git_revert_bindir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3cc3948d719d3b9dedaaf2e96221e4b5b96ea380 Mon Sep 17 00:00:00 2001
-From: Patrick McLean <chutzpah@gentoo.org>
-Date: Sun, 1 Dec 2019 13:59:52 -0800
-Subject: [PATCH] Revert "Honor --sbindir and --bindir for binary installation"
-
-This reverts commit e293aa9cfca0619a63616af75532637dab60d49d.
-
-See https://github.com/shadow-maint/shadow/issues/196
-
-Some distros still care about `/bin` vs `/usr/bin`. This commit makes
-it so all binaries are always installed to `/bin`/`/sbin`. The only way to
-restore the previous behaviour of installing some binaries to
-`/usr/bin`/`/usr/sbin` is to revert the patch.
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f31fd7ab..7b0aeec8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,8 +2,8 @@
- EXTRA_DIST = \
- 	.indent.pro
- 
--ubindir = ${bindir}
--usbindir = ${sbindir}
-+ubindir = ${prefix}/bin
-+usbindir = ${prefix}/sbin
- suidperms = 4755
- sgidperms = 2755
- 
diff --git a/debian/patches/series b/debian/patches/series
index 418cb395..68dc397a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@
 508_nologin_in_usr_sbin
 505_useradd_recommend_adduser
 501_commonio_group_shadow
-git_revert_bindir.patch