Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package openvswitch for openSUSE:Factory 
checked in at 2023-12-15 21:46:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openvswitch (Old)
 and      /work/SRC/openSUSE:Factory/.openvswitch.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openvswitch"

Fri Dec 15 21:46:52 2023 rev:71 rq:1133086 version:unknown

Changes:
--------
--- /work/SRC/openSUSE:Factory/openvswitch/openvswitch.changes  2023-12-06 
23:52:21.084353365 +0100
+++ /work/SRC/openSUSE:Factory/.openvswitch.new.25432/openvswitch.changes       
2023-12-15 21:47:01.961609382 +0100
@@ -1,0 +2,5 @@
+Thu Dec 14 11:55:19 UTC 2023 - Dirk Müller <[email protected]>
+
+- convert to sysuser generated users
+
+-------------------------------------------------------------------

New:
----
  openvswitch-user.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openvswitch.spec ++++++
--- /var/tmp/diff_new_pack.1foVru/_old  2023-12-15 21:47:03.049649151 +0100
+++ /var/tmp/diff_new_pack.1foVru/_new  2023-12-15 21:47:03.053649298 +0100
@@ -63,6 +63,7 @@
 Source0:        http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
 Source1:        
https://github.com/ovn-org/ovn/archive/v%{ovn_version}.tar.gz#/ovn-%{ovn_version}.tar.gz
 Source2:        preamble
+Source10:       openvswitch-user.conf
 Source89:       Module.supported.updates
 Source99:       openvswitch-rpmlintrc
 # OVS patches
@@ -116,10 +117,12 @@
 %if 0%{?suse_version}
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-rpm-macros
+BuildRequires:  sysuser-tools
 Requires(post): %fillup_prereq
 Requires(pre):  shadow
 Suggests:       logrotate
 %{?systemd_ordering}
+%sysusers_requires
 %else
 BuildRequires:  environment-modules
 BuildRequires:  openssl-devel
@@ -507,6 +510,8 @@
         PYTHON3=%{_bindir}/python3 \
         LDFLAGS=-L../%{ovs_dir}/lib/.libs
 %make_build
+popd
+%sysusers_generate_pre %{SOURCE10} openvswitch openvswitch.conf
 
 %check
 %if %{with check}
@@ -727,7 +732,9 @@
 # Done with OVN additional files.
 popd
 
-%pre
+install -D -m 0644 %{SOURCE10} %{buildroot}%{_sysusersdir}/openvswitch.conf
+
+%pre -f openvswitch.pre
 %if 0%{?suse_version}
     %service_add_pre ovsdb-server.service ovs-vswitchd.service 
openvswitch.service ovs-delete-transient-ports.service
 %endif
@@ -736,17 +743,10 @@
     # ownership of openvswitch.service from openvswitch-switch to
     # openvswitch.
     if [ x$(systemctl is-enabled openvswitch.service 2>/dev/null ||:) = 
"xenabled" ]; then
-        touch %{rpmstate}openvswitch
+        touch %{rpmstate}openvswitch || :
     fi
 fi
 
-getent group openvswitch >/dev/null || groupadd -r openvswitch
-getent passwd openvswitch >/dev/null || \
-    useradd -r -g openvswitch -d / -s /sbin/nologin \
-    -c "Open vSwitch Daemons" openvswitch
-
-exit 0
-
 %pre ipsec
 %if 0%{?suse_version}
     %service_add_pre openvswitch-ipsec.service
@@ -1171,6 +1171,7 @@
 %{_fillupdir}/sysconfig.openvswitch
 %{_datadir}/bash-completion/completions/ovs-appctl-bashcomp.bash
 %{_datadir}/bash-completion/completions/ovs-vsctl-bashcomp.bash
+%{_sysusersdir}/openvswitch.conf
 %else
 %config(noreplace) %{_sysconfdir}/sysconfig/openvswitch
 %{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash

++++++ openvswitch-user.conf ++++++
# Type Name ID GECOS [HOME]
g openvswitch - -
u openvswitch - "Open vSwitch Daemons" /  /sbin/nologin

Reply via email to