diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-08-20 14:00:34 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-08-20 14:00:34 +0000 |
| commit | 088d86511f9e407a27a62e16af60ced1fb05944f (patch) | |
| tree | e2bbc127a4a059392f3c5bea27e2944e0c149ecb /package/busybox/patches/520-ipkg_secure.patch | |
| parent | 57db10667068d52282c008a820e50d930c99d3fa (diff) | |
| download | upstream-088d86511f9e407a27a62e16af60ced1fb05944f.tar.gz upstream-088d86511f9e407a27a62e16af60ced1fb05944f.tar.bz2 upstream-088d86511f9e407a27a62e16af60ced1fb05944f.zip | |
upgrade busybox to v1.11.1 and add current upstream fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12348 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 | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/package/busybox/patches/520-ipkg_secure.patch b/package/busybox/patches/520-ipkg_secure.patch index fec9c2100f..b0ccceec90 100644 --- a/package/busybox/patches/520-ipkg_secure.patch +++ b/package/busybox/patches/520-ipkg_secure.patch @@ -1,7 +1,5 @@ -Index: busybox-1.7.2/archival/libipkg/ipkg_conf.c -=================================================================== ---- busybox-1.7.2.orig/archival/libipkg/ipkg_conf.c 2007-10-30 15:38:45.000000000 -0500 -+++ busybox-1.7.2/archival/libipkg/ipkg_conf.c 2007-10-30 15:38:47.000000000 -0500 +--- 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 }, @@ -21,10 +19,8 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_conf.c 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); -Index: busybox-1.7.2/archival/libipkg/ipkg_conf.h -=================================================================== ---- busybox-1.7.2.orig/archival/libipkg/ipkg_conf.h 2007-10-30 15:38:45.000000000 -0500 -+++ busybox-1.7.2/archival/libipkg/ipkg_conf.h 2007-10-30 15:38:47.000000000 -0500 +--- a/archival/libipkg/ipkg_conf.h ++++ b/archival/libipkg/ipkg_conf.h @@ -79,6 +79,10 @@ char *proxy_user; char *proxy_passwd; @@ -36,10 +32,8 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_conf.h hash_table_t pkg_hash; hash_table_t file_hash; hash_table_t obs_file_hash; -Index: busybox-1.7.2/archival/libipkg/ipkg_download.c -=================================================================== ---- busybox-1.7.2.orig/archival/libipkg/ipkg_download.c 2007-10-30 15:38:45.000000000 -0500 -+++ busybox-1.7.2/archival/libipkg/ipkg_download.c 2007-10-30 15:38:47.000000000 -0500 +--- a/archival/libipkg/ipkg_download.c ++++ b/archival/libipkg/ipkg_download.c @@ -69,8 +69,12 @@ } |