diff --git a/debian/copyright b/debian/copyright index 7ad4b588..e3bd327d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -77,6 +77,10 @@ Files: man/po/fr.po Copyright: 2011-2013, Debian French l10n team License: BSD-3-clause +Files: man/shadowconfig.8 +Copyright: 2025 Alejandro Colomar +License: BSD-3-clause + Files: man/zh_TW/man5/* Copyright: 1993, Michael Haardt 1993, Scorpio, www.linuxforum.net diff --git a/debian/patches/debian/Define-LOGIN_NAME_MAX-on-HURD.patch b/debian/patches/debian/Define-LOGIN_NAME_MAX-on-HURD.patch index ef84ed3f..76a5f4ae 100644 --- a/debian/patches/debian/Define-LOGIN_NAME_MAX-on-HURD.patch +++ b/debian/patches/debian/Define-LOGIN_NAME_MAX-on-HURD.patch @@ -7,7 +7,7 @@ Subject: Define LOGIN_NAME_MAX on HURD 1 file changed, 6 insertions(+) diff --git a/lib/chkname.c b/lib/chkname.c -index 95fbe10..c36bcc9 100644 +index 98f7917..5f5ac91 100644 --- a/lib/chkname.c +++ b/lib/chkname.c @@ -31,6 +31,12 @@ diff --git a/debian/patches/debian/Document-the-shadowconfig-utility.patch b/debian/patches/debian/Document-the-shadowconfig-utility.patch index 66245638..fe4901e2 100644 --- a/debian/patches/debian/Document-the-shadowconfig-utility.patch +++ b/debian/patches/debian/Document-the-shadowconfig-utility.patch @@ -2,27 +2,26 @@ From: Shadow package maintainers Date: Sat, 22 Jun 2024 17:39:41 +0200 Subject: Document the shadowconfig utility -Status wrt upstream: The shadowconfig utility is debian specific. -Its man page also (but it used to be distributed) +Status wrt upstream: The shadowconfig utility is Debian-specific. +The man page is Debian-specific, but it used to be distributed by +upstream. --- - man/Makefile.am | 2 ++ + man/Makefile.am | 1 + man/fr/Makefile.am | 1 + - man/fr/man8/shadowconfig.8 | 26 +++++++++++++++++++++++ + man/fr/man8/shadowconfig.8 | 26 ++++++++++++++++++++++++++ man/ja/Makefile.am | 1 + - man/ja/man8/shadowconfig.8 | 25 ++++++++++++++++++++++ + man/ja/man8/shadowconfig.8 | 25 +++++++++++++++++++++++++ + man/man8/shadowconfig.8 | 39 +++++++++++++++++++++++++++++++++++++++ man/pl/Makefile.am | 1 + - man/pl/man8/shadowconfig.8 | 27 ++++++++++++++++++++++++ - man/shadowconfig.8 | 41 ++++++++++++++++++++++++++++++++++++ - man/shadowconfig.8.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++ - 9 files changed, 176 insertions(+) + man/pl/man8/shadowconfig.8 | 27 +++++++++++++++++++++++++++ + 8 files changed, 121 insertions(+) create mode 100644 man/fr/man8/shadowconfig.8 create mode 100644 man/ja/man8/shadowconfig.8 + create mode 100644 man/man8/shadowconfig.8 create mode 100644 man/pl/man8/shadowconfig.8 - create mode 100644 man/shadowconfig.8 - create mode 100644 man/shadowconfig.8.xml diff --git a/man/Makefile.am b/man/Makefile.am -index 1405509..6f9dcd9 100644 +index 1405509..0e88fea 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -36,6 +36,7 @@ man_MANS = \ @@ -33,14 +32,6 @@ index 1405509..6f9dcd9 100644 man1/sg.1 \ man3/shadow.3 \ man5/shadow.5 \ -@@ -106,6 +107,7 @@ man_XMANS = \ - porttime.5.xml \ - pwck.8.xml \ - pwconv.8.xml \ -+ shadowconfig.8.xml \ - shadow.3.xml \ - shadow.5.xml \ - sg.1.xml \ diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am index 2365e23..e175a15 100644 --- a/man/fr/Makefile.am @@ -128,6 +119,51 @@ index 0000000..a75c6f7 + +.I /usr/share/doc/passwd/README.debian.gz +には shadow パスワードとそれに関する特徴の簡単な紹介が書かれている。 +diff --git a/man/man8/shadowconfig.8 b/man/man8/shadowconfig.8 +new file mode 100644 +index 0000000..ec11fc6 +--- /dev/null ++++ b/man/man8/shadowconfig.8 +@@ -0,0 +1,39 @@ ++.TH shadowconfig 8 2025-01-01 "Debian shadow-utils" ++.SH Name ++shadowconfig \- toggle shadow passwords on and off ++. ++. ++.SH Synopsis ++.SY shadowconfig ++.BR on | off ++.YS ++. ++. ++.SH Description ++.I shadowconfig\ on ++will turn shadow passwords on. ++.P ++.I shadowconfig\ off ++will turn shadow passwords off. ++. ++. ++.SH Errors ++.B shadowconfig ++will print an error message and exit with a nonzero code ++if it finds anything awry. ++If that happens, ++you should correct the error and run it again. ++Turning shadow passwords on when they are already on, ++or off when they are already off, ++is harmless. ++. ++. ++.SH Caveats ++Turning shadow passwords off and on again ++will lose all password aging information. ++. ++. ++.SH See also ++Read ++.I /usr/share/doc/passwd/README.Debian ++for a brief introduction to shadow passwords and related features. diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am index 2a015f3..04093ec 100644 --- a/man/pl/Makefile.am @@ -173,108 +209,3 @@ index 0000000..2016c9f +.IR /usr/share/doc/passwd/README.debian.gz , +gdzie znajdziesz krótkie wprowadzenie do ochrony haseł z użyciem dodatkowych +plików haseł przesłanianych (shadow passwords) i związanych tematów. -diff --git a/man/shadowconfig.8 b/man/shadowconfig.8 -new file mode 100644 -index 0000000..c0ee0af ---- /dev/null -+++ b/man/shadowconfig.8 -@@ -0,0 +1,41 @@ -+.\"Generated by db2man.xsl. Don't modify this, modify the source. -+.de Sh \" Subsection -+.br -+.if t .Sp -+.ne 5 -+.PP -+\fB\\$1\fR -+.PP -+.. -+.de Sp \" Vertical space (when we can't use .PP) -+.if t .sp .5v -+.if n .sp -+.. -+.de Ip \" List item -+.br -+.ie \\n(.$>=3 .ne \\$3 -+.el .ne 3 -+.IP "\\$1" \\$2 -+.. -+.TH "SHADOWCONFIG" 8 "19 Apr 1997" "" "" -+.SH NAME -+shadowconfig \- toggle shadow passwords on and off -+.SH "SYNOPSIS" -+.ad l -+.hy 0 -+.HP 13 -+\fBshadowconfig\fR \fB\fIon\fR\fR | \fB\fIoff\fR\fR -+.ad -+.hy -+ -+.SH "DESCRIPTION" -+ -+.PP -+\fBshadowconfig\fR on will turn shadow passwords on; \fIshadowconfig off\fR will turn shadow passwords off\&. \fBshadowconfig\fR will print an error message and exit with a nonzero code if it finds anything awry\&. If that happens, you should correct the error and run it again\&. Turning shadow passwords on when they are already on, or off when they are already off, is harmless\&. -+ -+.PP -+Read \fI/usr/share/doc/passwd/README\&.Debian\fR for a brief introduction to shadow passwords and related features\&. -+ -+.PP -+Note that turning shadow passwords off and on again will lose all password aging information\&. -+ -diff --git a/man/shadowconfig.8.xml b/man/shadowconfig.8.xml -new file mode 100644 -index 0000000..b4080ea ---- /dev/null -+++ b/man/shadowconfig.8.xml -@@ -0,0 +1,52 @@ -+ -+ -+ -+ -+ -+ 19 Apr 1997 -+ -+ -+ shadowconfig -+ 8 -+ 19 Apr 1997 -+ Debian GNU/Linux -+ -+ -+ shadowconfig -+ toggle shadow passwords on and off -+ -+ -+ -+ -+ shadowconfig -+ -+ on -+ off -+ -+ -+ -+ -+ -+ DESCRIPTION -+ shadowconfig on will turn shadow passwords on; -+ shadowconfig off will turn shadow -+ passwords off. shadowconfig will print an error -+ message and exit with a nonzero code if it finds anything awry. If -+ that happens, you should correct the error and run it again. Turning -+ shadow passwords on when they are already on, or off when they are -+ already off, is harmless. -+ -+ -+ -+ Read /usr/share/doc/passwd/README.Debian for a -+ brief introduction -+ to shadow passwords and related features. -+ -+ -+ Note that turning shadow passwords off and on again will lose all -+ password -+ aging information. -+ -+ -+ diff --git a/debian/patches/debian/Keep-using-Debian-adduser-defaults.patch b/debian/patches/debian/Keep-using-Debian-adduser-defaults.patch index 0599257d..d1ab5186 100644 --- a/debian/patches/debian/Keep-using-Debian-adduser-defaults.patch +++ b/debian/patches/debian/Keep-using-Debian-adduser-defaults.patch @@ -30,7 +30,7 @@ index 001e7d1..4888100 100644 diff --git a/src/useradd.c b/src/useradd.c -index 891fd14..7b150ea 100644 +index 7623dab..954b329 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -96,14 +96,14 @@ static const char Prog[] = "useradd"; diff --git a/debian/patches/debian/Stop-building-programs-we-do-not-install.patch b/debian/patches/debian/Stop-building-programs-we-do-not-install.patch index 0c1cc636..1b48df7b 100644 --- a/debian/patches/debian/Stop-building-programs-we-do-not-install.patch +++ b/debian/patches/debian/Stop-building-programs-we-do-not-install.patch @@ -24,7 +24,7 @@ Subject: Stop building programs we do not install 18 files changed, 3 insertions(+), 122 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am -index 6f9dcd9..49dfc3d 100644 +index 0e88fea..18c012d 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -13,8 +13,6 @@ man_MANS = \ @@ -81,8 +81,8 @@ index 6f9dcd9..49dfc3d 100644 passwd.1.xml \ passwd.5.xml \ porttime.5.xml \ -@@ -110,9 +97,6 @@ man_XMANS = \ - shadowconfig.8.xml \ +@@ -109,9 +96,6 @@ man_XMANS = \ + pwconv.8.xml \ shadow.3.xml \ shadow.5.xml \ - sg.1.xml \ diff --git a/debian/patches/upstream/a015e919834c90b99947829c6c823f7fe93a8097-E_BAD_NAME.patch b/debian/patches/upstream/a015e919834c90b99947829c6c823f7fe93a8097-E_BAD_NAME.patch index 602d8bb3..93aeabe1 100644 --- a/debian/patches/upstream/a015e919834c90b99947829c6c823f7fe93a8097-E_BAD_NAME.patch +++ b/debian/patches/upstream/a015e919834c90b99947829c6c823f7fe93a8097-E_BAD_NAME.patch @@ -16,7 +16,7 @@ Bug-Debian: 1074306 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/useradd.c b/src/useradd.c -index 7b150ea..00c86f6 100644 +index 954b329..92f8054 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -201,6 +201,7 @@ static bool home_added = false;