[arch-commits] Commit in openslp/trunk (3 files)

[Jan de Groot]

    Date: Saturday, March 11, 2017 @ 22:57:45
  Author: jgc
Revision: 290640

upgpkg: openslp 2.0.0-2

Added:
  openslp/trunk/openslp-2.0.0-null-pointer-deref.patch
  openslp/trunk/openslp-2.0.0-openssl-1.1-fix.patch
Modified:
  openslp/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   21 ++++++++++++++-------
 openslp-2.0.0-null-pointer-deref.patch |   12 ++++++++++++
 openslp-2.0.0-openssl-1.1-fix.patch    |   25 +++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-11 22:42:50 UTC (rev 290639)
+++ PKGBUILD	2017-03-11 22:57:45 UTC (rev 290640)
@@ -3,7 +3,7 @@
 
 pkgname=openslp
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source implementation of Service Location Protocol"
 arch=('i686' 'x86_64')
 url="http://www.openslp.org"
@@ -12,14 +12,20 @@
 makedepends=('doxygen')
 backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi')
 options=(!makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae
-        openslp.service)
-md5sums=('18cf7940bcc444e32592cf34e84f833f'
-         '90eea4426492287ebfc01b2056a3ef9d')
+source=(https://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        openslp.service
+        openslp-2.0.0-null-pointer-deref.patch
+        openslp-2.0.0-openssl-1.1-fix.patch)
+sha256sums=('924337a2a8e5be043ebaea2a78365c7427ac6e9cee24610a0780808b2ba7579b'
+            '8bba465806891a5df4702ab25866bd43258a6b0370b6e0941d188568ef82bdb9'
+            'da639ca50ea3e7eeb747505171bc7678a444b6755a7068b0cd294cc87f1ebdbe'
+            'bf38f7a251ff41582c17451af185a964d1ed235d0f2ff294e1d2761da17ab078')
 
 prepare() {
-  sed -i 's|$(datadir)/doc|$(docdir)|' ${pkgname}-${pkgver}/doc/Makefile.in
+  cd $pkgname-$pkgver
+  sed -i 's|$(datadir)/doc|$(docdir)|' doc/Makefile.in
+  patch -Np1 -i ../openslp-2.0.0-null-pointer-deref.patch
+  patch -Np1 -i ../openslp-2.0.0-openssl-1.1-fix.patch
 }
 
 build() {
@@ -31,6 +37,7 @@
     --docdir=/usr/share/doc/openslp-${pkgver} \
     --enable-slpv1 \
     --enable-slpv2-security # service would fail to start without this
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 

Added: openslp-2.0.0-null-pointer-deref.patch
===================================================================
--- openslp-2.0.0-null-pointer-deref.patch	                        (rev 0)
+++ openslp-2.0.0-null-pointer-deref.patch	2017-03-11 22:57:45 UTC (rev 290640)
@@ -0,0 +1,12 @@
+diff -up openslp-2.0.0/common/slp_xmalloc.c.orig openslp-2.0.0/common/slp_xmalloc.c
+--- openslp-2.0.0/common/slp_xmalloc.c.orig	2012-12-07 01:52:08.000000000 +0100
++++ openslp-2.0.0/common/slp_xmalloc.c	2016-05-23 12:58:57.953532979 +0200
+@@ -203,6 +203,8 @@ void * _xrealloc(const char * file, int
+       if (x->size != size)
+       {
+          newptr = _xmalloc(file, line, size);
++         if (newptr == 0)
++            return 0;
+          memcpy(newptr, ptr, x->size);
+          _xfree(file, line, x);
+       }

Added: openslp-2.0.0-openssl-1.1-fix.patch
===================================================================
--- openslp-2.0.0-openssl-1.1-fix.patch	                        (rev 0)
+++ openslp-2.0.0-openssl-1.1-fix.patch	2017-03-11 22:57:45 UTC (rev 290640)
@@ -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;
+ }