summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-21 23:15:09 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-21 23:15:09 +0000
commitad7702f5aa87d2fb0ea1f605297f996aea8cca6e (patch)
tree535c03ee1ace5781d17ce20672618d18638f53e4
parent387ca04afc1fcef6553c64d2c7a12b83f85ada92 (diff)
revert [4599], the bug was fixed elsewhere
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4618 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/busybox/patches/911-ipkg.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/busybox/patches/911-ipkg.patch b/package/busybox/patches/911-ipkg.patch
index b2fca7f9c4..1824e03c42 100644
--- a/package/busybox/patches/911-ipkg.patch
+++ b/package/busybox/patches/911-ipkg.patch
@@ -3399,7 +3399,7 @@ diff -ruN busybox-1.2.0-orig/archival/libipkg/ipkg_configure.h busybox-1.2.0+ipk
diff -ruN busybox-1.2.0-orig/archival/libipkg/ipkg_download.c busybox-1.2.0+ipkg-0.99.162/archival/libipkg/ipkg_download.c
--- busybox-1.2.0-orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
+++ busybox-1.2.0+ipkg-0.99.162/archival/libipkg/ipkg_download.c 2006-07-22 16:31:25.000000000 +0200
-@@ -0,0 +1,190 @@
+@@ -0,0 +1,195 @@
+/* ipkg_download.c - the itsy package management system
+
+ Carl D. Worth
@@ -3471,7 +3471,12 @@ diff -ruN busybox-1.2.0-orig/archival/libipkg/ipkg_download.c busybox-1.2.0+ipkg
+ }
+
+ /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */
-+ sprintf_alloc(&cmd, "wget %s -P %s %s",
++ sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s",
++ (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "",
++ conf->proxy_user ? "--proxy-user=" : "",
++ conf->proxy_user ? conf->proxy_user : "",
++ conf->proxy_passwd ? "--proxy-passwd=" : "",
++ conf->proxy_passwd ? conf->proxy_passwd : "",
+ conf->verbose_wget ? "" : "-q",
+ conf->tmp_dir,
+ src);