Mon Apr 11 10:04:39 2022 UTC ()
miniupnpc: Update to 2.2.3

Changelog:

2021/08/13:
  Change directory structure : include/ and src/ directories.


(nikita)
diff -r1.7 -r1.8 pkgsrc/net/miniupnpc/Makefile
diff -r1.9 -r1.10 pkgsrc/net/miniupnpc/distinfo
diff -r1.4 -r1.5 pkgsrc/net/miniupnpc/patches/patch-Makefile
diff -r1.2 -r1.3 pkgsrc/net/miniupnpc/patches/patch-minissdpc.c
diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/patches/patch-miniwget.c
diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/patches/patch-upnpc.c
cvs diff -r1.7 -r1.8 pkgsrc/net/miniupnpc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/Makefile 2021/06/04 18:57:46 1.7
+++ pkgsrc/net/miniupnpc/Makefile 2022/04/11 10:04:38 1.8
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.7 2021/06/04 18:57:46 adam Exp $ 1# $NetBSD: Makefile,v 1.8 2022/04/11 10:04:38 nikita Exp $
2 2
3DISTNAME= miniupnpc-2.2.2 3DISTNAME= miniupnpc-2.2.3
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://miniupnp.free.fr/files/download.php?file= 5MASTER_SITES= http://miniupnp.free.fr/files/download.php?file=
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://miniupnp.free.fr/ 8HOMEPAGE= http://miniupnp.free.fr/
9COMMENT= Client and library for UPnP IGD services 9COMMENT= Client and library for UPnP IGD services
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12USE_TOOLS+= gmake 12USE_TOOLS+= gmake
13USE_LANGUAGES= c99 13USE_LANGUAGES= c99
14 14
15CPPFLAGS.SunOS+= -D__EXTENSIONS__ 15CPPFLAGS.SunOS+= -D__EXTENSIONS__
16LDFLAGS.SunOS+= -lsocket -lnsl 16LDFLAGS.SunOS+= -lsocket -lnsl
cvs diff -r1.9 -r1.10 pkgsrc/net/miniupnpc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/distinfo 2021/10/26 11:06:00 1.9
+++ pkgsrc/net/miniupnpc/distinfo 2022/04/11 10:04:38 1.10
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.9 2021/10/26 11:06:00 nia Exp $ 1$NetBSD: distinfo,v 1.10 2022/04/11 10:04:38 nikita Exp $
2 2
3BLAKE2s (miniupnpc-2.2.2.tar.gz) = 2273f740fb05bfeeb9803c3cbc84b281bd063e6a5d234047eb003a4862cc20a1 3BLAKE2s (miniupnpc-2.2.3.tar.gz) = 24b937140e5d792c9a1df1f2ff62a8a144d429214888a87609c4294fdc644c42
4SHA512 (miniupnpc-2.2.2.tar.gz) = d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116 4SHA512 (miniupnpc-2.2.3.tar.gz) = 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
5Size (miniupnpc-2.2.2.tar.gz) = 100008 bytes 5Size (miniupnpc-2.2.3.tar.gz) = 101360 bytes
6SHA1 (patch-Makefile) = ff725105ef51547e586f705d47cdc4eb2cf52e51 6SHA1 (patch-Makefile) = 0d518bc727c3ae474d51c6872502ba3f1a819f47
7SHA1 (patch-minissdpc.c) = 183fcebe7a94acb596db6ef03ee7663532808108 7SHA1 (patch-minissdpc.c) = bb2e5cd4c4cebceb39ad11496ce0d6bf3a1557a4
8SHA1 (patch-miniwget.c) = 6bf80bc09af904c10a9ad1dc226115070860cf11 8SHA1 (patch-miniwget.c) = c4463b91540378c911a1b46db50c3ac4c6efd59e
9SHA1 (patch-upnpc.c) = 65a0f801de3ce41aa74a143c112e0dbd4a972dcb 9SHA1 (patch-upnpc.c) = 2eb87b306095950e6c4f2e599b645a5d876e8ae6
cvs diff -r1.4 -r1.5 pkgsrc/net/miniupnpc/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/patches/patch-Makefile 2021/06/10 16:45:22 1.4
+++ pkgsrc/net/miniupnpc/patches/patch-Makefile 2022/04/11 10:04:38 1.5
@@ -1,35 +1,61 @@ @@ -1,35 +1,61 @@
1$NetBSD: patch-Makefile,v 1.4 2021/06/10 16:45:22 nia Exp $ 1$NetBSD: patch-Makefile,v 1.5 2022/04/11 10:04:38 nikita Exp $
2 2
3Do not pick pkgsrc libtool on Darwin. 3Do not pick pkgsrc libtool on Darwin.
4Use correct installation dirs. 4Use correct installation dirs.
5Avoid non-portable sed in updateversion. 5Avoid non-portable sed in updateversion.
 6Fix Makefile rules to account for $(BUILD) (fixed in upstream).
