Accepting request 1315006 from Base:System

- Remove dependency on chage

OBS-URL: https://build.opensuse.org/request/show/1315006
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysuser-tools?expand=0&rev=37

sysuser-tools.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Sat Nov  1 15:48:03 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Remove dependency on chage
+
+-------------------------------------------------------------------
+Thu Aug 28 15:16:04 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Fallback to useradd if systemd is older than v257 [bsc#1248855]
+
+-------------------------------------------------------------------
+Wed Aug 27 06:56:02 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Don't set TZ=UTC for chage to avoid dependency on env.
+
+-------------------------------------------------------------------
+Tue Aug 26 09:45:05 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Use run macro for chage for log files/debugging.
+
+-------------------------------------------------------------------
+Mon Aug 25 07:17:30 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Generate provides for "u!".
+
 -------------------------------------------------------------------
 Wed Jul 23 18:28:04 UTC 2025 - Marcus Meissner <meissner@suse.com>
 

sysuser-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sysuser-tools
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

sysusers.prov

@@ -9,7 +9,7 @@ parse()
 		set -- $line
 		if [ "$1" = 'g' ]; then
 			echo "group($2)"
-		elif [ "$1" = 'u' ]; then
+		elif [ "$1" = 'u' ] || [ "$1" = 'u!' ] ; then
 			echo "user($2)"
 			echo "group($2)"
 		fi

sysusers2shadow.sh

@@ -7,15 +7,19 @@ run() {
 	"$@"
 }
 
+SYSTEMD_VERSION=0
 if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then
+	SYSTEMD_VERSION=$(systemd-sysusers --version | head -n1 | sed 's|systemd \([0-9]\+\).*|\1|g')
+fi
+
+# "u!" is only supported with systemd-sysusers v257 or newer
+if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ] && [ $SYSTEMD_VERSION -ge 257 ]; then
 
 	if [ -n "$1" ] && [ "$1" != "%3" ]; then
 		REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1"
 	fi
 	# Use systemd-sysusers and let it read the input directly from stdin
-	if ! run /usr/bin/systemd-sysusers $REPLACE_ARG - ; then
+	run /usr/bin/systemd-sysusers $REPLACE_ARG -
-		run /usr/bin/systemd-sysusers -
-	fi
 else
 	# Absolute path to busybox, if found
 	busybox=
@@ -48,7 +52,7 @@ else
 		;;
 		u|u\!)
 			if [ "${1}" = "u!" ]; then
-			    EXPIRE_DATE="1970-01-02"
+			    LOCK_ACCOUNT=1
 			fi
 
 			shift
@@ -93,8 +97,8 @@ else
 			    fi
 
 			    run /usr/sbin/useradd -r -c "$3" -d "${homedir}" $ARGUMENTS
-			    if [ -n "$EXPIRE_DATE" ]; then
+			    if [ -n "$LOCK_ACCOUNT" ] && [ -x /usr/sbin/usermod ]; then
-				TZ=UTC chage -E "$EXPIRE_DATE" "$1"
+				run /usr/sbin/usermod --expiredate 1 "$1"
 			    fi
 			elif [ -x "$busybox" ]; then
 			    if [ -n "$GROUP_ID" ] && [ "$GROUP_ID" != "-" ]; then