VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refresh patches

Browse Source
This commit is contained in:
Chris Hofstaedtler
2024-12-06 19:31:48 +01:00
parent 24c35ea945
commit 32d53642f0
13 changed files with 156 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian/patches/debian/Define-LOGIN_NAME_MAX-on-HURD.patch vendored
View File

@@ -7,11 +7,11 @@ Subject: Define LOGIN_NAME_MAX on HURD
1 file changed, 6 insertions(+)
diff --git a/lib/chkname.c b/lib/chkname.c
index 9954410..751fdf0 100644
index f71f9fe..412dcce 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -26,6 +26,12 @@
#include <stddef.h>
@@ -31,6 +31,12 @@
#include <sys/param.h>
#include <unistd.h>
+#ifdef __GNU__

18
debian/patches/debian/Document-the-shadowconfig-utility.patch vendored
View File

@@ -22,10 +22,10 @@ Its man page also (but it used to be distributed)
create mode 100644 man/shadowconfig.8.xml
diff --git a/man/Makefile.am b/man/Makefile.am
index 83b1d68..dab98f4 100644
index 1405509..6f9dcd9 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -37,6 +37,7 @@ man_MANS = \
@@ -36,6 +36,7 @@ man_MANS = \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
@@ -33,7 +33,7 @@ index 83b1d68..dab98f4 100644
man1/sg.1 \
man3/shadow.3 \
man5/shadow.5 \
@@ -108,6 +109,7 @@ man_XMANS = \
@@ -106,6 +107,7 @@ man_XMANS = \
porttime.5.xml \
pwck.8.xml \
pwconv.8.xml \
@@ -42,10 +42,10 @@ index 83b1d68..dab98f4 100644
shadow.5.xml \
sg.1.xml \
diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am
index 335e029..78aee9a 100644
index 2365e23..e175a15 100644
--- a/man/fr/Makefile.am
+++ b/man/fr/Makefile.am
@@ -32,6 +32,7 @@ man_MANS = \
@@ -31,6 +31,7 @@ man_MANS = \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
@@ -86,10 +86,10 @@ index 0000000..784da70
+Nicolas FRANÇOIS, 2004.
+Veuillez signaler toute erreur à <\fIdebian\-l10\-french@lists.debian.org\fR>.
diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am
index 13f18da..c72097f 100644
index b759726..b9f1df0 100644
--- a/man/ja/Makefile.am
+++ b/man/ja/Makefile.am
@@ -27,6 +27,7 @@ man_MANS = \
@@ -26,6 +26,7 @@ man_MANS = \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
@@ -129,10 +129,10 @@ index 0000000..a75c6f7
+.I /usr/share/doc/passwd/README.debian.gz
+には shadow パスワードとそれに関する特徴の簡単な紹介が書かれている。
diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am
index b2f096f..aa79af2 100644
index 2a015f3..04093ec 100644
--- a/man/pl/Makefile.am
+++ b/man/pl/Makefile.am
@@ -18,6 +18,7 @@ man_MANS = \
@@ -17,6 +17,7 @@ man_MANS = \
man8/logoutd.8 \
man1/newgrp.1 \
man1/sg.1 \

4
debian/patches/debian/Keep-using-Debian-adduser-defaults.patch vendored
View File

@@ -30,10 +30,10 @@ index 001e7d1..4888100 100644
</listitem>
</varlistentry>
diff --git a/src/useradd.c b/src/useradd.c
index 347334a..ac43edd 100644
index 891fd14..7b150ea 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -91,14 +91,14 @@ static const char Prog[] = "useradd";
@@ -96,14 +96,14 @@ static const char Prog[] = "useradd";
/*
* These defaults are used if there is no defaults file.
*/

2
debian/patches/debian/Recommend-using-adduser-and-deluser.patch vendored
View File

@@ -28,7 +28,7 @@ index 4888100..17987a6 100644
When invoked without the <option>-D</option> option, the
<command>useradd</command> command creates a new user account using
diff --git a/man/userdel.8.xml b/man/userdel.8.xml
index 5bd2981..384cc86 100644
index 32851f1..4373cd8 100644
--- a/man/userdel.8.xml
+++ b/man/userdel.8.xml
@@ -58,6 +58,12 @@

