From 6fa3fd2fc59483e2e301d39805029749e950bb0b Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Tue, 8 Feb 2011 02:45:18 +0000
Subject: Add FETCH_USE_IPV4_ONLY option to force connecting to only IPv4
 addresses.

---
 mk/fetch/fetch.mk | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'mk')

diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk
index 30574acc5ff..f2a0c4eb881 100644
--- a/mk/fetch/fetch.mk
+++ b/mk/fetch/fetch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.48 2011/02/08 02:40:57 obache Exp $
+# $NetBSD: fetch.mk,v 1.49 2011/02/08 02:45:18 obache Exp $
 
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE=	${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -192,23 +192,29 @@ fetch-check-interactive: .USEBEFORE
 #	connections after the given amount of seconds.
 #       The specific behavior depends on the command used.
 #
+# FETCH_USE_IPV4_ONLY, if defined, will cause the fetch command to force
+#	connecting to only IPv4 addresses.
+#
 
 # If this host is behind a filtering firewall, use passive ftp(1)
 _FETCH_BEFORE_ARGS.ftp=		${PASSIVE_FETCH:D-p} \
-				${FETCH_TIMEOUT:D-q ${FETCH_TIMEOUT}}
+				${FETCH_TIMEOUT:D-q ${FETCH_TIMEOUT}} \
+				${FETCH_USE_IPV4_ONLY:D-4}
 _FETCH_AFTER_ARGS.ftp=		# empty
 _FETCH_RESUME_ARGS.ftp=		-R
 _FETCH_OUTPUT_ARGS.ftp=		-o
 _FETCH_CMD.ftp=			${TOOLS_PATH.ftp}
 
-_FETCH_BEFORE_ARGS.fetch=	${FETCH_TIMEOUT:D-T ${FETCH_TIMEOUT}}
+_FETCH_BEFORE_ARGS.fetch=	${FETCH_TIMEOUT:D-T ${FETCH_TIMEOUT}} \
+				${FETCH_USE_IPV4_ONLY:D-4}
 _FETCH_AFTER_ARGS.fetch=	# empty
 _FETCH_RESUME_ARGS.fetch=	-r
 _FETCH_OUTPUT_ARGS.fetch=	-o
 _FETCH_CMD.fetch=		${TOOLS_PATH.fetch}
 
 _FETCH_BEFORE_ARGS.wget=	${PASSIVE_FETCH:D--passive-ftp} \
-				${FETCH_TIMEOUT:D--timeout=${FETCH_TIMEOUT}}
+				${FETCH_TIMEOUT:D--timeout=${FETCH_TIMEOUT}} \
+				${FETCH_USE_IPV4_ONLY:D--inet4-only}
 _FETCH_AFTER_ARGS.wget=		# empty
 _FETCH_RESUME_ARGS.wget=	-c
 _FETCH_OUTPUT_ARGS.wget=	-O
@@ -217,7 +223,8 @@ _FETCH_CMD.wget=		${PREFIX}/bin/wget
 _FETCH_BEFORE_ARGS.curl=	${PASSIVE_FETCH:D--ftp-pasv} \
 				--fail --location \
 				${FETCH_TIMEOUT:D--connect-timeout ${FETCH_TIMEOUT}} \
-				${FETCH_TIMEOUT:D--speed-time ${FETCH_TIMEOUT}}
+				${FETCH_TIMEOUT:D--speed-time ${FETCH_TIMEOUT}} \
+				${FETCH_USE_IPV4_ONLY:D--ipv4}
 _FETCH_AFTER_ARGS.curl=		-O # must be here to honor -o option
 _FETCH_RESUME_ARGS.curl=	-C -
 _FETCH_OUTPUT_ARGS.curl=	-o
-- 
cgit v1.2.3