From 15cee3140787e3a212d7822e4b36177e26624d0f430104bdd567443e5ea7199b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Aug 2023 20:23:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/xmlsec1?expand=0&rev=51 --- xmlsec1-ui_null.patch | 20 ++++++++++++++++++++ xmlsec1.spec | 7 +++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 xmlsec1-ui_null.patch diff --git a/xmlsec1-ui_null.patch b/xmlsec1-ui_null.patch new file mode 100644 index 0000000..b0acdf1 --- /dev/null +++ b/xmlsec1-ui_null.patch @@ -0,0 +1,20 @@ +--- xmlsec1-1.2.33/src/openssl/app.c 2022-01-28 07:47:11.922603482 +0100 ++++ xmlsec1-1.2.33/src/openssl/app.c 2022-01-28 08:18:12.786240295 +0100 +@@ -437,7 +437,7 @@ + } + } + +- if(ENGINE_ctrl_cmd(engine, "SET_USER_INTERFACE", 0, (void *)UI_null(), 0, 1) < 0) { ++ if(ENGINE_ctrl_cmd(engine, "SET_USER_INTERFACE", 0, (void *)0, 0, 1) < 0) { + xmlSecOpenSSLError("ENGINE_ctrl_cmd_string(SET_USER_INTERFACE)", NULL); + goto done; + } +@@ -453,7 +453,7 @@ + + /* load private key */ + pKey = ENGINE_load_private_key(engine, engineKeyId, +- (UI_METHOD *)UI_null(), ++ (UI_METHOD *)0, + NULL); + if(pKey == NULL) { + xmlSecOpenSSLError("ENGINE_load_private_key", NULL); diff --git a/xmlsec1.spec b/xmlsec1.spec index 2cfbf9a..e4d9186 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -32,6 +32,7 @@ Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.g Source1: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.sig#/xmlsec1-%{version}.tar.gz.sig Source2: %{name}.keyring Source99: xmlsec1-rpmlintrc +Patch0: xmlsec1-ui_null.patch BuildRequires: libgcrypt-devel BuildRequires: libtool # Needed certutil for tests @@ -140,7 +141,10 @@ Requires: mozilla-nss-devel >= 3.35 Libraries, includes, etc. for developing XML Security applications with NSS. %prep -%autosetup -p1 +%setup -q +%if 0%{?suse_version} < 1500 +%patch0 -p1 +%endif %build # Allow for deprecations @@ -149,7 +153,6 @@ export CXXFLAGS="-Wno-error=deprecated-declarations -Wno-error=redundant-decls" %configure \ --disable-static \ --disable-silent-rules \ - --enable-werror \ --disable-md5 %make_build