32
debian/patches/debian/Relax-usernames-groupnames-checking.patch vendored
View File

@@ -16,16 +16,16 @@ anymore. closes: #79682, #166798, #171179
Status wrt upstream: Debian specific. Not to be used upstream
---
lib/chkname.c | 47 +++++++++++++++--------------------------------
lib/chkname.c | 50 ++++++++++++++------------------------------------
man/groupadd.8.xml | 6 ++++++
man/useradd.8.xml | 8 ++++++++
3 files changed, 29 insertions(+), 32 deletions(-)
3 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/lib/chkname.c b/lib/chkname.c
index 995562f..9954410 100644
index 8bde7a2..f71f9fe 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -54,44 +54,27 @@ static bool is_valid_name (const char *name)
@@ -60,51 +60,29 @@ is_valid_name(const char *name)
}
/*
@@ -46,7 +46,7 @@ index 995562f..9954410 100644
- (*name >= 'A' && *name <= 'Z') ||
- (*name >= '0' && *name <= '9') ||
- *name == '_' ||
- *name == '.')) {
- *name == '.'))
+ * POSIX indicate that usernames are composed of characters from the
+ * portable filename character set [A-Za-z0-9._-], and that the hyphen
+ * should not be used as the first character of a portable user name.
@@ -56,7 +56,9 @@ index 995562f..9954410 100644
+ if ( ('\0' == *name)
+ || ('-' == *name)
+ || ('~' == *name)
+ || ('+' == *name)) {
+ || ('+' == *name))
{
errno = EINVAL;
return false;
}
@@ -70,23 +72,27 @@ index 995562f..9954410 100644
- *name == '.' ||
- *name == '-' ||
- (*name == '$' && name[1] == '\0')
- )) {
- ))
+ do {
+ if ((':' == *name) || (',' == *name) || ('\\' == *name) || isspace(*name)) {
+ if ((':' == *name) || (',' == *name) || ('\\' == *name) || isspace(*name))
{
errno = EINVAL;
return false;
}
- numeric &= isdigit(*name);
- }
-
- if (numeric) {
- errno = EINVAL;
- return false;
- }
+ name++;
+ } while ('\0' != *name);
- return !numeric;
+ return true;
return true;
}
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 61a548f..d472bd0 100644
index 9abf159..06f8f7c 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -71,6 +71,12 @@

18
debian/patches/debian/Set-group-and-mode-for-g-shadow-files.patch vendored
View File

@@ -12,18 +12,18 @@ Fixes: #166793
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/commonio.c b/lib/commonio.c
index 01a26c9..72e53b0 100644
index 4d83e83..51e6300 100644
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -21,6 +21,7 @@
#include <errno.h>
#include <stdio.h>
#include <signal.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <utime.h>
+#include <grp.h>
#include "alloc.h"
#include "memzero.h"
@@ -956,12 +957,23 @@ int commonio_close (struct commonio_db *db)
#include "alloc/malloc.h"
#include "alloc/reallocf.h"
@@ -953,12 +954,23 @@ int commonio_close (struct commonio_db *db)
if (errors != 0)
goto fail;
} else {
@@ -48,10 +48,10 @@ index 01a26c9..72e53b0 100644
if (SNPRINTF(buf, "%s+", db->filename) == -1)
diff --git a/lib/sgroupio.c b/lib/sgroupio.c
index 0297df4..107b1e5 100644
index acb140d..6ffccd1 100644
--- a/lib/sgroupio.c
+++ b/lib/sgroupio.c
@@ -209,7 +209,7 @@ static struct commonio_db gshadow_db = {
@@ -210,7 +210,7 @@ static struct commonio_db gshadow_db = {
#ifdef WITH_SELINUX
NULL, /* scontext */
#endif

179
debian/patches/debian/Stop-building-programs-we-do-not-install.patch vendored
View File

