From 29f0e1dcf42be2d2b0cbb3aaa76a113bfe8d75b2 Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Thu, 27 Jun 2024 01:20:06 +0200 Subject: [PATCH] patches: fix gbp-pq topic annotation Gbp-Dch: ignore --- .../Document-the-shadowconfig-utility.patch | 2 -- .../Keep-using-Debian-adduser-defaults.patch | 2 -- ...et-pam_unix-handle-login-failure-delays.patch | 2 -- .../Recommend-using-adduser-and-deluser.patch | 2 -- .../Relax-usernames-groupnames-checking.patch | 2 -- .../Set-group-and-mode-for-g-shadow-files.patch | 2 -- debian/patches/{ => debian}/cppw-Add-tool.patch | 1 - .../{ => debian}/cppw-add-selinux-support.patch | 2 -- debian/patches/series | 16 ++++++++-------- 9 files changed, 8 insertions(+), 23 deletions(-) rename debian/patches/{ => debian}/Document-the-shadowconfig-utility.patch (99%) rename debian/patches/{ => debian}/Keep-using-Debian-adduser-defaults.patch (98%) rename debian/patches/{ => debian}/Let-pam_unix-handle-login-failure-delays.patch (99%) rename debian/patches/{ => debian}/Recommend-using-adduser-and-deluser.patch (98%) rename debian/patches/{ => debian}/Relax-usernames-groupnames-checking.patch (99%) rename debian/patches/{ => debian}/Set-group-and-mode-for-g-shadow-files.patch (99%) rename debian/patches/{ => debian}/cppw-Add-tool.patch (99%) rename debian/patches/{ => debian}/cppw-add-selinux-support.patch (98%) diff --git a/debian/patches/Document-the-shadowconfig-utility.patch b/debian/patches/debian/Document-the-shadowconfig-utility.patch similarity index 99% rename from debian/patches/Document-the-shadowconfig-utility.patch rename to debian/patches/debian/Document-the-shadowconfig-utility.patch index 5aee1d07..6e5ee798 100644 --- a/debian/patches/Document-the-shadowconfig-utility.patch +++ b/debian/patches/debian/Document-the-shadowconfig-utility.patch @@ -4,8 +4,6 @@ Subject: Document the shadowconfig utility Status wrt upstream: The shadowconfig utility is debian specific. Its man page also (but it used to be distributed) - -Gbp-Topic: debian --- man/Makefile.am | 2 ++ man/fr/Makefile.am | 1 + diff --git a/debian/patches/Keep-using-Debian-adduser-defaults.patch b/debian/patches/debian/Keep-using-Debian-adduser-defaults.patch similarity index 98% rename from debian/patches/Keep-using-Debian-adduser-defaults.patch rename to debian/patches/debian/Keep-using-Debian-adduser-defaults.patch index 51dfb885..0a9adcd4 100644 --- a/debian/patches/Keep-using-Debian-adduser-defaults.patch +++ b/debian/patches/debian/Keep-using-Debian-adduser-defaults.patch @@ -11,8 +11,6 @@ in 4.9 merged those values from upstream's default configuration file which is not shipped in Debian. This patch keeps the program's compiled in defaults in sync with the configuration files shipped in Debian (debian/default/useradd). - -Gbp-Topic: debian --- man/useradd.8.xml | 2 +- src/useradd.c | 4 ++-- diff --git a/debian/patches/Let-pam_unix-handle-login-failure-delays.patch b/debian/patches/debian/Let-pam_unix-handle-login-failure-delays.patch similarity index 99% rename from debian/patches/Let-pam_unix-handle-login-failure-delays.patch rename to debian/patches/debian/Let-pam_unix-handle-login-failure-delays.patch index 66f50637..c3572d52 100644 --- a/debian/patches/Let-pam_unix-handle-login-failure-delays.patch +++ b/debian/patches/debian/Let-pam_unix-handle-login-failure-delays.patch @@ -7,8 +7,6 @@ Fixes: #87648 Status wrt upstream: Forwarded but not applied yet Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs - -Gbp-Topic: debian --- lib/getdef.c | 1 - src/login.c | 19 +++++-------------- diff --git a/debian/patches/Recommend-using-adduser-and-deluser.patch b/debian/patches/debian/Recommend-using-adduser-and-deluser.patch similarity index 98% rename from debian/patches/Recommend-using-adduser-and-deluser.patch rename to debian/patches/debian/Recommend-using-adduser-and-deluser.patch index 79019a4b..41e87eff 100644 --- a/debian/patches/Recommend-using-adduser-and-deluser.patch +++ b/debian/patches/debian/Recommend-using-adduser-and-deluser.patch @@ -5,8 +5,6 @@ Subject: Recommend using adduser and deluser Fixes: #406046 Status wrt upstream: Debian specific patch. - -Gbp-Topic: debian --- man/useradd.8.xml | 6 ++++++ man/userdel.8.xml | 6 ++++++ diff --git a/debian/patches/Relax-usernames-groupnames-checking.patch b/debian/patches/debian/Relax-usernames-groupnames-checking.patch similarity index 99% rename from debian/patches/Relax-usernames-groupnames-checking.patch rename to debian/patches/debian/Relax-usernames-groupnames-checking.patch index 8e00d436..6eb58cfd 100644 --- a/debian/patches/Relax-usernames-groupnames-checking.patch +++ b/debian/patches/debian/Relax-usernames-groupnames-checking.patch @@ -15,8 +15,6 @@ than '-' as the leading character). Thus, the maintenance tools don't anymore. closes: #79682, #166798, #171179 Status wrt upstream: Debian specific. Not to be used upstream - -Gbp-Topic: debian --- lib/chkname.c | 47 +++++++++++++++-------------------------------- man/groupadd.8.xml | 6 ++++++ diff --git a/debian/patches/Set-group-and-mode-for-g-shadow-files.patch b/debian/patches/debian/Set-group-and-mode-for-g-shadow-files.patch similarity index 99% rename from debian/patches/Set-group-and-mode-for-g-shadow-files.patch rename to debian/patches/debian/Set-group-and-mode-for-g-shadow-files.patch index c5e21ac9..e9027aa4 100644 --- a/debian/patches/Set-group-and-mode-for-g-shadow-files.patch +++ b/debian/patches/debian/Set-group-and-mode-for-g-shadow-files.patch @@ -5,8 +5,6 @@ Subject: Set group and mode for [g]shadow files Set group 'shadow' and mode 0400. Fixes: #166793 - -Gbp-Topic: debian --- lib/commonio.c | 12 ++++++++++++ lib/sgroupio.c | 2 +- diff --git a/debian/patches/cppw-Add-tool.patch b/debian/patches/debian/cppw-Add-tool.patch similarity index 99% rename from debian/patches/cppw-Add-tool.patch rename to debian/patches/debian/cppw-Add-tool.patch index a738898b..59a67a7b 100644 --- a/debian/patches/cppw-Add-tool.patch +++ b/debian/patches/debian/cppw-Add-tool.patch @@ -2,7 +2,6 @@ From: Nicolas FRANCOIS Date: Sat, 22 Jun 2024 17:39:41 +0200 Subject: cppw: Add tool -Gbp-Topic: debian --- po/POTFILES.in | 1 + src/Makefile.am | 2 + diff --git a/debian/patches/cppw-add-selinux-support.patch b/debian/patches/debian/cppw-add-selinux-support.patch similarity index 98% rename from debian/patches/cppw-add-selinux-support.patch rename to debian/patches/debian/cppw-add-selinux-support.patch index 0e0566db..a554373a 100644 --- a/debian/patches/cppw-add-selinux-support.patch +++ b/debian/patches/debian/cppw-add-selinux-support.patch @@ -4,8 +4,6 @@ Subject: cppw: add selinux support Status wrt upstream: cppw is not available upstream. Needs to be reviewed by an SE-Linux aware person. - -Gbp-Topic: debian --- src/cppw.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/debian/patches/series b/debian/patches/series index daa1da4f..0ceb7ee7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,9 @@ -cppw-Add-tool.patch -cppw-add-selinux-support.patch -Let-pam_unix-handle-login-failure-delays.patch -Set-group-and-mode-for-g-shadow-files.patch -Keep-using-Debian-adduser-defaults.patch -Document-the-shadowconfig-utility.patch -Recommend-using-adduser-and-deluser.patch -Relax-usernames-groupnames-checking.patch +debian/cppw-Add-tool.patch +debian/cppw-add-selinux-support.patch +debian/Let-pam_unix-handle-login-failure-delays.patch +debian/Set-group-and-mode-for-g-shadow-files.patch +debian/Keep-using-Debian-adduser-defaults.patch +debian/Document-the-shadowconfig-utility.patch +debian/Recommend-using-adduser-and-deluser.patch +debian/Relax-usernames-groupnames-checking.patch upstream/tests-Support-run_some-from-exported-tarball.patch