diff --git a/libupnp-1.6.21.tar.bz2 b/libupnp-1.6.21.tar.bz2 deleted file mode 100644 index 6b7ecbd..0000000 --- a/libupnp-1.6.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b -size 1245353 diff --git a/libupnp-1.6.21.tar.bz2.sha1 b/libupnp-1.6.21.tar.bz2.sha1 deleted file mode 100644 index 30cbbda..0000000 --- a/libupnp-1.6.21.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -4c2f03f8d2f52d92bfe80039a027fafa98c8c226 libupnp-1.6.21.tar.bz2 diff --git a/libupnp-1.6.25.tar.bz2 b/libupnp-1.6.25.tar.bz2 new file mode 100644 index 0000000..3b4ac8a --- /dev/null +++ b/libupnp-1.6.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43 +size 722731 diff --git a/libupnp-1.6.25.tar.bz2.sha1 b/libupnp-1.6.25.tar.bz2.sha1 new file mode 100644 index 0000000..a78ef1e --- /dev/null +++ b/libupnp-1.6.25.tar.bz2.sha1 @@ -0,0 +1 @@ +6adb96f864bb030263b8b57b2ab4610eeddb37b5 libupnp-1.6.25.tar.bz2 diff --git a/libupnp-configure.patch b/libupnp-configure.patch index 228783e..e05d71b 100644 --- a/libupnp-configure.patch +++ b/libupnp-configure.patch @@ -1,5 +1,7 @@ ---- a/configure.ac -+++ b/configure.ac +Index: libupnp-1.6.25/configure.ac +=================================================================== +--- libupnp-1.6.25.orig/configure.ac 2018-02-10 15:26:39.000000000 +0100 ++++ libupnp-1.6.25/configure.ac 2018-04-13 10:53:41.920947961 +0200 @@ -7,7 +7,7 @@ # (C) Copyright 2005-2007 Rémi Turboult # @@ -7,9 +9,9 @@ -AC_PREREQ(2.60) +AC_PREREQ([2.60]) - AC_INIT([libupnp], [1.6.21], [mroberto@users.sourceforge.net]) + AC_INIT([libupnp], [1.6.25], [mroberto@users.sourceforge.net]) dnl ############################################################################ -@@ -549,10 +549,12 @@ AC_MSG_RESULT($docdir) +@@ -594,10 +594,12 @@ AC_MSG_RESULT($docdir) # # Checks for programs # @@ -24,7 +26,7 @@ AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_EGREP -@@ -592,8 +594,6 @@ echo "---------------------------------- +@@ -637,8 +639,6 @@ echo "---------------------------------- # AC_TYPE_SIZE_T AC_TYPE_OFF_T diff --git a/libupnp.changes b/libupnp.changes index 61b88c0..5888893 100644 --- a/libupnp.changes +++ b/libupnp.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Apr 13 08:55:40 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 1.6.25: + + Fix and add more compat helpers. + + Fix assertion error when http_MakeMessage is called with E in + fmt. + + libupnp.pc: drop -pthread from Cflags. + + Fix segmentation fault in http_MakeMessage. +- Changes from version 1.6.23: + + Allow extra headers to be sent to client in the File_Info + struct by adding extra_headers, an array of struct + Extra_Headers. + + Queue events on their subscription object instead of adding + them to the thread pool immediately. +- Changes from version 1.6.22: + + Fix some compiler warning messages on md5.c. + + Replace MD5 impmplementation with public-domain version. + + ixml/test/test_document.c is missing the string.h include, + therefore the compiler complains about an implicit declaration. +- Rebase libupnp-configure.patch with quilt. +- Run spec-cleaner, modernize spec. + ------------------------------------------------------------------- Thu Mar 2 11:01:33 UTC 2017 - jengelh@inai.de diff --git a/libupnp.spec b/libupnp.spec index 7853158..c85267b 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ # # spec file for package libupnp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011, Sascha Peilicke # # All modifications and additions to the file contributed by third parties @@ -20,26 +20,25 @@ %define lname libupnp6 Name: libupnp -Version: 1.6.21 +Version: 1.6.25 Release: 0 Summary: Portable Universal Plug and Play (UPnP) SDK License: BSD-3-Clause Group: Development/Libraries/C and C++ -Url: http://sourceforge.net/projects/pupnp/ +URL: http://sourceforge.net/projects/pupnp/ Source0: http://downloads.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2 Source1: http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20%version/libupnp-%version.tar.bz2.sha1 Source42: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: libupnp-configure.patch BuildRequires: libtool BuildRequires: pkgconfig -Patch: libupnp-configure.patch %description The portable Universal Plug and Play (UPnP) SDK provides support for building UPnP-compliant control points, devices, and bridges on several operating systems. -%package -n %lname +%package -n %{lname} Summary: Portable Universal Plug and Play (UPnP) SDK # Replace individual packages from Packman to make migration to Tumbleweed easier. Group: System/Libraries @@ -48,7 +47,7 @@ Obsoletes: libixml2 < %{version} Provides: libthreadutil6 = %{version}-%{release} Obsoletes: libthreadutil6 < %{version} -%description -n %lname +%description -n %{lname} The portable Universal Plug and Play (UPnP) SDK provides support for building UPnP-compliant control points, devices, and bridges on several operating systems @@ -65,7 +64,7 @@ systems. %prep %setup -q -%patch -p1 +%patch0 -p1 %build autoreconf -fiv @@ -73,22 +72,19 @@ autoreconf -fiv make %{?_smp_mflags} %install -%makeinstall -find %{buildroot} -type f -name '*.la' -delete +%make_install +find %{buildroot} -type f -name "*.la" -delete -print -%post -p /sbin/ldconfig -n %lname +%post -p /sbin/ldconfig -n %{lname} +%postun -p /sbin/ldconfig -n %{lname} -%postun -p /sbin/ldconfig -n %lname - -%files -n %lname -%defattr(-,root,root,-) -%doc ChangeLog NEWS README TODO LICENSE +%files -n %{lname} +%doc ChangeLog NEWS TODO README.md LICENSE %{_libdir}/libixml.so.* %{_libdir}/libthreadutil.so.* %{_libdir}/libupnp.so.* %files -n libupnp-devel -%defattr(-,root,root,-) %{_libdir}/pkgconfig/libupnp.pc %{_libdir}/libixml.so %{_libdir}/libthreadutil.so