@@ -3,29 +3,31 @@ Date: Tue, 6 Aug 2024 00:27:13 +0200
Subject: Stop building programs we do not install
---
man/Makefile.am | 19 -------------------
man/cs/Makefile.am | 5 -----
man/da/Makefile.am | 4 ----
man/de/Makefile.am | 9 ---------
man/Makefile.am | 16 ----------------
man/cs/Makefile.am | 9 ---------
man/da/Makefile.am | 3 ---
man/de/Makefile.am | 10 ----------
man/fr/Makefile.am | 10 ----------
man/hu/Makefile.am | 3 ---
man/id/Makefile.am | 1 -
man/it/Makefile.am | 10 ----------
man/ja/Makefile.am | 8 --------
man/ko/Makefile.am | 2 --
man/pl/Makefile.am | 5 -----
man/ru/Makefile.am | 8 --------
man/sv/Makefile.am | 7 -------
man/pl/Makefile.am | 6 ------
man/ru/Makefile.am | 9 ---------
man/sv/Makefile.am | 8 --------
man/tr/Makefile.am | 2 --
man/uk/Makefile.am | 10 ----------
man/zh_CN/Makefile.am | 9 ---------
man/uk/Makefile.am | 9 ---------
man/zh_CN/Makefile.am | 10 ----------
man/zh_TW/Makefile.am | 2 --
src/Makefile.am | 7 +++----
16 files changed, 3 insertions(+), 114 deletions(-)
18 files changed, 3 insertions(+), 122 deletions(-)
diff --git a/man/Makefile.am b/man/Makefile.am
index dab98f4..2beb0e4 100644
index 6f9dcd9..49dfc3d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -13,35 +13,26 @@ man_MANS = \
@@ -13,8 +13,6 @@ man_MANS = \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
@@ -34,11 +36,7 @@ index dab98f4..2beb0e4 100644
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
- man1/groups.1 \
man8/grpck.8 \
@@ -25,22 +23,16 @@ man_MANS = \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
@@ -61,7 +59,7 @@ index dab98f4..2beb0e4 100644
man8/useradd.8 \
man8/userdel.8 \
man8/usermod.8 \
@@ -83,27 +74,20 @@ man_XMANS = \
@@ -82,8 +74,6 @@ man_XMANS = \
chpasswd.8.xml \
chsh.1.xml \
expiry.1.xml \
@@ -70,14 +68,8 @@ index dab98f4..2beb0e4 100644
getsubids.1.xml \
gpasswd.1.xml \
groupadd.8.xml \
groupdel.8.xml \
groupmems.8.xml \
groupmod.8.xml \
- groups.1.xml \
grpck.8.xml \
gshadow.5.xml \
limits.5.xml \
- login.1.xml \
@@ -96,12 +86,9 @@ man_XMANS = \
login.1.xml \
login.access.5.xml \
login.defs.5.xml \
- logoutd.8.xml \
@@ -89,7 +81,7 @@ index dab98f4..2beb0e4 100644
passwd.1.xml \
passwd.5.xml \
porttime.5.xml \
@@ -112,9 +96,6 @@ man_XMANS = \
@@ -110,9 +97,6 @@ man_XMANS = \
shadowconfig.8.xml \
shadow.3.xml \
shadow.5.xml \
@@ -100,10 +92,10 @@ index dab98f4..2beb0e4 100644
subuid.5.xml \
useradd.8.xml \
diff --git a/man/cs/Makefile.am b/man/cs/Makefile.am
index 84407d7..42638c4 100644
index 45aec38..e1f9f87 100644
--- a/man/cs/Makefile.am
+++ b/man/cs/Makefile.am
@@ -3,19 +3,14 @@ mandir = @mandir@/cs
@@ -3,25 +3,16 @@ mandir = @mandir@/cs
man_MANS = \
man1/expiry.1 \
@@ -113,7 +105,6 @@ index 84407d7..42638c4 100644
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
- man1/groups.1 \
man8/grpck.8 \
man5/gshadow.5 \
- man8/nologin.8 \
@@ -123,15 +114,20 @@ index 84407d7..42638c4 100644
man8/vipw.8
if ENABLE_LASTLOG
man_MANS += man8/lastlog.8
endif
-
-EXTRA_DIST = $(man_MANS) \
- man8/groupmems.8 \
- man8/logoutd.8
-
diff --git a/man/da/Makefile.am b/man/da/Makefile.am
index a3b0922..f8e957d 100644
index c61b787..12234cb 100644
--- a/man/da/Makefile.am
+++ b/man/da/Makefile.am
@@ -5,12 +5,8 @@ mandir = @mandir@/da
man_MANS = \
@@ -6,10 +6,7 @@ man_MANS = \
man1/chfn.1 \
man8/groupdel.8 \
- man1/groups.1 \
man5/gshadow.5 \
- man8/logoutd.8 \
man1/newgrp.1 \
@@ -141,10 +137,10 @@ index a3b0922..f8e957d 100644
man8/vipw.8
diff --git a/man/de/Makefile.am b/man/de/Makefile.am
index 671432d..777e5bf 100644
index d3a6d6c..59602aa 100644
--- a/man/de/Makefile.am
+++ b/man/de/Makefile.am
@@ -8,8 +8,6 @@ man_MANS = \
@@ -8,34 +8,24 @@ man_MANS = \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
@@ -153,7 +149,10 @@ index 671432d..777e5bf 100644
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
@@ -21,22 +19,15 @@ man_MANS = \
man8/groupdel.8 \
- man8/groupmems.8 \
man8/groupmod.8 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
@@ -177,10 +176,10 @@ index 671432d..777e5bf 100644
man8/userdel.8 \
man8/usermod.8 \
diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am
index 78aee9a..b454b94 100644
index e175a15..d4cb276 100644
--- a/man/fr/Makefile.am
+++ b/man/fr/Makefile.am
@@ -8,36 +8,26 @@ man_MANS = \
@@ -8,35 +8,25 @@ man_MANS = \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
@@ -190,9 +189,8 @@ index 78aee9a..b454b94 100644
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
- man8/groupmems.8 \
man8/groupmod.8 \
- man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
@@ -217,11 +215,39 @@ index 78aee9a..b454b94 100644
man8/useradd.8 \
man8/userdel.8 \
man8/usermod.8 \
diff --git a/man/hu/Makefile.am b/man/hu/Makefile.am
index 6bf68e8..2930da3 100644
--- a/man/hu/Makefile.am
+++ b/man/hu/Makefile.am
@@ -4,11 +4,8 @@ mandir = @mandir@/hu
man_MANS = \
man1/chsh.1 \
man1/gpasswd.1 \
- man1/login.1 \
- man1/newgrp.1 \
man1/passwd.1 \
man5/passwd.5 \
- man1/sg.1 \
man1/su.1
if ENABLE_LASTLOG
diff --git a/man/id/Makefile.am b/man/id/Makefile.am
index 21f3dbe..566fa8b 100644
--- a/man/id/Makefile.am
+++ b/man/id/Makefile.am
@@ -3,7 +3,6 @@ mandir = @mandir@/id
man_MANS = \
man1/chsh.1 \
- man1/login.1 \
man8/useradd.8
EXTRA_DIST = $(man_MANS)
diff --git a/man/it/Makefile.am b/man/it/Makefile.am
index b76187f..cf220b7 100644
index 736576c..3312232 100644
--- a/man/it/Makefile.am
+++ b/man/it/Makefile.am
@@ -8,35 +8,25 @@ man_MANS = \
@@ -8,34 +8,24 @@ man_MANS = \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
@@ -231,9 +257,8 @@ index b76187f..cf220b7 100644
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
- man8/groupmems.8 \
man8/groupmod.8 \
- man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
@@ -258,7 +283,7 @@ index b76187f..cf220b7 100644
man8/userdel.8 \
man8/usermod.8 \
diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am
index c72097f..374adee 100644
index b9f1df0..07fa208 100644
--- a/man/ja/Makefile.am
+++ b/man/ja/Makefile.am
@@ -7,8 +7,6 @@ man_MANS = \
@@ -270,7 +295,7 @@ index c72097f..374adee 100644
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
@@ -17,10 +15,7 @@ man_MANS = \
@@ -16,10 +14,7 @@ man_MANS = \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
@@ -281,7 +306,7 @@ index c72097f..374adee 100644
man8/newusers.8 \
man1/passwd.1 \
man5/passwd.5 \
@@ -28,10 +23,7 @@ man_MANS = \
@@ -27,10 +22,7 @@ man_MANS = \
man8/pwconv.8 \
man8/pwunconv.8 \
man8/shadowconfig.8 \
@@ -293,13 +318,13 @@ index c72097f..374adee 100644
man8/userdel.8 \
man8/usermod.8 \
diff --git a/man/ko/Makefile.am b/man/ko/Makefile.am
index c269f0b..6d15190 100644
index 4f73651..0f17a17 100644
--- a/man/ko/Makefile.am
+++ b/man/ko/Makefile.am
@@ -5,9 +5,7 @@ man_MANS = \
@@ -4,9 +4,7 @@ mandir = @mandir@/ko
man_MANS = \
man1/chfn.1 \
man1/chsh.1 \
man1/groups.1 \
- man1/login.1 \
man5/passwd.5 \
- man1/su.1 \
@@ -307,10 +332,10 @@ index c269f0b..6d15190 100644
man8/vipw.8
# newgrp.1 must be updated
diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am
index aa79af2..df11bf6 100644
index 04093ec..ba91f47 100644
--- a/man/pl/Makefile.am
+++ b/man/pl/Makefile.am
@@ -6,8 +6,6 @@ man_MANS = \
@@ -6,17 +6,11 @@ man_MANS = \
man1/chage.1 \
man1/chsh.1 \
man1/expiry.1 \
@@ -319,9 +344,8 @@ index aa79af2..df11bf6 100644
man3/getspnam.3 \
man8/groupadd.8 \
man8/groupdel.8 \
@@ -15,9 +13,6 @@ man_MANS = \
- man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
- man8/logoutd.8 \
- man1/newgrp.1 \
@@ -330,10 +354,10 @@ index aa79af2..df11bf6 100644
man3/shadow.3 \
man8/userdel.8 \
diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am
index 84d55d9..42c58b9 100644
index 845a603..9afcb22 100644
--- a/man/ru/Makefile.am
+++ b/man/ru/Makefile.am
@@ -8,8 +8,6 @@ man_MANS = \
@@ -8,22 +8,16 @@ man_MANS = \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
@@ -342,7 +366,10 @@ index 84d55d9..42c58b9 100644
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
@@ -21,10 +19,7 @@ man_MANS = \
man8/groupdel.8 \
- man8/groupmems.8 \
man8/groupmod.8 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
@@ -353,7 +380,7 @@ index 84d55d9..42c58b9 100644
man8/newusers.8 \
man8/nologin.8 \
man1/passwd.1 \
@@ -32,11 +27,8 @@ man_MANS = \
@@ -31,11 +25,8 @@ man_MANS = \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
@@ -366,10 +393,10 @@ index 84d55d9..42c58b9 100644
man8/userdel.8 \
man8/usermod.8 \
diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am
index 70329ed..5ae9272 100644
index 1918af7..d572c36 100644
--- a/man/sv/Makefile.am
+++ b/man/sv/Makefile.am
@@ -5,8 +5,6 @@ man_MANS = \
@@ -5,24 +5,16 @@ man_MANS = \
man1/chage.1 \
man1/chsh.1 \
man1/expiry.1 \
@@ -378,8 +405,8 @@ index 70329ed..5ae9272 100644
man3/getspnam.3 \
man8/groupadd.8 \
man8/groupdel.8 \
@@ -15,15 +13,10 @@ man_MANS = \
man1/groups.1 \
- man8/groupmems.8 \
man8/groupmod.8 \
man8/grpck.8 \
man5/gshadow.5 \
- man8/logoutd.8 \
@@ -411,10 +438,10 @@ index 8d8b916..8b2aa2d 100644
man8/userdel.8 \
man8/usermod.8
diff --git a/man/uk/Makefile.am b/man/uk/Makefile.am
index 3fb5ffb..e5ae706 100644
index a0f106d..f069eea 100644
--- a/man/uk/Makefile.am
+++ b/man/uk/Makefile.am
@@ -8,35 +8,25 @@ man_MANS = \
@@ -8,34 +8,25 @@ man_MANS = \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
@@ -424,9 +451,8 @@ index 3fb5ffb..e5ae706 100644
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
- man8/groupmems.8 \
man8/groupmod.8 \
- man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
@@ -434,7 +460,7 @@ index 3fb5ffb..e5ae706 100644
- man1/login.1 \
man5/login.defs.5 \
- man8/logoutd.8 \
- man1/newgrp.1 \
man1/newgrp.1 \
man8/newusers.8 \
- man8/nologin.8 \
man1/passwd.1 \
@@ -451,10 +477,10 @@ index 3fb5ffb..e5ae706 100644
man8/userdel.8 \
man8/usermod.8 \
diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am
index a8b93a5..96230e4 100644
index 59d1072..9402a9e 100644
--- a/man/zh_CN/Makefile.am
+++ b/man/zh_CN/Makefile.am
@@ -8,8 +8,6 @@ man_MANS = \
@@ -8,34 +8,24 @@ man_MANS = \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
@@ -463,7 +489,10 @@ index a8b93a5..96230e4 100644
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
@@ -21,22 +19,15 @@ man_MANS = \
man8/groupdel.8 \
- man8/groupmems.8 \
man8/groupmod.8 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
@@ -504,14 +533,14 @@ index c36ed2c..6fb6a15 100644
man8/userdel.8 \
man8/usermod.8
diff --git a/src/Makefile.am b/src/Makefile.am
index b6cb09e..f517d1e 100644
index d4e6f3a..78722ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,8 +26,8 @@ AM_CFLAGS = $(LIBBSD_CFLAGS)
# and installation would be much simpler (just two directories,
# $prefix/bin and $prefix/sbin, no install-data hacks...)
-bin_PROGRAMS = groups login
-bin_PROGRAMS = login
-sbin_PROGRAMS = nologin
+bin_PROGRAMS =
+sbin_PROGRAMS =
@@ -529,8 +558,8 @@ index b6cb09e..f517d1e 100644
@@ -59,7 +58,7 @@ usbin_PROGRAMS = \
vipw
# id and groups are from gnu, sulogin from sysvinit
-noinst_PROGRAMS = id sulogin
# sulogin from sysvinit
-noinst_PROGRAMS = sulogin
+noinst_PROGRAMS =
suidusbins =

