Update changelog for 1:4.17.1-2 release

Remove unnecessary Build-Depends: quilt
Closes: #1092461 Thanks: Bastian Germann
2025-01-08 12:40:14 +01:00 · 2025-01-08 12:39:17 +01:00 · 2025-01-04 13:43:40 +01:00
10 changed files with 75 additions and 226 deletions
@@ -1,16 +0,0 @@
-PKG=shadow
-SITE=ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/
-
-deb:: check_cheese
-
-include /usr/share/quilt/quilt.debbuild.mk
-
-check_cheese:
-	@dpkg-parsechangelog | grep -q "\* The \".*\".* release\." || { \
-		echo ""; \
-		echo " **                                  **"; \
-		echo " **  Warning: not a cheesy release!  **"; \
-		echo " **                                  **"; \
-		echo ""; \
-		exit 1; \
-	}
@@ -1,3 +1,12 @@
+shadow (1:4.17.1-2) experimental; urgency=medium
+
+  * Rewrite shadowconfig(8) manpage.
+    Thanks to Alejandro Colomar <alx@kernel.org>
+  * Remove unnecessary Build-Depends: quilt.
+    Thanks to Bastian Germann (Closes: #1092461)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Wed, 08 Jan 2025 12:40:10 +0100
+
 shadow (1:4.17.1-1) experimental; urgency=medium

  * New upstream version 4.17.1
@@ -25,7 +25,6 @@ Build-Depends:
 libsemanage-dev [linux-any],
 libxml2-utils <!nodoc>,
 pkgconf,
- quilt,
 systemd-dev [linux-any],
 xsltproc <!nodoc>
 Standards-Version: 4.7.0
@@ -77,6 +77,10 @@ Files: man/po/fr.po
 Copyright: 2011-2013, Debian French l10n team <debian-l10n-french@lists.debian.org>
 License: BSD-3-clause

+Files: man/shadowconfig.8
+Copyright: 2025 Alejandro Colomar <alx@kernel.org>
+License: BSD-3-clause
+
 Files: man/zh_TW/man5/*
 Copyright: 1993, Michael Haardt <michael@moria.de>
           1993, Scorpio, www.linuxforum.net
@@ -1,19 +1,7 @@
 Build-Depends:
 ==============
- * autoconf
- * automake1.9
-   works with 1.7 or 1.9 (at least)
- * libtool
 * gettext
   POT, PO, GMO regenerated?
- * libpam0g-dev
-   OK
- * debhelper (>= 4.1.16)
- * po-debconf
-   OK
- * quilt
-   patch system
- * dpkg-dev (>= 1.13.5)
 * xsltproc
   used to generate the manpages
 * docbook-xsl
@@ -25,70 +13,4 @@ Build-Depends:
   Needed by JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], [DocBook XML DTD V4.1.2], [], enable_man=no)
 * libxml2-utils
   needed by the JH_CHECK_XML_CATALOG macros
- * cdbs
-   used in debian/rules
- * libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
- * gnome-doc-utils (>= 0.4.3-1)
-   xml2po, 0.4.3-1 needed for the -l switch.
-
-passwd Depends:
-===============
- * ${shlibs:Depends}
-   OK
- * ${loginpam}
-   - hurd
-     login
-     libpam-modules (>= 0.72-5)
-   - other archs
-     + login (>= 970502-1)
-       login is needed because some passwd utils need /etc/login.defs
-       login is Essential, so this is just to enforce the version
-     + libpam-modules (>= 0.72-5)
- * debianutils (>= 2.15.2)
-   After 1:4.0.12-6, {add,remove}-shell are distributed in debianutils (2.15)
-   /etc/shell was forgotten and introduced in debianutils in 2.15.2
-
-passwd Conflicts:
-=================
-
-passwd Replaces:
-================
-   Some of the passwd man pages are also distributed in some manpages* packages.
-   Look at the debian/02/run test to optimize these dependencies.
-   NOTE: Not all maintainers have been notified.
- * manpages-de (<< 0.4-9), manpages-fi (<< 0.2-4), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-5), manpages-it (<< 0.3.4-3), manpages-ja (<< 0.5.0.0.20050915-1), manpages-ko (<< 20050219-2), manpages-es (<< 1.55-4), manpages-es-extra (<< 0.8a-15), manpages-ru (<< 0.98-3)
-   All those packages have been updated during sarge->etch. So these Replaces
-   should be removed after lenny release
- * manpages-tr, manpages-zh
-   Those packages are still in etch, so the Replaces should be kept even
-   after lenny release
-
-login Pre-Depends:
-==================
- * ${shlibs:Depends}
- * libpam-runtime (>= 0.76-14)
-   sarge contained 0.76-22
-
-Why Pre-Depends? (because it's an essential package?)
-
-login Depends:
-==============
- * libpam-modules (>= 0.72-5)
-   libpam-modules is needed.
-   potato contained 0.72-9
-
-login Conflicts:
-================
-
-login Replaces:
-===============
- * Some of the login man pages are also distributed in some manpages* packages.
-   Look at the debian/02/run test to optimize these dependencies.
-   NOTE: Not all maintainers have been notified.
-   - manpages-fi, manpages-fr (<<1.64.0-1), manpages-hu, manpages-it, manpages-ko, manpages-ja (<< 0.5.0.0.20050915-1), manpages-de (<< 0.4-10), manpages-es-extra (<<0.8a-15) 
-     Those are packages that have been updated during sarge->etch. These
-     Replaces should be removed after lenny
-   - manpages-tr, manpages-zh
-     Those packages are still in etch, so the Replaces should be kept even
-     after lenny release

@@ -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 @@
@@ -2,27 +2,26 @@ From: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
 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 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-+		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-+<refentry id='shadowconfig.8'>
-+  <!-- $Id: shadowconfig.8.xml,v 1.6 2005/06/15 12:39:27 kloczek Exp $ -->
-+  <refentryinfo>
-+    <date>19 Apr 1997</date>
-+  </refentryinfo>
-+  <refmeta>
-+    <refentrytitle>shadowconfig</refentrytitle>
-+    <manvolnum>8</manvolnum>
-+    <refmiscinfo class='date'>19 Apr 1997</refmiscinfo>
-+    <refmiscinfo class='source'>Debian GNU/Linux</refmiscinfo>
-+  </refmeta>
-+  <refnamediv id='name'>
-+    <refname>shadowconfig</refname>
-+    <refpurpose>toggle shadow passwords on and off</refpurpose>
-+  </refnamediv>
-+
-+  <refsynopsisdiv id='synopsis'>
-+    <cmdsynopsis>
-+      <command>shadowconfig</command>
-+      <group choice='plain'>
-+        <arg choice='plain'><replaceable>on</replaceable></arg>
-+        <arg choice='plain'><replaceable>off</replaceable></arg>
-+      </group>
-+    </cmdsynopsis>
-+  </refsynopsisdiv>
-+
-+  <refsect1 id='description'>
-+    <title>DESCRIPTION</title>
-+    <para><command>shadowconfig</command> on will turn shadow passwords on;
-+      <emphasis remap='B'>shadowconfig off</emphasis> will turn shadow
-+      passwords off. <command>shadowconfig</command> 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.
-+    </para>
-+
-+    <para>
-+      Read <filename>/usr/share/doc/passwd/README.Debian</filename> for a
-+      brief introduction
-+      to shadow passwords and related features.
-+    </para>
-+
-+    <para>Note that turning shadow passwords off and on again will lose all
-+      password
-+      aging information.
-+    </para>
-+  </refsect1>
-+</refentry>
@@ -30,7 +30,7 @@ index 001e7d1..4888100 100644
 	</listitem>
       </varlistentry>
 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";
@@ -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 \
@@ -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;
Author	SHA1	Message	Date
Chris Hofstaedtler	30f621e2a7	Update changelog for 1:4.17.1-2 release	2025-01-08 12:40:14 +01:00
Chris Hofstaedtler	f6f677a4ca	Remove unnecessary Build-Depends: quilt Closes: #1092461 Thanks: Bastian Germann	2025-01-08 12:39:17 +01:00
Chris Hofstaedtler	ac4bab2baa	Rewrite shadowconfig(8) manpage Contributed by Alejandro Colomar <alx@kernel.org> Thanks: Alejandro Colomar <alx@kernel.org>	2025-01-04 13:43:40 +01:00