[packages/poldek] - add upstream patch to fix https://bugs.launchpad.net/poldek/+bug/1571324 - rel 2

baggins baggins at pld-linux.org
Wed Apr 20 20:20:50 CEST 2016


commit ad277442aafe68be3b49fa515d6689cb11be57e6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Apr 20 20:19:57 2016 +0200

    - add upstream patch to fix https://bugs.launchpad.net/poldek/+bug/1571324
    - rel 2

 64k-packages.patch | 26 ++++++++++++++++++++++++++
 poldek.spec        |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/poldek.spec b/poldek.spec
index 205e803..d006437 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -34,7 +34,7 @@
 %define		ver_rpm		5.4.10
 %endif
 
-%define		rel	1
+%define		rel	2
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -63,6 +63,7 @@ Source102:	%{name}-debuginfo-snap.conf
 Patch0:		%{name}-size-type.patch
 Patch1:		%{name}-config.patch
 Patch2:		pm-hooks.patch
+Patch3:		64k-packages.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	%{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	autoconf
@@ -226,6 +227,7 @@ Moduły języka Python dla poldka.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
diff --git a/64k-packages.patch b/64k-packages.patch
new file mode 100644
index 0000000..db148d0
--- /dev/null
+++ b/64k-packages.patch
@@ -0,0 +1,26 @@
+From a46a0bc806331e419207ae951864243946892b9a Mon Sep 17 00:00:00 2001
+From: Marcin Banasiak <marcin.banasiak at gmail.com>
+Date: Wed, 20 Apr 2016 19:56:34 +0200
+Subject: Fix crash when loading more than 64k packages (lp#1571324)
+
+
+diff --git a/capreqidx.h b/capreqidx.h
+index 0311e76..327e1f4 100644
+--- a/capreqidx.h
++++ b/capreqidx.h
+@@ -28,8 +28,10 @@ struct capreq_idx {
+ 
+ struct pkg;
+ struct capreq_idx_ent {
+-    int16_t items;
+-    int32_t _size;
++
++    unsigned int items;		/* number of elements stored in this entry */
++    unsigned int _size;		/* number of elements for which memory is already allocated */
++
+     union {
+         struct pkg *pkg;
+         struct pkg **pkgs;       /* pkgs list */
+-- 
+cgit v0.10.2
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/ad277442aafe68be3b49fa515d6689cb11be57e6



More information about the pld-cvs-commit mailing list