CVS commit: pkgsrc/net/miniupnpc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/miniupnpc
From: "Nikita" <nikita%netbsd.org@localhost>
Date: Mon, 11 Apr 2022 10:04:39 +0000

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon Apr 11 10:04:39 UTC 2022

Modified Files:
        pkgsrc/net/miniupnpc: Makefile distinfo
        pkgsrc/net/miniupnpc/patches: patch-Makefile patch-minissdpc.c
            patch-miniwget.c patch-upnpc.c

Log Message:
miniupnpc: Update to 2.2.3

Changelog:

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


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/miniupnpc/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/miniupnpc/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/miniupnpc/patches/patch-Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/miniupnpc/patches/patch-minissdpc.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/miniupnpc/patches/patch-miniwget.c \
    pkgsrc/net/miniupnpc/patches/patch-upnpc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/miniupnpc/Makefile
diff -u pkgsrc/net/miniupnpc/Makefile:1.7 pkgsrc/net/miniupnpc/Makefile:1.8
--- pkgsrc/net/miniupnpc/Makefile:1.7   Fri Jun  4 18:57:46 2021
+++ pkgsrc/net/miniupnpc/Makefile       Mon Apr 11 10:04:38 2022
@@ -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=
 

Index: pkgsrc/net/miniupnpc/distinfo
diff -u pkgsrc/net/miniupnpc/distinfo:1.9 pkgsrc/net/miniupnpc/distinfo:1.10
--- pkgsrc/net/miniupnpc/distinfo:1.9   Tue Oct 26 11:06:00 2021
+++ pkgsrc/net/miniupnpc/distinfo       Mon Apr 11 10:04:38 2022
@@ -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

Index: pkgsrc/net/miniupnpc/patches/patch-Makefile
diff -u pkgsrc/net/miniupnpc/patches/patch-Makefile:1.4 pkgsrc/net/miniupnpc/patches/patch-Makefile:1.5
--- pkgsrc/net/miniupnpc/patches/patch-Makefile:1.4     Thu Jun 10 16:45:22 2021
+++ pkgsrc/net/miniupnpc/patches/patch-Makefile Mon Apr 11 10:04:38 2022
@@ -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)))

Index: pkgsrc/net/miniupnpc/patches/patch-minissdpc.c
diff -u pkgsrc/net/miniupnpc/patches/patch-minissdpc.c:1.2 pkgsrc/net/miniupnpc/patches/patch-minissdpc.c:1.3
--- pkgsrc/net/miniupnpc/patches/patch-minissdpc.c:1.2  Wed Oct  3 22:27:05 2018
+++ pkgsrc/net/miniupnpc/patches/patch-minissdpc.c      Mon Apr 11 10:04:38 2022
@@ -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>

Index: pkgsrc/net/miniupnpc/patches/patch-miniwget.c
diff -u pkgsrc/net/miniupnpc/patches/patch-miniwget.c:1.1 pkgsrc/net/miniupnpc/patches/patch-miniwget.c:1.2
--- pkgsrc/net/miniupnpc/patches/patch-miniwget.c:1.1   Mon Nov 23 20:15:19 2020
+++ pkgsrc/net/miniupnpc/patches/patch-miniwget.c       Mon Apr 11 10:04:38 2022
@@ -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++;
Index: pkgsrc/net/miniupnpc/patches/patch-upnpc.c
diff -u pkgsrc/net/miniupnpc/patches/patch-upnpc.c:1.1 pkgsrc/net/miniupnpc/patches/patch-upnpc.c:1.2
--- pkgsrc/net/miniupnpc/patches/patch-upnpc.c:1.1      Mon Nov 23 20:15:19 2020
+++ pkgsrc/net/miniupnpc/patches/patch-upnpc.c  Mon Apr 11 10:04:38 2022
@@ -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) {

Prev by Date: CVS commit: pkgsrc/x11/motif
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/x11/motif
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index