Fri Dec 14 16:46:24 2012 UTC ()
Clear FTPUSERAGENT environment variable.
When FTPUSERAGENT="Mozilla/1.0", for example, fetching from
MASTER_SITE_SOURCEFORGE fails.
Original problem is reported from tsutsui@.


(ryoon)
diff -r1.56 -r1.57 pkgsrc/mk/fetch/fetch.mk
cvs diff -r1.56 -r1.57 pkgsrc/mk/fetch/fetch.mk (expand / switch to unified diff)

--- pkgsrc/mk/fetch/fetch.mk 2012/07/27 10:48:36 1.56
+++ pkgsrc/mk/fetch/fetch.mk 2012/12/14 16:46:24 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: fetch.mk,v 1.56 2012/07/27 10:48:36 jperkin Exp $ 1# $NetBSD: fetch.mk,v 1.57 2012/12/14 16:46:24 ryoon Exp $
2 2
3_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} 3_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
4_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} 4_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
5 5
6# Where to put distfiles that don't have any other master site 6# Where to put distfiles that don't have any other master site
7MASTER_SITE_LOCAL?= ${MASTER_SITE_BACKUP:=LOCAL_PORTS/} 7MASTER_SITE_LOCAL?= ${MASTER_SITE_BACKUP:=LOCAL_PORTS/}
8 8
9# Set up _ORDERED_SITES to work out the exact list of sites for every file, 9# Set up _ORDERED_SITES to work out the exact list of sites for every file,
10# using the dynamic sites script, or ordering according to the master site 10# using the dynamic sites script, or ordering according to the master site
11# list, MASTER_SORT_RANDOM randomization feature, or the patterns in 11# list, MASTER_SORT_RANDOM randomization feature, or the patterns in
12# MASTER_SORT or MASTER_SORT_REGEX as appropriate. 12# MASTER_SORT or MASTER_SORT_REGEX as appropriate.
13# No actual sorting is done until _ORDERED_SITES is expanded. 13# No actual sorting is done until _ORDERED_SITES is expanded.
14# 14#
@@ -232,26 +232,27 @@ _FETCH_OUTPUT_ARGS.curl= -o @@ -232,26 +232,27 @@ _FETCH_OUTPUT_ARGS.curl= -o
232_FETCH_CMD.curl= ${TOOLS_PATH.curl} 232_FETCH_CMD.curl= ${TOOLS_PATH.curl}
233 233
234_FETCH_CMD.manual= ${TOOLS_PATH.false} 234_FETCH_CMD.manual= ${TOOLS_PATH.false}
235 235
236_FETCH_CMD.custom= ${FETCH_CMD} 236_FETCH_CMD.custom= ${FETCH_CMD}
237_FETCH_BEFORE_ARGS.custom= ${FETCH_BEFORE_ARGS} 237_FETCH_BEFORE_ARGS.custom= ${FETCH_BEFORE_ARGS}
238_FETCH_AFTER_ARGS.custom= ${FETCH_AFTER_ARGS} 238_FETCH_AFTER_ARGS.custom= ${FETCH_AFTER_ARGS}
239_FETCH_RESUME_ARGS.custom= ${FETCH_RESUME_ARGS} 239_FETCH_RESUME_ARGS.custom= ${FETCH_RESUME_ARGS}
240_FETCH_OUTPUT_ARGS.custom= ${FETCH_OUTPUT_ARGS} 240_FETCH_OUTPUT_ARGS.custom= ${FETCH_OUTPUT_ARGS}
241 241
242_FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${_CHECKSUM_CMD:Q} \ 242_FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${_CHECKSUM_CMD:Q} \
243 CP=${TOOLS_CP:Q} \ 243 CP=${TOOLS_CP:Q} \
244 ECHO=${TOOLS_ECHO:Q} \ 244 ECHO=${TOOLS_ECHO:Q} \
 245 FTPUSERAGENT= \
245 FETCH_CMD=${_FETCH_CMD.${FETCH_USING}:Q} \ 246 FETCH_CMD=${_FETCH_CMD.${FETCH_USING}:Q} \
246 FETCH_BEFORE_ARGS=${_FETCH_BEFORE_ARGS.${FETCH_USING}:Q} \ 247 FETCH_BEFORE_ARGS=${_FETCH_BEFORE_ARGS.${FETCH_USING}:Q} \
247 FETCH_AFTER_ARGS=${_FETCH_AFTER_ARGS.${FETCH_USING}:Q} \ 248 FETCH_AFTER_ARGS=${_FETCH_AFTER_ARGS.${FETCH_USING}:Q} \
248 FETCH_RESUME_ARGS=${_FETCH_RESUME_ARGS.${FETCH_USING}:Q} \ 249 FETCH_RESUME_ARGS=${_FETCH_RESUME_ARGS.${FETCH_USING}:Q} \
249 FETCH_OUTPUT_ARGS=${_FETCH_OUTPUT_ARGS.${FETCH_USING}:Q} \ 250 FETCH_OUTPUT_ARGS=${_FETCH_OUTPUT_ARGS.${FETCH_USING}:Q} \
250 MKDIR=${TOOLS_MKDIR:Q} MV=${TOOLS_MV:Q} \ 251 MKDIR=${TOOLS_MKDIR:Q} MV=${TOOLS_MV:Q} \
251 TEST=${TOOLS_TEST:Q} TOUCH=${TOOLS_TOUCH:Q} \ 252 TEST=${TOOLS_TEST:Q} TOUCH=${TOOLS_TOUCH:Q} \
252 WC=${TOOLS_WC:Q} \ 253 WC=${TOOLS_WC:Q} \
253 ${SH} ${PKGSRCDIR}/mk/fetch/fetch 254 ${SH} ${PKGSRCDIR}/mk/fetch/fetch
254 255
255_FETCH_ARGS+= ${PKG_VERBOSE:D-v} 256_FETCH_ARGS+= ${PKG_VERBOSE:D-v}
256.if exists(${DISTINFO_FILE}) 257.if exists(${DISTINFO_FILE})
257_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:Q} 258_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:Q}