pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/47525: fetch from sourceforge fails if user sets ownFTPUSERAGENT



The following reply was made to PR pkg/47525; it has been noted by GNATS.

From: Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: tsutsui%ceres.dti.ne.jp@localhost
Subject: Re: pkg/47525: fetch from sourceforge fails if user sets 
ownFTPUSERAGENT
Date: Thu, 7 Feb 2013 18:48:01 +0900

 >  I'm affraid that your patch won't work (make doesn't know anything about 
 > unset) but 
 >  reverting fetch.mk to 1.56 and changing script alone will work:
 >  
 >  Index: mk/fetch/fetch
 >  ===================================================================
 >  RCS file: /cvsroot/pkgsrc/mk/fetch/fetch,v
 >  retrieving revision 1.14
 >  diff -u -r1.14 fetch
 >  --- mk/fetch/fetch  2 Aug 2009 02:38:52 -0000       1.14
 >  +++ mk/fetch/fetch  6 Feb 2013 20:11:28 -0000
 >  @@ -115,6 +115,8 @@
 >   : ${TOUCH:=touch}
 >   : ${WC:=wc}
 >   
 >  +unset FTPUSERAGENT
 >  +
 >   self="${0##*/}"
 >   
 >   usage() {
 >  Index: mk/fetch/fetch.mk
 >  ===================================================================
 >  RCS file: /cvsroot/pkgsrc/mk/fetch/fetch.mk,v
 >  retrieving revision 1.58
 >  diff -u -r1.58 fetch.mk
 >  --- mk/fetch/fetch.mk       20 Jan 2013 13:22:59 -0000      1.58
 >  +++ mk/fetch/fetch.mk       6 Feb 2013 20:11:28 -0000
 >  @@ -242,7 +242,6 @@
 >   _FETCH_CMD=        ${PKGSRC_SETENV} CHECKSUM=${_CHECKSUM_CMD:Q}    \
 >              CP=${TOOLS_CP:Q}                                \
 >              ECHO=${TOOLS_ECHO:Q}                            \
 >  -           FTPUSERAGENT=${FTPUSERAGENT:Q}                  \
 >              FETCH_CMD=${_FETCH_CMD.${FETCH_USING}:Q}        \
 >              FETCH_BEFORE_ARGS=${_FETCH_BEFORE_ARGS.${FETCH_USING}:Q} \
 >              FETCH_AFTER_ARGS=${_FETCH_AFTER_ARGS.${FETCH_USING}:Q}   \
 >  
 >  
 >  Could you try that? 
 
 The following tests also work with your diff:
 
 % ( rm -rf distfiles/rxvt-unicode-* && cd x11/rxvt-unicode && env 
FTPUSERAGENT= make fetch )
 
 % ( rm -rf distfiles/rxvt-unicode-* && cd x11/rxvt-unicode && env 
FTPUSERAGENT='Mozilla/5.0' make fetch )
 
 % ( rm -rf distfiles/mlterm-* && cd x11/mlterm && env FTPUSERAGENT= make fetch 
)
 
 % ( rm -rf distfiles/mlterm-* && cd x11/mlterm && env 
FTPUSERAGENT='Mozilla/5.0' make fetch )
 
 
 >  I could add guards for this unset, so only it will be used when FETCH_CMD 
 > is set to ftp.
 
 That's also fine.
 
 ---
 Izumi Tsutsui
 


Home | Main Index | Thread Index | Old Index