12
debian/patches/debian/tests-disable-su.patch vendored
View File

@@ -5,14 +5,14 @@ Subject: upstream testsuite: disable su tests
Debian uses su from util-linux, pointless/impossible to test shadow's su
here.
---
tests/tests/run_some | 68 ----------------------------------------------------
tests/run_some | 68 ----------------------------------------------------------
1 file changed, 68 deletions(-)
diff --git a/tests/tests/run_some b/tests/tests/run_some
index 91f5626..a1e6e11 100755
--- a/tests/tests/run_some
+++ b/tests/tests/run_some
@@ -63,74 +63,6 @@ echo "-: test failed"
diff --git a/tests/run_some b/tests/run_some
index c58f59b..46317eb 100755
--- a/tests/run_some
+++ b/tests/run_some
@@ -79,74 +79,6 @@ echo "-: test failed"
find "${build_path}" -name "*.gcda" -delete
# ignore the result of the first test. ~magic~
run_test ./su/01/su_user.test ignore_failure

22
debian/patches/debian/tests-libsubid-04_nss-fix-setting-basedir.patch vendored
View File

@@ -1,22 +0,0 @@
From: Chris Hofstaedtler <zeha@debian.org>
Date: Sat, 6 Jul 2024 23:35:51 +0200
Subject: tests/libsubid/04_nss: fix setting basedir
---
tests/tests/libsubid/04_nss/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/tests/libsubid/04_nss/Makefile b/tests/tests/libsubid/04_nss/Makefile
index 79c2fc9..bf2699f 100644
--- a/tests/tests/libsubid/04_nss/Makefile
+++ b/tests/tests/libsubid/04_nss/Makefile
@@ -1,7 +1,7 @@
all: test_nss libsubid_zzz.so
-BASE_TEST_DIR ?= $(shell git rev-parse --show-toplevel)
-basedir := $(BASE_TEST_DIR)
+BUILD_BASE_DIR ?= $(shell git rev-parse --show-toplevel)
+basedir := $(BUILD_BASE_DIR)
test_nss: test_nss.c $(basedir)/lib/nss.c
gcc -c -I$(basedir)/lib/ -I$(basedir) -o test_nss.o test_nss.c

