diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2009-11-11 21:42:05 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-11-11 21:42:05 +0000 |
commit | 374664f3af27cd893e6b65f83bd12dbdc619769f (patch) | |
tree | 9695ba43a5efc611588a8035c0ab559673a3e4fb /package/opkg/patches/003-fs_overlay_support.patch | |
parent | 87daff29bad9c3c9b97e7f556e6f78ebb197f501 (diff) | |
download | master-187ad058-374664f3af27cd893e6b65f83bd12dbdc619769f.tar.gz master-187ad058-374664f3af27cd893e6b65f83bd12dbdc619769f.tar.bz2 master-187ad058-374664f3af27cd893e6b65f83bd12dbdc619769f.zip |
[package] opkg: bump to r284
- incorporates parsing improvements upstream
- fixes a couple of memory leaks
- fixes some null pointer dereferences
- fixes possible crashes during removal of packages
- various other corrections
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18380 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/opkg/patches/003-fs_overlay_support.patch')
-rw-r--r-- | package/opkg/patches/003-fs_overlay_support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/opkg/patches/003-fs_overlay_support.patch b/package/opkg/patches/003-fs_overlay_support.patch index 88a09d0a67..f84060ab14 100644 --- a/package/opkg/patches/003-fs_overlay_support.patch +++ b/package/opkg/patches/003-fs_overlay_support.patch @@ -6,7 +6,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org> --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c -@@ -70,6 +70,7 @@ int opkg_init_options_array(const opkg_c +@@ -72,6 +72,7 @@ { "offline_root_path", OPKG_OPT_TYPE_STRING, &conf->offline_root_path }, { "offline_root_post_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_post_script_cmd }, { "offline_root_pre_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd }, @@ -16,7 +16,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org> { "query-all", OPKG_OPT_TYPE_BOOL, &conf->query_all }, --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h -@@ -70,6 +70,7 @@ struct opkg_conf +@@ -70,6 +70,7 @@ char *offline_root_path; char *offline_root_pre_script_cmd; char *offline_root_post_script_cmd; @@ -26,7 +26,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org> int noaction; --- a/libopkg/opkg_install.c +++ b/libopkg/opkg_install.c -@@ -474,12 +474,15 @@ static int verify_pkg_installable(opkg_c +@@ -470,12 +470,15 @@ * my diddling with the .opk file size below isn't going to cut it. * 3) return a proper error code instead of 1 */ @@ -46,7 +46,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org> /* round up a blocks count without doing fancy-but-slow casting jazz */ --- a/libopkg/opkg_utils.c +++ b/libopkg/opkg_utils.c -@@ -30,10 +30,8 @@ long unsigned int get_available_blocks(c +@@ -31,10 +31,8 @@ { struct statfs sfs; |