From 87f9c9f0b8b32510df0858210d727726a41090c032746d237027cc2a1ca6a9d7 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Thu, 26 Apr 2018 06:59:57 +0000 Subject: [PATCH 1/2] Accepting request 601101 from home:BinLiu:branches:network:ha-clustering:Factory - NSS_NoDB_Init: the parameter is reserved, must be NULL(bsc#1090996) Added: 0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch OBS-URL: https://build.opensuse.org/request/show/601101 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=145 --- ...e-parameter-is-reserved-must-be-NULL.patch | 53 +++++++++++++++++++ corosync.changes | 6 +++ 2 files changed, 59 insertions(+) create mode 100644 0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch diff --git a/0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch b/0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch new file mode 100644 index 0000000..5d0c42a --- /dev/null +++ b/0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch @@ -0,0 +1,53 @@ +From 4f6a22ae78055da7b89e237ea6bf6449610a1b90 Mon Sep 17 00:00:00 2001 +From: Bin Liu +Date: Thu, 26 Apr 2018 14:30:31 +0800 +Subject: [PATCH] NSS_NoDB_Init: the parameter is reserved, must be NULL + +--- + cts/agents/cpg_test_agent.c | 2 +- + exec/totemcrypto.c | 2 +- + test/cpgverify.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cts/agents/cpg_test_agent.c b/cts/agents/cpg_test_agent.c +index 0837c69c..9ac9b4c2 100644 +--- a/cts/agents/cpg_test_agent.c ++++ b/cts/agents/cpg_test_agent.c +@@ -788,7 +788,7 @@ main(int argc, char *argv[]) + list_init (&msg_log_head); + list_init (&config_chg_log_head); + +- if (NSS_NoDB_Init(".") != SECSuccess) { ++ if (NSS_NoDB_Init(NULL) != SECSuccess) { + qb_log(LOG_ERR, "Couldn't initialize nss"); + exit (0); + } +diff --git a/exec/totemcrypto.c b/exec/totemcrypto.c +index 64246c98..b35683f9 100644 +--- a/exec/totemcrypto.c ++++ b/exec/totemcrypto.c +@@ -670,7 +670,7 @@ static int init_nss_db(struct crypto_instance *instance) + return 0; + } + +- if (NSS_NoDB_Init(".") != SECSuccess) { ++ if (NSS_NoDB_Init(NULL) != SECSuccess) { + log_printf(instance->log_level_security, "NSS DB initialization failed (err %d)", + PR_GetError()); + return -1; +diff --git a/test/cpgverify.c b/test/cpgverify.c +index 928eff33..0462a34d 100644 +--- a/test/cpgverify.c ++++ b/test/cpgverify.c +@@ -137,7 +137,7 @@ int main (int argc, char *argv[]) + exit (0); + } + +- if (NSS_NoDB_Init(".") != SECSuccess) { ++ if (NSS_NoDB_Init(NULL) != SECSuccess) { + printf ("Couldn't initialize nss\n"); + exit (0); + } +-- +2.13.6 + diff --git a/corosync.changes b/corosync.changes index f137c13..db56d19 100644 --- a/corosync.changes +++ b/corosync.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 26 06:43:54 UTC 2018 - bliu@suse.com + +- NSS_NoDB_Init: the parameter is reserved, must be NULL(bsc#1090996) + Added: 0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch + ------------------------------------------------------------------- Tue Apr 17 10:19:52 UTC 2018 - bliu@suse.com From b98c1fc972804b87ed1e3c3456d68c70d4c495b587ee5e84557ff28493fbcacb Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Thu, 26 Apr 2018 07:25:08 +0000 Subject: [PATCH 2/2] Accepting request 601109 from home:BinLiu:branches:network:ha-clustering:Factory OBS-URL: https://build.opensuse.org/request/show/601109 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=146 --- corosync.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/corosync.spec b/corosync.spec index d72b596..d61cff3 100644 --- a/corosync.spec +++ b/corosync.spec @@ -72,6 +72,7 @@ Patch14: 0007-add-config-for-corosync-qnetd.patch Patch15: 0008-bsc#1083561-upgrade-from-1-x-y.patch Patch16: 0009-bsc#1088619-add-version.patch Patch17: 0010-qdevice-net-instance.c-optarg-should-be-str.patch +Patch18: 0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # openais is indeed gone and should be uninstalled. Yes, we do not @@ -154,6 +155,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %build %if %{with runautogen}