Thu Jul 10 13:44:22 2014 UTC ()
Changes 1.8.20140523:
* Add ipv6_bind_address (option "ipv6_listening_ip")
* disable IPv6 when socket(PF_INTET6, ...) errors with EAFNOSUPPORT
* Add IPV6 multicast membership only on selected "LAN" interfaces


(adam)
diff -r1.11 -r1.12 pkgsrc/net/miniupnpd/Makefile
diff -r1.11 -r1.12 pkgsrc/net/miniupnpd/distinfo
diff -r1.5 -r1.6 pkgsrc/net/miniupnpd/options.mk
diff -r1.5 -r0 pkgsrc/net/miniupnpd/patches/patch-Makefile
diff -r1.1 -r0 pkgsrc/net/miniupnpd/patches/patch-bsd_getroute.c
diff -r1.1 -r0 pkgsrc/net/miniupnpd/patches/patch-bsd_ifacewatcher.c
diff -r1.1 -r0 pkgsrc/net/miniupnpd/patches/patch-upnputils.h
diff -r0 -r1.1 pkgsrc/net/miniupnpd/patches/patch-genconfig.sh
cvs diff -r1.11 -r1.12 pkgsrc/net/miniupnpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/miniupnpd/Makefile 2014/02/10 11:45:52 1.11
+++ pkgsrc/net/miniupnpd/Makefile 2014/07/10 13:44:22 1.12
@@ -1,25 +1,31 @@ @@ -1,25 +1,31 @@
1# $NetBSD: Makefile,v 1.11 2014/02/10 11:45:52 adam Exp $ 1# $NetBSD: Makefile,v 1.12 2014/07/10 13:44:22 adam Exp $
2 2
3DISTNAME= miniupnpd-1.8.20140203 3DISTNAME= miniupnpd-1.8.20140523
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= UPnP IGD service with NAT-PMP support 9COMMENT= UPnP IGD service with NAT-PMP support
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12EGDIR= ${PREFIX}/share/examples/miniupnpd 12EGDIR= ${PREFIX}/share/examples/miniupnpd
13CONF_FILES= ${EGDIR}/miniupnpd.conf ${PKG_SYSCONFDIR}/miniupnpd.conf 13CONF_FILES= ${EGDIR}/miniupnpd.conf ${PKG_SYSCONFDIR}/miniupnpd.conf
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16.include "options.mk" 16.include "options.mk"
17 17
18CFLAGS+= -DDEFAULT_CONFIG=\"${PKG_SYSCONFDIR}/miniupnpd.conf\" 18CFLAGS+= -DDEFAULT_CONFIG=\"${PKG_SYSCONFDIR}/miniupnpd.conf\"
19 19
20INSTALL_MAKE_FLAGS+= INSTALLETCDIR=${EGDIR} 20INSTALL_MAKE_FLAGS+= INSTALLETCDIR=${EGDIR}
21INSTALL_MAKE_FLAGS+= INSTALLMANDIR=${PREFIX}/${PKGMANDIR}/man1 21INSTALL_MAKE_FLAGS+= INSTALLMANDIR=${PREFIX}/${PKGMANDIR}/man1
22 22
23RCD_SCRIPTS= miniupnpd 23RCD_SCRIPTS= miniupnpd
24 24
 25SUBST_CLASSES+= fwname
 26SUBST_STAGE.fwname= pre-configure
 27SUBST_MESSAGE.fwname= Setting desired firewall type.
 28SUBST_FILES.fwname= genconfig.sh
 29SUBST_VARS.fwname= FWNAME
 30
25.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/net/miniupnpd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/miniupnpd/distinfo 2014/03/31 11:25:22 1.11
+++ pkgsrc/net/miniupnpd/distinfo 2014/07/10 13:44:22 1.12
@@ -1,9 +1,6 @@ @@ -1,9 +1,6 @@
1$NetBSD: distinfo,v 1.11 2014/03/31 11:25:22 wiz Exp $ 1$NetBSD: distinfo,v 1.12 2014/07/10 13:44:22 adam Exp $
2 2
3SHA1 (miniupnpd-1.8.20140203.tar.gz) = f2ffb05db5831f0105662dcb2787ec5d6ea25630 3SHA1 (miniupnpd-1.8.20140523.tar.gz) = 1f29d76df57fcf4046c7cb9c7312d7fbc3f28e26
4RMD160 (miniupnpd-1.8.20140203.tar.gz) = 6f781c1fad39f0ff6901f1309aef32af41febbc8 4RMD160 (miniupnpd-1.8.20140523.tar.gz) = 215e7b930aa78a9ebe5880b8350adb4e3ff7eab7
5Size (miniupnpd-1.8.20140203.tar.gz) = 170112 bytes 5Size (miniupnpd-1.8.20140523.tar.gz) = 190936 bytes
6SHA1 (patch-Makefile) = c7ec423a3f405aa19959c93df2432cb538e2563e 6SHA1 (patch-genconfig.sh) = 2bd34c785bf4812e191144fd6cb5af89dccce1ee
7SHA1 (patch-bsd_getroute.c) = 0649c6e3febc2bac008f4325f71c64c99200c216 
8SHA1 (patch-bsd_ifacewatcher.c) = 3a9fdf12e721c1452bc34bf2a4938ae5d492a0f0 
9SHA1 (patch-upnputils.h) = a948bc7e77a9ef105f72b28f97498b329849e31f 
cvs diff -r1.5 -r1.6 pkgsrc/net/miniupnpd/options.mk (expand / switch to unified diff)

