diff options
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/0007-merge-newpkg-provides-even-when-oldpkg-provides-exis.patch')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/0007-merge-newpkg-provides-even-when-oldpkg-provides-exis.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/0007-merge-newpkg-provides-even-when-oldpkg-provides-exis.patch b/meta/recipes-devtools/opkg/opkg/0007-merge-newpkg-provides-even-when-oldpkg-provides-exis.patch deleted file mode 100644 index f1be7b89ae..0000000000 --- a/meta/recipes-devtools/opkg/opkg/0007-merge-newpkg-provides-even-when-oldpkg-provides-exis.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 3340b120909ea353440cfffe01fed43c55387a00 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 19 Sep 2012 17:31:45 +0200 | ||
4 | Subject: [PATCH 7/7] merge newpkg->provides even when oldpkg->provides | ||
5 | existed | ||
6 | |||
7 | * introduced in http://code.google.com/p/opkg/source/diff?spec=svn277&r=277&format=side&path=/trunk/libopkg/pkg.c | ||
8 | * the problem happens when oldpkg provide 1 and newpkg provide 2 | ||
9 | provides_count is merged to 2, but oldpkg->provides has only 1 entry | ||
10 | causing SIGSEGV: | ||
11 | pkg_formatted_field (fp=fp@entry=0x1444ce0, pkg=pkg@entry=0x120c620, field=<optimized out>, field@entry=0x7ffff7bd2abe "Provides") at pkg.c:739 | ||
12 | 739 fprintf(fp, "%s %s", i == 1 ? "" : ",", | ||
13 | (gdb) bt | ||
14 | #0 pkg_formatted_field (fp=fp@entry=0x1444ce0, pkg=pkg@entry=0x120c620, field=<optimized out>, field@entry=0x7ffff7bd2abe "Provides") at pkg.c:739 | ||
15 | #1 0x00007ffff7bc32fc in pkg_print_status (pkg=0x120c620, file=0x1444ce0) at pkg.c:887 | ||
16 | #2 0x00007ffff7bbff59 in opkg_conf_write_status_files () at opkg_conf.c:400 | ||
17 | #3 0x00007ffff7bbad8a in write_status_files_if_changed () at opkg_cmd.c:65 | ||
18 | #4 0x00007ffff7bbb73e in opkg_upgrade_cmd (argc=<optimized out>, argv=<optimized out>) at opkg_cmd.c:577 | ||
19 | #5 0x00007ffff7bbbcc2 in opkg_cmd_exec (cmd=cmd@entry=0x7ffff7dda080, argc=argc@entry=1, argv=argv@entry=0x7fffffffe768) at opkg_cmd.c:1319 | ||
20 | #6 0x000000000040165f in main (argc=3, argv=0x7fffffffe758) at opkg-cl.c:377 | ||
21 | |||
22 | Upstream-Status: Submitted | ||
23 | http://code.google.com/p/opkg/issues/detail?id=93 | ||
24 | |||
25 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
26 | --- | ||
27 | libopkg/pkg.c | 6 ++---- | ||
28 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
29 | |||
30 | diff --git a/libopkg/pkg.c b/libopkg/pkg.c | ||
31 | index be486ee..255c673 100644 | ||
32 | --- a/libopkg/pkg.c | ||
33 | +++ b/libopkg/pkg.c | ||
34 | @@ -377,10 +377,8 @@ pkg_merge(pkg_t *oldpkg, pkg_t *newpkg) | ||
35 | oldpkg->provides_count = newpkg->provides_count; | ||
36 | newpkg->provides_count = 0; | ||
37 | |||
38 | - if (!oldpkg->provides) { | ||
39 | - oldpkg->provides = newpkg->provides; | ||
40 | - newpkg->provides = NULL; | ||
41 | - } | ||
42 | + oldpkg->provides = newpkg->provides; | ||
43 | + newpkg->provides = NULL; | ||
44 | } | ||
45 | |||
46 | if (!oldpkg->conflicts_count) { | ||
47 | -- | ||
48 | 1.7.12 | ||
49 | |||