Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sysuser-tools for openSUSE:Factory
checked in at 2024-07-31 13:27:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysuser-tools (Old)
and /work/SRC/openSUSE:Factory/.sysuser-tools.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysuser-tools"
Wed Jul 31 13:27:57 2024 rev:26 rq:1190493 version:3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/sysuser-tools/sysuser-tools.changes
2023-11-08 22:16:32.540559984 +0100
+++ /work/SRC/openSUSE:Factory/.sysuser-tools.new.7232/sysuser-tools.changes
2024-07-31 13:27:58.720562528 +0200
@@ -1,0 +2,5 @@
+Mon Jul 1 15:01:19 UTC 2024 - Johannes Weberhofer <jweberho...@weberhofer.at>
+
+- Allow setting of UID:GID for as defined in sysusers.d
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysuser-tools.spec ++++++
--- /var/tmp/diff_new_pack.O8Z9e7/_old 2024-07-31 13:28:00.040616743 +0200
+++ /var/tmp/diff_new_pack.O8Z9e7/_new 2024-07-31 13:28:00.044616907 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sysuser-tools
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: sysuser-tools
-Version: 3.2
+Version: 3.3
Release: 0
Summary: Auto provides for system users
License: MIT
++++++ disable-systemd-sysusers.patch ++++++
--- /var/tmp/diff_new_pack.O8Z9e7/_old 2024-07-31 13:28:00.072618057 +0200
+++ /var/tmp/diff_new_pack.O8Z9e7/_new 2024-07-31 13:28:00.076618221 +0200
@@ -1,7 +1,5 @@
-# Disable usage of systemd-sysusers for SLE15 to stay compatible
-
---- sysusers2shadow.sh.old 2021-09-08 15:06:18.000000000 +0200
-+++ sysusers2shadow.sh 2021-11-26 10:37:20.911541368 +0100
+--- sysusers2shadow.sh.old 2024-07-04 14:24:01.013092683 +0200
++++ sysusers2shadow.sh 2024-07-04 14:28:06.701540250 +0200
@@ -7,14 +7,6 @@
"$@"
}
@@ -14,10 +12,10 @@
- # Use systemd-sysusers and let it read the input directly from stdin
- run /usr/bin/systemd-sysusers $REPLACE_ARG -
-else
-
# Absolute path to busybox, if found
busybox=
-@@ -115,4 +115,3 @@
+ for i in /bin/busybox /usr/bin/busybox; do [ -x "$i" ] && busybox=$i;
done
+@@ -126,4 +118,3 @@
;;
esac
done
++++++ sysusers2shadow.sh ++++++
--- /var/tmp/diff_new_pack.O8Z9e7/_old 2024-07-31 13:28:00.136620686 +0200
+++ /var/tmp/diff_new_pack.O8Z9e7/_new 2024-07-31 13:28:00.140620850 +0200
@@ -15,7 +15,6 @@
# Use systemd-sysusers and let it read the input directly from stdin
run /usr/bin/systemd-sysusers $REPLACE_ARG -
else
-
# Absolute path to busybox, if found
busybox=
for i in /bin/busybox /usr/bin/busybox; do [ -x "$i" ] && busybox=$i;
done
@@ -48,9 +47,23 @@
u)
shift
ARGUMENTS="$1"
- if [ -n "${2-}" ] && [ "$2" != "-" ]; then
- ARGUMENTS="-u $2 $ARGUMENTS"
+
+ # Split user and Group id
+ userGrouArr=(${2//:/ })
+ USER_ID=${userGrouArr[0]}
+ GROUP_ID=${userGrouArr[1]}
+
+ if [ -n "$USER_ID" ] && [ "$USER_ID" != "-" ]; then
+ ARGUMENTS="-u $USER_ID $ARGUMENTS"
+ fi
+ if [ -n "$GROUP_ID" ] && [ "$GROUP_ID" != "-" ]; then
+ ARGUMENTS="-g $GROUP_ID $ARGUMENTS"
+ else
+ if [ "$USER_ID" == "-" ]; then
+ ARGUMENTS="-U $ARGUMENTS"
+ fi
fi
+
homedir="/" # If null, empty or '-'
if [ "${4:--}" != "-" ]; then
homedir="$4"
@@ -69,7 +82,7 @@
if /usr/bin/getent group "$1" >>
/dev/null; then
ARGUMENTS="-g $1 $ARGUMENTS"
else
- ARGUMENTS="-U $ARGUMENTS"
+ ARGUMENTS="$ARGUMENTS"
fi
run /usr/sbin/useradd -r -c "$3" -d
"${homedir}" $ARGUMENTS
