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
--- 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,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2014/02/10 11:45:52 adam Exp $
+# $NetBSD: Makefile,v 1.12 2014/07/10 13:44:22 adam Exp $
-DISTNAME= miniupnpd-1.8.20140203
+DISTNAME= miniupnpd-1.8.20140523
CATEGORIES= net
MASTER_SITES= http://miniupnp.free.fr/files/download.php?file=
@@ -21,5 +21,11 @@
INSTALL_MAKE_FLAGS+= INSTALLMANDIR=${PREFIX}/${PKGMANDIR}/man1
RCD_SCRIPTS= miniupnpd
+
+SUBST_CLASSES+= fwname
+SUBST_STAGE.fwname= pre-configure
+SUBST_MESSAGE.fwname= Setting desired firewall type.
+SUBST_FILES.fwname= genconfig.sh
+SUBST_VARS.fwname= FWNAME
.include "../../mk/bsd.pkg.mk"
--- 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 @@
-$NetBSD: distinfo,v 1.11 2014/03/31 11:25:22 wiz Exp $
+$NetBSD: distinfo,v 1.12 2014/07/10 13:44:22 adam Exp $
-SHA1 (miniupnpd-1.8.20140203.tar.gz) = f2ffb05db5831f0105662dcb2787ec5d6ea25630
+SHA1 (miniupnpd-1.8.20140523.tar.gz) = 1f29d76df57fcf4046c7cb9c7312d7fbc3f28e26
-RMD160 (miniupnpd-1.8.20140203.tar.gz) = 6f781c1fad39f0ff6901f1309aef32af41febbc8
+RMD160 (miniupnpd-1.8.20140523.tar.gz) = 215e7b930aa78a9ebe5880b8350adb4e3ff7eab7
-Size (miniupnpd-1.8.20140203.tar.gz) = 170112 bytes
+Size (miniupnpd-1.8.20140523.tar.gz) = 190936 bytes
-SHA1 (patch-Makefile) = c7ec423a3f405aa19959c93df2432cb538e2563e
+SHA1 (patch-genconfig.sh) = 2bd34c785bf4812e191144fd6cb5af89dccce1ee
-SHA1 (patch-bsd_getroute.c) = 0649c6e3febc2bac008f4325f71c64c99200c216
-SHA1 (patch-bsd_ifacewatcher.c) = 3a9fdf12e721c1452bc34bf2a4938ae5d492a0f0
-SHA1 (patch-upnputils.h) = a948bc7e77a9ef105f72b28f97498b329849e31f
--- 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,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2014/01/30 15:07:57 adam Exp $
+# $NetBSD: options.mk,v 1.6 2014/07/10 13:44:22 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.miniupnpd
PKG_OPTIONS_REQUIRED_GROUPS= miniupnpd-fw
@@ -17,16 +17,15 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mipfilter)
-MAKE_ENV+= FWNAME=ipf
-FILES_SUBST+= FWNAME=ipfilter
+FWNAME= ipf
.endif
.if !empty(PKG_OPTIONS:Mipfw)
-MAKE_ENV+= FWNAME=ipfw
-FILES_SUBST+= FWNAME=ipfw
+FWNAME= ipfw
.endif
.if !empty(PKG_OPTIONS:Mpf)
-MAKE_ENV+= FWNAME=pf
-FILES_SUBST+= FWNAME=pf
+FWNAME= pf
.endif
+
+MAKE_ENV+= FWNAME=${FWNAME}
$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}
;;