From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 11 Nov 2009 22:13:10 +0000 (+0000)
Subject: [package] opkg: forgot to remove two obsolete patches in last commit
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=25941ba23fb2a8ebcce9a2143007809c4136fba3

[package] opkg: forgot to remove two obsolete patches in last commit


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18381 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/opkg/patches/006-fix_force_space.patch b/package/opkg/patches/006-fix_force_space.patch
deleted file mode 100644
index 80406ba16..000000000
--- a/package/opkg/patches/006-fix_force_space.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libopkg/opkg_conf.c
-+++ b/libopkg/opkg_conf.c
-@@ -252,6 +252,9 @@ int opkg_conf_init(opkg_conf_t *conf, co
-      if (args->force_downgrade) {
- 	  conf->force_downgrade = 1;
-      }
-+     if (args->force_space) {
-+	  conf->force_space = 1;
-+     }
-      if (args->force_reinstall) {
- 	  conf->force_reinstall = 1;
-      }
diff --git a/package/opkg/patches/011-fix_nullpointer_deref.patch b/package/opkg/patches/011-fix_nullpointer_deref.patch
deleted file mode 100644
index ed198af39..000000000
--- a/package/opkg/patches/011-fix_nullpointer_deref.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libopkg/opkg_cmd.c
-+++ b/libopkg/opkg_cmd.c
-@@ -954,7 +954,7 @@
- 	            pkg_to_remove = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name );
-                }
-         
--               if (pkg == NULL) {
-+               if (pkg_to_remove == NULL) {
- 	            opkg_message(conf, OPKG_ERROR, "Package %s is not installed.\n", pkg->name);
- 	            continue;
-                }