Missing null check wrt #277845 by Thomas Eschenbacher.

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

6 files changed, 80 insertions, 12 deletions

diff --git a/media-libs/id3lib/ChangeLog b/media-libs/id3lib/ChangeLog
index a6c572be6cc5..cf954d9c1417 100644
--- a/media-libs/id3lib/ChangeLog
+++ b/media-libs/id3lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/id3lib
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.70 2008/07/29 15:04:05 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.71 2009/07/16 19:18:11 ssuominen Exp $
+
+*id3lib-3.8.3-r8 (16 Jul 2009)
+
+  16 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +id3lib-3.8.3-r8.ebuild,
+  +files/id3lib-3.8.3-missing_nullpointer_check.patch:
+  Missing null check wrt #277845 by Thomas Eschenbacher.
 
 *id3lib-3.8.3-r7 (29 Jul 2008)
 
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index b8bb10f01e86..90abfc30eb5f 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -1,11 +1,13 @@
 AUX id3lib-3.8.3-autoconf259.patch 1130 RMD160 bd5205973dfa31542935daa35ad04c6709c08b9d SHA1 6006f32d29461136ec029dda2ae7339fde6df1df SHA256 ffde572cb263cce4585292143a4396ebd12592ac34b398da19d1608f1c2374f9
 AUX id3lib-3.8.3-doxyinput.patch 977 RMD160 102b5cad0637776a26505d53d3722e549a7448d3 SHA1 b92df9fe9e7b0f124eba03d43a63b0da5b3718de SHA256 e7cd2eafe39229fee1195524872be3465d247590b7ead4a9cfa2178102a3d9ea
 AUX id3lib-3.8.3-gcc-4.3.patch 2971 RMD160 686fa49e1108684a652435afcc56fd062ed516a4 SHA1 d25b5e69e633e12f929e0d656b87f3f72b4b5849 SHA256 536f6bb5dddd48df3c7fc080c04f03a2053ab11429094f2f31d6e2d5f21a987e
+AUX id3lib-3.8.3-missing_nullpointer_check.patch 329 RMD160 c35705eb48deac430070f0587b913416007e287e SHA1 d257b88587d726ea3a33dda402078ac5f2ce60e9 SHA256 98a6a9a99474f8166a112e68956da25711ba3e2f7b503dd044f2161e525052e6
 AUX id3lib-3.8.3-security.patch 1601 RMD160 165fcc3773343c36394207f833b9336859ec13f4 SHA1 e9a835fc14e8a83468206eba08ca4d5e0fc5e9c1 SHA256 aa5f4e12a0a625acd58199f3e2d8d6d39290480fea7767adbbc1f8379964e01c
 AUX id3lib-3.8.3-test_io.patch 281 RMD160 773e84752a84cd746def0ff4878f4b248d6611e6 SHA1 76f6bab888f1d47e75006f7bcb44df0205693d76 SHA256 cc124f8805bcb977a1673f0b04fff368dac1af70d78c21da6f0415ce067d7687
 AUX id3lib-3.8.3-unicode16.patch 1542 RMD160 1b60e40e5cb1f172e4020ba2b87a10b557521572 SHA1 f3644a7f637b65b46afdea04195c48cde03edcd7 SHA256 71c79002d9485965a3a93e87ecbd7fed8f89f64340433b7ccd263d21385ac969
 AUX id3lib-3.8.3-zlib.patch 833 RMD160 477f5e846ef7070bd3c10203bbaaa7eeaaedf6f2 SHA1 231721feb310f5ef6d820d1c1397e3605b5689cb SHA256 0b5531089422bda659deddcccf0562fcaa96529e74778065e35c848d6cf2a502
 DIST id3lib-3.8.3.tar.gz 950726 RMD160 bfa2499ec649ed40815ad0a370c78eb1517952c4 SHA1 c92c880da41d1ec0b242745a901702ae87970838 SHA256 2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079
