- added format patch (fixes build with -Werror=format-security)

- removed outdated miniupnp patch

diff --git a/dante-format.patch b/dante-format.patch
new file mode 100644 (file)
index 0000000..b41f744
--- /dev/null
+++ b/dante-format.patch
@@ -0,0 +1,20 @@
+--- dante-1.4.1/lib/upnp.c.orig        2014-08-21 18:21:50.000000000 +0200
++++ dante-1.4.1/lib/upnp.c     2014-10-25 18:12:07.582908742 +0200
+@@ -828,7 +828,7 @@
+ {
+    const char *function = "sighandler()";
+ 
+-   slog(LOG_DEBUG, function);
++   slog(LOG_DEBUG, "%s", function);
+    upnpcleanup(-1);
+ 
+    /* reinstall original signal handler. */
+@@ -936,7 +936,7 @@
+ {
+    const char *function = "atexit_upnpcleanup()";
+ 
+-   slog(LOG_DEBUG, function);
++   slog(LOG_DEBUG, "%s", function);
+    upnpcleanup(-1);
+ }
+ #endif /* SOCKS_CLIENT */

diff --git a/dante-miniupnp.patch b/dante-miniupnp.patch
deleted file mode 100644 (file)
index fee15a1..0000000
--- a/dante-miniupnp.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- dante-1.3.2/miniupnpc.m4.orig      2011-07-15 14:03:48.000000000 +0200
-+++ dante-1.3.2/miniupnpc.m4   2013-02-05 16:34:47.963810307 +0100
-@@ -20,7 +20,7 @@
-       LIBS=$oLIBS
-     fi
-     if test x"${have_libminiupnp}" = xt; then
--        AC_MSG_CHECKING([for miniupnpc version >= 1.4])
-+        AC_MSG_CHECKING([for miniupnpc version >= 1.6])
-       AC_TRY_COMPILE([
-             #include <stdio.h>
-             #include <miniupnpc/miniupnpc.h>
-@@ -37,7 +37,7 @@
-             (void)UPNP_GetIGDFromUrl(str, UPNPUrls, IGDdatas, str, 0);
-             (void)UPNP_GetValidIGD(UPNPDev, UPNPUrls, IGDdatas, str, 0);
-             (void)UPNP_GetExternalIPAddress(str, str, str);
--            (void)UPNP_AddPortMapping(str, str, str, str, str, str, str, str);
-+            (void)UPNP_AddPortMapping(str, str, str, str, str, str, str, str, str);
-             (void)UPNP_DeletePortMapping(str, str, str, str, str);],
-          [AC_MSG_RESULT(yes)
-           AC_DEFINE(HAVE_LIBMINIUPNP, 1, [UPNP support library])
---- dante-1.3.2/lib/upnp.c.orig        2011-07-21 16:09:19.000000000 +0200
-+++ dante-1.3.2/lib/upnp.c     2013-02-05 16:48:04.403793706 +0100
-@@ -111,7 +111,7 @@
-       slog(LOG_DEBUG, "%s: doing upnp discovery on interface of addr %s (%s)",
-       function, addrstring, gwaddr2string(gw, gwstring, sizeof(gwstring)));
- 
--      if ((dev = upnpDiscover(UPNP_DISCOVERYTIME_MS, addrstring, NULL, 0))
-+      if ((dev = upnpDiscover(UPNP_DISCOVERYTIME_MS, addrstring, NULL, 0, 0, NULL))
-       == NULL) {
-          slog(LOG_DEBUG, "no upnp devices found");
- 
-@@ -477,7 +477,7 @@
-          str2upper(protocol); /* seems to fail if not. */
-          if ((rc = UPNP_AddPortMapping(state->upnp.controlurl,
-          state->upnp.servicetype, strport, strport, straddr, buf, protocol,
--         NULL)) != UPNPCOMMAND_SUCCESS) {
-+         NULL, NULL)) != UPNPCOMMAND_SUCCESS) {
-                swarnx("%s: UPNP_AddPortMapping() failed: %s",
-                function, strupnperror(rc));
- 

diff --git a/dante.spec b/dante.spec
index 1fffd8accd38b78f9af305b0d7b81421f4566336..98eeb13759fa8594765b8b7b0a38166695e32548 100644 (file)
--- a/dante.spec
+++ b/dante.spec
@@ -16,7 +16,7 @@ Source0:      ftp://ftp.inet.no/pub/socks/%{name}-%{version}.tar.gz
 Source1:       sockd.init
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-build.patch
-Patch2:                %{name}-miniupnp.patch
+Patch2:                %{name}-format.patch
 URL:           http://www.inet.no/dante/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -100,6 +100,7 @@ Statyczna biblioteka socks.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}