diff options
author | Felix Fietkau <nbd@openwrt.org> | 2008-09-02 11:28:38 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2008-09-02 11:28:38 +0000 |
commit | 55cb889f6d3b137c3dcf12fd031dcb6dd55bc657 (patch) | |
tree | d966737b8161da369944e5afeb98a97306ce6684 /package/busybox/patches/520-ipkg_secure.patch | |
parent | de0c71f32b383d5146c9eeaccfa5262643dfebce (diff) | |
download | master-187ad058-55cb889f6d3b137c3dcf12fd031dcb6dd55bc657.tar.gz master-187ad058-55cb889f6d3b137c3dcf12fd031dcb6dd55bc657.tar.bz2 master-187ad058-55cb889f6d3b137c3dcf12fd031dcb6dd55bc657.zip |
remove ipkg from busybox
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12498 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/520-ipkg_secure.patch')
-rw-r--r-- | package/busybox/patches/520-ipkg_secure.patch | 50 |
1 files changed, 0 insertions, 50 deletions
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=" : "", |