From 64329707ff6245e86dd7a6fbba282c9f63badb36 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Tue, 30 Apr 2019 17:56:33 -0500 Subject: libosinfo-1.4.0-2.par1: updating version --- .../0001-media-Fix-usage-of-application-id.patch | 38 ++++++++++++++++++++++ ...r-Properly-load-the-arch-value-for-images.patch | 37 +++++++++++++++++++++ libre/libosinfo/PKGBUILD | 27 ++++++++++----- 3 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 libre/libosinfo/0001-media-Fix-usage-of-application-id.patch create mode 100644 libre/libosinfo/0002-loader-Properly-load-the-arch-value-for-images.patch diff --git a/libre/libosinfo/0001-media-Fix-usage-of-application-id.patch b/libre/libosinfo/0001-media-Fix-usage-of-application-id.patch new file mode 100644 index 000000000..003d9a8a9 --- /dev/null +++ b/libre/libosinfo/0001-media-Fix-usage-of-application-id.patch @@ -0,0 +1,38 @@ +From 2626058a7921749387f8d3107241af7507f48c65 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Mon, 1 Apr 2019 22:40:48 +0200 +Subject: [PATCH] media: Fix usage of application id +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Christophe Fergeau pointed this issue out during the review of 6d789033e +and, even though, the bogus code ended up merged (sorry, mea culpa +here!). + +Signed-off-by: Fabiano Fidêncio +Reviewed-by: Cole Robinson +--- + osinfo/osinfo_media.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c +index b16fcf6..4f86c2b 100644 +--- a/osinfo/osinfo_media.c ++++ b/osinfo/osinfo_media.c +@@ -830,10 +830,10 @@ create_from_location_async_data(CreateFromLocationAsyncData *data) + osinfo_entity_set_param(OSINFO_ENTITY(media), + OSINFO_MEDIA_PROP_PUBLISHER_ID, + data->publisher); +- if (!is_str_empty(data->pvd.application)) ++ if (!is_str_empty(data->application)) + osinfo_entity_set_param(OSINFO_ENTITY(media), + OSINFO_MEDIA_PROP_APPLICATION_ID, +- data->pvd.application); ++ data->application); + + index = (G_BYTE_ORDER == G_LITTLE_ENDIAN) ? 0 : 1; + vol_size = ((gint64) data->pvd.volume_space_size[index]) * +-- +2.20.1 + diff --git a/libre/libosinfo/0002-loader-Properly-load-the-arch-value-for-images.patch b/libre/libosinfo/0002-loader-Properly-load-the-arch-value-for-images.patch new file mode 100644 index 000000000..50611e8e4 --- /dev/null +++ b/libre/libosinfo/0002-loader-Properly-load-the-arch-value-for-images.patch @@ -0,0 +1,37 @@ +From 1940739805409af9e39c61dbfe238e6c9b1519b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Wed, 10 Apr 2019 13:45:14 +0200 +Subject: [PATCH] loader: Properly load the arch value for images +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +osinfo_loader_image() has been considering the XML tag for the +images' architecture was "architecture", while it actually is "arch". + +By trying to read the wrong tag, no arch was loaded, causing then any +image load to fail with: +CRITICAL **: 13:30:06.539: osinfo_entity_set_param: assertion 'value != NULL' failed + +Signed-off-by: Fabiano Fidêncio +--- + osinfo/osinfo_loader.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c +index e30148b..84c25e5 100644 +--- a/osinfo/osinfo_loader.c ++++ b/osinfo/osinfo_loader.c +@@ -1312,8 +1312,7 @@ static OsinfoImage *osinfo_loader_image(OsinfoLoader *loader, + { NULL, G_TYPE_INVALID } + }; + +- gchar *arch = (gchar *)xmlGetProp(root, +- BAD_CAST OSINFO_IMAGE_PROP_ARCHITECTURE); ++ gchar *arch = (gchar *)xmlGetProp(root, BAD_CAST "arch"); + gchar *format = (gchar *)xmlGetProp(root, + BAD_CAST OSINFO_IMAGE_PROP_FORMAT); + gchar *cloud_init = (gchar *)xmlGetProp(root, +-- +2.20.1 + diff --git a/libre/libosinfo/PKGBUILD b/libre/libosinfo/PKGBUILD index 93768d17c..a8662c308 100644 --- a/libre/libosinfo/PKGBUILD +++ b/libre/libosinfo/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 191823 2016-10-10 10:17:01Z bgyorgy $ # Maintainer (Arch): Balló György # Contributor (Arch): Stefano Facchini # Maintainer (Hyperbola): André Silva @@ -7,10 +6,13 @@ _pkgname=libosinfo-libre pkgname=libosinfo -pkgver=1.2.0 -pkgrel=1.parabola1 -pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without non-FSDG compliant distros and operating systems support" -arch=('i686' 'x86_64' 'armv7h') +pkgver=1.4.0 +pkgrel=2 +pkgrel+=.par1 +pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support" +pkgdesc+=", without non-FSDG compliant distros and operating systems support" +arch=('x86_64') +arch+=('i686' 'armv7h') url="https://libosinfo.org/" license=('GPL' 'LGPL') depends=('glib2' 'libxslt' 'osinfo-db') @@ -19,11 +21,16 @@ conflicts=(${pkgname}-libre) replaces=(${pkgname}-libre) mksource=(https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.gz{,.asc}) source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-$pkgver.tar.gz + 0001-media-Fix-usage-of-application-id.patch + 0002-loader-Properly-load-the-arch-value-for-images.patch libre.patch) -validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF') # Daniel P. Berrange -mksha256sums=('ee254fcf3f92447787a87b3f6df190c694a787de46348c45101e8dc7b29b5a78' +validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF' # Daniel P. Berrange + '09B9C8FF223EF113AFA06A39EE926C2BDACC177B') # Fabiano Fidêncio +mksha256sums=('a29e61a82b1a5727b145403914812273dfa033a0c07a15500078726bb3b84165' 'SKIP') -sha256sums=('6abe6b8bb3fdfaf748751c24bec5fb446723505e799024fabde9f5ecb7102482' +sha256sums=('27efec42a2a2e3ae8b1f6ffcc541aded8b90c06cfbe778b8948f7c0896409eda' + '439e2cf620560cb116d0c08201282c0e152b46b2ab1fa4abcd7e717a2d45dec7' + '80c7583882a935658b9f9409cf5beeb36f46c873bb9041bcc858aca4e2fa7741' '896216d2f132ff772b3c0cd9e18aa6c45aca2365767fc0c3aa98e8d3a21ca063') mksource() { @@ -35,6 +42,10 @@ prepare() { cd $pkgname-$pkgver sed -i '/export LC_ALL = C/d' maint.mk + # Upsteam fixes + patch -Np1 -i ../0001-media-Fix-usage-of-application-id.patch + patch -Np1 -i ../0002-loader-Properly-load-the-arch-value-for-images.patch + # rm -rv {docs,tests/isodata/*} patch -Np1 -i ../libre.patch -- cgit v1.2.3