Hello community, here is the log from the commit of package yum-metadata-parser for openSUSE:Factory checked in at 2013-03-08 10:03:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yum-metadata-parser (Old) and /work/SRC/openSUSE:Factory/.yum-metadata-parser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yum-metadata-parser", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yum-metadata-parser/yum-metadata-parser.changes 2011-09-23 12:53:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yum-metadata-parser.new/yum-metadata-parser.changes 2013-03-08 10:03:11.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 12 09:24:13 UTC 2013 - [email protected] + +- support >2G rpms in the XML to sqlite conversion (upstream patch) + (bnc#802576, rh#612409) + +------------------------------------------------------------------- New: ---- yum-metadata-parser-1.1.2-handle_2GB_sized_rpms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum-metadata-parser.spec ++++++ --- /var/tmp/diff_new_pack.LcPEe3/_old 2013-03-08 10:03:12.000000000 +0100 +++ /var/tmp/diff_new_pack.LcPEe3/_new 2013-03-08 10:03:12.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yum-metadata-parser (Version 1.1.2) +# spec file for package yum-metadata-parser # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yum-metadata-parser -BuildRequires: glib2-devel libxml2-devel pkgconfig python-devel sqlite-devel +BuildRequires: glib2-devel +BuildRequires: libxml2-devel +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: sqlite-devel Summary: A fast metadata parser for yum -Version: 1.1.2 -Release: 107 -Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-1.0-quiet.patch License: GPL-2.0+ Group: Development/Libraries/Python +Version: 1.1.2 +Release: 107.<RELEASE20> +Source0: %{name}-%{version}.tar.bz2 +Patch0: %{name}-1.0-quiet.patch +# PATCH-FIX-UPSTREAM yum-metadata-parser [bnc#802576] +Patch1: %{name}-1.1.2-handle_2GB_sized_rpms.patch Url: http://devel.linux.duke.edu/cgi-bin/viewcvs.cgi/yum-metadata-parser/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{suse_version} <= 1010 @@ -45,7 +49,8 @@ %prep %setup -q -%patch +%patch0 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ yum-metadata-parser-1.1.2-handle_2GB_sized_rpms.patch ++++++ >From a88e3bef4d71dc03244768a0764d442660f7a2bc Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P <[email protected]> Date: Mon, 11 Feb 2013 13:58:30 +0100 Subject: [PATCH] Handle > 2GB sized rpms, in XML => sqlite conversion, BZ 612409. --- db.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db.c b/db.c index d2b51d6..ac60b4d 100644 --- a/db.c +++ b/db.c @@ -520,9 +520,9 @@ yum_db_package_write (sqlite3 *db, sqlite3_stmt *handle, Package *p) sqlite3_bind_int (handle, 17, p->rpm_header_start); sqlite3_bind_int (handle, 18, p->rpm_header_end); sqlite3_bind_text (handle, 19, p->rpm_packager, -1, SQLITE_STATIC); - sqlite3_bind_int (handle, 20, p->size_package); - sqlite3_bind_int (handle, 21, p->size_installed); - sqlite3_bind_int (handle, 22, p->size_archive); + sqlite3_bind_int64 (handle, 20, p->size_package); + sqlite3_bind_int64 (handle, 21, p->size_installed); + sqlite3_bind_int64 (handle, 22, p->size_archive); sqlite3_bind_text (handle, 23, p->location_href, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 24, p->location_base, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 25, p->checksum_type, -1, SQLITE_STATIC); -- 1.7.10.4 >From fd3b45b29c23764f23cbe8ab7cc7912b2e79abea Mon Sep 17 00:00:00 2001 From: James Antill <[email protected]> Date: Thu, 24 Feb 2011 11:18:54 -0500 Subject: [PATCH 2/2] Change the conversion to be 64bit safe too, *sigh*. BZ 612409 --- xml-parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xml-parser.c b/xml-parser.c index 9617d17..35f04e6 100644 --- a/xml-parser.c +++ b/xml-parser.c @@ -185,11 +185,11 @@ primary_parser_package_start (PrimarySAXContext *ctx, value = attrs[++i]; if (!strcmp (attr, "package")) - p->size_package = strtol(value, NULL, 10); + p->size_package = strtoll(value, NULL, 10); else if (!strcmp (attr, "installed")) - p->size_installed = strtol(value, NULL, 10); + p->size_installed = strtoll(value, NULL, 10); else if (!strcmp (attr, "archive")) - p->size_archive = strtol(value, NULL, 10); + p->size_archive = strtoll(value, NULL, 10); } } -- 1.7.10.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