6 7
7--- Makefile.orig 2020-11-27 18:25:02.000000000 +0000 8--- Makefile.orig 2021-09-28 23:11:31.000000000 +0200
8+++ Makefile 9+++ Makefile 2022-04-11 11:58:41.017331131 +0200
9@@ -15,7 +15,7 @@ VERSION = $(shell cat VERSION) 10@@ -15,7 +15,7 @@
10  11
11 ifneq (, $(findstring darwin, $(OS))) 12 ifneq (, $(findstring darwin, $(OS)))
12 JARSUFFIX=mac 13 JARSUFFIX=mac
13-LIBTOOL ?= $(shell which libtool) 14-LIBTOOL ?= $(shell which libtool)
14+LIBTOOL ?= /usr/bin/libtool 15+LIBTOOL ?= /usr/bin/libtool
15 endif 16 endif
16 ifneq (, $(findstring linux, $(OS))) 17 ifneq (, $(findstring linux, $(OS)))
17 JARSUFFIX=linux 18 JARSUFFIX=linux
18@@ -155,7 +155,7 @@ endif 19@@ -157,12 +157,12 @@
19 INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc 20 INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
20 INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) 21 INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
21 INSTALLDIRBIN = $(INSTALLPREFIX)/bin 22 INSTALLDIRBIN = $(INSTALLPREFIX)/bin
22-INSTALLDIRMAN = $(INSTALLPREFIX)/share/man 23-INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
23+INSTALLDIRMAN = $(INSTALLPREFIX)/$(PKGMANDIR) 24+INSTALLDIRMAN = $(INSTALLPREFIX)/$(PKGMANDIR)
24 PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig 25 PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
25  26
26 FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) 27 FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
27@@ -242,7 +242,7 @@ updateversion: miniupnpc.h 28 ifeq (, $(findstring amiga, $(OS)))
28 cp miniupnpc.h miniupnpc.h.bak 29-FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc
29 sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < miniupnpc.h.bak > miniupnpc.h 30+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
 31 endif
 32
 33
 34@@ -244,22 +244,22 @@
 35 cp $< $<.bak
 36 sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < $<.bak > $<
30  37
31-install: updateversion $(FILESTOINSTALL) 38-install: updateversion $(FILESTOINSTALL)
32+install: $(FILESTOINSTALL) 39+install: $(FILESTOINSTALL)
33 $(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC) 40 $(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
34 $(INSTALL) -m 644 $(HEADERS) $(DESTDIR)$(INSTALLDIRINC) 41 $(INSTALL) -m 644 $(HEADERS) $(DESTDIR)$(INSTALLDIRINC)
35 $(INSTALL) -d $(DESTDIR)$(INSTALLDIRLIB) 42 $(INSTALL) -d $(DESTDIR)$(INSTALLDIRLIB)
 43 $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
 44 ifeq (, $(findstring amiga, $(OS)))
 45 $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
 46- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
 47+ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY))
 48 $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
 49- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
 50+ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
 51 endif
 52 $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
 53 ifneq (, $(findstring amiga, $(OS)))
 54- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
 55+ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
 56 else
 57- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
 58+ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
 59 endif
 60 $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
 61 ifeq (, $(findstring amiga, $(OS)))