3
debian/patches/series vendored
View File

@@ -3,11 +3,8 @@ 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
debian/tests-disable-su.patch
debian/tests-libsubid-04_nss-fix-setting-basedir.patch
debian/Adapt-login.defs-for-Debian.patch
debian/Define-LOGIN_NAME_MAX-on-HURD.patch
debian/Stop-building-programs-we-do-not-install.patch
upstream/lib-user_busy.c-Include-utmpx.h.patch
upstream/a015e919834c90b99947829c6c823f7fe93a8097-E_BAD_NAME.patch

7
debian/patches/upstream/a015e919834c90b99947829c6c823f7fe93a8097-E_BAD_NAME.patch vendored
View File

@@ -1,8 +1,7 @@
From a015e919834c90b99947829c6c823f7fe93a8097 Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Thu, 5 Dec 2024 17:38:54 +0100
Subject: [PATCH] src/useradd.c: E_BAD_NAME: Use a different error code for bad
login names
Subject: [PATCH] src/useradd.c: E_BAD_NAME: Use a different error code for
bad login names
Wrappers like adduser(8) want to do their own stuff if the login name is
bad. For that, they need to be able to differentiate such an error.
@@ -17,7 +16,7 @@ Bug-Debian: 1074306
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/useradd.c b/src/useradd.c
index 891fd1420..d8429eecb 100644
index 7b150ea..00c86f6 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -201,6 +201,7 @@ static bool home_added = false;