--- pkgsrc/net/miniupnpd/options.mk 2014/01/30 15:07:57 1.5
+++ pkgsrc/net/miniupnpd/options.mk 2014/07/10 13:44:22 1.6
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: options.mk,v 1.5 2014/01/30 15:07:57 adam Exp $ 1# $NetBSD: options.mk,v 1.6 2014/07/10 13:44:22 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.miniupnpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.miniupnpd
4PKG_OPTIONS_REQUIRED_GROUPS= miniupnpd-fw 4PKG_OPTIONS_REQUIRED_GROUPS= miniupnpd-fw
5PKG_OPTIONS_GROUP.miniupnpd-fw= ipfilter ipfw pf 5PKG_OPTIONS_GROUP.miniupnpd-fw= ipfilter ipfw pf
6 6
7.if ${OPSYS} == "NetBSD" 7.if ${OPSYS} == "NetBSD"
8PKG_SUGGESTED_OPTIONS+= ipfilter 8PKG_SUGGESTED_OPTIONS+= ipfilter
9.else 9.else
10. if exists(/usr/include/net/pfvar.h) || exists(/usr/include/net/pf/pfvar.h) 10. if exists(/usr/include/net/pfvar.h) || exists(/usr/include/net/pf/pfvar.h)
11PKG_SUGGESTED_OPTIONS+= pf 11PKG_SUGGESTED_OPTIONS+= pf
12. else 12. else
13PKG_SUGGESTED_OPTIONS+= ipfilter 13PKG_SUGGESTED_OPTIONS+= ipfilter
14. endif 14. endif
15.endif 15.endif
16 16
17.include "../../mk/bsd.options.mk" 17.include "../../mk/bsd.options.mk"
18 18
19.if !empty(PKG_OPTIONS:Mipfilter) 19.if !empty(PKG_OPTIONS:Mipfilter)
20MAKE_ENV+= FWNAME=ipf 20FWNAME= ipf
21FILES_SUBST+= FWNAME=ipfilter 
22.endif 21.endif
23 22
24.if !empty(PKG_OPTIONS:Mipfw) 23.if !empty(PKG_OPTIONS:Mipfw)
25MAKE_ENV+= FWNAME=ipfw 24FWNAME= ipfw
26FILES_SUBST+= FWNAME=ipfw 
27.endif 25.endif
28 26
29.if !empty(PKG_OPTIONS:Mpf) 27.if !empty(PKG_OPTIONS:Mpf)
30MAKE_ENV+= FWNAME=pf 28FWNAME= pf
31FILES_SUBST+= FWNAME=pf 
32.endif 29.endif
 30
 31MAKE_ENV+= FWNAME=${FWNAME}
File Deleted: pkgsrc/net/miniupnpd/patches/Attic/patch-Makefile
File Deleted: pkgsrc/net/miniupnpd/patches/Attic/patch-bsd_getroute.c
File Deleted: pkgsrc/net/miniupnpd/patches/Attic/patch-bsd_ifacewatcher.c
File Deleted: pkgsrc/net/miniupnpd/patches/Attic/patch-upnputils.h
File Added: pkgsrc/net/miniupnpd/patches/patch-genconfig.sh
$NetBSD: patch-genconfig.sh,v 1.1 2014/07/10 13:44:22 adam Exp $

Avoid firewall type auto-detection.

--- genconfig.sh.orig	2014-07-10 10:43:05.000000000 +0000
+++ genconfig.sh
@@ -293,7 +293,7 @@ case $OS_NAME in
 		;;
 esac
 
-case $FW in
+case @FWNAME@ in
 	pf)
 		echo "#define USE_PF 1" >> ${CONFIGFILE}
 		;;