diff --git a/openslp-2.0.0-openssl-1.1-fix.patch b/openslp-2.0.0-openssl-1.1-fix.patch new file mode 100644 index 0000000..78dc6c5 --- /dev/null +++ b/openslp-2.0.0-openssl-1.1-fix.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; + } diff --git a/openslp.spec b/openslp.spec index 5f6d2fb..50f8a16 100644 --- a/openslp.spec +++ b/openslp.spec @@ -2,7 +2,7 @@ Summary: Open implementation of Service Location Protocol V2 Name: openslp Version: 2.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Group: System Environment/Libraries License: BSD @@ -23,6 +23,8 @@ Patch1: openslp-2.0.0-multicast-set.patch Patch2: openslp-2.0.0-notify-systemd-of-start-up.patch # Patch3: fixes posible null pointer dereference, bz#1337402, CVE-2016-4912 Patch3: openslp-2.0.0-null-pointer-deref.patch +# Patch4: fixes FTBFS because of openssl-1.1 +Patch4: openslp-2.0.0-openssl-1.1-fix.patch BuildRequires: automake libtool BuildRequires: bison @@ -64,6 +66,7 @@ OpenSLP server daemon to dynamically register services. %patch1 -p1 -b .multicast-set %patch2 -p2 -b .systemd %patch3 -p1 -b .null-pointer-deref +%patch4 -p1 -b .openssl-1.1-fix # tarball goof (?), it wants to re-automake anyway, so let's do it right. #libtoolize --force @@ -177,6 +180,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 22 2017 Vitezslav Crhonek - 2.0.0-11 +- Fix FTBFS because of openssl-1.1 + Resolves: #1424028 + * Sat Feb 11 2017 Fedora Release Engineering - 2.0.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild