debian/changelog: finalize

debian/changelog: add new entry
Merge branch 'dpkg-root' into 'master'
2021-10-23 21:05:12 +02:00 · 2021-10-23 20:54:30 +02:00 · 2021-10-23 18:45:33 +00:00 · 2021-08-20 14:39:17 +02:00 · 2021-08-20 14:38:35 +02:00 · 2020-04-20 21:28:07 +00:00
5 changed files with 28 additions and 155 deletions
@@ -1,3 +1,19 @@
+shadow (1:4.8.1-1.1) unstable; urgency=medium
+
+  [ Johannes Schauer Marin Rodrigues ]
+  * Non-maintainer upload.
+
+  [ Niels Thykier ]
+  * Remove obsolete login.preinst
+  * Remove obsolete code from passwd maintscripts
+
+  [ Helmut Grohne ]
+  * logoutd is gone since at least buster (closes: #989712)
+  * Delete duplicate subuid/subgid creation.
+  * login.postinstd support for DPKG_ROOT (closes: #992578)
+
+ -- Johannes Schauer Marin Rodrigues <josch@debian.org>  Sat, 23 Oct 2021 21:04:57 +0200
+
 shadow (1:4.8.1-1) unstable; urgency=medium

  * debian/default/useradd: Fix typo DHSELL -> DSHELL (Closes: #897028)
@@ -2,55 +2,29 @@

 set -e

-if test "$1" = configure
-then
-	if test -f /etc/init.d/logoutd
-	then 
-		if test "$(md5sum /etc/init.d/logoutd)" = "9080f92783dd53f6f2108e698c06bd53  /etc/init.d/logoutd"
-		then	
-			echo "removing logoutd cruft"
-			rm /etc/init.d/logoutd
-			update-rc.d logoutd remove
-		fi
-	fi
-fi
-rm -f /etc/pam.d/login.pre-upgrade 2>/dev/null

 if [ "$1" = "configure" ]; then
 	# Install faillog during initial installs only
-	if [ "$2" = "" ] && [ ! -f /var/log/faillog ] ; then
-		touch /var/log/faillog
-		chown root:root /var/log/faillog
-		chmod 644 /var/log/faillog
+	if [ "$2" = "" ] && [ ! -f "$DPKG_ROOT/var/log/faillog" ] ; then
+		touch "$DPKG_ROOT/var/log/faillog"
+		chown 0:0 "$DPKG_ROOT/var/log/faillog"
+		chmod 644 "$DPKG_ROOT/var/log/faillog"
 	fi

 	# Create subuid/subgid if missing
-	if [ ! -e /etc/subuid ]; then
-		touch /etc/subuid
-		chown root:root /etc/subuid
-		chmod 644 /etc/subuid
+	if [ ! -e "$DPKG_ROOT/etc/subuid" ]; then
+		touch "$DPKG_ROOT/etc/subuid"
+		chown 0:0 "$DPKG_ROOT/etc/subuid"
+		chmod 644 "$DPKG_ROOT/etc/subuid"
 	fi

-	if [ ! -e /etc/subgid ]; then
-		touch /etc/subgid
-		chown root:root /etc/subgid
-		chmod 644 /etc/subgid
+	if [ ! -e "$DPKG_ROOT/etc/subgid" ]; then
+		touch "$DPKG_ROOT/etc/subgid"
+		chown 0:0 "$DPKG_ROOT/etc/subgid"
+		chmod 644 "$DPKG_ROOT/etc/subgid"
 	fi
 fi

-        # Create subuid/subgid if missing
-        if [ ! -e /etc/subuid ]; then
-                touch /etc/subuid
-                chown root:root /etc/subuid
-                chmod 644 /etc/subuid
-        fi
-
-        if [ ! -e /etc/subgid ]; then
-                touch /etc/subgid
-                chown root:root /etc/subgid
-                chmod 644 /etc/subgid
-        fi
-
 #DEBHELPER#

 exit 0
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-remove_md5() {
-    if md5sum $1 2>/dev/null |grep -q $2; then
-	cp $1 $1.pre-upgrade
-	sed -e '/^[^#][ \t]*assword[ \t]*required[ \t]*pam_unix.so/ s/ md5$//' $1 >$1.post-upgrade \
-	    && mv $1.post-upgrade $1
-    fi
-    }
-
-
-case "$1" in
-    install|upgrade)
-        if [ "x$2" != "x" ] ; then
-	    if dpkg --compare-versions $2 lt 1:4.0.3 ; then
-		remove_md5 /etc/pam.d/login 5e61c3334e25625fe1fa4d79cf9123ff
-		fi
-	    fi
-	    
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
@@ -4,20 +4,6 @@ set -e

 case "$1" in
 configure)
-    # Fix permissions on various log files from old versions of the debian
-    # installer, some unrelated to passwd but we decided to put the fix
-    # here since there was no better place. This can safely be removed
-    # after etch is released.
-    if dpkg --compare-versions "$2" lt "1:4.0.14-9"; then
-	    for log in /var/log/base-config* \
-		    $(find /var/log/debian-installer/ /var/log/installer/ -type f 2>/dev/null ); do
-		if [ -e "$log" ]; then
-			chmod 600 "$log"
-		fi
-            done
-    fi
-
-    rm -f /etc/pam.d/passwd.pre-upgrade 2>/dev/null
 	if ! getent group shadow | grep -q '^shadow:[^:]*:42'
 	then
 		groupadd -g 42 shadow || (
@@ -1,51 +0,0 @@
-#! /bin/sh
-
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-remove_md5() {
-    if md5sum $1 2>/dev/null |grep -q $2; then
-	cp $1 $1.pre-upgrade
-	sed -e '/^[^#]*[ \t]*password[ \t]*required[ \t]*pam_unix.so/ s/ md5$//' $1 >$1.post-upgrade \
-	    && mv $1.post-upgrade $1
-    fi
-    }
-
-
-case "$1" in
-    install|upgrade)
-        if [ "x$2" != "x" ] ; then
-	    if dpkg --compare-versions $2 lt 1:4.0.3 ; then
-		remove_md5 /etc/pam.d/passwd 23a5d1465bbc1e39ca6e0c32f22a75c9
-	    fi
-	fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Author	SHA1	Message	Date
Johannes Schauer Marin Rodrigues	5a8056702c	debian/changelog: finalize	2021-10-23 21:05:12 +02:00
Johannes Schauer Marin Rodrigues	89221d3983	debian/changelog: add new entry	2021-10-23 20:54:30 +02:00
Johannes Schauer Marin Rodrigues	b7878255ff	Merge branch 'dpkg-root' into 'master' cruft removal and support for DPKG_ROOT (closes: #989712, #992578) See merge request debian/shadow!15	2021-10-23 18:45:33 +00:00
Helmut Grohne	06d1bd8617	login.postinstd support for DPKG_ROOT (closes: #992578 )	2021-08-20 14:39:17 +02:00
Helmut Grohne	d19ac3ae86	login.postinstd remove cruft (closes: #989712 )	2021-08-20 14:38:35 +02:00
Balint Reczey	cfc17bfaa7	Merge branch 'clean-up-old-passwd-maintscript' into 'master' Remove obsolete code from passwd maintscripts See merge request debian/shadow!11	2020-04-20 21:28:07 +00:00
Niels Thykier	fe2a40ab85	Remove obsolete code from passwd maintscripts The transitional behaviour was complete before oldoldstable and is no longer relevant. Moving this snippet will eventually enable us to remove the preinst for passwd completely (when the /etc/cron.daily/passwd removal is complete). This will both reduce the total number of maintscripts and also enable us to simplify deployment DPKG_ROOT (the InstallBootstrap spec). * https://wiki.debian.org/Teams/Dpkg/Spec/InstallBootstrap Signed-off-by: Niels Thykier <niels@thykier.net>	2020-04-18 09:03:48 +00:00
Balint Reczey	c7baab6534	Merge branch 'clean-up-old-login-preinst' into 'master' Remove obsolete login.preinst See merge request debian/shadow!10	2020-04-18 09:00:17 +00:00
Niels Thykier	92b40afe13	Remove obsolete login.preinst The transitional behaviour was complete before oldoldstable and is no longer relevant. Moving this snippet will eventually enable us to remove the preinst for login completely (when the /etc/securetty removal is complete). This will both reduce the total number of maintscripts and also enable us to simplify deployment DPKG_ROOT (the InstallBootstrap spec). * https://wiki.debian.org/Teams/Dpkg/Spec/InstallBootstrap Signed-off-by: Niels Thykier <niels@thykier.net>	2020-04-18 08:59:07 +00:00