diff --git a/0001-Fixes-177-NULL-pointer-dereference-in-FindServiceCon.patch b/0001-Fixes-177-NULL-pointer-dereference-in-FindServiceCon.patch deleted file mode 100644 index 9aa5da0..0000000 --- a/0001-Fixes-177-NULL-pointer-dereference-in-FindServiceCon.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c805c1de1141cb22f74c0d94dd5664bda37398e0 Mon Sep 17 00:00:00 2001 -From: Marcelo Roberto Jimenez -Date: Thu, 4 Jun 2020 12:03:03 -0300 -Subject: [PATCH] Fixes #177: NULL pointer dereference in - FindServiceControlURLPath -References: https://bugzilla.opensuse.org/show_bug.cgi?id=1172625 - -Also fixes its dual bug in FindServiceEventURLPath. ---- - ChangeLog | 6 ++++++ - upnp/src/genlib/service_table/service_table.c | 6 ++++++ - 2 files changed, 12 insertions(+) - -Index: libupnp-1.12.1/ChangeLog -=================================================================== ---- libupnp-1.12.1.orig/ChangeLog -+++ libupnp-1.12.1/ChangeLog -@@ -32,6 +32,12 @@ Version 1.12.1 - - List: Add extern C for C++ users - -+2020-06-04 Patrik Lantz pjlantz(at)github -+ -+ Fixes #177 -+ -+ NULL pointer dereference in FindServiceControlURLPath -+ - ******************************************************************************* - Version 1.12.0 - ******************************************************************************* -Index: libupnp-1.12.1/upnp/src/genlib/service_table/service_table.c -=================================================================== ---- libupnp-1.12.1.orig/upnp/src/genlib/service_table/service_table.c -+++ libupnp-1.12.1/upnp/src/genlib/service_table/service_table.c -@@ -300,6 +300,9 @@ FindServiceEventURLPath( service_table * - uri_type parsed_url; - uri_type parsed_url_in; - -+ if (!table || !eventURLPath) { -+ return NULL; -+ } - if( ( table ) - && - ( parse_uri( eventURLPath, -@@ -352,6 +355,9 @@ FindServiceControlURLPath( service_table - uri_type parsed_url; - uri_type parsed_url_in; - -+ if (!table || !controlURLPath) { -+ return NULL; -+ } - if( ( table ) - && - ( parse_uri diff --git a/baselibs.conf b/baselibs.conf index f6dd998..96b36b9 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libupnp16 +libupnp17 libixml11 diff --git a/libupnp-1.12.1.tar.bz2 b/libupnp-1.12.1.tar.bz2 deleted file mode 100644 index 11ee256..0000000 --- a/libupnp-1.12.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc36642b1848fe5a81296d496291d350ecfc12b85fd0b268478ab230976d4009 -size 681174 diff --git a/libupnp-1.12.1.tar.bz2.sha1 b/libupnp-1.12.1.tar.bz2.sha1 deleted file mode 100644 index f5e5853..0000000 --- a/libupnp-1.12.1.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -08fd7ec2d77ff4e7bc4632bf30695c7af63820ee libupnp-1.12.1.tar.bz2 diff --git a/libupnp-1.14.0.tar.bz2 b/libupnp-1.14.0.tar.bz2 new file mode 100644 index 0000000..4d9b238 --- /dev/null +++ b/libupnp-1.14.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb +size 672409 diff --git a/libupnp-1.14.0.tar.bz2.sha1 b/libupnp-1.14.0.tar.bz2.sha1 new file mode 100644 index 0000000..9dd5c0a --- /dev/null +++ b/libupnp-1.14.0.tar.bz2.sha1 @@ -0,0 +1 @@ +b14cff9ddd7cfe7f0e4bf552387122a31770f51f libupnp-1.14.0.tar.bz2 diff --git a/libupnp.changes b/libupnp.changes index 1f7cf79..a510727 100644 --- a/libupnp.changes +++ b/libupnp.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Aug 16 15:27:31 UTC 2020 - Jan Engelhardt + +- Update to release 1.14.0 + * Remove deprecated "UpnpInit" function + * Reworked the miniserver code to deal with SO_REUSEADDR +- Drop 0001-Fixes-177-NULL-pointer-dereference-in-FindServiceCon.patch + (merged) + ------------------------------------------------------------------- Tue Jun 9 19:08:27 UTC 2020 - Jan Engelhardt diff --git a/libupnp.spec b/libupnp.spec index 09879d3..51f4f5d 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -17,10 +17,10 @@ # -%define pnpver 16 +%define pnpver 17 %define ixmlver 11 Name: libupnp -Version: 1.12.1 +Version: 1.14.0 Release: 0 Summary: An implementation of Universal Plug and Play (UPnP) License: BSD-3-Clause @@ -29,7 +29,6 @@ URL: https://github.com/pupnp/pupnp Source: https://github.com/pupnp/pupnp/releases/download/release-%version/%name-%version.tar.bz2 Source2: https://github.com/pupnp/pupnp/releases/download/release-%version/%name-%version.tar.bz2.sha1 Source3: baselibs.conf -Patch1: 0001-Fixes-177-NULL-pointer-dereference-in-FindServiceCon.patch BuildRequires: libtool BuildRequires: pkg-config