[arch-commits] Commit in libupnp/trunk (PKGBUILD segfault_http_makemessage.patch)

[Levente Polyak]

    Date: Tuesday, March 13, 2018 @ 01:41:24
  Author: anthraxx
Revision: 318779

upgpkg: libupnp 1.6.25-1

Modified:
  libupnp/trunk/PKGBUILD
Deleted:
  libupnp/trunk/segfault_http_makemessage.patch

---------------------------------+
 PKGBUILD                        |   32 ++++++++++++---------------
 segfault_http_makemessage.patch |   45 --------------------------------------
 2 files changed, 15 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-13 01:03:20 UTC (rev 318778)
+++ PKGBUILD	2018-03-13 01:41:24 UTC (rev 318779)
@@ -1,36 +1,34 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org> 
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: kastor <kastor at fobos.org.ar>
 
 pkgname=libupnp
-pkgver=1.6.24
-pkgrel=2
-pkgdesc="Portable Open Source UPnP Development Kit"
+pkgver=1.6.25
+pkgrel=1
+pkgdesc='Portable Open Source UPnP Development Kit'
+url='http://pupnp.sourceforge.net/'
 arch=('x86_64')
-url="http://pupnp.sourceforge.net/"
 license=('BSD')
 depends=('glibc')
 makedepends=('pkgconfig')
-source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2"
-        "segfault_http_makemessage.patch")
-md5sums=('c5f4a3b674741d85ef29258841ccd540'
-         'b5ab030107cadfb307dc1b809b7a5fe3')
+source=(https://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/segfault_http_makemessage.patch
+  cd ${pkgname}-${pkgver}
+  autoreconf -fiv
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
+
+# vim: ts=2 sw=2 et:

Deleted: segfault_http_makemessage.patch
===================================================================
--- segfault_http_makemessage.patch	2018-03-13 01:03:20 UTC (rev 318778)
+++ segfault_http_makemessage.patch	2018-03-13 01:41:24 UTC (rev 318779)
@@ -1,45 +0,0 @@
-From 70e3d626378e12ea50d76dfda50311c8bb4a2a78 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause at embedded.rocks>
-Date: Tue, 5 Dec 2017 11:29:44 +0100
-Subject: [PATCH] Fix segmentation fault in http_MakeMessage
-
-When upmpdcli is linked with libupnp 1.6.24 it fails with an
-segmentation fault, but linking with libupnp worked just fine.
-
-git bisect shows that commit 9c2e8ec8a0291ebe81959009e2f78edbdb47ced5 is
-the bad one as the variable `extras` is not properly checked before
-attempting to used it as a pointer.
-
-Asure `extras` is not Null before using it.
----
- upnp/src/genlib/net/http/httpreadwrite.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
-index 68cd4baa..57ab8051 100644
---- a/upnp/src/genlib/net/http/httpreadwrite.c
-+++ b/upnp/src/genlib/net/http/httpreadwrite.c
-@@ -1662,14 +1662,16 @@ int http_MakeMessage(membuffer *buf, int http_major_version,
- 			struct Extra_Headers *extras;
- 			/* array of extra headers */
- 			extras = (struct Extra_Headers *) va_arg(argp, struct Extra_Headers *);
--			while (extras->name) {
--				if (extras->resp) {
--					if (membuffer_append(buf, extras->resp, strlen(extras->resp)))
--						goto error_handler;
--					if (membuffer_append(buf, "\r\n", (size_t)2))
--						goto error_handler;
-+			if (extras) {
-+				while (extras->name) {
-+					if (extras->resp) {
-+						if (membuffer_append(buf, extras->resp, strlen(extras->resp)))
-+							goto error_handler;
-+						if (membuffer_append(buf, "\r\n", (size_t)2))
-+							goto error_handler;
-+					}
-+					extras++;
- 				}
--				extras++;
- 			}
- 		}
- 		if (c == 's') {