Add patch to fix a segfault (bug 292079).

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

4 files changed, 66 insertions, 3 deletions

diff --git a/app-arch/libpar2/ChangeLog b/app-arch/libpar2/ChangeLog
index 9180d52591d6..6c86cae56d4e 100644
--- a/app-arch/libpar2/ChangeLog
+++ b/app-arch/libpar2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/libpar2
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/ChangeLog,v 1.6 2008/06/20 10:47:16 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/ChangeLog,v 1.7 2009/11/06 17:53:00 yngwin Exp $
+
+*libpar2-0.2-r1 (06 Nov 2009)
+
+  06 Nov 2009; Ben de Groot <yngwin@gentoo.org> +libpar2-0.2-r1.ebuild,
+  +files/libpar2-0.2-bugfixes.patch:
+  Add patch to fix a segfault (bug 292079).
 
   20 Jun 2008; Ben de Groot <yngwin@gentoo.org> libpar2-0.2.ebuild:
   Specifying slot for libsigc++ dep, bug #228475.
diff --git a/app-arch/libpar2/Manifest b/app-arch/libpar2/Manifest
index 0d35ee31885d..42539a22a852 100644
--- a/app-arch/libpar2/Manifest
+++ b/app-arch/libpar2/Manifest
@@ -1,4 +1,6 @@
+AUX libpar2-0.2-bugfixes.patch 986 RMD160 2092c061212f8d75921c819b0bd77ab169298b06 SHA1 b0c99a8b1f48d83a34b99580b8e50b59000b22c0 SHA256 66d9d40a60fd0eea760841edb4ff54e07a4ed413965ff58dba27fc97a0af9cab
 DIST libpar2-0.2.tar.gz 401700 RMD160 7b93bc3e2a8b10f095761c26fd008322befde7a2 SHA1 4b3da928ea6097a8299aadafa703fc6d59bdfb4b SHA256 074fbf840f73b1e13e0405fce261078c81c8c0a4859e30a7bba10510f9199908
+EBUILD libpar2-0.2-r1.ebuild 703 RMD160 f5b50e5eb039b12e9d8f8bd74613368e2da6c411 SHA1 3553d113f40b2e373f22e3587e021da18fb435bf SHA256 05878df15da94adfeb73585b2f01b527d3ab9be7a3b268e5d515b71634b800fe
 EBUILD libpar2-0.2.ebuild 632 RMD160 7d3d1f72961de3f345be808f1a3dbd4b776803e1 SHA1 6d437697ebef09f9eccb649b067ae87c81ecfe0c SHA256 09db9c855695ba05fc71d2d5fe7f35619de5576dfbed48752ad45ab0eeba9228
-MISC ChangeLog 962 RMD160 3863716bf84753c652e8e61e48989ae81e7eeddd SHA1 fb1cea29dcf2dcad05333fce446b23e46d23f217 SHA256 178bf658b1698141cfa3c6688d692a6da235cfb0c4c71fabf1143c97a0ecaaae
+MISC ChangeLog 1147 RMD160 1e5358348e6b6cbd7b152983ca27451885df5453 SHA1 9d81a33dd46686d4b468ef489fc1f15106c5d1ff SHA256 b940686744fd1a1aa1b1731a1ec3ed3f01617f7e95b9c450dd73b41b9e7e9409
 MISC metadata.xml 230 RMD160 4fba2bfa5643e420ed2e1f1fcb66fafae6a6f84d SHA1 7ff110295f203f3714add0525196a5159e678f2d SHA256 f92bee6e29613fc8f86ded00d8f4c2be1bdd6a72773a28462fb35ecf4c201191
diff --git a/app-arch/libpar2/files/libpar2-0.2-bugfixes.patch b/app-arch/libpar2/files/libpar2-0.2-bugfixes.patch
new file mode 100644
index 000000000000..cb3c938dfe74
--- /dev/null
+++ b/app-arch/libpar2/files/libpar2-0.2-bugfixes.patch
@@ -0,0 +1,29 @@
+diff -aud ../libpar2-0.2-original/par2repairer.cpp ../libpar2-0.2/par2repairer.cpp
+--- ../libpar2-0.2-original/par2repairer.cpp	2006-01-20 18:25:20.000000000 +0100
++++ ../libpar2-0.2/par2repairer.cpp	2008-02-06 12:02:53.226050300 +0100
+@@ -78,6 +78,7 @@
+ 
+   delete mainpacket;
+   delete creatorpacket;
++  delete headers;
+ }
+ 
+ 
+@@ -1261,7 +1262,7 @@
+         DiskFile::SplitFilename(filename, path, name);
+ 
+         cout << "Target: \"" << name << "\" - missing." << endl;
+-	sig_done.emit(name, 0, sourcefile->GetVerificationPacket()->BlockCount());
++	sig_done.emit(name, 0, sourcefile->GetVerificationPacket() ? sourcefile->GetVerificationPacket()->BlockCount() : 0);
+       }
+     }
+ 
+@@ -1804,7 +1805,7 @@
+       }
+     }
+   }
+-  sig_done.emit(name,count,sourcefile->GetVerificationPacket()->BlockCount()); 
++  sig_done.emit(name,count, sourcefile->GetVerificationPacket() ? sourcefile->GetVerificationPacket()->BlockCount() : 0); 
+   sig_progress.emit(1000.0);
+   return true;
+ }
diff --git a/app-arch/libpar2/libpar2-0.2-r1.ebuild b/app-arch/libpar2/libpar2-0.2-r1.ebuild
new file mode 100644
index 000000000000..f74480e53a7b
--- /dev/null
+++ b/app-arch/libpar2/libpar2-0.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2-r1.ebuild,v 1.1 2009/11/06 17:53:00 yngwin Exp $
+
+EAPI=2
+inherit base
+
+DESCRIPTION="A library for par2, extracted from par2cmdline"
+HOMEPAGE="http://parchive.sourceforge.net/"
+SRC_URI="mirror://sourceforge/parchive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libsigc++:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/libpar2-0.2-bugfixes.patch" )
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+}