cvs diff -r1.2 -r1.3 pkgsrc/net/miniupnpc/patches/patch-minissdpc.c (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/patches/patch-minissdpc.c 2018/10/03 22:27:05 1.2
+++ pkgsrc/net/miniupnpc/patches/patch-minissdpc.c 2022/04/11 10:04:38 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-minissdpc.c,v 1.2 2018/10/03 22:27:05 nia Exp $ 1$NetBSD: patch-minissdpc.c,v 1.3 2022/04/11 10:04:38 nikita Exp $
2 2
3need sockio.h for SIOCGIFADDR on SunOS 3need sockio.h for SIOCGIFADDR on SunOS
4 4
5--- minissdpc.c.orig 2018-04-06 10:53:30.000000000 +0000 5--- src/minissdpc.c.orig 2018-04-06 10:53:30.000000000 +0000
6+++ minissdpc.c 6+++ src/minissdpc.c
7@@ -14,6 +14,9 @@ 7@@ -14,6 +14,9 @@
8 #if defined (__NetBSD__) 8 #if defined (__NetBSD__)
9 #include <net/if.h> 9 #include <net/if.h>
10 #endif 10 #endif
11+#if defined(__sun) 11+#if defined(__sun)
12+#include <sys/sockio.h> 12+#include <sys/sockio.h>
13+#endif 13+#endif
14 #if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__) 14 #if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
15 #ifdef _WIN32 15 #ifdef _WIN32
16 #include <winsock2.h> 16 #include <winsock2.h>
cvs diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/patches/patch-miniwget.c (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/patches/patch-miniwget.c 2020/11/23 20:15:19 1.1
+++ pkgsrc/net/miniupnpc/patches/patch-miniwget.c 2022/04/11 10:04:38 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-miniwget.c,v 1.1 2020/11/23 20:15:19 nia Exp $ 1$NetBSD: patch-miniwget.c,v 1.2 2022/04/11 10:04:38 nikita Exp $
2 2
3ctype arguments must be unsigned char. 3ctype arguments must be unsigned char.
4 4
5--- miniwget.c.orig 2020-11-09 19:43:34.000000000 +0000 5--- src/miniwget.c.orig 2020-11-09 19:43:34.000000000 +0000
6+++ miniwget.c 6+++ src/miniwget.c
7@@ -249,7 +249,7 @@ getHTTPResponse(SOCKET s, int * size, in 7@@ -249,7 +249,7 @@ getHTTPResponse(SOCKET s, int * size, in
8 if(buf[i] == '\r') i++; 8 if(buf[i] == '\r') i++;
9 if(i<n && buf[i] == '\n') i++; 9 if(i<n && buf[i] == '\n') i++;
10 } 10 }
11- while(i<n && isxdigit(buf[i]) 11- while(i<n && isxdigit(buf[i])
12+ while(i<n && isxdigit((unsigned char)buf[i]) 12+ while(i<n && isxdigit((unsigned char)buf[i])
13 && chunksize_buf_index < (sizeof(chunksize_buf)-1)) 13 && chunksize_buf_index < (sizeof(chunksize_buf)-1))
14 { 14 {
15 chunksize_buf[chunksize_buf_index++] = buf[i]; 15 chunksize_buf[chunksize_buf_index++] = buf[i];
cvs diff -r1.1 -r1.2 pkgsrc/net/miniupnpc/patches/patch-upnpc.c (expand / switch to unified diff)

--- pkgsrc/net/miniupnpc/patches/patch-upnpc.c 2020/11/23 20:15:19 1.1
+++ pkgsrc/net/miniupnpc/patches/patch-upnpc.c 2022/04/11 10:04:38 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-upnpc.c,v 1.1 2020/11/23 20:15:19 nia Exp $ 1$NetBSD: patch-upnpc.c,v 1.2 2022/04/11 10:04:38 nikita Exp $
2 2
3ctype arguments must be unsigned char. 3ctype arguments must be unsigned char.
4 4
5--- upnpc.c.orig 2020-11-09 19:43:35.000000000 +0000 5--- src/upnpc.c.orig 2020-11-09 19:43:35.000000000 +0000
6+++ upnpc.c 6+++ src/upnpc.c
7@@ -53,7 +53,7 @@ int is_int(char const* s) 7@@ -53,7 +53,7 @@ int is_int(char const* s)
8 return 0; 8 return 0;
9 while(*s) { 9 while(*s) {
10 /* #define isdigit(c) ((c) >= '0' && (c) <= '9') */ 10 /* #define isdigit(c) ((c) >= '0' && (c) <= '9') */
11- if(!isdigit(*s)) 11- if(!isdigit(*s))
12+ if(!isdigit((unsigned char)*s)) 12+ if(!isdigit((unsigned char)*s))
13 return 0; 13 return 0;
14 s++; 14 s++;
15 } 15 }