libopkg: accept alternative notation for "Replaces" control field

The presence of a "Replaces:" tag in any package feed list will cause
opkg prior to "d217daf libopkg: fix replacelist parsing and writing"
to segfault while parsing such a list.

Add a hack which lets opkg recognize a "Replace2" field and handle
it identically to "Replaces".

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index 0baa4db396569be816386b50568c57e12d1cd98c..f6199da70c7fa0226805c4f0b6d4ce501fb2e05a 100644 (file)
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -302,7 +302,7 @@ int pkg_parse_line(void *ptr, char *line, uint mask)
        case 'R':
                if ((mask & PFM_RECOMMENDS) && is_field("Recommends", line))
                        parse_deplist(pkg, RECOMMEND, line + strlen("Recommends") + 1);
-               else if ((mask & PFM_REPLACES) && is_field("Replaces", line))
+               else if ((mask & PFM_REPLACES) && (is_field("Replaces", line) || is_field("Replace2", line)))
                        parse_replacelist(pkg, line + strlen("Replaces") + 1);
                break;