CVS commit: pkgsrc/net/openslp

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Tue Apr 17 18:42:10 UTC 2018

Modified Files:
        pkgsrc/net/openslp: distinfo
Added Files:
        pkgsrc/net/openslp/patches: patch-common-slp_crypto.c

Log Message:
port this to openssl 1.1 hosts.

should only fix broken builds thus a pkg bump is not wanted.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/openslp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/openslp/patches/patch-common-slp_crypto.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/openslp/distinfo
diff -u pkgsrc/net/openslp/distinfo:1.19 pkgsrc/net/openslp/distinfo:1.20
--- pkgsrc/net/openslp/distinfo:1.19    Thu Feb 11 15:12:06 2016
+++ pkgsrc/net/openslp/distinfo Tue Apr 17 18:42:10 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2016/02/11 15:12:06 he Exp $
+$NetBSD: distinfo,v 1.20 2018/04/17 18:42:10 mrg Exp $
 
 SHA1 (openslp-1.2.1.tar.gz) = 47ab19154084d2b467f09525f5351e9ab7193cf9
 RMD160 (openslp-1.2.1.tar.gz) = a31d516ba784ad893a740946082fe5e0f15a37ea
@@ -14,4 +14,5 @@ SHA1 (patch-aj) = 8e1d32772cf59a938a4d9d
 SHA1 (patch-ak) = e64ede590e4af9d8951177b68c4bbf1b56ebdfae
 SHA1 (patch-al) = 19fa24e2ac362c3e45413826cd139ced984e8adc
 SHA1 (patch-am) = 7b8a47f0998202aab9c82278a2c405584eb3fea4
+SHA1 (patch-common-slp_crypto.c) = 094bdbc31cfd4f872001a4d2236e3c6b1a1625d9
 SHA1 (patch-slpd_slpd__knownda.c) = c01286e4dfedc2112272405934cbe4097f90fd07

Added files:

Index: pkgsrc/net/openslp/patches/patch-common-slp_crypto.c
diff -u /dev/null pkgsrc/net/openslp/patches/patch-common-slp_crypto.c:1.1
--- /dev/null   Tue Apr 17 18:42:10 2018
+++ pkgsrc/net/openslp/patches/patch-common-slp_crypto.c        Tue Apr 17 18:42:10 2018
@@ -0,0 +1,28 @@
+$NetBSD: patch-common-slp_crypto.c,v 1.1 2018/04/17 18:42:10 mrg Exp $
+
+port to OpenSSL 1.1.
+
+--- common/slp_crypto.c.orig   2005-02-08 14:23:27.000000000 -0800
++++ common/slp_crypto.c        2018-04-17 01:27:35.975421083 -0700
+@@ -90,11 +90,21 @@
+     result =  DSA_new();
+     if(result)
+     {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         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);
++#else
++        const BIGNUM *p, *q, *g;
++        const BIGNUM *pub_key, *priv_key;
++
++        DSA_get0_pqg(dsa, &p, &q, &g);
++        DSA_set0_pqg(result, BN_dup(p), BN_dup(q), BN_dup(g));
++        DSA_get0_key(dsa, &pub_key, &priv_key);
++        DSA_set0_key(result, BN_dup(pub_key), BN_dup(priv_key));
++#endif
+     }
+ 
+     return result;