diff --git a/0004-remove-systemV-method.patch b/0004-remove-systemV-method.patch deleted file mode 100644 index eeef7a612cda089d67397e3204c2fa5c369bb508..0000000000000000000000000000000000000000 --- a/0004-remove-systemV-method.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 7d2d404c36e68ba7aaa1192f72c9f0e5524aa7ff Mon Sep 17 00:00:00 2001 -From: caodongxia <315816521@qq.com> -Date: Thu, 17 Jun 2021 09:39:39 +0800 -Subject: [PATCH] patch - ---- - dist/obsscheduler | 35 +++------------------------------- - dist/obsworker | 48 +++-------------------------------------------- - 2 files changed, 6 insertions(+), 77 deletions(-) - -diff --git a/dist/obsscheduler b/dist/obsscheduler -index d7f49db..66af2d0 100755 ---- a/dist/obsscheduler -+++ b/dist/obsscheduler -@@ -3,8 +3,6 @@ - # - # Author: adrian@suse.de - --. /etc/rc.status -- - . /etc/sysconfig/obs-server - - # Determine the base and follow a runlevel link name. -@@ -42,22 +40,18 @@ if test -z "$OBS_SCHEDULER_ARCHITECTURES" ; then - fi - - --rc_reset - case "$1" in - start) -- echo -n "Initializing obsscheduler" - mkdir -p "$rundir" "$logdir" - chown obsrun:obsrun "$logdir" "$rundir" - cd "$obsdir" - # FIXME: not nice, this should receive a proper daemon handling, - # including real logging, pid file and startproc - for i in $OBS_SCHEDULER_ARCHITECTURES; do -- ./bs_sched $i >> "$logdir"/scheduler_$i.log 2>&1 & -+ $OBS_SCHEDULER_WRAPPER ./bs_sched $i >> "$logdir"/scheduler_$i.log 2>&1 & - done -- rc_status -v - ;; -- stop|shutdown) -- echo -n "Shutting down obsscheduler" -+ stop) - if checkproc bs_sched; then - for i in $OBS_SCHEDULER_ARCHITECTURES; do - $obsdir/bs_admin --shutdown-scheduler "$i" -@@ -70,32 +64,9 @@ case "$1" in - killall bs_sched - fi - fi -- rc_status -v -- ;; -- restart) -- $0 stop -- $0 start -- rc_status -- ;; -- try-restart|reload) -- $0 status -- if test $? = 0; then -- $0 restart -- else -- rc_reset # Not running is not a failure. -- fi -- # Remember status and be quiet -- rc_status -- ;; -- status) -- echo -n "Checking for obsscheduler: " -- # FIXME: needs proper checking for all invoked schedulers -- checkproc bs_sched -- rc_status -v - ;; - *) -- echo "Usage: $0 {start|stop|status|try-restart|restart|reload}" -+ echo "Usage: $0 {start|stop}" - exit 1 - ;; - esac --rc_exit -diff --git a/dist/obsworker b/dist/obsworker -index 7d991ba..85e4f8b 100755 ---- a/dist/obsworker -+++ b/dist/obsworker -@@ -4,22 +4,6 @@ - # Author: adrian@suse.de - # - # /etc/init.d/obsworker --# and its symbolic link --# /usr/sbin/rcobsworker --# --### BEGIN INIT INFO --# Provides: obsworker --# Required-Start: $time $network $syslog --# Required-Stop: $time $network $syslog --# Should-Start: $remote_fs obsstoragesetup obssrcserver obsrepserver xendomains --# Should-Stop: $none --# Default-Start: 3 5 --# Default-Stop: 0 1 2 4 6 --# Short-Description: OBS worker --# Description: Open Build Service worker --### END INIT INFO -- --. /etc/rc.status - - # Is the worker running on Fedora >= 17 ? - # It lacks the complete path to build other distros then -@@ -334,7 +318,6 @@ EOF - fi - } - --rc_reset - case "$1" in - start) - # reset screenrc -@@ -353,8 +336,8 @@ case "$1" in - NUM=`ls -d /sys/devices/system/cpu/cpu[0-9]* | wc -l` - fi - if [ "--zvm" == "$vmopt" ]; then -- check_vmcp || rc_status -v -- create_initrd $OBS_VM_KERNEL $OBS_VM_INITRD || rc_status -v -+ check_vmcp || exit 1 -+ create_initrd $OBS_VM_KERNEL $OBS_VM_INITRD || exit 1 - if [ -n "$OBS_WORKER_INSTANCE_NAMES" ]; then - WORKERS=($OBS_WORKER_INSTANCE_NAMES) - NUM=${#WORKERS[*]} -@@ -483,7 +466,6 @@ case "$1" in - popd > /dev/null - ;; - stop) -- echo -n "Shutting down obsworker" - for I in "$workerdir"/*; do - test -d "$I" || continue - test -e "$I/state" || continue -@@ -496,33 +478,9 @@ case "$1" in - sleep 2 - killall -s 9 bs_worker 2>/dev/null - screen -S obsworker -X quit -- rc_status -v -- ;; -- restart) -- ## If first returns OK call the second, if first or -- ## second command fails, set echo return value. -- $0 stop -- $0 start -- rc_status -- ;; -- try-restart|reload) -- $0 status -- if test $? = 0; then -- $0 restart -- else -- rc_reset # Not running is not a failure. -- fi -- # Remember status and be quiet -- rc_status -- ;; -- status) -- echo -n "Checking for obsworker: " -- checkproc bs_worker -- rc_status -v - ;; - *) -- echo "Usage: $0 {start|stop|status|try-restart|restart|reload}" -+ echo "Usage: $0 {start|stop}" - exit 1 - ;; - esac --rc_exit --- -2.27.0 - diff --git a/0005-obsscheduler-stop.patch b/0005-obsscheduler-stop.patch index 394999f79c20609faf55e6060a56075381a0ddf7..4c2b23211226800f0cecc61db32714a25e9ff3ee 100644 --- a/0005-obsscheduler-stop.patch +++ b/0005-obsscheduler-stop.patch @@ -1,20 +1,20 @@ -From 566516386b56023059d5b6f759bb4d648e88f724 Mon Sep 17 00:00:00 2001 -From: caodongxia <315816521@qq.com> -Date: Thu, 17 Jun 2021 15:23:32 +0800 -Subject: [PATCH] patch +From 480480f23eca2e998a9a78bc4d1692d899c5cba3 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Mon, 8 Aug 2022 11:43:05 +0800 +Subject: [PATCH] obsscheduler stop --- dist/obsscheduler | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/obsscheduler b/dist/obsscheduler -index 66af2d0..bbbc1c7 100755 +index 6b5a211..06c90bb 100755 --- a/dist/obsscheduler +++ b/dist/obsscheduler @@ -52,15 +52,15 @@ case "$1" in done ;; - stop) + stop) - if checkproc bs_sched; then + if ps aux | grep bs_sched | grep -v grep &> /dev/null ; then for i in $OBS_SCHEDULER_ARCHITECTURES; do diff --git a/0006-add-rexml-dependency.patch b/0006-add-rexml-dependency.patch new file mode 100644 index 0000000000000000000000000000000000000000..8eb03682c70fab3b4a4646ac440305e83fcab2a9 --- /dev/null +++ b/0006-add-rexml-dependency.patch @@ -0,0 +1,38 @@ +From e0a64a42a877a6c935573360b5d8d1a4a052895c Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Mon, 22 Aug 2022 18:43:42 +0800 +Subject: [PATCH] add rexml dependency + +--- + src/api/Gemfile | 2 ++ + src/api/Gemfile.lock | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/src/api/Gemfile b/src/api/Gemfile +index b383074..560488c 100644 +--- a/src/api/Gemfile ++++ b/src/api/Gemfile +@@ -92,6 +92,8 @@ gem 'octokit' + gem 'gitlab' + # Build reusable, testable & encapsulated view components in Ruby on Rails + gem 'view_component' ++# Used in Package and XpathEngine ++gem 'rexml' + + group :development, :production do + # to have the delayed job daemon +diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock +index 585a553..89e1d45 100644 +--- a/src/api/Gemfile.lock ++++ b/src/api/Gemfile.lock +@@ -580,6 +580,7 @@ DEPENDENCIES + rantly + rdoc + redcarpet ++ rexml + rspec + rspec-rails + rspec_junit_formatter +-- +2.27.0 + diff --git a/0007-replace-URI.escape-with-Addressable-URI.escape.patch b/0007-replace-URI.escape-with-Addressable-URI.escape.patch new file mode 100644 index 0000000000000000000000000000000000000000..0f88d3ef0bf03cff0d3261c3a954ab8055833182 --- /dev/null +++ b/0007-replace-URI.escape-with-Addressable-URI.escape.patch @@ -0,0 +1,177 @@ +From fd265547021e54d74671f4bda7896feab860e692 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Sat, 20 Aug 2022 17:24:39 +0800 +Subject: [PATCH] replace URI.escape with Addressable::URI.escape + +--- + src/api/app/helpers/maintenance_helper.rb | 10 +++++----- + src/api/app/helpers/webui/webui_helper.rb | 2 +- + src/api/app/models/package.rb | 7 ++++--- + src/api/app/models/project.rb | 5 +++-- + src/api/spec/factories/packages.rb | 12 ++++++++---- + src/api/spec/models/package_spec.rb | 2 +- + 6 files changed, 22 insertions(+), 16 deletions(-) + +diff --git a/src/api/app/helpers/maintenance_helper.rb b/src/api/app/helpers/maintenance_helper.rb +index c6015cb..2cfa052 100644 +--- a/src/api/app/helpers/maintenance_helper.rb ++++ b/src/api/app/helpers/maintenance_helper.rb +@@ -97,7 +97,7 @@ module MaintenanceHelper + link.remove_attribute('project') # its a local link, project name not needed + link['package'] = link['package'].gsub(/\..*/, '') + target_package_name.gsub(/.*\./, '.') # adapt link target with suffix + link_xml = link.to_xml +- Backend::Connection.put "/source/#{URI.escape(target_project.name)}/#{URI.escape(target_package_name)}/_link?rev=repository&user=#{CGI.escape(User.session!.login)}", link_xml ++ Backend::Connection.put Addressable::URI.escape("/source/#{target_project.name}/#{target_package_name}/_link?rev=repository&user=#{User.session!.login}"), link_xml + + md5 = Digest::MD5.hexdigest(link_xml) + # commit with noservice parameter +@@ -108,7 +108,7 @@ module MaintenanceHelper + comment: "Set local link to #{target_package_name} via maintenance_release request" + } + upload_params[:requestid] = action.bs_request.number if action +- upload_path = "/source/#{URI.escape(target_project.name)}/#{URI.escape(target_package_name)}" ++ upload_path = Addressable::URI.escape("/source/#{target_project.name}/#{target_package_name}") + upload_path << Backend::Connection.build_query_from_hash(upload_params, [:user, :comment, :cmd, :noservice, :requestid]) + answer = Backend::Connection.post upload_path, " " + tpkg.sources_changed(dir_xml: answer) +@@ -131,7 +131,7 @@ module MaintenanceHelper + rev: 'repository', + comment: "Set link to #{target_package_name} via maintenance_release request" + } +- upload_path = "/source/#{URI.escape(target_project.name)}/#{URI.escape(base_package_name)}/_link" ++ upload_path = Addressable::URI.escape("/source/#{target_project.name}/#{base_package_name}/_link") + upload_path << Backend::Connection.build_query_from_hash(upload_params, [:user, :rev]) + link = "\n" + md5 = Digest::MD5.hexdigest(link) +@@ -140,7 +140,7 @@ module MaintenanceHelper + upload_params[:cmd] = 'commitfilelist' + upload_params[:noservice] = '1' + upload_params[:requestid] = request.number if request +- upload_path = "/source/#{URI.escape(target_project.name)}/#{URI.escape(base_package_name)}" ++ upload_path = Addressable::URI.escape("/source/#{target_project.name}/#{base_package_name}") + upload_path << Backend::Connection.build_query_from_hash(upload_params, [:user, :comment, :cmd, :noservice, :requestid]) + answer = Backend::Connection.post upload_path, " " + lpkg.sources_changed(dir_xml: answer) +@@ -232,7 +232,7 @@ module MaintenanceHelper + cp_params[:setupdateinfoid] = update_info_id if update_info_id + cp_params[:setrelease] = setrelease if setrelease + cp_params[:multibuild] = '1' unless source_package_name.include?(':') +- cp_path = "/build/#{CGI.escape(target_repository.project.name)}/#{URI.escape(target_repository.name)}/#{URI.escape(arch.name)}/#{URI.escape(target_package_name)}" ++ cp_path = Addressable::URI.escape("/build/#{target_repository.project.name}/#{target_repository.name}/#{arch.name}/#{target_package_name}") + + cp_path << Backend::Connection.build_query_from_hash(cp_params, [:cmd, :oproject, :opackage, + :orepository, :setupdateinfoid, +diff --git a/src/api/app/helpers/webui/webui_helper.rb b/src/api/app/helpers/webui/webui_helper.rb +index cf19252..564aea8 100644 +--- a/src/api/app/helpers/webui/webui_helper.rb ++++ b/src/api/app/helpers/webui/webui_helper.rb +@@ -13,7 +13,7 @@ module Webui::WebuiHelper + cc = ('&cc=' + email_list[1..-1].join('&cc=')) if email_list + end + +- URI.escape( ++ Addressable::URI.escape( + "#{@configuration['bugzilla_url']}/enter_bug.cgi?classification=7340&product=openSUSE.org" \ + "&component=3rd party software&assigned_to=#{assignee}#{cc}&short_desc=#{desc}" + ) +diff --git a/src/api/app/models/package.rb b/src/api/app/models/package.rb +index fed2aab..77d12ce 100644 +--- a/src/api/app/models/package.rb ++++ b/src/api/app/models/package.rb +@@ -426,8 +426,9 @@ class Package < ApplicationRecord + end + + def self.source_path(project, package, file = nil, opts = {}) +- path = "/source/#{URI.escape(project)}/#{URI.escape(package)}" +- path += "/#{URI.escape(file)}" if file.present? ++ path = "/source/#{project}/#{package}" ++ path = Addressable::URI.escape(path) ++ path += "/#{CGI.escape(file)}" if file.present? + path += '?' + opts.to_query if opts.present? + path + end +@@ -1322,7 +1323,7 @@ class Package < ApplicationRecord + permitted_params = params.permit(:repository, :arch, :package, :code, :wipe) + + # do not use project.name because we missuse the package source container for build container operations +- Backend::Connection.post("/build/#{URI.escape(build_project)}?cmd=#{command}&#{permitted_params.to_h.to_query}") ++ Backend::Connection.post(Addressable::URI.escape("/build/#{build_project}?cmd=#{command}&#{permitted_params.to_h.to_query}")) + rescue Backend::Error, Timeout::Error, Project::WritePermissionError => e + errors.add(:base, e.message) + return false +diff --git a/src/api/app/models/project.rb b/src/api/app/models/project.rb +index 3becf15..7f46fa5 100644 +--- a/src/api/app/models/project.rb ++++ b/src/api/app/models/project.rb +@@ -307,8 +307,9 @@ class Project < ApplicationRecord + end + + def source_path(project, file = nil, opts = {}) +- path = "/source/#{URI.escape(project)}" +- path += "/#{URI.escape(file)}" if file.present? ++ path = "/source/#{project}" ++ path = Addressable::URI.escape(path) ++ path += "/#{CGI.escape(file)}" if file.present? + path += '?' + opts.to_query if opts.present? + path + end +diff --git a/src/api/spec/factories/packages.rb b/src/api/spec/factories/packages.rb +index 6ab4c68..8868474 100644 +--- a/src/api/spec/factories/packages.rb ++++ b/src/api/spec/factories/packages.rb +@@ -108,7 +108,9 @@ FactoryBot.define do + after(:create) do |package| + # NOTE: Enable global write through when writing new VCR cassetes. + # ensure the backend knows the project +- Backend::Connection.put("/source/#{URI.escape(package.project.name)}/#{URI.escape(package.name)}/_service", '') if CONFIG['global_write_through'] ++ if CONFIG['global_write_through'] ++ Backend::Connection.put(Addressable::URI.escape("/source/#{package.project.name}/#{package.name}/_service"), '') ++ end + end + end + +@@ -116,7 +118,9 @@ FactoryBot.define do + after(:create) do |package| + # NOTE: Enable global write through when writing new VCR cassetes. + # ensure the backend knows the project +- Backend::Connection.put("/source/#{URI.escape(package.project.name)}/#{URI.escape(package.name)}/_service", 'broken') if CONFIG['global_write_through'] ++ if CONFIG['global_write_through'] ++ Backend::Connection.put(Addressable::URI.escape("/source/#{package.project.name}/#{package.name}/_service"), 'broken') ++ end + end + end + +@@ -131,7 +135,7 @@ FactoryBot.define do + # ensure the backend knows the project + if CONFIG['global_write_through'] + full_path = "/source/#{package.project.name}/#{package.name}/#{evaluator.changes_file_name}" +- Backend::Connection.put(URI.escape(full_path), evaluator.changes_file_content) ++ Backend::Connection.put(Addressable::URI.escape(full_path), evaluator.changes_file_content) + end + end + end +@@ -160,7 +164,7 @@ FactoryBot.define do + # ensure the backend knows the project + if CONFIG['global_write_through'] + full_path = "/source/#{package.project.name}/#{package.name}/#{evaluator.kiwi_file_name}" +- Backend::Connection.put(URI.escape(full_path), evaluator.kiwi_file_content) ++ Backend::Connection.put(Addressable::URI.escape(full_path), evaluator.kiwi_file_content) + end + end + end +diff --git a/src/api/spec/models/package_spec.rb b/src/api/spec/models/package_spec.rb +index b085f3f..e653594 100644 +--- a/src/api/spec/models/package_spec.rb ++++ b/src/api/spec/models/package_spec.rb +@@ -646,7 +646,7 @@ RSpec.describe Package, vcr: true do + before do + if CONFIG['global_write_through'] + full_path = "/source/#{package.project.name}/#{package.name}/lorem.changes" +- Backend::Connection.put(URI.escape(full_path), 'Lorem ipsum dolorem') ++ Backend::Connection.put(Addressable::URI.escape(full_path), 'Lorem ipsum dolorem') + end + end + +-- +2.27.0 + diff --git a/2.10.15.tar.gz b/2.10.15.tar.gz deleted file mode 100644 index 74eef39f9c72a815b0fb9e6919aac30f0ee3d813..0000000000000000000000000000000000000000 Binary files a/2.10.15.tar.gz and /dev/null differ diff --git a/Adapt-setup-appliance.sh-for-openeuler.patch b/Adapt-setup-appliance.sh-for-openeuler.patch new file mode 100644 index 0000000000000000000000000000000000000000..35517f255163b1a398eb91683ae84aa6dc7535ee --- /dev/null +++ b/Adapt-setup-appliance.sh-for-openeuler.patch @@ -0,0 +1,25 @@ +From 99baf838306e8dc445697931d0592a4d7961ed98 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Mon, 22 Aug 2022 18:35:02 +0800 +Subject: [PATCH] Adapt setup appliance.sh for openeuler + +--- + dist/functions.setup-appliance.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dist/functions.setup-appliance.sh b/dist/functions.setup-appliance.sh +index e2b985e..a02f897 100755 +--- a/dist/functions.setup-appliance.sh ++++ b/dist/functions.setup-appliance.sh +@@ -635,7 +635,7 @@ function prepare_os_settings { + OBS_SIGND=obssignd + SIGND_BIN="/usr/sbin/signd" + ;; +- fedora) ++ fedora|openEuler) + MYSQL_SERVICE=mariadb + HTTPD_SERVICE=httpd + HTTPD_USER=apache +-- +2.27.0 + diff --git a/Gemfile.lock.aarch64 b/Gemfile.lock.aarch64 deleted file mode 100644 index 8c07b1560a9133f946547601bbe79dd55778c9d8..0000000000000000000000000000000000000000 --- a/Gemfile.lock.aarch64 +++ /dev/null @@ -1,588 +0,0 @@ -GEM - remote: https://anonymous:devcloud@mirrors.huaweicloud.com/repository/rubygems/ - specs: - actioncable (5.2.7.1) - actionpack (= 5.2.7.1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - 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.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.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.1) - activesupport (= 5.2.7.1) - globalid (>= 0.3.6) - 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.1) - activemodel (= 5.2.7.1) - activesupport (= 5.2.7.1) - arel (>= 9.0) - activestorage (5.2.7.1) - actionpack (= 5.2.7.1) - activerecord (= 5.2.7.1) - marcel (~> 1.0.0) - activesupport (5.2.7.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - acts_as_list (1.0.4) - activerecord (>= 4.2) - acts_as_tree (2.9.1) - activerecord (>= 3.0.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - airbrake (13.0.0) - airbrake-ruby (~> 6.0) - airbrake-ruby (6.0.2) - rbtree3 (~> 0.5) - ajax-datatables-rails (1.3.1) - zeitwerk - amq-protocol (2.3.2) - ansi (1.5.0) - arel (9.0.0) - ast (2.4.2) - autoprefixer-rails (10.4.2.0) - execjs (~> 2) - bcrypt (3.1.17) - bootstrap (5.1.3) - autoprefixer-rails (>= 9.1.0) - popper_js (>= 2.9.3, < 3) - sassc-rails (>= 2.0.0) - builder (3.2.4) - bullet (7.0.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.11) - bunny (2.19.0) - amq-protocol (~> 2.3, >= 2.3.1) - sorted_set (~> 1, >= 1.0.2) - bunny-mock (1.7.0) - bunny (>= 1.7) - byebug (11.1.3) - capybara (3.36.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - capybara_minitest_spec (1.0.7) - capybara (>= 2) - minitest (>= 4) - childprocess (4.1.0) - chunky_png (1.4.0) - clockwork (3.0.0) - activesupport - tzinfo - cocoon (1.2.15) - codecov (0.6.0) - simplecov (>= 0.15, < 0.22) - codemirror-rails (5.16.0) - railties (>= 3.0, < 6.0) - coderay (1.1.3) - coffee-rails (5.0.0) - coffee-script (>= 2.2.0) - railties (>= 5.2.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - colorize (0.8.1) - concurrent-ruby (1.1.9) - concurrent-ruby-ext (1.1.9) - concurrent-ruby (= 1.1.9) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.5) - rexml - crass (1.0.6) - cssmin (1.0.3) - daemons (1.4.1) - dalli (3.2.1) - data_migrate (8.0.0) - activerecord (>= 5.0) - railties (>= 5.0) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) - database_cleaner-core (2.0.1) - deep_cloneable (2.4.0) - activerecord (>= 3.1.0, < 6) - delayed_job (4.1.10) - activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.7) - activerecord (>= 3.0, < 8.0) - delayed_job (>= 3.0, < 5) - diff-lcs (1.5.0) - docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - erubi (1.10.0) - erubis (2.7.0) - escape_utils (1.2.1) - execjs (2.8.1) - experimental-influxdb-rails (1.0.0.beta5) - influxdb (~> 0.6, >= 0.6.4) - railties (>= 4.2) - factory_bot (6.2.1) - activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) - railties (>= 5.0.0) - faker (2.20.0) - i18n (>= 1.8.11, < 2) - feature (1.4.0) - ffi (1.15.5) - flot-rails (0.0.7) - jquery-rails - font-awesome-sass (6.1.0) - sassc (>= 2.0) - globalid (1.0.0) - activesupport (>= 5.0) - gssapi (1.3.1) - ffi (>= 1.0.1) - haml (5.2.2) - temple (>= 0.8.0) - tilt - haml-rails (2.0.1) - actionpack (>= 5.1) - activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) - railties (>= 5.1) - haml_lint (0.40.0) - haml (>= 4.0, < 5.3) - parallel (~> 1.10) - rainbow - rubocop (>= 0.50.0) - sysexits (~> 1.1) - hashdiff (1.0.1) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) - http-accept (1.7.0) - http-cookie (1.0.4) - domain_name (~> 0.5) - i18n (1.10.0) - concurrent-ruby (~> 1.0) - influxdb (0.8.1) - innertube (1.1.0) - joiner (0.4.2) - activerecord (>= 5.2.beta1) - jquery-datatables (1.10.20) - jquery-rails (4.4.0) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) - railties (>= 3.2.16) - kaminari (1.2.2) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.2) - kaminari-activerecord (= 1.2.2) - kaminari-core (= 1.2.2) - kaminari-actionview (1.2.2) - actionview - kaminari-core (= 1.2.2) - kaminari-activerecord (1.2.2) - activerecord - kaminari-core (= 1.2.2) - kaminari-core (1.2.2) - launchy (2.5.0) - addressable (~> 2.7) - lograge (0.11.2) - actionpack (>= 4) - activesupport (>= 4) - railties (>= 4) - request_store (~> 1.0) - loofah (2.15.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.2) - matrix (0.4.2) - method_source (1.0.0) - middleware (0.1.0) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - mini_mime (1.1.2) - minitest (5.15.0) - minitest-ci (3.4.0) - minitest (>= 5.0.6) - minitest-fail-fast (0.1.0) - minitest (~> 5) - minitest-reporters (1.5.0) - ansi - builder - minitest (>= 5.0) - ruby-progressbar - mocha (1.13.0) - momentjs-rails (2.29.1.1) - railties (>= 3.1) - mousetrap-rails (1.4.6) - multi_json (1.15.0) - mysql2 (0.5.3) - netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.13.4-aarch64-linux) - racc (~> 1.4) - parallel (1.21.0) - parser (3.1.1.0) - ast (~> 2.4.1) - peek (1.1.0) - railties (>= 4.0.0) - peek-dalli (1.2.0) - concurrent-ruby - concurrent-ruby-ext - dalli - peek - peek-host (1.0.0) - peek - peek-mysql2 (1.2.0) - concurrent-ruby - concurrent-ruby-ext - mysql2 - peek - pkg-config (1.4.7) - popper_js (2.9.3) - power_assert (2.0.1) - pry (0.13.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) - public_suffix (4.0.6) - puma (4.3.11) - nio4r (~> 2.0) - pundit (2.2.0) - activesupport (>= 3.0.0) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - 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.1) - sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - rails-timeago (2.20.0) - actionpack (>= 5.2) - activesupport (>= 5.2) - rails_tokeninput (1.7.0) - railties (>= 3.1.0) - 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) - rainbow (3.1.1) - rake (13.0.6) - rantly (2.0.0) - rbtree (0.4.5) - rbtree3 (0.7.0) - rdoc (6.3.3) - redcarpet (3.5.1) - regexp_parser (2.2.1) - request_store (1.5.1) - rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - rexml (3.2.5) - riddle (2.4.3) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.1) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.0) - rspec_junit_formatter (0.5.1) - rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.26.0) - parallel (~> 1.10) - parser (>= 3.1.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) - parser (>= 3.1.1.0) - rubocop-performance (1.13.3) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.9.0) - rubocop (~> 1.19) - ruby-ldap (0.9.20) - ruby-progressbar (1.11.0) - ruby_parser (3.18.1) - sexp_processor (~> 4.16) - rubyzip (2.3.2) - sanitize (6.0.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - selenium-webdriver (4.1.0) - childprocess (>= 0.5, < 5.0) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) - set (1.0.2) - sexp_processor (4.16.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) - simplecov (0.21.2) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - single_test (0.6.0) - rake - sorted_set (1.0.3) - rbtree - set (~> 1.0) - sprite-factory (1.7.1) - sprockets (4.0.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - sync (0.5.0) - sysexits (1.2.0) - temple (0.8.2) - term-ansicolor (1.7.1) - tins (~> 1.0) - test-unit (3.5.3) - power_assert - thinking-sphinx (5.4.0) - activerecord (>= 4.2.0) - builder (>= 2.1.2) - innertube (>= 1.0.2) - joiner (>= 0.3.4) - middleware (>= 0.1.0) - riddle (~> 2.3) - thor (1.2.1) - thread_safe (0.3.6) - tilt (2.0.10) - timecop (0.9.5) - tins (1.31.0) - sync - tzinfo (1.2.9) - thread_safe (~> 0.1) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.1.0) - uniform_notifier (1.14.2) - vcr (6.1.0) - voight_kampff (1.1.4) - rack (>= 1.4, < 3.0) - webmock (3.14.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.7.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xmlhash (1.3.8) - pkg-config - xmlrpc (0.3.2) - webrick - xpath (3.2.0) - nokogiri (~> 1.8) - yajl-ruby (1.4.2) - zeitwerk (2.5.4) - -PLATFORMS - aarch64-linux - -DEPENDENCIES - activemodel-serializers-xml - acts_as_list - acts_as_tree - addressable - airbrake - airbrake-ruby - ajax-datatables-rails - bcrypt - bootstrap - builder - bullet - bunny - bunny-mock - capybara - capybara_minitest_spec - chunky_png - clockwork (>= 0.7) - cocoon - codecov - codemirror-rails - coffee-rails - colorize - coveralls - cssmin (>= 1.0.2) - daemons - dalli - data_migrate - database_cleaner (>= 1.0.1) - deep_cloneable (~> 2.4.0) - delayed_job_active_record (>= 4.0.0) - escape_utils - experimental-influxdb-rails (>= 1.0.0.beta5) - factory_bot_rails - faker - feature - flot-rails - font-awesome-sass - gssapi - haml - haml-rails - haml_lint - jquery-datatables - jquery-rails - jquery-ui-rails (~> 4.2.1) - kaminari - launchy - lograge - minitest - minitest-ci - minitest-fail-fast - minitest-reporters - mocha (> 0.13.0) - momentjs-rails - mousetrap-rails - mysql2 - nokogiri - peek - peek-dalli - peek-host - peek-mysql2 - pry (>= 0.9.12) - pry-byebug - puma (~> 4.0) - pundit - rails (~> 5.2) - rails-controller-testing - rails-timeago (~> 2.0) - rails_tokeninput (>= 1.6.1.rc1) - rantly - rdoc - redcarpet - responders (~> 3.0) - rspec - rspec-rails - rspec_junit_formatter - rubocop - rubocop-performance - rubocop-rails - rubocop-rspec - ruby-ldap - sanitize - sassc-rails - selenium-webdriver - shoulda-matchers (~> 4.0) - simplecov - single_test - sprite-factory (>= 1.5.2) - test-unit - thinking-sphinx (> 3.1) - tilt (>= 1.4.1) - timecop - uglifier (>= 1.2.2) - vcr - voight_kampff - webmock (>= 2.3.0) - xmlhash (>= 1.3.6) - xmlrpc - yajl-ruby - -BUNDLED WITH - 2.2.33 diff --git a/Gemfile.lock.x86 b/Gemfile.lock.x86 deleted file mode 100644 index d7491ce3c67371b6a5d5530641ee2dba14928ddb..0000000000000000000000000000000000000000 --- a/Gemfile.lock.x86 +++ /dev/null @@ -1,588 +0,0 @@ -GEM - remote: https://anonymous:devcloud@mirrors.huaweicloud.com/repository/rubygems/ - specs: - actioncable (5.2.7.1) - actionpack (= 5.2.7.1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - 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.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.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.1) - activesupport (= 5.2.7.1) - globalid (>= 0.3.6) - 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.1) - activemodel (= 5.2.7.1) - activesupport (= 5.2.7.1) - arel (>= 9.0) - activestorage (5.2.7.1) - actionpack (= 5.2.7.1) - activerecord (= 5.2.7.1) - marcel (~> 1.0.0) - activesupport (5.2.7.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - acts_as_list (1.0.4) - activerecord (>= 4.2) - acts_as_tree (2.9.1) - activerecord (>= 3.0.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - airbrake (13.0.0) - airbrake-ruby (~> 6.0) - airbrake-ruby (6.0.2) - rbtree3 (~> 0.5) - ajax-datatables-rails (1.3.1) - zeitwerk - amq-protocol (2.3.2) - ansi (1.5.0) - arel (9.0.0) - ast (2.4.2) - autoprefixer-rails (10.4.2.0) - execjs (~> 2) - bcrypt (3.1.17) - bootstrap (5.1.3) - autoprefixer-rails (>= 9.1.0) - popper_js (>= 2.9.3, < 3) - sassc-rails (>= 2.0.0) - builder (3.2.4) - bullet (7.0.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.11) - bunny (2.19.0) - amq-protocol (~> 2.3, >= 2.3.1) - sorted_set (~> 1, >= 1.0.2) - bunny-mock (1.7.0) - bunny (>= 1.7) - byebug (11.1.3) - capybara (3.36.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - capybara_minitest_spec (1.0.7) - capybara (>= 2) - minitest (>= 4) - childprocess (4.1.0) - chunky_png (1.4.0) - clockwork (3.0.0) - activesupport - tzinfo - cocoon (1.2.15) - codecov (0.6.0) - simplecov (>= 0.15, < 0.22) - codemirror-rails (5.16.0) - railties (>= 3.0, < 6.0) - coderay (1.1.3) - coffee-rails (5.0.0) - coffee-script (>= 2.2.0) - railties (>= 5.2.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - colorize (0.8.1) - concurrent-ruby (1.1.9) - concurrent-ruby-ext (1.1.9) - concurrent-ruby (= 1.1.9) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.5) - rexml - crass (1.0.6) - cssmin (1.0.3) - daemons (1.4.1) - dalli (3.2.1) - data_migrate (8.0.0) - activerecord (>= 5.0) - railties (>= 5.0) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) - database_cleaner-core (2.0.1) - deep_cloneable (2.4.0) - activerecord (>= 3.1.0, < 6) - delayed_job (4.1.10) - activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.7) - activerecord (>= 3.0, < 8.0) - delayed_job (>= 3.0, < 5) - diff-lcs (1.5.0) - docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - erubi (1.10.0) - erubis (2.7.0) - escape_utils (1.2.1) - execjs (2.8.1) - experimental-influxdb-rails (1.0.0.beta5) - influxdb (~> 0.6, >= 0.6.4) - railties (>= 4.2) - factory_bot (6.2.1) - activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) - railties (>= 5.0.0) - faker (2.20.0) - i18n (>= 1.8.11, < 2) - feature (1.4.0) - ffi (1.15.5) - flot-rails (0.0.7) - jquery-rails - font-awesome-sass (6.1.0) - sassc (>= 2.0) - globalid (1.0.0) - activesupport (>= 5.0) - gssapi (1.3.1) - ffi (>= 1.0.1) - haml (5.2.2) - temple (>= 0.8.0) - tilt - haml-rails (2.0.1) - actionpack (>= 5.1) - activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) - railties (>= 5.1) - haml_lint (0.40.0) - haml (>= 4.0, < 5.3) - parallel (~> 1.10) - rainbow - rubocop (>= 0.50.0) - sysexits (~> 1.1) - hashdiff (1.0.1) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) - http-accept (1.7.0) - http-cookie (1.0.4) - domain_name (~> 0.5) - i18n (1.10.0) - concurrent-ruby (~> 1.0) - influxdb (0.8.1) - innertube (1.1.0) - joiner (0.4.2) - activerecord (>= 5.2.beta1) - jquery-datatables (1.10.20) - jquery-rails (4.4.0) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) - railties (>= 3.2.16) - kaminari (1.2.2) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.2) - kaminari-activerecord (= 1.2.2) - kaminari-core (= 1.2.2) - kaminari-actionview (1.2.2) - actionview - kaminari-core (= 1.2.2) - kaminari-activerecord (1.2.2) - activerecord - kaminari-core (= 1.2.2) - kaminari-core (1.2.2) - launchy (2.5.0) - addressable (~> 2.7) - lograge (0.11.2) - actionpack (>= 4) - activesupport (>= 4) - railties (>= 4) - request_store (~> 1.0) - loofah (2.15.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.2) - matrix (0.4.2) - method_source (1.0.0) - middleware (0.1.0) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - mini_mime (1.1.2) - minitest (5.15.0) - minitest-ci (3.4.0) - minitest (>= 5.0.6) - minitest-fail-fast (0.1.0) - minitest (~> 5) - minitest-reporters (1.5.0) - ansi - builder - minitest (>= 5.0) - ruby-progressbar - mocha (1.13.0) - momentjs-rails (2.29.1.1) - railties (>= 3.1) - mousetrap-rails (1.4.6) - multi_json (1.15.0) - mysql2 (0.5.3) - netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.13.4-x86_64-linux) - racc (~> 1.4) - parallel (1.21.0) - parser (3.1.1.0) - ast (~> 2.4.1) - peek (1.1.0) - railties (>= 4.0.0) - peek-dalli (1.2.0) - concurrent-ruby - concurrent-ruby-ext - dalli - peek - peek-host (1.0.0) - peek - peek-mysql2 (1.2.0) - concurrent-ruby - concurrent-ruby-ext - mysql2 - peek - pkg-config (1.4.7) - popper_js (2.9.3) - power_assert (2.0.1) - pry (0.13.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) - public_suffix (4.0.6) - puma (4.3.11) - nio4r (~> 2.0) - pundit (2.2.0) - activesupport (>= 3.0.0) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - 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.1) - sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - rails-timeago (2.20.0) - actionpack (>= 5.2) - activesupport (>= 5.2) - rails_tokeninput (1.7.0) - railties (>= 3.1.0) - 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) - rainbow (3.1.1) - rake (13.0.6) - rantly (2.0.0) - rbtree (0.4.5) - rbtree3 (0.7.0) - rdoc (6.3.3) - redcarpet (3.5.1) - regexp_parser (2.2.1) - request_store (1.5.1) - rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - rexml (3.2.5) - riddle (2.4.3) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.1) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.0) - rspec_junit_formatter (0.5.1) - rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.26.0) - parallel (~> 1.10) - parser (>= 3.1.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) - parser (>= 3.1.1.0) - rubocop-performance (1.13.3) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.9.0) - rubocop (~> 1.19) - ruby-ldap (0.9.20) - ruby-progressbar (1.11.0) - ruby_parser (3.18.1) - sexp_processor (~> 4.16) - rubyzip (2.3.2) - sanitize (6.0.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - selenium-webdriver (4.1.0) - childprocess (>= 0.5, < 5.0) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) - set (1.0.2) - sexp_processor (4.16.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) - simplecov (0.21.2) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - single_test (0.6.0) - rake - sorted_set (1.0.3) - rbtree - set (~> 1.0) - sprite-factory (1.7.1) - sprockets (4.0.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - sync (0.5.0) - sysexits (1.2.0) - temple (0.8.2) - term-ansicolor (1.7.1) - tins (~> 1.0) - test-unit (3.5.3) - power_assert - thinking-sphinx (5.4.0) - activerecord (>= 4.2.0) - builder (>= 2.1.2) - innertube (>= 1.0.2) - joiner (>= 0.3.4) - middleware (>= 0.1.0) - riddle (~> 2.3) - thor (1.2.1) - thread_safe (0.3.6) - tilt (2.0.10) - timecop (0.9.5) - tins (1.31.0) - sync - tzinfo (1.2.9) - thread_safe (~> 0.1) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.1.0) - uniform_notifier (1.14.2) - vcr (6.1.0) - voight_kampff (1.1.4) - rack (>= 1.4, < 3.0) - webmock (3.14.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.7.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xmlhash (1.3.8) - pkg-config - xmlrpc (0.3.2) - webrick - xpath (3.2.0) - nokogiri (~> 1.8) - yajl-ruby (1.4.2) - zeitwerk (2.5.4) - -PLATFORMS - x86_64-linux - -DEPENDENCIES - activemodel-serializers-xml - acts_as_list - acts_as_tree - addressable - airbrake - airbrake-ruby - ajax-datatables-rails - bcrypt - bootstrap - builder - bullet - bunny - bunny-mock - capybara - capybara_minitest_spec - chunky_png - clockwork (>= 0.7) - cocoon - codecov - codemirror-rails - coffee-rails - colorize - coveralls - cssmin (>= 1.0.2) - daemons - dalli - data_migrate - database_cleaner (>= 1.0.1) - deep_cloneable (~> 2.4.0) - delayed_job_active_record (>= 4.0.0) - escape_utils - experimental-influxdb-rails (>= 1.0.0.beta5) - factory_bot_rails - faker - feature - flot-rails - font-awesome-sass - gssapi - haml - haml-rails - haml_lint - jquery-datatables - jquery-rails - jquery-ui-rails (~> 4.2.1) - kaminari - launchy - lograge - minitest - minitest-ci - minitest-fail-fast - minitest-reporters - mocha (> 0.13.0) - momentjs-rails - mousetrap-rails - mysql2 - nokogiri - peek - peek-dalli - peek-host - peek-mysql2 - pry (>= 0.9.12) - pry-byebug - puma (~> 4.0) - pundit - rails (~> 5.2) - rails-controller-testing - rails-timeago (~> 2.0) - rails_tokeninput (>= 1.6.1.rc1) - rantly - rdoc - redcarpet - responders (~> 3.0) - rspec - rspec-rails - rspec_junit_formatter - rubocop - rubocop-performance - rubocop-rails - rubocop-rspec - ruby-ldap - sanitize - sassc-rails - selenium-webdriver - shoulda-matchers (~> 4.0) - simplecov - single_test - sprite-factory (>= 1.5.2) - test-unit - thinking-sphinx (> 3.1) - tilt (>= 1.4.1) - timecop - uglifier (>= 1.2.2) - vcr - voight_kampff - webmock (>= 2.3.0) - xmlhash (>= 1.3.6) - xmlrpc - yajl-ruby - -BUNDLED WITH - 2.2.33 diff --git a/a39f185b53492d2207e9b2c0437fd7d407b864f3.zip b/a39f185b53492d2207e9b2c0437fd7d407b864f3.zip new file mode 100644 index 0000000000000000000000000000000000000000..0cad17a1a9e3fa17aacb28e74117fd749730416b Binary files /dev/null and b/a39f185b53492d2207e9b2c0437fd7d407b864f3.zip differ diff --git a/fix-obsapisetup-script-problems.patch b/fix-obsapisetup-script-problems.patch deleted file mode 100644 index 2accefaf08020bc2ffb1acc3b18a66432175bccc..0000000000000000000000000000000000000000 --- a/fix-obsapisetup-script-problems.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 804c99034ac187f00875a5324ee2a13251d3fc98 Mon Sep 17 00:00:00 2001 -From: lingsheng -Date: Thu, 23 Sep 2021 09:53:06 +0800 -Subject: [PATCH] fix obsapisetup script problems - ---- - dist/setup-appliance.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dist/setup-appliance.sh b/dist/setup-appliance.sh -index 37b1cf3..51e4ef6 100755 ---- a/dist/setup-appliance.sh -+++ b/dist/setup-appliance.sh -@@ -247,7 +247,7 @@ function prepare_database_setup { - echo " - changing ownership for new datadir" - chown mysql:mysql -R /srv/obs/MySQL - echo " - restarting mysql" -- systemctl restart mysql -+ systemctl restart mariadb - echo " - setting new password for user root in mysql" - mysqladmin -u root password "opensuse" - if [[ $? > 0 ]];then -@@ -376,7 +376,7 @@ function relink_server_cert { - ############################################################################### - function fix_permissions { - cd $apidir -- chown -R wwwrun.www $apidir/log -+ chown -R apache.apache $apidir/log - } - - ############################################################################### --- -2.23.0 - diff --git a/obs-server.spec b/obs-server.spec index a1318bd1d7a336d382e3ad0ea5d9b019f517411a..4f4f5d32f62f49cf981a5825b11ec2e2122a2ed2 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -2,24 +2,23 @@ %global apache_user apache %global apache_group apache %global obs_api_support_scripts obs-api-support.target obs-clockwork.service obs-delayedjob-queue-consistency_check.service obs-delayedjob-queue-default.service - +%global commit a39f185b53492d2207e9b2c0437fd7d407b864f3 Name: obs-server Version: 2.10.15 -Release: 4 +Release: 7 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/%{version}.tar.gz -Source1: Gemfile.lock.aarch64 -Source2: Gemfile.lock.x86 +Source0: https://github.com/openSUSE/open-build-service/archive/%{commit}.zip Patch1: 0001-obs_server-fix-usage-info.patch Patch2: fix-obs_productconvert-inputfile-path.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 -Patch7: fix-obsapisetup-script-problems.patch +Patch7: Adapt-setup-appliance.sh-for-openeuler.patch +Patch8: 0006-add-rexml-dependency.patch +Patch9: 0007-replace-URI.escape-with-Addressable-URI.escape.patch BuildArch: noarch @@ -27,7 +26,7 @@ BuildRequires: python3-devel, /usr/bin/xmllint, openssl, perl-BSSolv, perl-Comp BuildRequires: perl-File-Sync >= 0.10, perl-JSON-XS, perl-Net-SSLeay, perl-Socket-MsgHdr, nodejs BuildRequires: perl-TimeDate, perl-XML-Parser, perl-XML-Simple, perl-YAML-LibYAML, procps, tzdata BuildRequires: rubygem-bundler, rubygem-rake, obs-bundled-gems, rubygem-bigdecimal, perl(Test::Simple) > 1 -BuildRequires: rubygem-rdoc make +BuildRequires: rubygem-rdoc make hostname Requires(pre): obs-common Requires: build >= 20191114, perl-BSSolv, perl(Date::Parse), diffutils, git-core, patch @@ -35,6 +34,7 @@ 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: perl-XML-Structured perl-DBD-SQLite policycoreutils-python-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -67,33 +67,32 @@ This is a package providing basic configuration files. %package -n obs-api Summary: The Open Build Service -- The API and WEBUI Requires: httpd, apache2-mod_xforward, rubygem-passenger, mod_passenger >= 6.0.4 -Requires: ruby, nodejs, urw-base35-fonts-legacy, obs-api-deps = 2.10.1 -Requires: obs-bundled-gems = 2.10.1 +Requires: ruby, nodejs, urw-base35-fonts-legacy, obs-api-deps = %{version} +Requires: obs-bundled-gems = %{version} +AutoReq: no Conflicts: memcached < 1.4 %description -n obs-api This is the API server instance, and the web client for the OBS. %prep -%autosetup -n open-build-service-%version -p1 - +%autosetup -n open-build-service-%{commit} -p1 +sed -i 's/our $clouduploadserver/#our $clouduploadserver/g' src/backend/BSConfig.pm.template +rm -rf /src/api/vendor/cache/* rm -rf src/{api,backend}/docker-files rm -rf src/api/Dockerfile.frontend-base rm -rf src/backend/build #adpate to obs-bundled-gema-2.10.1 because of updating to obs-server-2.10.11 rm -rf src/api/config/brakeman.ignore -arch=`uname -m` -if [ $arch == 'aarch64' ];then -cp %{SOURCE1} src/api/Gemfile.lock -else -cp %{SOURCE2} src/api/Gemfile.lock -fi +sed -i 's/1.17.3/2.2.33/g' src/api/Gemfile.lock +sed -i '/sed/d' docs/api/api/Makefile find -name .keep -o -name .gitignore | xargs rm -rf -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 +for file in `grep -Fnr "/env ruby.ruby2.5" | awk -F':' '{print $1}'`;do sed -i 's:/env ruby.ruby2.5:/ruby:g' $file;done +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.5" | awk -F':' '{print $1}'`;do sed -i 's:/usr/bin/ruby.ruby2.5:/usr/bin/ruby: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.7:/usr/bin/bundle:g' $file;done @@ -105,27 +104,21 @@ bundle --local --path %_libdir/obs-api/ cd - make sed -i '/c.blacklist_keys = \[/d' src/api/config/initializers/airbrake.rb -sed -i '/config.db_adapter = :/d' src/api/config/initializers/ajax_datatables_rails.rb -sed -i '/AjaxDatatablesRails.configure/d' src/api/config/initializers/ajax_datatables_rails.rb -sed -i '/end/d' src/api/config/initializers/ajax_datatables_rails.rb -rm -rf src/api/app/assets/stylesheets/webui2/webui2.css.scss -sed -i 's/js_compressor = :uglifier/js_compressor = Uglifier.new(harmony: true)/g' src/api/config/environments/production.rb +sed -i 's/rails/\/usr\/lib64\/obs-api\/ruby\/3.0.0\/bin\/rails/g' dist/systemd/obs-sphinx.service %install export DESTDIR=$RPM_BUILD_ROOT -perl -p -i -e 's/^APACHE_VHOST_CONF=.*/APACHE_VHOST_CONF=obs-apache2.conf/' Makefile.include perl -p -i -e 's/^APACHE_USER=.*/APACHE_USER=apache/' Makefile.include perl -p -i -e 's/^APACHE_GROUP=.*/APACHE_GROUP=apache/' Makefile.include +perl -p -i -e 's/^APACHE_CONFDIR=.*/APACHE_CONFDIR=\/etc\/httpd/' Makefile.include +perl -p -i -e 's/^APACHE_CONFDIR_VHOST=.*/APACHE_CONFDIR_VHOST=\$\(APACHE_CONFDIR\)\/conf.d/' Makefile.include +perl -p -i -e 's/^APACHE_LOGDIR=.*/APACHE_LOGDIR=\/var\/log\/httpd/' Makefile.include +perl -p -i -e 's/^OBS_BUNDLE_BIN=.*/OBS_BUNDLE_BIN=\/usr\/bin\/bundle/' Makefile.include +perl -p -i -e 's/^OBS_RAKE_BIN=.*/OBS_RAKE_BIN=\/usr\/bin\/rake/' Makefile.include +perl -p -i -e 's/^OBS_RUBY_VERSION=.*/OBS_RUBY_VERSION=3.0.0/' Makefile.include +sed -i '2401s/$jobstatus/#$jobstatus/' src/backend/bs_repserver +sed -i 's/createkey({ %$cgi/#createkey({ %$cgi/g' src/backend/bs_srcserver -mkdir -p src/api/app/assets/config -pushd src/api/app/assets/config -cat << EOF > manifest.js -//= link_tree ../images -//= link_directory ../ -//= link_directory ../ -EOF -#javascripts.js stylesheets.css -popd export OBS_VERSION="%{version}" DESTDIR=$RPM_BUILD_ROOT make install FILLUPDIR=/var/adm/fillup-templates if [ -f %{_sourcedir}/open-build-service.obsinfo ]; then @@ -145,7 +138,7 @@ if ! test -L $RPM_BUILD_ROOT/usr/lib/obs/server/build; then exit 1 fi -cd $RPM_BUILD_ROOT/srv/www/obs/api/public/assets/webui2/ +cd $RPM_BUILD_ROOT/srv/www/obs/api/public/assets/webui/ ln -sf application-*.js application.js ln -sf webui2-*.css webui2.css cd - @@ -178,6 +171,7 @@ make -C src/api test make -C dist test %endif + %pre getent passwd obsservicerun >/dev/null || \ /usr/sbin/useradd -r -g obsrun -d /usr/lib/obs -s /sbin/nologin \ @@ -220,6 +214,8 @@ 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 @@ -243,6 +239,13 @@ exit 0 %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/ +cd /usr/lib64/obs-api/ruby/3.0.0/bin +ls | awk '{print $1}' | for line in `xargs`;do chmod 755 $line;done +cd - + %posttrans [ -d /srv/obs ] || install -d -o obsrun -g obsrun /srv/obs @@ -347,6 +350,9 @@ fi /usr/lib/obs/server/* %exclude /usr/lib/obs/server/setup-appliance.sh %exclude /usr/lib/obs/server/build +%exclude /srv/www/obs/api/Gemfile.next +%exclude /srv/www/obs/api/Gemfile.next.lock +%exclude /srv/www/obs/api/vendor/cache/* /usr/lib/obs/server/BSConfig.pm /usr/lib/obs/tests/* %config(noreplace) /etc/logrotate.d/obs-server @@ -366,26 +372,13 @@ fi %{_unitdir}/obsnotifyforward.service %{_unitdir}/obsredis.service %{_unitdir}/obsworker.service +%{_unitdir}/obs-delayedjob-queue-scm.service +%{_unitdir}/obssourcepublish.service %{_sbindir}/obs_admin %{_sbindir}/obs_serverstatus %{_sbindir}/obsscheduler %{_sbindir}/obsworker %{_sbindir}/obs_project_update -%{_sbindir}/rcobsdispatcher -%{_sbindir}/rcobspublisher -%{_sbindir}/rcobsrepserver -%{_sbindir}/rcobssrcserver -%{_sbindir}/rcobswarden -%{_sbindir}/rcobsdodup -%{_sbindir}/rcobsgetbinariesproxy -%{_sbindir}/rcobsdeltastore -%{_sbindir}/rcobsservicedispatch -%{_sbindir}/rcobssigner -%{_sbindir}/rcobsnotifyforward -%{_sbindir}/rcobsredis -%{_sbindir}/rcobsworker -%{_sbindir}/rcobsscheduler -%{_sbindir}/rcobsservice %{_bindir}/obs_productconvert %config(noreplace) /usr/lib/obs/server/BSConfig.pm %config(noreplace) /etc/slp.reg.d/* @@ -428,15 +421,16 @@ usermod -a -G docker obsservicerun %config(noreplace) /srv/www/obs/api/config/crawler-user-agents.json /srv/www/obs/api/config/initializers %dir /srv/www/obs/api/config/environments -%dir /srv/www/obs/api/files %dir /srv/www/obs/api/db -/srv/www/obs/api/db/checker.rb /srv/www/obs/api/Gemfile %verify(not mtime) /srv/www/obs/api/last_deploy /srv/www/obs/api/Gemfile.lock /srv/www/obs/api/config.ru /srv/www/obs/api/config/application.rb /srv/www/obs/api/config/clock.rb +/srv/www/obs/api/config/routes/api_routes.rb +/srv/www/obs/api/config/routes/webui_routes.rb +/srv/www/obs/api/db/schema.rb %config(noreplace) /etc/logrotate.d/obs-api %{_unitdir}/obsapisetup.service %{_unitdir}/obs-api-support.target @@ -450,25 +444,12 @@ usermod -a -G docker obsservicerun %{_unitdir}/obs-delayedjob-queue-releasetracking.service %{_unitdir}/obs-delayedjob-queue-staging.service %{_unitdir}/obs-sphinx.service -%{_sbindir}/rcobs-api-support -%{_sbindir}/rcobs-clockwork -%{_sbindir}/rcobs-delayedjob-queue-consistency_check -%{_sbindir}/rcobs-delayedjob-queue-default -%{_sbindir}/rcobs-delayedjob-queue-issuetracking -%{_sbindir}/rcobs-delayedjob-queue-mailers -%{_sbindir}/rcobs-delayedjob-queue-project_log_rotate -%{_sbindir}/rcobs-delayedjob-queue-releasetracking -%{_sbindir}/rcobs-delayedjob-queue-staging -%{_sbindir}/rcobs-sphinx -%{_sbindir}/rcobsapisetup /srv/www/obs/api/app -%attr(-,apache,apache) /srv/www/obs/api/db/structure.sql %attr(-,apache,apache) /srv/www/obs/api/db/data_schema.rb /srv/www/obs/api/db/attribute_descriptions.rb /srv/www/obs/api/db/data /srv/www/obs/api/db/migrate /srv/www/obs/api/db/seeds.rb -/srv/www/obs/api/files/wizardtemplate.spec /srv/www/obs/api/lib /srv/www/obs/api/public /srv/www/obs/api/Rakefile @@ -496,9 +477,9 @@ usermod -a -G docker obsservicerun %config /srv/www/obs/api/config/environments/stage.rb %dir %attr(-,apache,apache) /srv/www/obs/api/log %attr(-,apache,apache) /srv/www/obs/api/tmp -%dir /etc/apache2 -%dir /etc/apache2/vhosts.d -%config(noreplace) /etc/apache2/vhosts.d/obs.conf +%dir /etc/httpd +%dir /etc/httpd/conf.d +%config(noreplace) /etc/httpd/conf.d/obs.conf %defattr(0644,wwwrun,www) %ghost /srv/www/obs/api/log/access.log %ghost /srv/www/obs/api/log/backend_access.log @@ -510,13 +491,20 @@ usermod -a -G docker obsservicerun %files -n obs-common %defattr(-,root,root) -/var/adm/fillup-templates/sysconfig.obs-server /usr/lib/obs/server/setup-appliance.sh %{_unitdir}/obsstoragesetup.service %{_sbindir}/obsstoragesetup -%{_sbindir}/rcobsstoragesetup %changelog +* Wed Jun 28 2023 Ge Wang - 2.10.15-7 +- fix obs-clockwork service start failure + +* Thu Jun 15 2023 Ge Wang - 2.10.15-6 +- Replace src package with commit a39f185b53492d2207e9b2c0437fd7d407b864f3 + +* Fri Jun 02 2023 Ge Wang - 2.10.15-5 +- Add post script to adatp selinux policy + * Mon Feb 13 2023 wangkai 2.10.15-4 - Modify the rdoc version to 6.3.3