diff options
author | nikita <nikita@pkgsrc.org> | 2022-04-11 10:04:38 +0000 |
---|---|---|
committer | nikita <nikita@pkgsrc.org> | 2022-04-11 10:04:38 +0000 |
commit | 24af1de1cd0af5b231b0728f287c1fb9b36e1856 (patch) | |
tree | 9d7a39c6f6a00f0d5e94e50c2466ba946c521cf2 /net | |
parent | bc5226f8b4a62bad2d6c06f7e5da05a653829ee2 (diff) | |
download | pkgsrc-24af1de1cd0af5b231b0728f287c1fb9b36e1856.tar.gz |
miniupnpc: Update to 2.2.3
Changelog:
2021/08/13:
Change directory structure : include/ and src/ directories.
Diffstat (limited to 'net')
-rw-r--r-- | net/miniupnpc/Makefile | 4 | ||||
-rw-r--r-- | net/miniupnpc/distinfo | 16 | ||||
-rw-r--r-- | net/miniupnpc/patches/patch-Makefile | 42 | ||||
-rw-r--r-- | net/miniupnpc/patches/patch-minissdpc.c | 6 | ||||
-rw-r--r-- | net/miniupnpc/patches/patch-miniwget.c | 6 | ||||
-rw-r--r-- | net/miniupnpc/patches/patch-upnpc.c | 6 |
6 files changed, 53 insertions, 27 deletions
diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile index 8a9141a1dae..3e5b3cc75e6 100644 --- a/net/miniupnpc/Makefile +++ b/net/miniupnpc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2021/06/04 18:57:46 adam Exp $ +# $NetBSD: Makefile,v 1.8 2022/04/11 10:04:38 nikita Exp $ -DISTNAME= miniupnpc-2.2.2 +DISTNAME= miniupnpc-2.2.3 CATEGORIES= net MASTER_SITES= http://miniupnp.free.fr/files/download.php?file= diff --git a/net/miniupnpc/distinfo b/net/miniupnpc/distinfo index 9e86b580030..bb77b7f44d8 100644 --- a/net/miniupnpc/distinfo +++ b/net/miniupnpc/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2021/10/26 11:06:00 nia Exp $ +$NetBSD: distinfo,v 1.10 2022/04/11 10:04:38 nikita Exp $ -BLAKE2s (miniupnpc-2.2.2.tar.gz) = 2273f740fb05bfeeb9803c3cbc84b281bd063e6a5d234047eb003a4862cc20a1 -SHA512 (miniupnpc-2.2.2.tar.gz) = d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116 -Size (miniupnpc-2.2.2.tar.gz) = 100008 bytes -SHA1 (patch-Makefile) = ff725105ef51547e586f705d47cdc4eb2cf52e51 -SHA1 (patch-minissdpc.c) = 183fcebe7a94acb596db6ef03ee7663532808108 -SHA1 (patch-miniwget.c) = 6bf80bc09af904c10a9ad1dc226115070860cf11 -SHA1 (patch-upnpc.c) = 65a0f801de3ce41aa74a143c112e0dbd4a972dcb +BLAKE2s (miniupnpc-2.2.3.tar.gz) = 24b937140e5d792c9a1df1f2ff62a8a144d429214888a87609c4294fdc644c42 +SHA512 (miniupnpc-2.2.3.tar.gz) = 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee +Size (miniupnpc-2.2.3.tar.gz) = 101360 bytes +SHA1 (patch-Makefile) = 0d518bc727c3ae474d51c6872502ba3f1a819f47 +SHA1 (patch-minissdpc.c) = bb2e5cd4c4cebceb39ad11496ce0d6bf3a1557a4 +SHA1 (patch-miniwget.c) = c4463b91540378c911a1b46db50c3ac4c6efd59e +SHA1 (patch-upnpc.c) = 2eb87b306095950e6c4f2e599b645a5d876e8ae6 diff --git a/net/miniupnpc/patches/patch-Makefile b/net/miniupnpc/patches/patch-Makefile index 9b6246640e2..5eab472a69b 100644 --- a/net/miniupnpc/patches/patch-Makefile +++ b/net/miniupnpc/patches/patch-Makefile @@ -1,12 +1,13 @@ -$NetBSD: patch-Makefile,v 1.4 2021/06/10 16:45:22 nia Exp $ +$NetBSD: patch-Makefile,v 1.5 2022/04/11 10:04:38 nikita Exp $ Do not pick pkgsrc libtool on Darwin. Use correct installation dirs. Avoid non-portable sed in updateversion. +Fix Makefile rules to account for $(BUILD) (fixed in upstream). ---- Makefile.orig 2020-11-27 18:25:02.000000000 +0000 -+++ Makefile -@@ -15,7 +15,7 @@ VERSION = $(shell cat VERSION) +--- Makefile.orig 2021-09-28 23:11:31.000000000 +0200 ++++ Makefile 2022-04-11 11:58:41.017331131 +0200 +@@ -15,7 +15,7 @@ ifneq (, $(findstring darwin, $(OS))) JARSUFFIX=mac @@ -15,7 +16,7 @@ Avoid non-portable sed in updateversion. endif ifneq (, $(findstring linux, $(OS))) JARSUFFIX=linux -@@ -155,7 +155,7 @@ endif +@@ -157,12 +157,12 @@ INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) INSTALLDIRBIN = $(INSTALLPREFIX)/bin @@ -24,12 +25,37 @@ Avoid non-portable sed in updateversion. PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) -@@ -242,7 +242,7 @@ updateversion: miniupnpc.h - cp miniupnpc.h miniupnpc.h.bak - sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < miniupnpc.h.bak > miniupnpc.h + ifeq (, $(findstring amiga, $(OS))) +-FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc ++FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc + endif + + +@@ -244,22 +244,22 @@ + cp $< $<.bak + sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < $<.bak > $< -install: updateversion $(FILESTOINSTALL) +install: $(FILESTOINSTALL) $(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC) $(INSTALL) -m 644 $(HEADERS) $(DESTDIR)$(INSTALLDIRINC) $(INSTALL) -d $(DESTDIR)$(INSTALLDIRLIB) + $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB) + ifeq (, $(findstring amiga, $(OS))) + $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME) +- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY) ++ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY)) + $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) +- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) ++ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) + endif + $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN) + ifneq (, $(findstring amiga, $(OS))) +- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc ++ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc + else +- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc ++ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc + endif + $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip + ifeq (, $(findstring amiga, $(OS))) diff --git a/net/miniupnpc/patches/patch-minissdpc.c b/net/miniupnpc/patches/patch-minissdpc.c index b7862f260ae..549d3efbe1c 100644 --- a/net/miniupnpc/patches/patch-minissdpc.c +++ b/net/miniupnpc/patches/patch-minissdpc.c @@ -1,9 +1,9 @@ -$NetBSD: patch-minissdpc.c,v 1.2 2018/10/03 22:27:05 nia Exp $ +$NetBSD: patch-minissdpc.c,v 1.3 2022/04/11 10:04:38 nikita Exp $ need sockio.h for SIOCGIFADDR on SunOS ---- minissdpc.c.orig 2018-04-06 10:53:30.000000000 +0000 -+++ minissdpc.c +--- src/minissdpc.c.orig 2018-04-06 10:53:30.000000000 +0000 ++++ src/minissdpc.c @@ -14,6 +14,9 @@ #if defined (__NetBSD__) #include <net/if.h> diff --git a/net/miniupnpc/patches/patch-miniwget.c b/net/miniupnpc/patches/patch-miniwget.c index a2743f36188..80dc8128414 100644 --- a/net/miniupnpc/patches/patch-miniwget.c +++ b/net/miniupnpc/patches/patch-miniwget.c @@ -1,9 +1,9 @@ -$NetBSD: patch-miniwget.c,v 1.1 2020/11/23 20:15:19 nia Exp $ +$NetBSD: patch-miniwget.c,v 1.2 2022/04/11 10:04:38 nikita Exp $ ctype arguments must be unsigned char. ---- miniwget.c.orig 2020-11-09 19:43:34.000000000 +0000 -+++ miniwget.c +--- src/miniwget.c.orig 2020-11-09 19:43:34.000000000 +0000 ++++ src/miniwget.c @@ -249,7 +249,7 @@ getHTTPResponse(SOCKET s, int * size, in if(buf[i] == '\r') i++; if(i<n && buf[i] == '\n') i++; diff --git a/net/miniupnpc/patches/patch-upnpc.c b/net/miniupnpc/patches/patch-upnpc.c index 33bcd0dd528..6aa38e00a60 100644 --- a/net/miniupnpc/patches/patch-upnpc.c +++ b/net/miniupnpc/patches/patch-upnpc.c @@ -1,9 +1,9 @@ -$NetBSD: patch-upnpc.c,v 1.1 2020/11/23 20:15:19 nia Exp $ +$NetBSD: patch-upnpc.c,v 1.2 2022/04/11 10:04:38 nikita Exp $ ctype arguments must be unsigned char. ---- upnpc.c.orig 2020-11-09 19:43:35.000000000 +0000 -+++ upnpc.c +--- src/upnpc.c.orig 2020-11-09 19:43:35.000000000 +0000 ++++ src/upnpc.c @@ -53,7 +53,7 @@ int is_int(char const* s) return 0; while(*s) { |