Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package miniupnpc for openSUSE:Factory checked in at 2021-06-04 00:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/miniupnpc (Old) and /work/SRC/openSUSE:Factory/.miniupnpc.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "miniupnpc" Fri Jun 4 00:33:11 2021 rev:22 rq:894918 version:2.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/miniupnpc/miniupnpc.changes 2021-04-01 14:16:07.939881211 +0200 +++ /work/SRC/openSUSE:Factory/.miniupnpc.new.1898/miniupnpc.changes 2021-06-04 00:33:14.476876075 +0200 @@ -1,0 +2,12 @@ +Tue May 18 17:53:57 UTC 2021 - Andreas Stieger <andreas.stie...@gmx.de> + +- add upstream signing key and validate source signature + +------------------------------------------------------------------- +Wed Apr 28 10:53:57 UTC 2021 - Martin Pluskal <mplus...@suse.com> + +- Update to version 2.2.2: + * miniupnpcmodule.c: throw an exception in UPnP_discover() + * Fix usage of IP_MULTICAST_IF with struct ip_mreqn + +------------------------------------------------------------------- Old: ---- miniupnpc-2.2.1.tar.gz New: ---- miniupnpc-2.2.2.tar.gz miniupnpc-2.2.2.tar.gz.sig miniupnpc.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ miniupnpc.spec ++++++ --- /var/tmp/diff_new_pack.x0Y9Ol/_old 2021-06-04 00:33:15.104876562 +0200 +++ /var/tmp/diff_new_pack.x0Y9Ol/_new 2021-06-04 00:33:15.104876562 +0200 @@ -1,7 +1,7 @@ # # spec file for package miniupnpc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,15 @@ %define soname 17 %bcond_without python2 Name: miniupnpc -Version: 2.2.1 +Version: 2.2.2 Release: 0 Summary: Universal Plug'n'Play (UPnP) Client License: BSD-3-Clause Group: Productivity/Networking/Other URL: http://miniupnp.free.fr/ Source: http://miniupnp.free.fr/files/miniupnpc-%{version}.tar.gz +Source2: http://miniupnp.free.fr/files/miniupnpc-%{version}.tar.gz.sig +Source3: http://miniupnp.free.fr/A31ACAAF.asc#/%{name}.keyring Source99: baselibs.conf # PATCH-FIX-SUSE: do not hardcode kernel version in headers Patch0: miniupnpc-kernelversion.patch ++++++ miniupnpc-2.2.1.tar.gz -> miniupnpc-2.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/CMakeLists.txt new/miniupnpc-2.2.2/CMakeLists.txt --- old/miniupnpc-2.2.1/CMakeLists.txt 2020-12-20 19:03:55.000000000 +0100 +++ new/miniupnpc-2.2.2/CMakeLists.txt 2021-03-03 00:44:52.000000000 +0100 @@ -2,7 +2,7 @@ project (miniupnpc C) -set (MINIUPNPC_VERSION 2.2.1) +set (MINIUPNPC_VERSION 2.2.2) set (MINIUPNPC_API_VERSION 17) option (UPNPC_BUILD_STATIC "Build static library" TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/Changelog.txt new/miniupnpc-2.2.2/Changelog.txt --- old/miniupnpc-2.2.1/Changelog.txt 2020-12-04 00:31:51.000000000 +0100 +++ new/miniupnpc-2.2.2/Changelog.txt 2021-03-03 00:43:04.000000000 +0100 @@ -1,6 +1,14 @@ -$Id: Changelog.txt,v 1.246 2020/12/03 23:23:09 nanard Exp $ +$Id: Changelog.txt,v 1.248 2021/03/02 23:40:55 nanard Exp $ miniUPnP client Changelog. +2021/01/15: + miniupnpcmodule.c: throw an exception in UPnP_discover() + +2020/12/30: + Fix usage of IP_MULTICAST_IF with struct ip_mreqn + +VERSION 2.2.1 : released 2020/12/20 + 2020/11/30: Add miniupnpc.rc for .dll description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/Makefile.mingw new/miniupnpc-2.2.2/Makefile.mingw --- old/miniupnpc-2.2.1/Makefile.mingw 2020-12-04 00:31:51.000000000 +0100 +++ new/miniupnpc-2.2.2/Makefile.mingw 2021-03-03 00:43:04.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: Makefile.mingw,v 1.29 2020/12/03 23:23:10 nanard Exp $ +# $Id: Makefile.mingw,v 1.30 2021/03/02 23:23:14 nanard Exp $ # Miniupnp project. # http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ # (c) 2005-2020 Thomas Bernard @@ -19,7 +19,7 @@ RM = rm -f endif #CFLAGS = -Wall -g -DDEBUG -D_WIN32_WINNT=0X501 -CFLAGS = -Wall -Os -DNDEBUG -D_WIN32_WINNT=0X501 +CFLAGS = -Wall -W -Wstrict-prototypes -Os -DNDEBUG -D_WIN32_WINNT=0X501 LDLIBS = -lws2_32 -liphlpapi # -lwsock32 # -liphlpapi is needed for GetBestRoute() and GetIpAddrTable() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/VERSION new/miniupnpc-2.2.2/VERSION --- old/miniupnpc-2.2.1/VERSION 2020-12-20 19:03:54.000000000 +0100 +++ new/miniupnpc-2.2.2/VERSION 2021-03-03 00:44:51.000000000 +0100 @@ -1 +1 @@ -2.2.1 +2.2.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/addr_is_reserved.c new/miniupnpc-2.2.2/addr_is_reserved.c --- old/miniupnpc-2.2.1/addr_is_reserved.c 2020-11-09 20:43:34.000000000 +0100 +++ new/miniupnpc-2.2.2/addr_is_reserved.c 2021-03-03 00:43:04.000000000 +0100 @@ -1,9 +1,9 @@ -/* $Id: addr_is_reserved.c,v 1.3 2020/11/09 19:42:42 nanard Exp $ */ +/* $Id: addr_is_reserved.c,v 1.4 2021/03/02 23:40:32 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project : miniupnp * Web : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ * Author : Thomas BERNARD - * copyright (c) 2005-2020 Thomas Bernard + * copyright (c) 2005-2021 Thomas Bernard * This software is subjet to the conditions detailed in the * provided LICENSE file. */ #ifdef _WIN32 @@ -62,7 +62,7 @@ return 1; #else /* was : addr_n = inet_addr(addr_str); */ - if (inet_pton(AF_INET, addr_str, &addr_n) < 0) { + if (inet_pton(AF_INET, addr_str, &addr_n) <= 0) { /* error */ return 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/minissdpc.c new/miniupnpc-2.2.2/minissdpc.c --- old/miniupnpc-2.2.1/minissdpc.c 2020-11-09 20:43:34.000000000 +0100 +++ new/miniupnpc-2.2.2/minissdpc.c 2021-03-03 00:43:04.000000000 +0100 @@ -1,9 +1,9 @@ -/* $Id: minissdpc.c,v 1.46 2020/11/09 19:28:05 nanard Exp $ */ +/* $Id: minissdpc.c,v 1.47 2021/03/02 23:38:30 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project : miniupnp * Web : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ * Author : Thomas BERNARD - * copyright (c) 2005-2020 Thomas Bernard + * copyright (c) 2005-2021 Thomas Bernard * This software is subjet to the conditions detailed in the * provided LICENCE file. */ #include <stdio.h> @@ -33,6 +33,12 @@ #define strncasecmp memicmp #endif /* defined(_MSC_VER) && (_MSC_VER >= 1400) */ #endif /* #ifndef strncasecmp */ +#if defined(WINAPI_FAMILY) && defined(WINAPI_FAMILY_PARTITION) +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP +#define in6addr_any in6addr_any_init +static const IN6_ADDR in6addr_any_init = {0}; +#endif +#endif #endif /* _WIN32 */ #if defined(__amigaos__) || defined(__amigaos4__) #include <sys/socket.h> @@ -66,7 +72,7 @@ #define HAS_IP_MREQN #endif -#if !defined(HAS_IP_MREQN) && !defined(_WIN32) +#ifndef _WIN32 #include <sys/ioctl.h> #if defined(__sun) || defined(__HAIKU__) #include <sys/sockio.h> @@ -697,6 +703,13 @@ * MS Windows Vista and MS Windows Server 2008. * http://msdn.microsoft.com/en-us/library/bb408409%28v=vs.85%29.aspx */ unsigned int ifindex = if_nametoindex(multicastif); /* eth0, etc. */ + if(ifindex == 0) + { + if(error) + *error = MINISSDPC_INVALID_INPUT; + fprintf(stderr, "Invalid multicast interface name %s\n", multicastif); + goto error; + } if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifindex, sizeof(ifindex)) < 0) { PRINT_SOCKET_ERROR("setsockopt IPV6_MULTICAST_IF"); @@ -716,7 +729,7 @@ #endif #else /* was : mc_if.s_addr = inet_addr(multicastif); */ /* ex: 192.168.x.x */ - if (inet_pton(AF_INET, multicastif, &mc_if.s_addr) < 0) { + if (inet_pton(AF_INET, multicastif, &mc_if.s_addr) <= 0) { mc_if.s_addr = INADDR_NONE; } #endif @@ -728,16 +741,11 @@ PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF"); } } else { -#ifdef HAS_IP_MREQN /* was not an ip address, try with an interface name */ +#ifndef _WIN32 +#ifdef HAS_IP_MREQN struct ip_mreqn reqn; /* only defined with -D_BSD_SOURCE or -D_GNU_SOURCE */ - memset(&reqn, 0, sizeof(struct ip_mreqn)); - reqn.imr_ifindex = if_nametoindex(multicastif); - if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&reqn, sizeof(reqn)) < 0) - { - PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF"); - } -#elif !defined(_WIN32) +#endif struct ifreq ifr; int ifrlen = sizeof(ifr); strncpy(ifr.ifr_name, multicastif, IFNAMSIZ); @@ -745,12 +753,30 @@ if(ioctl(sudp, SIOCGIFADDR, &ifr, &ifrlen) < 0) { PRINT_SOCKET_ERROR("ioctl(...SIOCGIFADDR...)"); + goto error; } mc_if.s_addr = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr; +#ifdef HAS_IP_MREQN + memset(&reqn, 0, sizeof(struct ip_mreqn)); + reqn.imr_address.s_addr = mc_if.s_addr; + reqn.imr_ifindex = if_nametoindex(multicastif); + if(reqn.imr_ifindex == 0) + { + if(error) + *error = MINISSDPC_INVALID_INPUT; + fprintf(stderr, "Invalid multicast ip address / interface name %s\n", multicastif); + goto error; + } + if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&reqn, sizeof(reqn)) < 0) + { + PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF"); + } +#else if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0) { PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF"); } +#endif #else /* _WIN32 */ #ifdef DEBUG printf("Setting of multicast interface not supported with interface name.\n"); @@ -966,4 +992,3 @@ closesocket(sudp); return devlist; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/miniupnpc.c new/miniupnpc-2.2.2/miniupnpc.c --- old/miniupnpc-2.2.1/miniupnpc.c 2020-11-09 20:43:34.000000000 +0100 +++ new/miniupnpc-2.2.2/miniupnpc.c 2021-03-03 00:43:04.000000000 +0100 @@ -1,9 +1,9 @@ -/* $Id: miniupnpc.c,v 1.158 2020/11/09 19:41:48 nanard Exp $ */ +/* $Id: miniupnpc.c,v 1.159 2021/03/02 23:36:32 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project : miniupnp * Web : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ * Author : Thomas BERNARD - * copyright (c) 2005-2020 Thomas Bernard + * copyright (c) 2005-2021 Thomas Bernard * This software is subjet to the conditions detailed in the * provided LICENSE file. */ #include <stdlib.h> @@ -320,6 +320,8 @@ return devlist; } } +#else /* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */ + (void)minissdpdsock; /* unused */ #endif /* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */ /* direct discovery if minissdpd responses are not sufficient */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/miniupnpc.h new/miniupnpc-2.2.2/miniupnpc.h --- old/miniupnpc-2.2.1/miniupnpc.h 2020-12-20 19:03:55.000000000 +0100 +++ new/miniupnpc-2.2.2/miniupnpc.h 2021-03-03 00:44:52.000000000 +0100 @@ -1,4 +1,4 @@ -/* $Id: miniupnpc.h,v 1.55 2020/11/09 19:49:32 nanard Exp $ */ +/* $Id: miniupnpc.h,v 1.56 2020/12/20 18:07:35 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project: miniupnp * http://miniupnp.free.fr/ @@ -20,7 +20,7 @@ #define UPNPDISCOVER_MEMORY_ERROR (-102) /* versions : */ -#define MINIUPNPC_VERSION "2.2.1" +#define MINIUPNPC_VERSION "2.2.2" #define MINIUPNPC_API_VERSION 17 /* Source port: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/miniupnpc_socketdef.h new/miniupnpc-2.2.2/miniupnpc_socketdef.h --- old/miniupnpc-2.2.1/miniupnpc_socketdef.h 2019-02-10 14:25:00.000000000 +0100 +++ new/miniupnpc-2.2.2/miniupnpc_socketdef.h 2021-03-03 00:43:04.000000000 +0100 @@ -1,4 +1,4 @@ -/* $Id: miniupnpc_socketdef.h,v 1.3 2019/02/10 13:24:52 nanard Exp $ */ +/* $Id: miniupnpc_socketdef.h,v 1.4 2021/03/02 23:35:29 nanard Exp $ */ /* Miniupnp project : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ * Author : Thomas Bernard * Copyright (c) 2018 Thomas Bernard @@ -7,7 +7,7 @@ #ifndef MINIUPNPC_SOCKETDEF_H_INCLUDED #define MINIUPNPC_SOCKETDEF_H_INCLUDED -#ifdef _MSC_VER +#ifdef _WIN32 #define ISINVALID(s) (INVALID_SOCKET==(s)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/miniupnpcmodule.c new/miniupnpc-2.2.2/miniupnpcmodule.c --- old/miniupnpc-2.2.1/miniupnpcmodule.c 2020-09-28 23:55:13.000000000 +0200 +++ new/miniupnpc-2.2.2/miniupnpcmodule.c 2021-03-03 00:43:04.000000000 +0100 @@ -1,9 +1,9 @@ -/* $Id: miniupnpcmodule.c,v 1.35 2020/09/28 21:02:08 nanard Exp $*/ +/* $Id: miniupnpcmodule.c,v 1.36 2021/03/02 23:34:33 nanard Exp $*/ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project : miniupnp * Author : Thomas BERNARD * website : https://miniupnp.tuxfamily.org/ - * copyright (c) 2007-2020 Thomas Bernard + * copyright (c) 2007-2021 Thomas Bernard * This software is subjet to the conditions detailed in the * provided LICENCE file. */ #include <Python.h> @@ -122,9 +122,9 @@ static PyObject * UPnP_discover(UPnPObject *self) { - struct UPNPDev * dev; - int i; + int error = 0; PyObject *res = NULL; + if(self->devlist) { freeUPNPDevlist(self->devlist); @@ -137,13 +137,21 @@ (int)self->localport, 0/*ip v6*/, 2/* TTL */, - 0/*error */); + &error); Py_END_ALLOW_THREADS /* Py_RETURN_NONE ??? */ - for(dev = self->devlist, i = 0; dev; dev = dev->pNext) - i++; - res = Py_BuildValue("i", i); - return res; + if (self->devlist != NULL) { + struct UPNPDev * dev; + int i = 0; + + for(dev = self->devlist; dev; dev = dev->pNext) + i++; + res = Py_BuildValue("i", i); + return res; + } else { + PyErr_SetString(PyExc_Exception, strupnperror(error)); + return NULL; + } } static PyObject * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/msvc/miniupnpc.vcxproj new/miniupnpc-2.2.2/msvc/miniupnpc.vcxproj --- old/miniupnpc-2.2.1/msvc/miniupnpc.vcxproj 2020-12-04 00:31:52.000000000 +0100 +++ new/miniupnpc-2.2.2/msvc/miniupnpc.vcxproj 2021-03-03 00:43:05.000000000 +0100 @@ -95,6 +95,9 @@ <PreBuildEvent> <Command>genminiupnpcstrings.vbs</Command> </PreBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>INTERNAL_NAME="\"miniupnpc.dll\0\"";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dll|Win32'"> <ClCompile> @@ -114,6 +117,9 @@ <Link> <AdditionalDependencies>ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> + <ResourceCompile> + <PreprocessorDefinitions>INTERNAL_NAME="\"miniupnpc.dll\0\"";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -129,6 +135,9 @@ <PreBuildEvent> <Command>genminiupnpcstrings.vbs</Command> </PreBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>INTERNAL_NAME="\"miniupnpc.dll\0\"";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Dll|Win32'"> <ClCompile> @@ -148,6 +157,9 @@ <Link> <AdditionalDependencies>ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> + <ResourceCompile> + <PreprocessorDefinitions>INTERNAL_NAME="\"miniupnpc.dll\0\"";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\addr_is_reserved.c" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/msvc/miniupnpc.vcxproj.filters new/miniupnpc-2.2.2/msvc/miniupnpc.vcxproj.filters --- old/miniupnpc-2.2.1/msvc/miniupnpc.vcxproj.filters 2020-11-09 20:43:35.000000000 +0100 +++ new/miniupnpc-2.2.2/msvc/miniupnpc.vcxproj.filters 2021-03-03 00:43:05.000000000 +0100 @@ -116,10 +116,18 @@ <ClInclude Include="..\win32_snprintf.h"> <Filter>Fichiers d%27en-t??te</Filter> </ClInclude> + <ClInclude Include="..\rc_version.h"> + <Filter>Fichiers d%27en-t??te</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="genminiupnpcstrings.vbs"> <Filter>scripts</Filter> </None> </ItemGroup> + <ItemGroup> + <ResourceCompile Include="../miniupnpc.rc"> + <Filter>Fichiers de ressources</Filter> + </ResourceCompile> + </ItemGroup> </Project> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/msvc/miniupnpc_vs2010.vcxproj new/miniupnpc-2.2.2/msvc/miniupnpc_vs2010.vcxproj --- old/miniupnpc-2.2.1/msvc/miniupnpc_vs2010.vcxproj 2020-12-04 00:31:52.000000000 +0100 +++ new/miniupnpc-2.2.2/msvc/miniupnpc_vs2010.vcxproj 2021-03-03 00:43:05.000000000 +0100 @@ -88,6 +88,9 @@ <PreBuildEvent> <Command>genminiupnpcstrings.vbs</Command> </PreBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>INTERNAL_NAME="\"miniupnpc.dll\0\"";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dll|Win32'"> <ClCompile> @@ -107,6 +110,9 @@ <Link> <AdditionalDependencies>ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> + <ResourceCompile> + <PreprocessorDefinitions>INTERNAL_NAME="\"miniupnpc.dll\0\"";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -123,6 +129,9 @@ <PreBuildEvent> <Command>genminiupnpcstrings.vbs</Command> </PreBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>INTERNAL_NAME="\"miniupnpc.dll\0\"";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Dll|Win32'"> <ClCompile> @@ -142,6 +151,9 @@ <Link> <AdditionalDependencies>ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> + <ResourceCompile> + <PreprocessorDefinitions>INTERNAL_NAME="\"miniupnpc.dll\0\"";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\addr_is_reserved.c" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/msvc/miniupnpc_vs2010.vcxproj.filters new/miniupnpc-2.2.2/msvc/miniupnpc_vs2010.vcxproj.filters --- old/miniupnpc-2.2.1/msvc/miniupnpc_vs2010.vcxproj.filters 2020-11-09 20:43:35.000000000 +0100 +++ new/miniupnpc-2.2.2/msvc/miniupnpc_vs2010.vcxproj.filters 2021-03-03 00:43:05.000000000 +0100 @@ -105,6 +105,9 @@ <ClInclude Include="..\win32_snprintf.h"> <Filter>Fichiers d%27en-t??te</Filter> </ClInclude> + <ClInclude Include="..\rc_version.h"> + <Filter>Fichiers d%27en-t??te</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <Filter Include="sources"> @@ -122,4 +125,9 @@ <Filter>scripts</Filter> </None> </ItemGroup> -</Project> \ No newline at end of file + <ItemGroup> + <ResourceCompile Include="../miniupnpc.rc"> + <Filter>Fichiers de ressources</Filter> + </ResourceCompile> + </ItemGroup> +</Project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/receivedata.c new/miniupnpc-2.2.2/receivedata.c --- old/miniupnpc-2.2.1/receivedata.c 2018-04-06 12:53:30.000000000 +0200 +++ new/miniupnpc-2.2.2/receivedata.c 2021-03-03 00:43:04.000000000 +0100 @@ -1,8 +1,8 @@ -/* $Id: receivedata.c,v 1.9 2018/04/06 10:53:15 nanard Exp $ */ +/* $Id: receivedata.c,v 1.10 2021/03/02 23:33:07 nanard Exp $ */ /* Project : miniupnp * Website : http://miniupnp.free.fr/ * Author : Thomas Bernard - * Copyright (c) 2011-2014 Thomas Bernard + * Copyright (c) 2011-2021 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. */ @@ -92,7 +92,13 @@ #endif /* DEBUG */ if(scope_id) *scope_id = src_addr6->sin6_scope_id; + } else { + if(scope_id) + *scope_id = 0; } +#else /* MINIUPNPC_GET_SRC_ADDR */ + if(scope_id) + *scope_id = 0; #endif /* MINIUPNPC_GET_SRC_ADDR */ return n; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-2.2.1/upnpc.c new/miniupnpc-2.2.2/upnpc.c --- old/miniupnpc-2.2.1/upnpc.c 2020-11-09 20:43:35.000000000 +0100 +++ new/miniupnpc-2.2.2/upnpc.c 2021-03-03 00:43:05.000000000 +0100 @@ -1,4 +1,4 @@ -/* $Id: upnpc.c,v 1.126 2020/11/09 19:38:06 nanard Exp $ */ +/* $Id: upnpc.c,v 1.127 2021/03/02 23:31:04 nanard Exp $ */ /* Project : miniupnp * Author : Thomas Bernard * Copyright (c) 2005-2020 Thomas Bernard @@ -741,8 +741,8 @@ if (SetRedirectAndTest(&urls, &data, commandargv[0], commandargv[1], commandargv[2], commandargv[3], - (commandargc > 4)&is_int(commandargv[4])?commandargv[4]:"0", - (commandargc > 4)&!is_int(commandargv[4])?commandargv[4]:(commandargc > 5)?commandargv[5]:NULL, + (commandargc > 4) && is_int(commandargv[4]) ? commandargv[4] : "0", + (commandargc > 4) && !is_int(commandargv[4]) ? commandargv[4] : (commandargc > 5) ? commandargv[5] : NULL, description, 0) < 0) retcode = 2; break; @@ -755,8 +755,8 @@ if (SetRedirectAndTest(&urls, &data, commandargv[0], commandargv[1], commandargv[2], commandargv[3], - (commandargc > 4)&is_int(commandargv[4])?commandargv[4]:"0", - (commandargc > 4)&!is_int(commandargv[4])?commandargv[4]:(commandargc > 5)?commandargv[5]:NULL, + (commandargc > 4) && is_int(commandargv[4]) ? commandargv[4] : "0", + (commandargc > 4) && !is_int(commandargv[4]) ? commandargv[4] : (commandargc > 5) ? commandargv[5] : NULL, description, 1) < 0) retcode = 2; break; ++++++ miniupnpc-kernelversion.patch ++++++ --- /var/tmp/diff_new_pack.x0Y9Ol/_old 2021-06-04 00:33:15.196876633 +0200 +++ /var/tmp/diff_new_pack.x0Y9Ol/_new 2021-06-04 00:33:15.196876633 +0200 @@ -1,7 +1,7 @@ -Index: miniupnpc-2.1/updateminiupnpcstrings.sh +Index: miniupnpc-2.2.2/updateminiupnpcstrings.sh =================================================================== ---- miniupnpc-2.1.orig/updateminiupnpcstrings.sh -+++ miniupnpc-2.1/updateminiupnpcstrings.sh +--- miniupnpc-2.2.2.orig/updateminiupnpcstrings.sh ++++ miniupnpc-2.2.2/updateminiupnpcstrings.sh @@ -8,8 +8,8 @@ TMPFILE=miniupnpcstrings.h.tmp TEMPLATE_FILE=${FILE}.in
