blob: ec160290be5f575066ae9a2f139a3a741c1bbbee [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 55c4ad666e76281bdd0db55fa6f4ab2744fea7e4 Mon Sep 17 00:00:00 2001
2From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
3Date: Tue, 4 Sep 2018 18:06:00 -0500
4Subject: [PATCH] remove_maintainer_scripts: use strict matching
5
6The function is using a glob to select which metadata files needs to be
7deleted during package removal, on the info_dir. However, the glob may
8match metadata files from packages with similar names. For example,
9during removal of package glibc-binary-localedata-de-at, the current
10logic was also removing the metadata for
11glibc-binary-localedata-de-at.iso-8859-1. Add check for an exact match
12before deletion.
13
14Fixes bugzilla: 12905
15
16Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/Fr40Yt0NBno]
17Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
18---
19 libopkg/opkg_remove.c | 14 +++++++++++---
20 1 file changed, 11 insertions(+), 3 deletions(-)
21
22diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
23index 82125fa..3936628 100644
24--- a/libopkg/opkg_remove.c
25+++ b/libopkg/opkg_remove.c
26@@ -137,7 +137,7 @@ void remove_maintainer_scripts(pkg_t * pkg)
27 {
28 unsigned int i;
29 int err;
30- char *globpattern;
31+ char *globpattern, *filename, *lastdot;
32 glob_t globbuf;
33
34 if (opkg_config->noaction)
35@@ -151,8 +151,16 @@ void remove_maintainer_scripts(pkg_t * pkg)
36 return;
37
38 for (i = 0; i < globbuf.gl_pathc; i++) {
39- opkg_msg(INFO, "Deleting %s.\n", globbuf.gl_pathv[i]);
40- unlink(globbuf.gl_pathv[i]);
41+ filename = xstrdup(basename(globbuf.gl_pathv[i]));
42+ lastdot = strrchr(filename, '.');
43+ *lastdot = '\0';
44+ // Only delete files that match the package name (the glob may match files
45+ // with similar names)
46+ if (!strcmp(filename, pkg->name)) {
47+ opkg_msg(INFO, "Deleting %s.\n", globbuf.gl_pathv[i]);
48+ unlink(globbuf.gl_pathv[i]);
49+ }
50+ free(filename);
51 }
52 globfree(&globbuf);
53 }
54--
552.18.0
56