From 6ad510334366d5a4d38a387af8e25fe0885c4c68 Mon Sep 17 00:00:00 2001
From: wangxiyuan <wangxiyuan1007@gmail.com>
Date: Thu, 15 Jun 2023 20:35:56 +0800
Subject: [PATCH] Fix user/group warning

---
 openvswitch.spec     | 36 +++++-------------------------------
 openvswitch.sysusers |  3 ---
 2 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 openvswitch.sysusers

diff --git a/openvswitch.spec b/openvswitch.spec
index 0c132eb..c3d2967 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -13,11 +13,10 @@ Name: openvswitch
 Summary: Open vSwitch daemon/database/utilities
 URL: https://www.openvswitch.org/
 Version: 2.17.5
-Release: 3
+Release: 4
 License: ASL 2.0 and LGPLv2+ and SISSL
 
 Source0: https://www.openvswitch.org/releases/%{name}-%{version}.tar.gz
-Source1: openvswitch.sysusers
 
 Patch0000:      0000-openvswitch-add-stack-protector-strong.patch
 Patch0002:      0002-Remove-unsupported-permission-names.patch
@@ -187,8 +186,6 @@ install -d -m 0755 $RPM_BUILD_ROOT/run/openvswitch
 install -d -m 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch
 install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch
 
-install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysusersdir}/openvswitch.conf
-
 install -p -D -m 0644 rhel/usr_lib_udev_rules.d_91-vfio.rules \
         $RPM_BUILD_ROOT%{_udevrulesdir}/91-vfio.rules
 
@@ -304,28 +301,7 @@ done
     fi
 %endif
 
-%pre
-if ! getent group openvswith > /dev/null; then
-    groupadd --system openvswith
-fi
-
-if ! getent passwd openvswith > /dev/null; then
-    useradd --system -g openvswith openvswith
-fi
-
 %post
-%{_sbindir}/update-alternatives --install %{_sbindir}/ovs-vswitchd \
-  ovs-vswitchd %{_sbindir}/ovs-vswitchd.nodpdk 10
-if [ $1 -eq 1 ]; then
-    sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch
-
-    sed -i \
-        's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="root:root"@'\
-        /etc/sysconfig/openvswitch
-fi
-chown -R openvswitch:openvswitch /etc/openvswitch
-sed -i '/^\[Service\]/ a\Slice=system-ovs.slice' /usr/lib/systemd/system/ovs-vswitchd.service
-
 %if 0%{?systemd_post:1}
     %systemd_post %{name}.service
 %else
@@ -336,9 +312,6 @@ sed -i '/^\[Service\]/ a\Slice=system-ovs.slice' /usr/lib/systemd/system/ovs-vsw
 %endif
 
 %postun
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove ovs-vswitchd %{_sbindir}/ovs-vswitchd.nodpdk
-fi
 %if 0%{?systemd_postun:1}
     %systemd_postun %{name}.service
 %else
@@ -408,7 +381,6 @@ fi
 %endif
 
 %files
-%defattr(-,openvswitch,openvswitch)
 %dir %{_sysconfdir}/openvswitch
 %{_sysconfdir}/openvswitch/default.conf
 %config %ghost %verify(not owner group md5 size mtime) %{_sysconfdir}/openvswitch/conf.db
@@ -447,13 +419,15 @@ fi
 %{_udevrulesdir}/91-vfio.rules
 %doc LICENSE NOTICE README.rst NEWS rhel/README.RHEL.rst
 /var/lib/openvswitch
-%attr(750,openvswitch,openvswitch) %verify(not owner group) /var/log/openvswitch
+/var/log/openvswitch
 %ghost %attr(755,root,root) %verify(not owner group) /run/openvswitch
 %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
 %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
-%{_sysusersdir}/openvswitch.conf
 
 %changelog
+* Thu Jun 15 2023 wangxiyuan <wangxiyuan1007@gmail.com> - 2.17.5-4
+- Clean up openvswitch group and user
+
 * Wed Apr 12 2023 zhangpan <zhangpan103@h-partners.com> - 2.17.5-3
 - fix CVE-2023-1668
 
diff --git a/openvswitch.sysusers b/openvswitch.sysusers
deleted file mode 100644
index 9a464c2..0000000
--- a/openvswitch.sysusers
+++ /dev/null
@@ -1,3 +0,0 @@
-#Type Name         ID         GECOS                   Home directory  Shell
-u     openvswitch  -          "Open vSwitch Daemons"  /               /sbin/nologin
-m     openvswitch  hugetlbfs
-- 
Gitee