summaryrefslogtreecommitdiffstats
path: root/openwrt/package/busybox/patches/914-ipkg-fixes.patch
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-09 03:42:19 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-09 03:42:19 +0000
commit45c7419a4f7a4436c27ffd62b1a05724c4ce6357 (patch)
tree3720c9dd88592f0143284d0db6f28bc227b899df /openwrt/package/busybox/patches/914-ipkg-fixes.patch
parentcb3c4276a0d92e542c2a222eb5c02f5f75e57ea0 (diff)
update busybox+ipkg to latest ipkg (v0.99.162),
fix a bug in ipkg that would prevent it from installing local packages if at least a remote package with the same name is available. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3742 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/busybox/patches/914-ipkg-fixes.patch')
-rw-r--r--openwrt/package/busybox/patches/914-ipkg-fixes.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/openwrt/package/busybox/patches/914-ipkg-fixes.patch b/openwrt/package/busybox/patches/914-ipkg-fixes.patch
new file mode 100644
index 000000000..55cd9040c
--- /dev/null
+++ b/openwrt/package/busybox/patches/914-ipkg-fixes.patch
@@ -0,0 +1,15 @@
+#
+# fix ipkg bugs
+#
+diff -ruN busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c busybox-1.1.2+ipkg-0.99.162-fixes/archival/libipkg/pkg.c
+--- busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c 2006-05-09 02:16:48.000000000 +0200
++++ busybox-1.1.2+ipkg-0.99.162-fixes/archival/libipkg/pkg.c 2006-05-09 05:15:29.000000000 +0200
+@@ -359,6 +359,8 @@
+ if (!oldpkg->essential)
+ oldpkg->essential = newpkg->essential;
+
++ oldpkg->provided_by_hand |= newpkg->provided_by_hand;
++
+ return 0;
+ }
+