From 7dfec231ebbaad445af1efd2ecc90640a45613340b622cd89159364833b39128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 3 Apr 2020 10:36:00 +0000 Subject: [PATCH] - Initialize the libgcrypt library [bnc#1167343] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=538 --- initgcrypt.diff | 11 +++++++++++ python-rpm.spec | 4 ++-- rpm.changes | 6 ++++++ rpm.spec | 7 ++++--- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 initgcrypt.diff diff --git a/initgcrypt.diff b/initgcrypt.diff new file mode 100644 index 0000000..d9e5b55 --- /dev/null +++ b/initgcrypt.diff @@ -0,0 +1,11 @@ +--- ./rpmio/digest_beecrypt.c.orig 2020-04-03 10:29:07.605265786 +0000 ++++ ./rpmio/digest_beecrypt.c 2020-04-03 10:29:21.765221764 +0000 +@@ -38,6 +38,8 @@ struct DIGEST_CTX_s { + /**************************** init ************************************/ + + int rpmInitCrypto(void) { ++ gcry_check_version (NULL); ++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); + return 0; + } + diff --git a/python-rpm.spec b/python-rpm.spec index 6d845c0..5046317 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -1,7 +1,7 @@ # # spec file for package python-rpm # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # diff --git a/rpm.changes b/rpm.changes index 110a183..4c4c379 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 3 12:34:42 CEST 2020 - mls@suse.de + +- Initialize the libgcrypt library [bnc#1167343] + * new patch: initgcrypt.diff + ------------------------------------------------------------------- Tue Mar 24 22:16:22 CET 2020 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 17b4411..3b4f396 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -131,6 +131,7 @@ Patch119: bdb_ro.diff Patch120: disable_bdb.diff Patch121: ndb_backport.diff Patch122: db_conversion.diff +Patch123: initgcrypt.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -255,7 +256,7 @@ cp config.guess config.sub db/dist/ %patch -P 93 -P 94 -P 99 %patch -P 100 -P 102 -P 103 %patch -P 109 -P 117 -%patch -P 118 -P 119 -P 120 -P 121 -P 122 +%patch -P 118 -P 119 -P 120 -P 121 -P 122 -P 123 %ifarch aarch64 ppc64le riscv64 %patch6464