From 3bf12701309ba33fa5af38b2f0f0168d411abba1 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <zeha@debian.org>
Date: Thu, 13 Jun 2024 04:21:16 +0200
Subject: [PATCH] Rebase patch 542_useradd-O_option

---
 ...add-O_option => 542_useradd-O_option.patch} | 18 +++++++++++-------
 debian/patches/series                          |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)
 rename debian/patches/{542_useradd-O_option => 542_useradd-O_option.patch} (73%)

diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option.patch
similarity index 73%
rename from debian/patches/542_useradd-O_option
rename to debian/patches/542_useradd-O_option.patch
index 3745826e..669e509c 100644
--- a/debian/patches/542_useradd-O_option
+++ b/debian/patches/542_useradd-O_option.patch
@@ -5,9 +5,11 @@ Note: useradd.8 needs to be regenerated.
 Status wrt upstream: not included as this is just specific 
                      backward compatibility for Debian
 
---- a/man/useradd.8.xml
-+++ b/man/useradd.8.xml
-@@ -326,6 +326,11 @@
+Index: shadow/man/useradd.8.xml
+===================================================================
+--- shadow.orig/man/useradd.8.xml
++++ shadow/man/useradd.8.xml
+@@ -333,6 +333,11 @@
  	    =<replaceable>100</replaceable>&nbsp;<option>-K</option>&nbsp;
  	    <replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
  	  </para>
@@ -19,9 +21,11 @@ Status wrt upstream: not included as this is just specific
  	  <!--para>
  	    Note: <option>-K</option>&nbsp;<replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
  	    doesn't work yet.
---- a/src/useradd.c
-+++ b/src/useradd.c
-@@ -1227,7 +1227,7 @@
+Index: shadow/src/useradd.c
+===================================================================
+--- shadow.orig/src/useradd.c
++++ shadow/src/useradd.c
+@@ -1218,7 +1218,7 @@ static void process_flags (int argc, cha
  			{NULL, 0, NULL, '\0'}
  		};
  		while ((c = getopt_long (argc, argv,
@@ -30,7 +34,7 @@ Status wrt upstream: not included as this is just specific
  #ifdef WITH_SELINUX
  		                         "Z:"
  #endif				/* WITH_SELINUX */
-@@ -1367,6 +1367,7 @@
+@@ -1358,6 +1358,7 @@ static void process_flags (int argc, cha
  				kflg = true;
  				break;
  			case 'K':
diff --git a/debian/patches/series b/debian/patches/series
index 0d641b71..5084305c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,4 @@
 503_shadowconfig.8
 505_useradd_recommend_adduser
 506_relaxed_usernames.patch
-542_useradd-O_option
+542_useradd-O_option.patch