X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbusybox%2Fpatches%2F520-ipkg_secure.patch;fp=package%2Fbusybox%2Fpatches%2F520-ipkg_secure.patch;h=0000000000000000000000000000000000000000;hb=93ecce5681037288866ca1433e8442a34378173a;hp=b0ccceec9095b1d58ee8743884abfa639a23b6ba;hpb=88b05245346f3521e2c9ec434adcbda9a4510bf0;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/busybox/patches/520-ipkg_secure.patch b/package/busybox/patches/520-ipkg_secure.patch
deleted file mode 100644
index b0ccceec90..0000000000
--- a/package/busybox/patches/520-ipkg_secure.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/archival/libipkg/ipkg_conf.c
-+++ b/archival/libipkg/ipkg_conf.c
-@@ -66,6 +66,8 @@
- 	  { "offline_root_pre_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd },
- 	  { "proxy_passwd", IPKG_OPT_TYPE_STRING, &conf->proxy_passwd },
- 	  { "proxy_user", IPKG_OPT_TYPE_STRING, &conf->proxy_user },
-+	  { "http_user", IPKG_OPT_TYPE_STRING, &conf->http_user },
-+	  { "http_passwd", IPKG_OPT_TYPE_STRING, &conf->http_passwd },
- 	  { "query-all", IPKG_OPT_TYPE_BOOL, &conf->query_all },
- 	  { "verbose-wget", IPKG_OPT_TYPE_BOOL, &conf->verbose_wget },
- 	  { "verbosity", IPKG_OPT_TYPE_BOOL, &conf->verbosity },
-@@ -160,6 +162,9 @@
-      conf->proxy_user = NULL;
-      conf->proxy_passwd = NULL;
- 
-+     conf->http_user = NULL;
-+     conf->http_passwd = NULL;
-+
-      pkg_hash_init("pkg-hash", &conf->pkg_hash, IPKG_CONF_DEFAULT_HASH_LEN);
-      hash_table_init("file-hash", &conf->file_hash, IPKG_CONF_DEFAULT_HASH_LEN);
-      hash_table_init("obs-file-hash", &conf->obs_file_hash, IPKG_CONF_DEFAULT_HASH_LEN);
---- a/archival/libipkg/ipkg_conf.h
-+++ b/archival/libipkg/ipkg_conf.h
-@@ -79,6 +79,10 @@
-      char *proxy_user;
-      char *proxy_passwd;
- 
-+     /* http user/pass */
-+     char *http_user;
-+     char *http_passwd;
-+
-      hash_table_t pkg_hash;
-      hash_table_t file_hash;
-      hash_table_t obs_file_hash;
---- a/archival/libipkg/ipkg_download.c
-+++ b/archival/libipkg/ipkg_download.c
-@@ -69,8 +69,12 @@
-     }
- 
-     /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */ 
--    sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s",
-+    sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s%s %s%s %s -P %s %s",
- 		  (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "",
-+          conf->http_user ? "--http-user=" : "",
-+          conf->http_user ? conf->http_user : "",
-+          conf->http_passwd ? "--http-password=" : "",
-+          conf->http_passwd ? conf->http_passwd : "",
- 		  conf->proxy_user ? "--proxy-user=" : "",
- 		  conf->proxy_user ? conf->proxy_user : "",
- 		  conf->proxy_passwd ? "--proxy-passwd=" : "",