aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/520-ipkg_secure.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-08-20 14:00:34 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-08-20 14:00:34 +0000
commit1e82faaa5e835b00676421b1c63bef541f8ca0d3 (patch)
treeabda8ea9d70f7d10c897cf214028b9037b17f784 /package/busybox/patches/520-ipkg_secure.patch
parente3d9bc5779a012df82e2c48af3bef81bb011257a (diff)
downloadupstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.gz
upstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.bz2
upstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.zip
upgrade busybox to v1.11.1 and add current upstream fixes
SVN-Revision: 12348
Diffstat (limited to 'package/busybox/patches/520-ipkg_secure.patch')
-rw-r--r--package/busybox/patches/520-ipkg_secure.patch18
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 @@
}