From b214d3fb51aa99fb05e02ad939d3b230393859e4 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <zeha@debian.org>
Date: Tue, 25 Jun 2024 20:12:39 +0200
Subject: [PATCH] Rebase patches

---
 ...et-pam_unix-handle-login-failure-delays.patch | 16 ++++++++--------
 debian/patches/cppw-Add-tool.patch               |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/Let-pam_unix-handle-login-failure-delays.patch b/debian/patches/Let-pam_unix-handle-login-failure-delays.patch
index 66f50637..7fc4607e 100644
--- a/debian/patches/Let-pam_unix-handle-login-failure-delays.patch
+++ b/debian/patches/Let-pam_unix-handle-login-failure-delays.patch
@@ -27,10 +27,10 @@ index 30f54ba..21307bb 100644
  	{"GID_MAX", NULL},
  	{"GID_MIN", NULL},
 diff --git a/src/login.c b/src/login.c
-index 9fed7b3..a5512d1 100644
+index 3a30298..4428907 100644
 --- a/src/login.c
 +++ b/src/login.c
-@@ -490,7 +490,6 @@ int main (int argc, char **argv)
+@@ -458,7 +458,6 @@ int main (int argc, char **argv)
  	const char     *tmptty;
  	const char     *cp;
  	const char     *tmp;
@@ -38,7 +38,7 @@ index 9fed7b3..a5512d1 100644
  	unsigned int   retries;
  	unsigned int   timeout;
  	struct passwd  *pwd = NULL;
-@@ -500,6 +499,7 @@ int main (int argc, char **argv)
+@@ -468,6 +467,7 @@ int main (int argc, char **argv)
  	char           *pam_user = NULL;
  	pid_t          child;
  #else
@@ -46,7 +46,7 @@ index 9fed7b3..a5512d1 100644
  	bool is_console;
  	struct spwd *spwd = NULL;
  # if defined(ENABLE_LASTLOG)
-@@ -669,7 +669,6 @@ int main (int argc, char **argv)
+@@ -610,7 +610,6 @@ int main (int argc, char **argv)
  	}
  
  	environ = newenvp;	/* make new environment active */
@@ -54,7 +54,7 @@ index 9fed7b3..a5512d1 100644
  	retries = getdef_unum ("LOGIN_RETRIES", RETRIES);
  
  #ifdef USE_PAM
-@@ -685,8 +684,7 @@ int main (int argc, char **argv)
+@@ -626,8 +625,7 @@ int main (int argc, char **argv)
  
  	/*
  	 * hostname & tty are either set to NULL or their correct values,
@@ -64,7 +64,7 @@ index 9fed7b3..a5512d1 100644
  	 *
  	 * PAM_RHOST and PAM_TTY are used for authentication, only use
  	 * information coming from login or from the caller (e.g. no utmp)
-@@ -695,10 +693,6 @@ int main (int argc, char **argv)
+@@ -636,10 +634,6 @@ int main (int argc, char **argv)
  	PAM_FAIL_CHECK;
  	retcode = pam_set_item (pamh, PAM_TTY, tty);
  	PAM_FAIL_CHECK;
@@ -75,7 +75,7 @@ index 9fed7b3..a5512d1 100644
  	/* if fflg, then the user has already been authenticated */
  	if (!fflg) {
  		char          hostn[256];
-@@ -736,12 +730,6 @@ int main (int argc, char **argv)
+@@ -677,12 +671,6 @@ int main (int argc, char **argv)
  			bool failed = false;
  
  			failcount++;
@@ -88,7 +88,7 @@ index 9fed7b3..a5512d1 100644
  
  			retcode = pam_authenticate (pamh, 0);
  
-@@ -1032,14 +1020,17 @@ int main (int argc, char **argv)
+@@ -973,14 +961,17 @@ int main (int argc, char **argv)
  		free (username);
  		username = NULL;
  
diff --git a/debian/patches/cppw-Add-tool.patch b/debian/patches/cppw-Add-tool.patch
index a738898b..64f616e6 100644
--- a/debian/patches/cppw-Add-tool.patch
+++ b/debian/patches/cppw-Add-tool.patch
@@ -11,10 +11,10 @@ Gbp-Topic: debian
  create mode 100644 src/cppw.c
 
 diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 9ff6100..a60c93e 100644
+index 6d2c052..1c7ffe3 100644
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
-@@ -86,6 +86,7 @@ src/chfn.c
+@@ -85,6 +85,7 @@ src/chfn.c
  src/chgpasswd.c
  src/chpasswd.c
  src/chsh.c