From 89f49f4340a1fe954df1c91fdfa690f99c5e534b3869d63485b6504e6c20337f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 31 Dec 2019 23:53:40 +0000 Subject: [PATCH] Accepting request 760054 from home:dimstar:Factory - Update to version 1.10.1: + Fix format string for ExtraHeaders. + Use higher port when reuseaddr is set and the default port is busy (boo#1132829). - Drop libupnp-configure.patch: patch seems no longer needed (patch was added before 2013 and only ever rebased without validating its usefulness). - Drop libtool BuildRequires and no longer call autoreconf: since we have no patch left, there is no need to bootstrap. - Bump libpnpn defines to 15 and libixmlver to 11, following upstream chanes (also in baselibs.conf). OBS-URL: https://build.opensuse.org/request/show/760054 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libupnp?expand=0&rev=29 --- baselibs.conf | 4 ++-- libupnp-1.10.1.tar.bz2 | 3 +++ libupnp-1.10.1.tar.bz2.sha1 | 1 + libupnp-1.8.4.tar.bz2 | 3 --- libupnp-1.8.4.tar.bz2.sha1 | 1 - libupnp-configure.patch | 28 ---------------------------- libupnp.changes | 15 +++++++++++++++ libupnp.spec | 15 ++++++--------- 8 files changed, 27 insertions(+), 43 deletions(-) create mode 100644 libupnp-1.10.1.tar.bz2 create mode 100644 libupnp-1.10.1.tar.bz2.sha1 delete mode 100644 libupnp-1.8.4.tar.bz2 delete mode 100644 libupnp-1.8.4.tar.bz2.sha1 delete mode 100644 libupnp-configure.patch diff --git a/baselibs.conf b/baselibs.conf index 9a68fd5..9547e26 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libupnp13 -libixml10 +libupnp15 +libixml11 diff --git a/libupnp-1.10.1.tar.bz2 b/libupnp-1.10.1.tar.bz2 new file mode 100644 index 0000000..92463ee --- /dev/null +++ b/libupnp-1.10.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b97dad43f5fbb1dad34384389ab038823862348e9e5f6d649d845d512165ed92 +size 679847 diff --git a/libupnp-1.10.1.tar.bz2.sha1 b/libupnp-1.10.1.tar.bz2.sha1 new file mode 100644 index 0000000..2d82c3c --- /dev/null +++ b/libupnp-1.10.1.tar.bz2.sha1 @@ -0,0 +1 @@ +0b4e9f38674b948adc2ca78165fb8d942fa46f38 libupnp-1.10.1.tar.bz2 diff --git a/libupnp-1.8.4.tar.bz2 b/libupnp-1.8.4.tar.bz2 deleted file mode 100644 index 93e0468..0000000 --- a/libupnp-1.8.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:188d3f786d92fe14191f17634d2d87847eee7d2b568a5257ea23262fec9973d6 -size 676576 diff --git a/libupnp-1.8.4.tar.bz2.sha1 b/libupnp-1.8.4.tar.bz2.sha1 deleted file mode 100644 index a7474ef..0000000 --- a/libupnp-1.8.4.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -93e7b3c94cf53eb59533b4b7b137ef5cc651e28b libupnp-1.8.4.tar.bz2 diff --git a/libupnp-configure.patch b/libupnp-configure.patch deleted file mode 100644 index 220d6ca..0000000 --- a/libupnp-configure.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: libupnp-1.8.4/configure.ac -=================================================================== ---- libupnp-1.8.4.orig/configure.ac -+++ libupnp-1.8.4/configure.ac -@@ -7,7 +7,7 @@ - # (C) Copyright 2005-2007 Rémi Turboult - # - --AC_PREREQ(2.60) -+AC_PREREQ([2.60]) - - AC_INIT([libupnp], [1.8.4], [mroberto@users.sourceforge.net]) - dnl ############################################################################ -@@ -546,10 +546,12 @@ RT_BOOL_ARG_ENABLE([samples], [yes], [co - # - # Checks for programs - # --AC_PROG_CC -+AC_PROG_CC_STDC -+AC_USE_SYSTEM_EXTENSIONS -+AC_SYS_LARGEFILE - AM_PROG_CC_C_O - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) --AC_PROG_LIBTOOL -+LT_INIT - AC_PROG_INSTALL - AC_PROG_MAKE_SET - AC_PROG_EGREP diff --git a/libupnp.changes b/libupnp.changes index 14344ce..2ed8905 100644 --- a/libupnp.changes +++ b/libupnp.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Dec 30 14:37:16 UTC 2019 - Dominique Leuenberger + +- Update to version 1.10.1: + + Fix format string for ExtraHeaders. + + Use higher port when reuseaddr is set and the default port is + busy (boo#1132829). +- Drop libupnp-configure.patch: patch seems no longer needed (patch + was added before 2013 and only ever rebased without validating + its usefulness). +- Drop libtool BuildRequires and no longer call autoreconf: since + we have no patch left, there is no need to bootstrap. +- Bump libpnpn defines to 15 and libixmlver to 11, following + upstream chanes (also in baselibs.conf). + ------------------------------------------------------------------- Thu Nov 29 19:32:02 UTC 2018 - Jan Engelhardt diff --git a/libupnp.spec b/libupnp.spec index 213921a..7ee0f14 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ # # spec file for package libupnp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2011, Sascha Peilicke # # All modifications and additions to the file contributed by third parties @@ -17,19 +17,18 @@ # -%define pnpver 13 -%define ixmlver 10 +%define pnpver 15 +%define ixmlver 11 Name: libupnp -Version: 1.8.4 +Version: 1.10.1 Release: 0 Summary: An implementation of Universal Plug and Play (UPnP) License: BSD-3-Clause Group: Development/Libraries/C and C++ URL: https://github.com/mrjimenez/pupnp -Source0: https://downloads.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2 -Source1: https://downloads.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2.sha1 +Source0: https://github.com/pupnp/pupnp/releases/download/release-%{version}/%{name}-%{version}.tar.bz2 +Source1: https://github.com/pupnp/pupnp/releases/download/release-%{version}/%{name}-%{version}.tar.bz2.sha1 Source42: baselibs.conf -Patch0: libupnp-configure.patch BuildRequires: libtool BuildRequires: pkgconfig @@ -68,11 +67,9 @@ systems. %prep %setup -q -%patch0 -p1 %build # the openssl simply does not compile -autoreconf -fiv %configure \ --disable-samples \ --enable-ipv6 \