diff --git a/0002-CVE-2020-8020.patch b/0002-CVE-2020-8020.patch deleted file mode 100644 index 60aed7c1f5ba308d9ecf16d4d25417dbf39f81b0..0000000000000000000000000000000000000000 --- a/0002-CVE-2020-8020.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4d3a644b8a68e625d34a0a1490b539d3bb648001 Mon Sep 17 00:00:00 2001 -From: Victor Pereira -Date: Wed, 13 May 2020 08:02:52 +0200 -Subject: [PATCH] Use Redcarpet Safe render to base OBS markdown render - -Conflict:delete src/api/spec/helpers/webui/markdown_helper_spec.rb change -Reference:https://github.com/openSUSE/open-build-service/commit/7cc32c8e2ff7290698e101d9a80a9dc29a5500fb - -Signed-off-by: Victor Pereira ---- - src/api/lib/obsapi/markdown_renderer.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/api/lib/obsapi/markdown_renderer.rb b/src/api/lib/obsapi/markdown_renderer.rb -index bc75e7b..cff936f 100644 ---- a/src/api/lib/obsapi/markdown_renderer.rb -+++ b/src/api/lib/obsapi/markdown_renderer.rb -@@ -1,7 +1,7 @@ - require 'uri' - - module OBSApi -- class MarkdownRenderer < Redcarpet::Render::HTML -+ class MarkdownRenderer < Redcarpet::Render::Safe - include Rails.application.routes.url_helpers - - def self.default_url_options --- -2.23.0 \ No newline at end of file diff --git a/0003-CVE-2020-8021.patch b/0003-CVE-2020-8021.patch deleted file mode 100644 index 3a023095cc4de291c6a4634bc7f45546a517b49c..0000000000000000000000000000000000000000 --- a/0003-CVE-2020-8021.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7323c904f86ba9e04065c23422d06c03647589fb Mon Sep 17 00:00:00 2001 -From: Marcus Huewe -Date: Wed, 13 May 2020 22:08:16 +0200 -Subject: [PATCH] bs_srcserver: Forbid the creation of a _link in - mergeservicerun - -A _link file is not allowed because it can result in a potential -privilege escalation. - -Conflict:NA -Reference:https://github.com/openSUSE/open-build-service/commit/7323c904f86ba9e04065c23422d06c03647589fb - -Signed-off-by:Marcus Huewe ---- - src/backend/bs_srcserver | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver -index da3f3c3..07e411e 100755 ---- a/src/backend/bs_srcserver -+++ b/src/backend/bs_srcserver -@@ -391,6 +391,7 @@ sub mergeservicerun { - delete $files->{'_service'}; - for (sort keys %$files) { - next unless /^_service:.*:(.*?)$/s; -+ die("cannot create a link from a service") if $1 eq '_link'; - $files->{$1} = $files->{$_}; - delete $files->{$_}; - BSSrcrep::copyonefile($projid, $packid, $1, $projid, $packid, $_, $files->{$1}); --- -2.23.0 \ No newline at end of file diff --git a/open-build-service-2.10.1.tar.xz b/2.10.11.tar.gz similarity index 50% rename from open-build-service-2.10.1.tar.xz rename to 2.10.11.tar.gz index e49d0da1a56106bb8ea0fdc2f827e8f5c1322a8d..a34326779e5f4419b5c6a5c36776aa8a1baaf078 100644 Binary files a/open-build-service-2.10.1.tar.xz and b/2.10.11.tar.gz differ diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..427b747bd2aa7c639f507a162042204a70778978 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,582 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + acts_as_list (0.9.19) + activerecord (>= 3.0) + acts_as_tree (2.9.0) + activerecord (>= 3.0.0) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + airbrake (8.0.1) + airbrake-ruby (~> 3.0) + airbrake-ruby (3.1.0) + tdigest (= 0.1.1) + ajax-datatables-rails (1.0.0) + railties (>= 4.2) + amq-protocol (2.3.0) + ansi (1.5.0) + arel (9.0.0) + ast (2.4.0) + autoprefixer-rails (9.6.0) + execjs + bcrypt (3.1.13) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) + builder (3.2.3) + bullet (6.0.1) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.11) + bunny (2.14.2) + amq-protocol (~> 2.3, >= 2.3.0) + bunny-mock (1.7.0) + bunny (>= 1.7) + byebug (11.0.1) + capybara (3.24.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + capybara_minitest_spec (1.0.7) + capybara (>= 2) + minitest (>= 4) + childprocess (3.0.0) + chunky_png (1.3.11) + clockwork (2.0.3) + tzinfo + cocoon (1.2.14) + codecov (0.1.14) + json + simplecov + url + codemirror-rails (5.16.0) + railties (>= 3.0, < 6.0) + coderay (1.1.2) + 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.5) + concurrent-ruby-ext (1.1.5) + concurrent-ruby (= 1.1.5) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) + crack (0.4.3) + safe_yaml (~> 1.0.0) + crass (1.0.5) + cssmin (1.0.3) + daemons (1.3.1) + dalli (2.7.10) + data_migrate (5.3.2) + rails (>= 4.2) + database_cleaner (1.7.0) + deep_cloneable (2.4.0) + activerecord (>= 3.1.0, < 6) + delayed_job (4.1.7) + activesupport (>= 3.0, < 5.3) + delayed_job_active_record (4.1.3) + activerecord (>= 3.0, < 5.3) + delayed_job (>= 3.0, < 5) + diff-lcs (1.3) + docile (1.3.2) + equatable (0.6.1) + erubi (1.8.0) + erubis (2.7.0) + escape_utils (1.2.1) + execjs (2.7.0) + experimental-influxdb-rails (1.0.0.beta5) + influxdb (~> 0.6, >= 0.6.4) + railties (>= 4.2) + factory_bot (5.0.2) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.2) + factory_bot (~> 5.0.2) + railties (>= 4.2.0) + faker (1.9.4) + i18n (>= 0.7) + pastel (~> 0.7.2) + thor (~> 0.20.0) + tty-pager (~> 0.12.0) + tty-screen (~> 0.6.5) + tty-tree (~> 0.3.0) + feature (1.4.0) + ffi (1.11.1) + flot-rails (0.0.7) + jquery-rails + font-awesome-sass (5.8.1) + sassc (>= 1.11) + globalid (0.4.2) + activesupport (>= 4.2.0) + gssapi (1.3.0) + ffi (>= 1.0.1) + haml (5.1.1) + 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.32.0) + haml (>= 4.0, < 5.2) + rainbow + rake (>= 10, < 13) + rubocop (>= 0.50.0) + sysexits (~> 1.1) + hashdiff (0.4.0) + html2haml (2.2.0) + erubis (~> 2.7.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + influxdb (0.7.0) + innertube (1.1.0) + jaro_winkler (1.5.3) + joiner (0.4.2) + activerecord (>= 5.2.beta1) + jquery-datatables (1.10.19.1) + jquery-rails (4.3.5) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-ui-rails (4.2.1) + railties (>= 3.2.16) + json (2.2.0) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) + launchy (2.4.3) + addressable (~> 2.3) + lograge (0.11.2) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) + loofah (2.3.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + metaclass (0.0.4) + method_source (0.9.2) + middleware (0.1.0) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-ci (3.4.0) + minitest (>= 5.0.6) + minitest-fail-fast (0.1.0) + minitest (~> 5) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + mocha (1.9.0) + metaclass (~> 0.0.1) + momentjs-rails (2.20.1) + railties (>= 3.1) + mousetrap-rails (1.4.6) + mysql2 (0.5.2) + nio4r (2.5.2) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.1) + nokogiri (~> 1.8, >= 1.8.4) + parallel (1.17.0) + parser (2.6.3.0) + ast (~> 2.4.0) + pastel (0.7.3) + equatable (~> 0.6) + tty-color (~> 0.5) + peek (1.0.1) + concurrent-ruby (>= 0.9.0) + concurrent-ruby-ext (>= 0.9.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.3.7) + popper_js (1.14.5) + power_assert (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + public_suffix (3.1.0) + puma (4.3.1) + nio4r (~> 2.0) + pundit (2.0.1) + activesupport (>= 3.0.0) + rack (2.0.8) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + rails-timeago (2.17.1) + actionpack (>= 3.1) + activesupport (>= 3.1) + rails_tokeninput (1.7.0) + railties (>= 3.1.0) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rainbow (3.0.0) + rake (12.3.3) + rantly (2.0.0) + rbtree (0.4.2) + rdoc (6.1.1) + redcarpet (3.4.0) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) + riddle (2.3.2) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.2) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.2) + rspec_junit_formatter (0.4.1) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (0.72.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.6) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-performance (1.4.0) + rubocop (>= 0.71.0) + rubocop-rails (2.1.0) + rack (>= 1.1) + rubocop (>= 0.72.0) + rubocop-rspec (1.33.0) + rubocop (>= 0.60.0) + ruby-ldap (0.9.20) + ruby-progressbar (1.10.1) + ruby_parser (3.13.1) + sexp_processor (~> 4.9) + rubyzip (2.0.0) + safe_yaml (1.0.5) + sanitize (5.0.0) + crass (~> 1.0.2) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) + sassc (2.0.1) + ffi (~> 1.9) + rake + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) + sexp_processor (4.12.1) + shoulda-matchers (4.1.0) + activesupport (>= 4.2.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + single_test (0.6.0) + rake + sprite-factory (1.7.1) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + strings (0.1.5) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.1.0) + sysexits (1.2.0) + tdigest (0.1.1) + rbtree (~> 0.4.2) + temple (0.8.1) + term-ansicolor (1.7.1) + tins (~> 1.0) + test-unit (3.3.3) + power_assert + thinking-sphinx (4.3.0) + activerecord (>= 3.1.0) + builder (>= 2.1.2) + innertube (>= 1.0.2) + joiner (>= 0.2.0) + middleware (>= 0.1.0) + riddle (~> 2.3) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.9) + timecop (0.9.1) + tins (1.20.3) + tty-color (0.5.0) + tty-pager (0.12.1) + strings (~> 0.1.4) + tty-screen (~> 0.6) + tty-which (~> 0.4) + tty-screen (0.6.5) + tty-tree (0.3.0) + tty-which (0.4.1) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) + unicode-display_width (1.6.0) + unicode_utils (1.4.0) + uniform_notifier (1.12.1) + url (0.3.2) + vcr (5.0.0) + voight_kampff (1.1.3) + rack (>= 1.4, < 3.0) + webmock (3.6.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + xmlhash (1.3.7) + pkg-config + xmlrpc (0.3.0) + xpath (3.2.0) + nokogiri (~> 1.8) + yajl-ruby (1.4.1) + +PLATFORMS + ruby + +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.19 diff --git a/obs-server.spec b/obs-server.spec index 2a9fe4e55e34658681d5be2fd332de405926503c..0d8ae151e1886ef819c8c6d60b177d908413e291 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -4,24 +4,22 @@ %global obs_api_support_scripts obs-api-support.target obs-clockwork.service obs-delayedjob-queue-consistency_check.service obs-delayedjob-queue-default.service Name: obs-server -Version: 2.10.1 -Release: lp151.23.14 +Version: 2.10.11 +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: open-build-service-%version.tar.xz +Source0: https://github.com/openSUSE/open-build-service/archive/2.10.11.tar.gz +Source1: Gemfile.lock Patch1: 0001-obs_server-fix-usage-info.patch -Patch2: 0002-CVE-2020-8020.patch -Patch3: 0003-CVE-2020-8021.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-obs_productconvert-inputfile-path.patch Patch8: fix-obs-server-compilation-failed.patch Patch9: Adapt-setup-appliance.sh-for-openeuler.patch -Patch10: ping-when-exiting-restarting-the-redis-services.patch BuildArch: noarch @@ -81,6 +79,9 @@ This is the API server instance, and the web client for the OBS. 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 +cp %{SOURCE1} src/api/ 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 @@ -493,6 +494,10 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Fri Mar 11 2022 houyingchao - 2.10.11-1 +- Fix CVE-2020-8031 +- Upgrade to 2.10.11 + * Mon Dec 06 2021 lingsheng - 2.10.1-lp151.23.14 - fix obsnotifyforward service stop failure diff --git a/ping-when-exiting-restarting-the-redis-services.patch b/ping-when-exiting-restarting-the-redis-services.patch deleted file mode 100644 index d28abdef7a96c41bfb4e1e8c35d061e4c22867f6..0000000000000000000000000000000000000000 --- a/ping-when-exiting-restarting-the-redis-services.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 31f9623ef70473539c9598ff4d2aca1fa0a0408f Mon Sep 17 00:00:00 2001 -From: Michael Schroeder -Date: Mon, 27 Apr 2020 17:36:07 +0200 -Subject: [PATCH] [backend] ping when exiting/restarting the redis services - ---- - src/backend/bs_notifyforward | 2 +- - src/backend/bs_redis | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/backend/bs_notifyforward b/src/backend/bs_notifyforward -index 75e42a5c138..bb155777b03 100755 ---- a/src/backend/bs_notifyforward -+++ b/src/backend/bs_notifyforward -@@ -248,7 +248,7 @@ BSUtil::drop_privs_to($BSConfig::bsuser, $BSConfig::bsgroup); - - $| = 1; - $SIG{'PIPE'} = 'IGNORE'; --BSUtil::restartexit($options, 'notifyforward', "$rundir/bs_notifyforward"); -+BSUtil::restartexit($options, 'notifyforward', "$rundir/bs_notifyforward", "$myeventdir/.ping"); - BSUtil::printlog("starting build service notifyforward"); - - mkdir_p($rundir); -diff --git a/src/backend/bs_redis b/src/backend/bs_redis -index cbbd05880ce..acb8eed2835 100755 ---- a/src/backend/bs_redis -+++ b/src/backend/bs_redis -@@ -224,7 +224,7 @@ BSUtil::drop_privs_to($BSConfig::bsuser, $BSConfig::bsgroup); - - $| = 1; - $SIG{'PIPE'} = 'IGNORE'; --BSUtil::restartexit($options, 'redis', "$rundir/bs_redis"); -+BSUtil::restartexit($options, 'redis', "$rundir/bs_redis", "$myeventdir/.ping"); - BSUtil::printlog("starting build service redis forwarder"); - - mkdir_p($rundir);