pool/libguestfs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
dfce015b70
libguestfs/0003-inspector-rpm-summary-and-description-may-not-be-utf.patch

130 lines
5.8 KiB
Diff
Raw Normal View History

Accepting request 580945 from home:cbosdonnat:branches:Virtualization - Remove unneeded createrepo build dependency (bsc#1082689) - builder-repository: fix SLES short id computation Patch added: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch - Fix handling of Latin-1 encoding in rpmdb (bsc#1075803) Patches added: 0001-Introduce-a-wrapper-around-xmlParseURI.patch 0002-common-extract-UTF-8-conversion-function.patch 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch OBS-URL: https://build.opensuse.org/request/show/580945 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
2018-02-28 13:33:26 +01:00
From 2a20ad737e4682b9f304b6c3ba6116f4cc195541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Wed, 14 Feb 2018 10:21:42 +0100
Subject: [PATCH 3/3] inspector: rpm summary and description may not be utf-8
The application inspection code assumes the data in the RPM database
are encoded in UTF-8. However this is not always the case.
As a basic workaround, try to parse the string to UTF-8 and if that
fails, try converting it from latin-1.
---
inspector/expected-fedora.img.xml | 4 ++++
lib/inspect-apps.c | 30 +++++++++++++++++++++++----
test-data/phony-guests/fedora-packages.db.txt | 4 ++--
3 files changed, 32 insertions(+), 6 deletions(-)
- Update to version 1.42.0 * virt-v2v is moved out from libguestfs into its own package * virt-p2v is moved out from libguestfs into its own package * Add support for the Vala language * Add support for the Rust language * Reproducible builds * Advanced Format disks (which use 4K sectors) can now be processed by libguestfs. Use the new optional blocksize parameter to guestfs_add_drive_opts, and the --blocksize option added to several tools * Windows CompactOS (NTFS file compression) is now supported. * Advanced machine readable output in various virt tools now supports JSON output, and writing logs to a numbered file descriptor * virt-filesystems tool now more accurately reports filesystem total size, in the case where for example the filesystem does not occupy the whole of its containing device * Python ≥ 2.7 is required. * Python bindings are now more extensively tested * Python bindings should now work with Python ≥ 3.8. * Multiple fixes to avoid crashes in the Python bindings * OCaml bindings are compiled with -DCAML_NAME_SPACE to ensure no non-caml_-namespaced symbols are used * OCaml bindings should now work with OCaml 4.09 and 4.10. * Fix compatibility with newer cgo for Go bindings * Go API error handling is now more idiomatic * Update documentation about how to handle boolean parameters in Ruby bindings * Libguestfs can now extract icons for Gentoo, newer SUSE and OpenMandriva guests. Improved extraction of RHEL icons. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=452
2020-05-06 22:58:16 +02:00
Index: libguestfs-1.42.0/inspector/expected-fedora.img.xml
===================================================================
--- libguestfs-1.42.0.orig/inspector/expected-fedora.img.xml
+++ libguestfs-1.42.0/inspector/expected-fedora.img.xml
Accepting request 580945 from home:cbosdonnat:branches:Virtualization - Remove unneeded createrepo build dependency (bsc#1082689) - builder-repository: fix SLES short id computation Patch added: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch - Fix handling of Latin-1 encoding in rpmdb (bsc#1075803) Patches added: 0001-Introduce-a-wrapper-around-xmlParseURI.patch 0002-common-extract-UTF-8-conversion-function.patch 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch OBS-URL: https://build.opensuse.org/request/show/580945 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
2018-02-28 13:33:26 +01:00
@@ -34,12 +34,16 @@
<version>1.0</version>
<release>1.fc14</release>
<arch>x86_64</arch>
+ <summary>summary with ö</summary>
+ <description>description with ö</description>
</application>
<application>
<name>test2</name>
<version>2.0</version>
<release>2.fc14</release>
<arch>x86_64</arch>
+ <summary>summary with ö</summary>
+ <description>description with ö</description>
</application>
<application>
<name>test3</name>
- Update to version 1.42.0 * virt-v2v is moved out from libguestfs into its own package * virt-p2v is moved out from libguestfs into its own package * Add support for the Vala language * Add support for the Rust language * Reproducible builds * Advanced Format disks (which use 4K sectors) can now be processed by libguestfs. Use the new optional blocksize parameter to guestfs_add_drive_opts, and the --blocksize option added to several tools * Windows CompactOS (NTFS file compression) is now supported. * Advanced machine readable output in various virt tools now supports JSON output, and writing logs to a numbered file descriptor * virt-filesystems tool now more accurately reports filesystem total size, in the case where for example the filesystem does not occupy the whole of its containing device * Python ≥ 2.7 is required. * Python bindings are now more extensively tested * Python bindings should now work with Python ≥ 3.8. * Multiple fixes to avoid crashes in the Python bindings * OCaml bindings are compiled with -DCAML_NAME_SPACE to ensure no non-caml_-namespaced symbols are used * OCaml bindings should now work with OCaml 4.09 and 4.10. * Fix compatibility with newer cgo for Go bindings * Go API error handling is now more idiomatic * Update documentation about how to handle boolean parameters in Ruby bindings * Libguestfs can now extract icons for Gentoo, newer SUSE and OpenMandriva guests. Improved extraction of RHEL icons. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=452
2020-05-06 22:58:16 +02:00
Index: libguestfs-1.42.0/lib/inspect-apps.c
===================================================================
--- libguestfs-1.42.0.orig/lib/inspect-apps.c
+++ libguestfs-1.42.0/lib/inspect-apps.c
Accepting request 580945 from home:cbosdonnat:branches:Virtualization - Remove unneeded createrepo build dependency (bsc#1082689) - builder-repository: fix SLES short id computation Patch added: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch - Fix handling of Latin-1 encoding in rpmdb (bsc#1075803) Patches added: 0001-Introduce-a-wrapper-around-xmlParseURI.patch 0002-common-extract-UTF-8-conversion-function.patch 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch OBS-URL: https://build.opensuse.org/request/show/580945 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
2018-02-28 13:33:26 +01:00
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
+#include <iconv.h>
#ifdef HAVE_ENDIAN_H
#include <endian.h>
@@ -43,6 +44,7 @@
#include "guestfs.h"
#include "guestfs-internal.h"
#include "guestfs-internal-actions.h"
+#include "guestfs-utils.h"
#include "structs-cleanups.h"
- Update to version 1.42.0 * virt-v2v is moved out from libguestfs into its own package * virt-p2v is moved out from libguestfs into its own package * Add support for the Vala language * Add support for the Rust language * Reproducible builds * Advanced Format disks (which use 4K sectors) can now be processed by libguestfs. Use the new optional blocksize parameter to guestfs_add_drive_opts, and the --blocksize option added to several tools * Windows CompactOS (NTFS file compression) is now supported. * Advanced machine readable output in various virt tools now supports JSON output, and writing logs to a numbered file descriptor * virt-filesystems tool now more accurately reports filesystem total size, in the case where for example the filesystem does not occupy the whole of its containing device * Python ≥ 2.7 is required. * Python bindings are now more extensively tested * Python bindings should now work with Python ≥ 3.8. * Multiple fixes to avoid crashes in the Python bindings * OCaml bindings are compiled with -DCAML_NAME_SPACE to ensure no non-caml_-namespaced symbols are used * OCaml bindings should now work with OCaml 4.09 and 4.10. * Fix compatibility with newer cgo for Go bindings * Go API error handling is now more idiomatic * Update documentation about how to handle boolean parameters in Ruby bindings * Libguestfs can now extract icons for Gentoo, newer SUSE and OpenMandriva guests. Improved extraction of RHEL icons. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=452
2020-05-06 22:58:16 +02:00
/* Some limits on what the inspection code will read, for safety. */
@@ -266,7 +268,7 @@ get_rpm_header_tag (guestfs_h *g, const
Accepting request 580945 from home:cbosdonnat:branches:Virtualization - Remove unneeded createrepo build dependency (bsc#1082689) - builder-repository: fix SLES short id computation Patch added: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch - Fix handling of Latin-1 encoding in rpmdb (bsc#1075803) Patches added: 0001-Introduce-a-wrapper-around-xmlParseURI.patch 0002-common-extract-UTF-8-conversion-function.patch 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch OBS-URL: https://build.opensuse.org/request/show/580945 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
2018-02-28 13:33:26 +01:00
/* This function parses the RPM header structure to pull out various
* tag strings (version, release, arch, etc.). For more detail on the
* header format, see:
- * http://www.rpm.org/max-rpm/s1-rpm-file-format-rpm-file-format.html#S2-RPM-FILE-FORMAT-HEADER
+ * http://rpm.org/devel_doc/file_format.html#24-header-format
*/
/* The minimum header size that makes sense here is 24 bytes. Four
- Update to version 1.42.0 * virt-v2v is moved out from libguestfs into its own package * virt-p2v is moved out from libguestfs into its own package * Add support for the Vala language * Add support for the Rust language * Reproducible builds * Advanced Format disks (which use 4K sectors) can now be processed by libguestfs. Use the new optional blocksize parameter to guestfs_add_drive_opts, and the --blocksize option added to several tools * Windows CompactOS (NTFS file compression) is now supported. * Advanced machine readable output in various virt tools now supports JSON output, and writing logs to a numbered file descriptor * virt-filesystems tool now more accurately reports filesystem total size, in the case where for example the filesystem does not occupy the whole of its containing device * Python ≥ 2.7 is required. * Python bindings are now more extensively tested * Python bindings should now work with Python ≥ 3.8. * Multiple fixes to avoid crashes in the Python bindings * OCaml bindings are compiled with -DCAML_NAME_SPACE to ensure no non-caml_-namespaced symbols are used * OCaml bindings should now work with OCaml 4.09 and 4.10. * Fix compatibility with newer cgo for Go bindings * Go API error handling is now more idiomatic * Update documentation about how to handle boolean parameters in Ruby bindings * Libguestfs can now extract icons for Gentoo, newer SUSE and OpenMandriva guests. Improved extraction of RHEL icons. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=452
2020-05-06 22:58:16 +02:00
@@ -316,6 +318,20 @@ struct read_package_data {
Accepting request 580945 from home:cbosdonnat:branches:Virtualization - Remove unneeded createrepo build dependency (bsc#1082689) - builder-repository: fix SLES short id computation Patch added: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch - Fix handling of Latin-1 encoding in rpmdb (bsc#1075803) Patches added: 0001-Introduce-a-wrapper-around-xmlParseURI.patch 0002-common-extract-UTF-8-conversion-function.patch 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch OBS-URL: https://build.opensuse.org/request/show/580945 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
2018-02-28 13:33:26 +01:00
struct guestfs_application2_list *apps;
};
+static char *
+to_utf8 (guestfs_h *g, char *input)
+{
+ char *out = NULL;
+
+ out = guestfs_int_string_to_utf8 (input, "UTF-8");
+ if (!out) {
+ out = guestfs_int_string_to_utf8 (input, "ISO-8859-1");
+ perrorf (g, "Not an UTF-8 or latin-1 string: '%s'", input);
+ }
+
+ return out;
+}
+
static int
read_package (guestfs_h *g,
const unsigned char *key, size_t keylen,
- Update to version 1.42.0 * virt-v2v is moved out from libguestfs into its own package * virt-p2v is moved out from libguestfs into its own package * Add support for the Vala language * Add support for the Rust language * Reproducible builds * Advanced Format disks (which use 4K sectors) can now be processed by libguestfs. Use the new optional blocksize parameter to guestfs_add_drive_opts, and the --blocksize option added to several tools * Windows CompactOS (NTFS file compression) is now supported. * Advanced machine readable output in various virt tools now supports JSON output, and writing logs to a numbered file descriptor * virt-filesystems tool now more accurately reports filesystem total size, in the case where for example the filesystem does not occupy the whole of its containing device * Python ≥ 2.7 is required. * Python bindings are now more extensively tested * Python bindings should now work with Python ≥ 3.8. * Multiple fixes to avoid crashes in the Python bindings * OCaml bindings are compiled with -DCAML_NAME_SPACE to ensure no non-caml_-namespaced symbols are used * OCaml bindings should now work with OCaml 4.09 and 4.10. * Fix compatibility with newer cgo for Go bindings * Go API error handling is now more idiomatic * Update documentation about how to handle boolean parameters in Ruby bindings * Libguestfs can now extract icons for Gentoo, newer SUSE and OpenMandriva guests. Improved extraction of RHEL icons. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=452
2020-05-06 22:58:16 +02:00
@@ -326,7 +342,7 @@ read_package (guestfs_h *g,
Accepting request 580945 from home:cbosdonnat:branches:Virtualization - Remove unneeded createrepo build dependency (bsc#1082689) - builder-repository: fix SLES short id computation Patch added: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch - Fix handling of Latin-1 encoding in rpmdb (bsc#1075803) Patches added: 0001-Introduce-a-wrapper-around-xmlParseURI.patch 0002-common-extract-UTF-8-conversion-function.patch 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch OBS-URL: https://build.opensuse.org/request/show/580945 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
2018-02-28 13:33:26 +01:00
struct rpm_name nkey, *entry;
CLEANUP_FREE char *version = NULL, *release = NULL,
*epoch_str = NULL, *arch = NULL, *url = NULL, *summary = NULL,
- *description = NULL;
+ *description = NULL, *summary_raw = NULL, *description_raw = NULL;
int32_t epoch;
/* This function reads one (key, value) pair from the Packages
- Update to version 1.42.0 * virt-v2v is moved out from libguestfs into its own package * virt-p2v is moved out from libguestfs into its own package * Add support for the Vala language * Add support for the Rust language * Reproducible builds * Advanced Format disks (which use 4K sectors) can now be processed by libguestfs. Use the new optional blocksize parameter to guestfs_add_drive_opts, and the --blocksize option added to several tools * Windows CompactOS (NTFS file compression) is now supported. * Advanced machine readable output in various virt tools now supports JSON output, and writing logs to a numbered file descriptor * virt-filesystems tool now more accurately reports filesystem total size, in the case where for example the filesystem does not occupy the whole of its containing device * Python ≥ 2.7 is required. * Python bindings are now more extensively tested * Python bindings should now work with Python ≥ 3.8. * Multiple fixes to avoid crashes in the Python bindings * OCaml bindings are compiled with -DCAML_NAME_SPACE to ensure no non-caml_-namespaced symbols are used * OCaml bindings should now work with OCaml 4.09 and 4.10. * Fix compatibility with newer cgo for Go bindings * Go API error handling is now more idiomatic * Update documentation about how to handle boolean parameters in Ruby bindings * Libguestfs can now extract icons for Gentoo, newer SUSE and OpenMandriva guests. Improved extraction of RHEL icons. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=452
2020-05-06 22:58:16 +02:00
@@ -357,8 +373,14 @@ read_package (guestfs_h *g,
Accepting request 580945 from home:cbosdonnat:branches:Virtualization - Remove unneeded createrepo build dependency (bsc#1082689) - builder-repository: fix SLES short id computation Patch added: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch - Fix handling of Latin-1 encoding in rpmdb (bsc#1075803) Patches added: 0001-Introduce-a-wrapper-around-xmlParseURI.patch 0002-common-extract-UTF-8-conversion-function.patch 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch OBS-URL: https://build.opensuse.org/request/show/580945 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
2018-02-28 13:33:26 +01:00
epoch_str = get_rpm_header_tag (g, value, valuelen, RPMTAG_EPOCH, 'i');
arch = get_rpm_header_tag (g, value, valuelen, RPMTAG_ARCH, 's');
url = get_rpm_header_tag (g, value, valuelen, RPMTAG_URL, 's');
- summary = get_rpm_header_tag (g, value, valuelen, RPMTAG_SUMMARY, 's');
- description = get_rpm_header_tag (g, value, valuelen, RPMTAG_DESCRIPTION, 's');
+ summary_raw = get_rpm_header_tag (g, value, valuelen, RPMTAG_SUMMARY, 's');
+ description_raw = get_rpm_header_tag (g, value, valuelen, RPMTAG_DESCRIPTION, 's');
+
+ /* Try (not too hard) to get UTF-8 */
+ if (summary_raw)
+ summary = to_utf8 (g, summary_raw);
+ if (description_raw)
+ description = to_utf8 (g, description_raw);
/* The epoch is stored as big-endian integer. */
if (epoch_str)
- Update to version 1.42.0 * virt-v2v is moved out from libguestfs into its own package * virt-p2v is moved out from libguestfs into its own package * Add support for the Vala language * Add support for the Rust language * Reproducible builds * Advanced Format disks (which use 4K sectors) can now be processed by libguestfs. Use the new optional blocksize parameter to guestfs_add_drive_opts, and the --blocksize option added to several tools * Windows CompactOS (NTFS file compression) is now supported. * Advanced machine readable output in various virt tools now supports JSON output, and writing logs to a numbered file descriptor * virt-filesystems tool now more accurately reports filesystem total size, in the case where for example the filesystem does not occupy the whole of its containing device * Python ≥ 2.7 is required. * Python bindings are now more extensively tested * Python bindings should now work with Python ≥ 3.8. * Multiple fixes to avoid crashes in the Python bindings * OCaml bindings are compiled with -DCAML_NAME_SPACE to ensure no non-caml_-namespaced symbols are used * OCaml bindings should now work with OCaml 4.09 and 4.10. * Fix compatibility with newer cgo for Go bindings * Go API error handling is now more idiomatic * Update documentation about how to handle boolean parameters in Ruby bindings * Libguestfs can now extract icons for Gentoo, newer SUSE and OpenMandriva guests. Improved extraction of RHEL icons. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=452
2020-05-06 22:58:16 +02:00
Index: libguestfs-1.42.0/test-data/phony-guests/fedora-packages.db.txt
===================================================================
--- libguestfs-1.42.0.orig/test-data/phony-guests/fedora-packages.db.txt
+++ libguestfs-1.42.0/test-data/phony-guests/fedora-packages.db.txt
Accepting request 580945 from home:cbosdonnat:branches:Virtualization - Remove unneeded createrepo build dependency (bsc#1082689) - builder-repository: fix SLES short id computation Patch added: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch - Fix handling of Latin-1 encoding in rpmdb (bsc#1075803) Patches added: 0001-Introduce-a-wrapper-around-xmlParseURI.patch 0002-common-extract-UTF-8-conversion-function.patch 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch OBS-URL: https://build.opensuse.org/request/show/580945 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
2018-02-28 13:33:26 +01:00
@@ -5,9 +5,9 @@ h_nelem=3
db_pagesize=4096
HEADER=END
\01\00\00\00
- \00\00\00\03\00\00\00\11\00\00\03\e9\00\00\00\00\00\00\00\00\00\00\00\00\00\00\03\ea\00\00\00\00\00\00\00\04\00\00\00\00\00\00\03\fe\00\00\00\00\00\00\00\0b\00\00\00\001.0\001.fc14\00x86_64\00
+ \00\00\00\05\00\00\00\33\00\00\03\e9\00\00\00\00\00\00\00\00\00\00\00\00\00\00\03\ea\00\00\00\00\00\00\00\04\00\00\00\00\00\00\03\fe\00\00\00\00\00\00\00\0b\00\00\00\00\00\00\03\ec\00\00\00\00\00\00\00\12\00\00\00\00\00\00\03\ed\00\00\00\00\00\00\00\21\00\00\00\001.0\001.fc14\00x86_64\00summary with \f6\00description with \f6\00
\02\00\00\00
- \00\00\00\03\00\00\00\11\00\00\03\e9\00\00\00\00\00\00\00\00\00\00\00\00\00\00\03\ea\00\00\00\00\00\00\00\04\00\00\00\00\00\00\03\fe\00\00\00\00\00\00\00\0b\00\00\00\002.0\002.fc14\00x86_64\00
+ \00\00\00\05\00\00\00\35\00\00\03\e9\00\00\00\00\00\00\00\00\00\00\00\00\00\00\03\ea\00\00\00\00\00\00\00\04\00\00\00\00\00\00\03\fe\00\00\00\00\00\00\00\0b\00\00\00\00\00\00\03\ec\00\00\00\00\00\00\00\12\00\00\00\00\00\00\03\ed\00\00\00\00\00\00\00\22\00\00\00\002.0\002.fc14\00x86_64\00summary with \c3\b6\00description with \c3\b6\00
\03\00\00\00
\00\00\00\03\00\00\00\11\00\00\03\e9\00\00\00\00\00\00\00\00\00\00\00\00\00\00\03\ea\00\00\00\00\00\00\00\04\00\00\00\00\00\00\03\fe\00\00\00\00\00\00\00\0b\00\00\00\003.0\003.fc14\00x86_64\00
DATA=END
Reference in New Issue Copy Permalink