-EBUILD id3lib-3.8.3-r7.ebuild 1388 RMD160 9d22322ced14e143fb1eccebbd7409ae17d28ed7 SHA1 e6622e820e27b3b08b38937475d83e057f2e3841 SHA256 cafd4fe35d2d5648b3b8e92bea671d96853c9137d09248e10a3d99b117623349
-MISC ChangeLog 9614 RMD160 b8c3b54a88c8c764faf936d4434313a3c05c3c20 SHA1 a9c35de338583229537a85b4d12bb60040de2a40 SHA256 b300c97883645da38c977c270c630c4788c250d91bb10516514e1a68019015bc
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+EBUILD id3lib-3.8.3-r7.ebuild 1341 RMD160 ed01f8cb59b2a55b4318dc8aafd7a59b4b28d00f SHA1 4f5bf1dcf09f2587fdd1e2cfcdaff5f7d14d04ed SHA256 f41248f5e7f127de4e83fb42a36d195f882d7583c5a8002c00806c0dccc01e2c
+EBUILD id3lib-3.8.3-r8.ebuild 1314 RMD160 2bc2443771e9e82a06eba5ed8c2c85335aefc872 SHA1 b086c42db99eb8dc31cebe3d489342f8c6c5d231 SHA256 2d704438dd3fe4572b18476d5d287a68d4cd9813db32897aa00e433750ce1fe7
+MISC ChangeLog 9843 RMD160 3c8eb73b5bd9928bd2ca65de3fcd7f494837662a SHA1 6a1e1ced61f4b737a3f397514c4eb336cf12a4ca SHA256 d4634a3069262621e71f49bdfc3f26cf0cf5e30f9147dd2ce2ac4f38762ff4a1
+MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch b/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
new file mode 100644
index 000000000000..3b9437967842
--- /dev/null
+++ b/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
@@ -0,0 +1,11 @@
+--- id3lib-3.8.3/src/header_tag.cpp.orig	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/src/header_tag.cpp	2009-07-13 22:54:21.000000000 +0200
+@@ -54,7 +54,7 @@
+ {
+   size_t bytesUsed = ID3_TagHeader::SIZE;
+ 
+-  if (_info->is_extended)
++  if (_info && _info->is_extended)
+   {
+     bytesUsed += _info->extended_bytes;
+   }
diff --git a/media-libs/id3lib/id3lib-3.8.3-r7.ebuild b/media-libs/id3lib/id3lib-3.8.3-r7.ebuild
index 4446734bbc2a..a0c188c85403 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r7.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r7.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r7.ebuild,v 1.1 2008/07/29 15:04:05 yngwin Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r7.ebuild,v 1.2 2009/07/16 19:18:11 ssuominen Exp $
 
 inherit eutils autotools
 
-MY_P=${P/_/}
-S="${WORKDIR}"/${MY_P}
+MY_P=${P/_}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Id3 library for C/C++"
 HOMEPAGE="http://id3lib.sourceforge.net/"
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
new file mode 100644
index 000000000000..7ea64b4a746b
--- /dev/null
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r8.ebuild,v 1.1 2009/07/16 19:18:11 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Id3 library for C/C++"
+HOMEPAGE="http://id3lib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+RESTRICT="test"
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zlib.patch \
+		"${FILESDIR}"/${P}-test_io.patch \
+		"${FILESDIR}"/${P}-autoconf259.patch \
+		"${FILESDIR}"/${P}-doxyinput.patch \
+		"${FILESDIR}"/${P}-unicode16.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-missing_nullpointer_check.patch
+
+	# Security fix for bug 189610.
+	epatch "${FILESDIR}"/${P}-security.patch
+
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		cd doc
+		doxygen Doxyfile || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog HISTORY README THANKS TODO
+	use doc && dohtml -r doc
+}
diff --git a/media-libs/id3lib/metadata.xml b/media-libs/id3lib/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-libs/id3lib/metadata.xml
+++ b/media-libs/id3lib/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>