X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/466838177a5891fff93eeb70d99831fab3de1c8f..6bcf219d4f447db3a468af44a3a50435f27bc0a2:/package/busybox/patches/911-ipkg.patch?ds=inline

diff --git a/package/busybox/patches/911-ipkg.patch b/package/busybox/patches/911-ipkg.patch
index b2fca7f9c..fdb790ad5 100644
--- a/package/busybox/patches/911-ipkg.patch
+++ b/package/busybox/patches/911-ipkg.patch
@@ -1,10 +1,3 @@
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# add ipkg support to busybox
-#
 diff -ruN busybox-1.2.0-orig/archival/Config.in busybox-1.2.0+ipkg-0.99.162/archival/Config.in
 --- busybox-1.2.0-orig/archival/Config.in	2006-07-01 00:42:04.000000000 +0200
 +++ busybox-1.2.0+ipkg-0.99.162/archival/Config.in	2006-07-22 16:31:25.000000000 +0200
@@ -3399,7 +3392,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 +3464,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);
@@ -7276,8 +7274,8 @@ diff -ruN busybox-1.2.0-orig/archival/libipkg/Makefile busybox-1.2.0+ipkg-0.99.1
 +
 diff -ruN busybox-1.2.0-orig/archival/libipkg/Makefile.in busybox-1.2.0+ipkg-0.99.162/archival/libipkg/Makefile.in
 --- busybox-1.2.0-orig/archival/libipkg/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.2.0+ipkg-0.99.162/archival/libipkg/Makefile.in	2006-07-22 16:31:25.000000000 +0200
-@@ -0,0 +1,85 @@
++++ busybox-1.2.0+ipkg-0.99.162/archival/libipkg/Makefile.in	2006-10-08 12:29:39.000000000 +0200
+@@ -0,0 +1,88 @@
 +# Makefile for busybox
 +#
 +# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
@@ -7353,7 +7351,10 @@ diff -ruN busybox-1.2.0-orig/archival/libipkg/Makefile.in busybox-1.2.0+ipkg-0.9
 +LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_SOURCES)
 +LIBIPKG_OBJS=$(patsubst %.c,$(LIBIPKG_DIR)%.o, $(LIBIPKG-y))
 +
-+CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(TARGET_ARCH)\""
++ifeq ($(strip $(IPKG_ARCH)),)
++IPKG_ARCH:=$(TARGET_ARCH)
++endif
++CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
 +
 +libraries-$(CONFIG_IPKG) += $(LIBIPKG_DIR)$(LIBIPKG_AR)
 +
@@ -10887,7 +10888,7 @@ diff -ruN busybox-1.2.0-orig/archival/libipkg/pkg_dest_list.h busybox-1.2.0+ipkg
 +
 diff -ruN busybox-1.2.0-orig/archival/libipkg/pkg_extract.c busybox-1.2.0+ipkg-0.99.162/archival/libipkg/pkg_extract.c
 --- busybox-1.2.0-orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.2.0+ipkg-0.99.162/archival/libipkg/pkg_extract.c	2006-07-22 16:31:25.000000000 +0200
++++ busybox-1.2.0+ipkg-0.99.162/archival/libipkg/pkg_extract.c	2006-07-30 22:47:49.000000000 +0200
 @@ -0,0 +1,224 @@
 +/* pkg_extract.c - the itsy package management system
 +