diff --git a/2.10.11.tar.gz b/2.10.15.tar.gz similarity index 56% rename from 2.10.11.tar.gz rename to 2.10.15.tar.gz index a343267..74eef39 100644 Binary files a/2.10.11.tar.gz and b/2.10.15.tar.gz differ diff --git a/Gemfile.lock.aarch64 b/Gemfile.lock.aarch64 index cbb174c..2beb63e 100644 --- a/Gemfile.lock.aarch64 +++ b/Gemfile.lock.aarch64 @@ -1,47 +1,47 @@ GEM remote: https://anonymous:devcloud@mirrors.huaweicloud.com/repository/rubygems/ specs: - actioncable (5.2.7) - actionpack (= 5.2.7) + actioncable (5.2.7.1) + actionpack (= 5.2.7.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) + actionmailer (5.2.7.1) + actionpack (= 5.2.7.1) + actionview (= 5.2.7.1) + activejob (= 5.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.7) - actionview (= 5.2.7) - activesupport (= 5.2.7) + actionpack (5.2.7.1) + actionview (= 5.2.7.1) + activesupport (= 5.2.7.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.7) - activesupport (= 5.2.7) + actionview (5.2.7.1) + activesupport (= 5.2.7.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.7) - activesupport (= 5.2.7) + activejob (5.2.7.1) + activesupport (= 5.2.7.1) globalid (>= 0.3.6) - activemodel (5.2.7) - activesupport (= 5.2.7) + activemodel (5.2.7.1) + activesupport (= 5.2.7.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.7) - activemodel (= 5.2.7) - activesupport (= 5.2.7) + activerecord (5.2.7.1) + activemodel (= 5.2.7.1) + activesupport (= 5.2.7.1) arel (>= 9.0) - activestorage (5.2.7) - actionpack (= 5.2.7) - activerecord (= 5.2.7) + activestorage (5.2.7.1) + actionpack (= 5.2.7.1) + activerecord (= 5.2.7.1) marcel (~> 1.0.0) - activesupport (5.2.7) + activesupport (5.2.7.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -256,7 +256,7 @@ GEM mysql2 (0.5.3) netrc (0.11.0) nio4r (2.5.8) - nokogiri (1.13.3-aarch64-linux) + nokogiri (1.13.4-aarch64-linux) racc (~> 1.4) parallel (1.21.0) parser (3.1.1.0) @@ -295,18 +295,18 @@ GEM rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.7) - actioncable (= 5.2.7) - actionmailer (= 5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) - activemodel (= 5.2.7) - activerecord (= 5.2.7) - activestorage (= 5.2.7) - activesupport (= 5.2.7) + rails (5.2.7.1) + actioncable (= 5.2.7.1) + actionmailer (= 5.2.7.1) + actionpack (= 5.2.7.1) + actionview (= 5.2.7.1) + activejob (= 5.2.7.1) + activemodel (= 5.2.7.1) + activerecord (= 5.2.7.1) + activestorage (= 5.2.7.1) + activesupport (= 5.2.7.1) bundler (>= 1.3.0) - railties (= 5.2.7) + railties (= 5.2.7.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -322,9 +322,9 @@ GEM activesupport (>= 5.2) rails_tokeninput (1.7.0) railties (>= 3.1.0) - railties (5.2.7) - actionpack (= 5.2.7) - activesupport (= 5.2.7) + railties (5.2.7.1) + actionpack (= 5.2.7.1) + activesupport (= 5.2.7.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -482,7 +482,7 @@ GEM webrick xpath (3.2.0) nokogiri (~> 1.8) - yajl-ruby (1.4.1) + yajl-ruby (1.4.2) zeitwerk (2.5.4) PLATFORMS diff --git a/Gemfile.lock.x86 b/Gemfile.lock.x86 index fd4be75..4e2ff88 100644 --- a/Gemfile.lock.x86 +++ b/Gemfile.lock.x86 @@ -1,47 +1,47 @@ GEM remote: https://anonymous:devcloud@mirrors.huaweicloud.com/repository/rubygems/ specs: - actioncable (5.2.7) - actionpack (= 5.2.7) + actioncable (5.2.7.1) + actionpack (= 5.2.7.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) + actionmailer (5.2.7.1) + actionpack (= 5.2.7.1) + actionview (= 5.2.7.1) + activejob (= 5.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.7) - actionview (= 5.2.7) - activesupport (= 5.2.7) + actionpack (5.2.7.1) + actionview (= 5.2.7.1) + activesupport (= 5.2.7.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.7) - activesupport (= 5.2.7) + actionview (5.2.7.1) + activesupport (= 5.2.7.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.7) - activesupport (= 5.2.7) + activejob (5.2.7.1) + activesupport (= 5.2.7.1) globalid (>= 0.3.6) - activemodel (5.2.7) - activesupport (= 5.2.7) + activemodel (5.2.7.1) + activesupport (= 5.2.7.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.7) - activemodel (= 5.2.7) - activesupport (= 5.2.7) + activerecord (5.2.7.1) + activemodel (= 5.2.7.1) + activesupport (= 5.2.7.1) arel (>= 9.0) - activestorage (5.2.7) - actionpack (= 5.2.7) - activerecord (= 5.2.7) + activestorage (5.2.7.1) + actionpack (= 5.2.7.1) + activerecord (= 5.2.7.1) marcel (~> 1.0.0) - activesupport (5.2.7) + activesupport (5.2.7.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -256,7 +256,7 @@ GEM mysql2 (0.5.3) netrc (0.11.0) nio4r (2.5.8) - nokogiri (1.13.3-x86_64-linux) + nokogiri (1.13.4-x86_64-linux) racc (~> 1.4) parallel (1.21.0) parser (3.1.1.0) @@ -295,18 +295,18 @@ GEM rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.7) - actioncable (= 5.2.7) - actionmailer (= 5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) - activemodel (= 5.2.7) - activerecord (= 5.2.7) - activestorage (= 5.2.7) - activesupport (= 5.2.7) + rails (5.2.7.1) + actioncable (= 5.2.7.1) + actionmailer (= 5.2.7.1) + actionpack (= 5.2.7.1) + actionview (= 5.2.7.1) + activejob (= 5.2.7.1) + activemodel (= 5.2.7.1) + activerecord (= 5.2.7.1) + activestorage (= 5.2.7.1) + activesupport (= 5.2.7.1) bundler (>= 1.3.0) - railties (= 5.2.7) + railties (= 5.2.7.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -322,9 +322,9 @@ GEM activesupport (>= 5.2) rails_tokeninput (1.7.0) railties (>= 3.1.0) - railties (5.2.7) - actionpack (= 5.2.7) - activesupport (= 5.2.7) + railties (5.2.7.1) + actionpack (= 5.2.7.1) + activesupport (= 5.2.7.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -482,7 +482,7 @@ GEM webrick xpath (3.2.0) nokogiri (~> 1.8) - yajl-ruby (1.4.1) + yajl-ruby (1.4.2) zeitwerk (2.5.4) PLATFORMS diff --git a/change-bundled-rubygem-bundler-version.patch b/change-bundled-rubygem-bundler-version.patch deleted file mode 100644 index 5e62059..0000000 --- a/change-bundled-rubygem-bundler-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f09770635d1dbf86085ece2a8000a909f4950f97 Mon Sep 17 00:00:00 2001 -From: wang_yue111 <648774160@qq.com> -Date: Mon, 28 Jun 2021 16:13:49 +0800 -Subject: [PATCH] change rubygem-bundler bundled version to fix compilation error - ---- - src/api/Gemfile.lock | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock -index c8cce14..427b747 100644 ---- a/src/api/Gemfile.lock -+++ b/src/api/Gemfile.lock -@@ -579,4 +579,4 @@ DEPENDENCIES - yajl-ruby - - BUNDLED WITH -- 1.17.1 -+ 2.2.19 --- -2.23.0 - diff --git a/obs-server.spec b/obs-server.spec index 7f152cb..a2fcacf 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -5,18 +5,17 @@ Name: obs-server -Version: 2.10.11 -Release: 5 +Version: 2.10.15 +Release: 1 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: https://github.com/openSUSE/open-build-service/archive/2.10.11.tar.gz +Source0: https://github.com/openSUSE/open-build-service/archive/%{version}.tar.gz Source1: Gemfile.lock.aarch64 Source2: Gemfile.lock.x86 Patch1: 0001-obs_server-fix-usage-info.patch Patch2: fix-obs_productconvert-inputfile-path.patch -Patch3: change-bundled-rubygem-bundler-version.patch Patch4: 0004-remove-systemV-method.patch Patch5: 0005-obsscheduler-stop.patch Patch6: obs_project_update-should-tell-the-usage-but-not-hung-still.patch @@ -91,13 +90,13 @@ cp %{SOURCE2} src/api/Gemfile.lock fi find -name .keep -o -name .gitignore | xargs rm -rf -for file in `grep -Fnr "#!/usr/bin/ruby.ruby2.5" | awk -F':' '{print $1}'`;do sed -i 's:#!/usr/bin/ruby.ruby2.5:#!/usr/bin/ruby:g' $file;done -for file in `grep -Fnr "#!/usr/bin/rake.ruby2.5" | awk -F':' '{print $1}'`;do sed -i 's:#!/usr/bin/rake.ruby2.5:#!/usr/bin/rake:g' $file;done +for file in `grep -Fnr "#!/usr/bin/ruby.ruby2.7" | awk -F':' '{print $1}'`;do sed -i 's:#!/usr/bin/ruby.ruby2.7:#!/usr/bin/ruby:g' $file;done +for file in `grep -Fnr "#!/usr/bin/rake.ruby2.7" | awk -F':' '{print $1}'`;do sed -i 's:#!/usr/bin/rake.ruby2.7:#!/usr/bin/rake:g' $file;done sed -i 's/apache2.service/httpd.service/g' `find . -name "obsapisetup.service"` #sed -i 's/2.5.0/2.6.0/g' `find . -name "obs-clockwork.service"` for file in `find . -name "*.service"`;do sed -i 's:User = wwwrun:User = apache:g' $file;done for file in `find . -name "*.service"`;do sed -i 's:Group = www:User = apache:g' $file;done -for file in `find . -name "*.service"`;do sed -i 's:/usr/bin/bundle.ruby2.5:/usr/bin/bundle:g' $file;done +for file in `find . -name "*.service"`;do sed -i 's:/usr/bin/bundle.ruby2.7:/usr/bin/bundle:g' $file;done %build export DESTDIR=$RPM_BUILD_ROOT @@ -278,8 +277,9 @@ rmdir /srv/obs 2> /dev/null || : %systemd_postun_with_restart obsstoragesetup.service %pre -n obs-api -/usr/sbin/groupadd www -/usr/sbin/useradd wwwrun +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 @@ -308,9 +308,9 @@ for i in production.rb ; do done if [ ! -s /srv/www/obs/api/config/secret.key ]; then - pushd /srv/www/obs/api + pushd /srv/www/obs/api >& /dev/null RAILS_ENV=production bin/rails secret > /srv/www/obs/api/config/secret.key - popd + popd >& /dev/null fi chmod 0640 /srv/www/obs/api/config/secret.key chown root.apache /srv/www/obs/api/config/secret.key @@ -517,6 +517,12 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Thu Oct 27 2022 liyanan - 2.10.15-1 +- Upgrade to version 2.10.15 + +* Thu May 26 2022 caodongxia - 2.10.11-6 +- Fix obs-api install warning + * Tue May 24 2022 wangkai - 2.10.11-5 - Update gems version for fix rpmbuild error