27
debian/patches/upstream/lib-user_busy.c-Include-utmpx.h.patch vendored
View File

@@ -1,27 +0,0 @@
From: Pino Toscano <toscano.pino@tiscali.it>
Date: Tue, 10 Sep 2024 14:36:49 +0200
Subject: [PATCH] lib/user_busy.c: Include <utmpx.h>
Since:
- utmpx APIs are used in non-Linux code blocks
- <utmpx.h> is already unconditionally included in Linux parts in other
files
then unconditionally include it in this file as well.
Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
---
lib/user_busy.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/user_busy.c b/lib/user_busy.c
index a622376..b559405 100644
--- a/lib/user_busy.c
+++ b/lib/user_busy.c
@@ -17,6 +17,7 @@
#include <dirent.h>
#include <fcntl.h>
#include <unistd.h>
+#include <utmpx.h>
#include "defines.h"
#include "prototypes.h"
#ifdef ENABLE_SUBIDS

148
debian/patches/upstream/tests-Support-run_some-from-exported-tarball.patch vendored
View File

@@ -1,148 +0,0 @@
From: Serge Hallyn <serge@hallyn.com>
Date: Sat, 25 May 2024 08:40:11 -0500
Subject: tests/: Support run_some from exported tarball
common/config.sh currently tries to find the top directory by looking
for .git. There are also many places under tests/ where we use
hard-coded ../../.. to find things like ${TOP_DIR}/lib.
We don't actually ship the tests with 'make dist'. So we will
be exporting tests/ as a separate tarball. In particular, I want
to then import this in the debian package. However, there it will
be under shadow.git/debian/tests, not shadow.git/tests.
To support this, accept the environment variable BUILD_BASE_DIR,
which should point to shadow.git.
An alternative would be to move the tests to their own git
tree. However, keeping tests in separate git tree tends to
lead to repos getting out of sync. And we'd still need to accept
something like BUILD_BASE_DIR.
Note there are a lot of tests under run-all, which I'm not converting
as they currently are not being run in CI, so I'm more likely to
break something.
Changelog:
2024 05 26: Incorporate feedback from alejandro-colomar
Link: <https://salsa.debian.org/debian/shadow/-/merge_requests/21>
Link: <https://salsa.debian.org/debian/shadow/-/merge_requests/22>
Cc: Chris Hofstaedtler <zeha@debian.org>
Signed-off-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
tests/tests/common/config.sh | 16 +++++++++-------
tests/tests/libsubid/04_nss/Makefile | 13 ++++++++-----
tests/tests/libsubid/04_nss/subidnss.test | 2 +-
tests/tests/libsubid/04_nss/test_range | 12 ++++++------
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/tests/tests/common/config.sh b/tests/tests/common/config.sh
index a2f8df0..926cdae 100644
--- a/tests/tests/common/config.sh
+++ b/tests/tests/common/config.sh
@@ -2,14 +2,16 @@
set -e
-build_path=$(pwd)
-while [ "${build_path}" != "/" -a ! -e "${build_path}/.git" ]; do
- build_path=$(dirname ${build_path})
-done
-if [ ! -e "${build_path}/.git" ]; then
- echo "Not inside git directory" 1>&2
- exit 1
+if [ -n "${BUILD_BASE_DIR}" ]; then
+ build_path="${BUILD_BASE_DIR}"
+else
+ build_path=$(git rev-parse --show-toplevel)
fi
+if [ -z "${build_path}" ]; then
+ echo "Failed to find build base path"
+ exit 1
+fi
+export build_path
# Save the configuration files in tmp.
save_config ()
diff --git a/tests/tests/libsubid/04_nss/Makefile b/tests/tests/libsubid/04_nss/Makefile
index dd5acf7..79c2fc9 100644
--- a/tests/tests/libsubid/04_nss/Makefile
+++ b/tests/tests/libsubid/04_nss/Makefile
@@ -1,12 +1,15 @@
all: test_nss libsubid_zzz.so
-test_nss: test_nss.c ../../../lib/nss.c
- gcc -c -I../../../lib/ -I../../.. -o test_nss.o test_nss.c
- gcc -o test_nss test_nss.o ../../../lib/.libs/libshadow.a -ldl
+BASE_TEST_DIR ?= $(shell git rev-parse --show-toplevel)
+basedir := $(BASE_TEST_DIR)
+
+test_nss: test_nss.c $(basedir)/lib/nss.c
+ gcc -c -I$(basedir)/lib/ -I$(basedir) -o test_nss.o test_nss.c
+ gcc -o test_nss test_nss.o $(basedir)/lib/.libs/libshadow.a -ldl
libsubid_zzz.so: libsubid_zzz.c
- gcc -c -I../../../lib/ -I../../.. -I../../../libsubid libsubid_zzz.c
- gcc -L../../../libsubid -shared -o libsubid_zzz.so libsubid_zzz.o ../../../lib/.libs/libshadow.a -ldl
+ gcc -c -I$(basedir)/lib/ -I$(basedir) -I$(basedir)/libsubid libsubid_zzz.c
+ gcc -L$(basedir)/libsubid -shared -o libsubid_zzz.so libsubid_zzz.o $(basedir)/lib/.libs/libshadow.a -ldl
clean:
rm -f *.o *.so test_nss
diff --git a/tests/tests/libsubid/04_nss/subidnss.test b/tests/tests/libsubid/04_nss/subidnss.test
index 3d40dc8..400171f 100755
--- a/tests/tests/libsubid/04_nss/subidnss.test
+++ b/tests/tests/libsubid/04_nss/subidnss.test
@@ -9,7 +9,7 @@ cd $(dirname $0)
make
-export LD_LIBRARY_PATH=.:../../../lib/.libs:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=.:${build_path}/lib/.libs:$LD_LIBRARY_PATH
./test_nss 1
./test_nss 2
diff --git a/tests/tests/libsubid/04_nss/test_range b/tests/tests/libsubid/04_nss/test_range
index ee25080..45a791c 100755
--- a/tests/tests/libsubid/04_nss/test_range
+++ b/tests/tests/libsubid/04_nss/test_range
@@ -11,23 +11,23 @@ cleanup1() {
umount /etc/nsswitch.conf
}
trap cleanup1 EXIT HUP INT TERM
-../../../src/check_subid_range user1 u 100000 65535
+${build_path}/src/check_subid_range user1 u 100000 65535
if [ $? -ne 0 ]; then
exit 1
fi
-../../../src/check_subid_range user2 u 100000 65535
+${build_path}/src/check_subid_range user2 u 100000 65535
if [ $? -eq 0 ]; then
exit 1
fi
-../../../src/check_subid_range unknown u 100000 65535
+${build_path}/src/check_subid_range unknown u 100000 65535
if [ $? -eq 0 ]; then
exit 1
fi
-../../../src/check_subid_range error u 100000 65535
+${build_path}/src/check_subid_range error u 100000 65535
if [ $? -eq 0 ]; then
exit 1
fi
-../../../src/check_subid_range user1 u 1000 65535
+${build_path}/src/check_subid_range user1 u 1000 65535
if [ $? -eq 0 ]; then
exit 1
fi
@@ -43,7 +43,7 @@ cleanup2() {
umount /etc/nsswitch.conf
}
trap cleanup2 EXIT HUP INT TERM
-../../../src/check_subid_range user1 u 100000 65535
+${build_path}/src/check_subid_range user1 u 100000 65535
if [ $? -eq 0 ]; then
exit 1
fi