Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP5:GA
rabbitmq-server.26990
fix-CVE-2022-31008-2.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-CVE-2022-31008-2.patch of Package rabbitmq-server.26990
From fd66d0c0e9c41145f0406c5dd7346ba46277b3ae Mon Sep 17 00:00:00 2001 From: Michael Klishin <michael@clojurewerkz.org> Date: Thu, 19 May 2022 15:51:51 +0400 Subject: [PATCH] Resolve conflicts (cherry picked from commit eaa0d85e956e3c6e19527d06c7ccb9eea06f7d77) # Conflicts: # deps/rabbit/Makefile # deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl --- deps/rabbit/Makefile | 7 ++++--- .../apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl | 3 +++ 3 files changed, 11 insertions(+), 6 deletions(-) Index: rabbitmq-server-3.8.11/deps/rabbit/Makefile =================================================================== --- rabbitmq-server-3.8.11.orig/deps/rabbit/Makefile +++ rabbitmq-server-3.8.11/deps/rabbit/Makefile @@ -122,15 +122,16 @@ define PROJECT_ENV {track_auth_attempt_source, false} ======= {stream_messages_soft_limit, 256}, -<<<<<<< HEAD - {track_auth_attempt_source, false} -======= {track_auth_attempt_source, false}, +<<<<<<< HEAD {credentials_obfuscation_fallback_secret, <<"nocookie">>}, {dead_letter_worker_consumer_prefetch, 32}, {dead_letter_worker_publisher_confirm_timeout, 180000} >>>>>>> 8b67133dd2 (implement fallback secret for credentials obfuscation) >>>>>>> fe1e1668a2 (implement fallback secret for credentials obfuscation) +======= + {credentials_obfuscation_fallback_secret, <<"nocookie">>} +>>>>>>> eaa0d85e95 (Resolve conflicts) ] endef Index: rabbitmq-server-3.8.11/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl =================================================================== --- rabbitmq-server-3.8.11.orig/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl +++ rabbitmq-server-3.8.11/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl @@ -386,6 +386,7 @@ apply_app_env_vars(_, []) -> ok. <<<<<<< HEAD +<<<<<<< HEAD set_credentials_obfuscation_secret() -> rabbit_log_prelaunch:debug( "Refreshing credentials obfuscation configuration from env: ~p", @@ -422,6 +423,8 @@ redact_env_var([AppVar | Rest], Acc) -> redact_env_var(Rest, [AppVar | Acc]). >>>>>>> 8b67133dd2 (implement fallback secret for credentials obfuscation) +======= +>>>>>>> eaa0d85e95 (Resolve conflicts) %% ------------------------------------------------------------------- %% Config decryption. %% -------------------------------------------------------------------
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor