[backfire/packages] opkg: merge r28458
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 15 Oct 2011 01:06:07 +0000 (01:06 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 15 Oct 2011 01:06:07 +0000 (01:06 +0000)
SVN-Revision: 28459

package/opkg/Makefile
package/opkg/patches/030-fix-double-free.patch [new file with mode: 0644]

index aba0ccb0354a68ff6449a63ceee7d61e0f15dd9e..609cd2a4031ca0155048fd4c645ac153411581af 100644 (file)
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=opkg
 PKG_REV:=576
 PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/package/opkg/patches/030-fix-double-free.patch b/package/opkg/patches/030-fix-double-free.patch
new file mode 100644 (file)
index 0000000..312e06c
--- /dev/null
@@ -0,0 +1,10 @@
+--- a/libopkg/opkg_remove.c
++++ b/libopkg/opkg_remove.c
+@@ -138,7 +138,6 @@ opkg_remove_dependent_pkgs(pkg_t *pkg, a
+     for (i = 0; i < dependent_pkgs->len; i++) {
+         err = opkg_remove_pkg(dependent_pkgs->pkgs[i],0);
+         if (err) {
+-            pkg_vec_free(dependent_pkgs);
+             break;
+       }
+     }