commit 1d6ac5b571408539e02755504f3ee3bda96588d7
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Sep 18 13:56:34 2018 +0200
- 5; fix openssl 1.1 build
openslp.spec | 4 +++-
openssl.patch | 25 +++++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/openslp.spec b/openslp.spec
index e12ddfe..1086f11 100644
--- a/openslp.spec
+++ b/openslp.spec
@@ -7,7 +7,7 @@ Summary(pl.UTF-8): Otwarta implementacja Service Location
Protocol V2
Summary(pt.UTF-8): Implementação 'open source' do protocolo Service
Location Protocol V2
Name: openslp
Version: 2.0.0
-Release: 4
+Release: 5
License: BSD
Group: Libraries
Source0:
http://downloads.sourceforge.net/openslp/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Source1: %{name}.init
Patch0: %{name}-opt.patch
Patch1: %{name}-build.patch
Patch2: %{name}-symbol-clashes.patch
+Patch3: openssl.patch
URL: http://www.openslp.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -134,6 +135,7 @@ Biblioteki statyczne OpenSLP.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..78dc6c5
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,25 @@
+diff -up openslp-2.0.0/common/slp_crypto.c.orig
openslp-2.0.0/common/slp_crypto.c
+--- openslp-2.0.0/common/slp_crypto.c.orig 2012-12-07 21:13:28.000000000
+0100
++++ openslp-2.0.0/common/slp_crypto.c 2017-02-22 11:16:11.620835724 +0100
+@@ -88,11 +88,16 @@ SLPCryptoDSAKey * SLPCryptoDSAKeyDup(SLP
+ result = DSA_new();
+ if (result)
+ {
+- result->p = BN_dup(dsa->p);
+- result->q = BN_dup(dsa->q);
+- result->g = BN_dup(dsa->g);
+- result->priv_key = BN_dup(dsa->priv_key);
+- result->pub_key = BN_dup(dsa->pub_key);
++ const BIGNUM *p, *q, *g;
++ const BIGNUM *priv_key, *pub_key;
++
++ DSA_get0_pqg(dsa, &p, &q, &g);
++ DSA_get0_key(dsa, &pub_key, &priv_key);
++
++ /* would be nice to check return values,
++ * but original code didn't do that either... */
++ DSA_set0_pqg(result, BN_dup(p), BN_dup(q), BN_dup(g));
++ DSA_set0_key(result, BN_dup(pub_key), BN_dup(priv_key));
+ }
+ return result;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openslp.git/commitdiff/1d6ac5b571408539e02755504f3ee3bda96588d7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
