Gemfile.lock

@@ -468,7 +468,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    xmlhash (1.3.8)
+    xmlhash (1.3.7)
       pkg-config
     xmlrpc (0.3.0)
     xpath (3.2.0)

obs-server.spec

@@ -5,7 +5,7 @@
 
 Name:           obs-server
 Version:        2.10.11
-Release:        6
+Release:        1
 Summary:        The Open Build Service -- Server Component
 License:        GPL-2.0-only or GPL-3.0-only
 URL:            http://www.openbuildservice.org
@@ -34,7 +34,6 @@ Requires:       createrepo_c, dpkg, yum, perl-Compress-Zlib, perl-File-Sync >= 0
 Requires:       perl-Net-SSLeay, perl-Socket-MsgHdr, perl-XML-Parser, perl-XML-Simple, perl-YAML-LibYAML
 Requires:       cpio, curl, perl-Compress-Zlib, perl-TimeDate, screen, psmisc, bash, binutils, bsdtar
 Requires:       util-linux >= 2.16, osc
-Requires:       policycoreutils-python-utils
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -201,8 +200,6 @@ exit 0
 %systemd_preun obsnotifyforward.service
 %systemd_preun obsredis.service
 %systemd_preun obsworker.service
-semanage fcontext -d "/srv/obs(/.*)?"
-semanage fcontext -d "/srv/obs/events(/.*)?"
 
 %preun -n obs-common
 %systemd_preun obsstoragesetup.service
@@ -226,9 +223,6 @@ semanage fcontext -d "/srv/obs/events(/.*)?"
 %systemd_post obsnotifyforward.service
 %systemd_post obsredis.service
 %systemd_post obsworker.service
-semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?"
-semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?"
-restorecon -Rv /srv/obs/
 
 %posttrans
 [ -d /srv/obs ] || install -d -o obsrun -g obsrun /srv/obs
@@ -263,10 +257,6 @@ rmdir /srv/obs 2> /dev/null || :
 %systemd_postun_with_restart obsstoragesetup.service
 
 %pre -n obs-api
-getent group www >/dev/null || /usr/sbin/groupadd -r www
-
-getent passwd wwwrun >/dev/null || /usr/sbin/useradd -d / -g www -s /sbin/nologin -r wwwrun
-
 getent passwd obsapidelayed >/dev/null || \
   /usr/sbin/useradd -r -s /bin/bash -c "User for build service api delayed jobs" -d /srv/www/obs/api -g apache obsapidelayed
 
@@ -295,9 +285,9 @@ for i in production.rb ; do
 done
 
 if [ ! -s /srv/www/obs/api/config/secret.key ]; then
-  pushd /srv/www/obs/api >& /dev/null
+  pushd /srv/www/obs/api
   RAILS_ENV=production bin/rails secret > /srv/www/obs/api/config/secret.key
-  popd  >& /dev/null
+  popd
 fi
 chmod 0640 /srv/www/obs/api/config/secret.key
 chown root.apache /srv/www/obs/api/config/secret.key
@@ -504,18 +494,6 @@ usermod -a -G docker obsservicerun
 %{_sbindir}/rcobsstoragesetup
 
 %changelog
-* Mon Nov 20 2023 liyanan <liyanan61@h-partners.com> - 2.10.11-6
-- Fix obs-api install warning
-
-* Wed Nov 08 2023 Ge Wang <wang__ge@126.com> - 2.10.11-5
-- Add post script to adatp selinux policy
-
-* Thu May 26 2022 caodongxia <caodongxia@h-partners.com> - 2.10.11-4
-- Fix obs-api install warning
-
-* Mon May 16 2022 wangkai <wangkai385@h-partners.com> - 2.10.11-3
-- Update xmlhash to 1.3.8 for fix CVE-2022-21949
-
 * Thu Mar 17 2022 houyingchao <houyingchao@huawei.com> - 2.10.11-2
 - Fix install failed