diff --git a/0001-db-Force-anchored-patterns-when-matching-regex.patch b/0001-db-Force-anchored-patterns-when-matching-regex.patch deleted file mode 100644 index e880efde1522057a4927d75587ebcfdc9d3693dc..0000000000000000000000000000000000000000 --- a/0001-db-Force-anchored-patterns-when-matching-regex.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e6168463f4fc659b9827b5c8694dc1c6d7d5239a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= -Date: Fri, 7 Sep 2018 15:53:20 +0200 -Subject: [PATCH] db: Force anchored patterns when matching regex -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without forcing anchored patterns some matches may be completely wrong -as "(J_)?CENN?A_X64FREV" (volume-id for Windows 10) that could be taken -as a match for "HRM_CENNA_X64FREV" (volume-id of a Windows 8 ISO). - -Signed-off-by: Fabiano Fidêncio -Reviewed-by: Cole Robinson ---- - osinfo/osinfo_db.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c -index fa14c6d..f4b3a8c 100644 ---- a/osinfo/osinfo_db.c -+++ b/osinfo/osinfo_db.c -@@ -37,7 +37,7 @@ G_DEFINE_TYPE(OsinfoDb, osinfo_db, G_TYPE_OBJECT); - #define match_regex(pattern, str) \ - (((pattern) == NULL) || \ - (((str) != NULL) && \ -- g_regex_match_simple((pattern), (str), 0, 0))) -+ g_regex_match_simple((pattern), (str), 0, G_REGEX_MATCH_ANCHORED))) - - static gchar *get_raw_lang(const char *volume_id, const gchar *regex_str) - { --- -1.8.3.1 - diff --git a/backport-add-check-for-unknown-filetype.patch b/backport-add-check-for-unknown-filetype.patch deleted file mode 100644 index 0422d66ff12c7ee161a43579f1540222ffce490f..0000000000000000000000000000000000000000 --- a/backport-add-check-for-unknown-filetype.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d3b1587f7b77b630bae8ab3f4760eda69bd7fe66 Mon Sep 17 00:00:00 2001 -From: Victor Toso -Date: Fri, 26 Nov 2021 17:36:09 +0100 -Subject: [PATCH] loader: add check for unknown file type - -So we can provide a meaningful error message in case the provided path -is not accessible to running process. - -e.g: running HOME=/root osinfo-query os we would get - `Error loading OS data: Unexpected file type` -and now we get - `Error loading OS data: Can't read path /root/.config/osinfo` - -This error was first hit with v2v [0] that was leaking $USER and $HOME -of root user when osinfo-query as vsdm user with `sudo -c vdsm`. The -example above is a simple way to show lack of permision of -osinfo-query to read the root's $HOME. - -[0] https://bugzilla.redhat.com/show_bug.cgi?id=1901423 - -Related: https://bugzilla.redhat.com/show_bug.cgi?id=1902720 -Signed-off-by: Victor Toso ---- - osinfo/osinfo_loader.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c -index 972f2a4..4403b75 100644 ---- a/osinfo/osinfo_loader.c -+++ b/osinfo/osinfo_loader.c -@@ -2356,6 +2356,11 @@ static void osinfo_loader_find_files(OsinfoLoader *loader, - } - g_object_unref(ents); - g_list_free(children); -+ } else if (type == G_FILE_TYPE_UNKNOWN) { -+ g_autofree gchar *path = g_file_get_path(file); -+ g_autofree gchar *msg = g_strdup_printf("Can't read path %s", path); -+ OSINFO_LOADER_SET_ERROR(&error, msg); -+ g_propagate_error(err, error); - } else { - OSINFO_LOADER_SET_ERROR(&error, "Unexpected file type"); - g_propagate_error(err, error); --- -2.27.0 - diff --git a/fix-build-error-for-CVE-2019-13313.patch b/fix-build-error-for-CVE-2019-13313.patch deleted file mode 100644 index 2f151f4b1e860b2927ffc6fb2d7dd419d6c7be7e..0000000000000000000000000000000000000000 --- a/fix-build-error-for-CVE-2019-13313.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1698257717d7a6be38ce81b4da2fbcd1e775dd6d Mon Sep 17 00:00:00 2001 -From: openEuler Buildteam -Date: Tue, 31 Dec 2019 23:34:18 +0800 -Subject: [PATCH] fix build error for CVE-2019-13313 - ---- - tools/osinfo-install-script.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tools/osinfo-install-script.c b/tools/osinfo-install-script.c -index 67df0a0..c2f2bc1 100644 ---- a/tools/osinfo-install-script.c -+++ b/tools/osinfo-install-script.c -@@ -61,7 +61,6 @@ static const gchar *configs[] = { - OSINFO_INSTALL_CONFIG_PROP_POST_INSTALL_DRIVERS_DISK, - OSINFO_INSTALL_CONFIG_PROP_POST_INSTALL_DRIVERS_LOCATION, - OSINFO_INSTALL_CONFIG_PROP_DRIVER_SIGNING, -- OSINFO_INSTALL_CONFIG_PROP_INSTALLATION_URL, - NULL - }; - --- -1.8.3.1 - diff --git a/libosinfo-1.10.0.tar.xz b/libosinfo-1.10.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3cf5ee514aae2d4c3b528fa9afffd97ebfdeb4c9 Binary files /dev/null and b/libosinfo-1.10.0.tar.xz differ diff --git a/libosinfo-1.8.0.tar.xz b/libosinfo-1.8.0.tar.xz deleted file mode 100644 index de032e7e89c30dc0ab6b80391f0bd4a1aabbc561..0000000000000000000000000000000000000000 Binary files a/libosinfo-1.8.0.tar.xz and /dev/null differ diff --git a/libosinfo.spec b/libosinfo.spec index 4ccc98569ddbc37819a9ecbba3cf8568b76f822a..97fbc52abe048fae98bcb5fb32897072685a64ff 100644 --- a/libosinfo.spec +++ b/libosinfo.spec @@ -1,6 +1,6 @@ Name: libosinfo -Version: 1.8.0 -Release: 2 +Version: 1.10.0 +Release: 1 Summary: A library for managing OS information for virtualization License: LGPLv2+ URL: https://libosinfo.org/ @@ -14,10 +14,6 @@ BuildRequires: libxslt-devel >= 1.0.0 Requires: hwdata osinfo-db-tools Requires: osinfo-db >= 20180920-1 -Patch0001: 0001-db-Force-anchored-patterns-when-matching-regex.patch -Patch6002: fix-build-error-for-CVE-2019-13313.patch -Patch6003: backport-add-check-for-unknown-filetype.patch - Provides: %{name}-vala Obsoletes: %{name}-vala @@ -95,6 +91,9 @@ rm -rf %{buildroot} %files lang -f %{name}.lang %changelog +* Thu May 26 2022 Chenxi Mao - 1.10.0-1 +- upgrade version to 1.10.0 + * Wed Jan 26 2022 tianwei - 1.8.0-2 - add check for unknown file type