diff --git a/.gitignore b/.gitignore index 2599338..e39b303 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /miniupnpc-1.6.tar.gz /miniupnpc-1.8.tar.gz +/miniupnpc-1.9.tar.gz diff --git a/miniupnpc-files.patch b/miniupnpc-files.patch index 2087113..99b1187 100644 --- a/miniupnpc-files.patch +++ b/miniupnpc-files.patch @@ -1,6 +1,6 @@ -diff -up miniupnpc-1.8/CMakeLists.txt.orig miniupnpc-1.8/CMakeLists.txt ---- miniupnpc-1.8/CMakeLists.txt.orig 2013-08-13 10:02:05.237748142 -0300 -+++ miniupnpc-1.8/CMakeLists.txt 2013-08-13 10:02:14.308748490 -0300 +diff -up miniupnpc-1.9/CMakeLists.txt.orig miniupnpc-1.9/CMakeLists.txt +--- miniupnpc-1.9/CMakeLists.txt.orig 2014-04-16 00:13:21.465068012 -0300 ++++ miniupnpc-1.9/CMakeLists.txt 2014-04-16 00:13:30.289068350 -0300 @@ -165,6 +165,8 @@ install (FILES igd_desc_parse.h upnpreplyparse.h diff --git a/miniupnpc-tests.patch b/miniupnpc-tests.patch index 9fb4bc9..a6e2d93 100644 --- a/miniupnpc-tests.patch +++ b/miniupnpc-tests.patch @@ -1,6 +1,6 @@ -diff -up miniupnpc-1.8/CMakeLists.txt.orig miniupnpc-1.8/CMakeLists.txt ---- miniupnpc-1.8/CMakeLists.txt.orig 2013-08-13 10:04:23.583753440 -0300 -+++ miniupnpc-1.8/CMakeLists.txt 2013-08-13 10:05:03.228754958 -0300 +diff -up miniupnpc-1.9/CMakeLists.txt.orig miniupnpc-1.9/CMakeLists.txt +--- miniupnpc-1.9/CMakeLists.txt.orig 2014-04-16 00:13:30.289068350 -0300 ++++ miniupnpc-1.9/CMakeLists.txt 2014-04-16 00:16:15.527074677 -0300 @@ -128,25 +128,25 @@ if (UPNPC_BUILD_TESTS) target_link_libraries (testminixml ${LDLIBS}) diff --git a/miniupnpc-version.patch b/miniupnpc-version.patch index 2692c18..1b47c85 100644 --- a/miniupnpc-version.patch +++ b/miniupnpc-version.patch @@ -1,15 +1,6 @@ -diff -up miniupnpc-1.8/CMakeLists.txt.orig miniupnpc-1.8/CMakeLists.txt ---- miniupnpc-1.8/CMakeLists.txt.orig 2013-08-13 10:28:07.207807956 -0300 -+++ miniupnpc-1.8/CMakeLists.txt 2013-08-13 10:28:22.476808540 -0300 -@@ -1,7 +1,7 @@ - cmake_minimum_required (VERSION 2.6) - - project (miniupnpc C) --set (MINIUPNPC_VERSION 1.7) -+set (MINIUPNPC_VERSION 1.8) - set (MINIUPNPC_API_VERSION 9) - - if (NOT CMAKE_BUILD_TYPE) +diff -up miniupnpc-1.9/CMakeLists.txt.orig miniupnpc-1.9/CMakeLists.txt +--- miniupnpc-1.9/CMakeLists.txt.orig 2014-04-16 00:27:30.652100530 -0300 ++++ miniupnpc-1.9/CMakeLists.txt 2014-04-16 00:27:59.441101633 -0300 @@ -117,7 +117,6 @@ endif (UPNPC_BUILD_STATIC) if (UPNPC_BUILD_SHARED) add_library (upnpc-shared SHARED ${MINIUPNPC_SOURCES}) diff --git a/miniupnpc.spec b/miniupnpc.spec index 1f29ba8..40590c6 100644 --- a/miniupnpc.spec +++ b/miniupnpc.spec @@ -4,14 +4,12 @@ %else %global with_python3 0 %endif -# Possibly wrong due to other version information mismatches -# but only patch where it calls itself version 1.7. -%global major 9 +%global major 10 %filter_provides_in %{python_sitearch}/.*\.so$ Summary: Library and tool to control NAT in UPnP-enabled routers Name: miniupnpc -Version: 1.8 +Version: 1.9 Release: 1%{?dist} License: BSD Group: System Environment/Libraries @@ -22,7 +20,7 @@ BuildRequires: python2-devel # Install headers and add extra file to compilation # Patch originally from Mageia Linux Patch0: %{name}-files.patch -# Do not create libminiupnpc.so.1.5 and libminiupnpc.so.8 linking to it +# Do not create libminiupnpc.so.%%{version} and libminiupnpc.so.%%{major} linking to it Patch1: %{name}-version.patch # Link to and find libminiupnpc Patch2: %{name}-tests.patch @@ -139,6 +137,10 @@ make CFLAGS="%{optflags} -DMINIUPNPC_SET_SOCKET_TIMEOUT" check %endif %changelog +* Wed Apr 16 2014 pcpa - 1.9-1 +- Update to latest upstream release (#1062206) +- Correct possible DoS crash vector (patch already in tarball) (#1085618) + * Tue Aug 13 2013 pcpa - 1.8-1 - Update to latest upstream release (#996357) - Build extra python3 module diff --git a/sources b/sources index 0a39c23..a9ce2a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -065bf20a20ebe605c675b7a5aaef340a miniupnpc-1.8.tar.gz +5ef3ba321e6df72d6519b728b292073e miniupnpc-1.9.tar.gz