Fix from Harald van Dijk for crash when given localtime() returns a NULL pointer #186369.

Package-Manager: portage-2.1.3_rc9

5 files changed, 96 insertions, 8 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index 39c27b1d9083..ac72e341e79a 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/strace
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.95 2007/07/28 17:06:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.96 2007/07/30 10:03:30 vapier Exp $
+
+*strace-4.5.15-r1 (30 Jul 2007)
+
+  30 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/strace-4.5.15-invalid-time.patch, +strace-4.5.15-r1.ebuild:
+  Fix from Harald van Dijk for crash when given localtime() returns a NULL
+  pointer #186369.
 
   28 Jul 2007; Raúl Porcel <armin76@gentoo.org> strace-4.5.15.ebuild:
   alpha/ia64/x86 stable
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 97a8f5fb2082..0adf7eb5c939 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -29,6 +29,10 @@ AUX strace-4.5.14-PT_GETSIGINFO.patch 766 RMD160 c44f89db60f0eaf8c9f37f2579dfc82
 MD5 f3397466058b002f3641219f3fad9b60 files/strace-4.5.14-PT_GETSIGINFO.patch 766
 RMD160 c44f89db60f0eaf8c9f37f2579dfc82cc0aff1ff files/strace-4.5.14-PT_GETSIGINFO.patch 766
 SHA256 8b58a9ba6e917e4f6bf3f3821271364511d3dfaa2e6cdd96d461da9c63af2b8a files/strace-4.5.14-PT_GETSIGINFO.patch 766
+AUX strace-4.5.15-invalid-time.patch 546 RMD160 020f1dfca6ce14754c8dbb868d1c6ee76781f57f SHA1 1d5ee81ed7b67eaf703b95feb0252aa4166e1495 SHA256 629667aa905d69e69f938422107b4304aa6e8861752cde4756a884b3c8e5a4e7
+MD5 73afff061c084c8f9d985556dd953c99 files/strace-4.5.15-invalid-time.patch 546
+RMD160 020f1dfca6ce14754c8dbb868d1c6ee76781f57f files/strace-4.5.15-invalid-time.patch 546
+SHA256 629667aa905d69e69f938422107b4304aa6e8861752cde4756a884b3c8e5a4e7 files/strace-4.5.15-invalid-time.patch 546
 AUX strace-4.5.15-mips-sprintsigmask.patch 375 RMD160 574513146fc496056bfab38b885c2e03bc6f0f66 SHA1 1ad6d61c6655a92e8e19d83b56f1cf01cfcc4b69 SHA256 a91ded61685b74b05fbd1716ead449810552508d7c7377e14929c362fa2f6e21
 MD5 2601f6f425544219ea603773650272cb files/strace-4.5.15-mips-sprintsigmask.patch 375
 RMD160 574513146fc496056bfab38b885c2e03bc6f0f66 files/strace-4.5.15-mips-sprintsigmask.patch 375
@@ -64,14 +68,18 @@ EBUILD strace-4.5.14.ebuild 1912 RMD160 8eee62624924512046dc0b8c75736575a763b628
 MD5 966f06f52d7137aee79a68f4834ff2fc strace-4.5.14.ebuild 1912
 RMD160 8eee62624924512046dc0b8c75736575a763b628 strace-4.5.14.ebuild 1912
 SHA256 534e6831b0267660165143e07e2b8213289da3102fd8cabc8811e7c96a2834c2 strace-4.5.14.ebuild 1912
+EBUILD strace-4.5.15-r1.ebuild 1278 RMD160 cb3b0200e09225212071d6415c62a3f3a857ac91 SHA1 def00f6f36ca1fd362d6a3f4bfdb457f6ec7a352 SHA256 5c1992230a51f4b8e55b4141338419c842a2873e1c2a4d25b4ba27cae151f478
+MD5 e5da52ecb2bb29c214d615ea5311327c strace-4.5.15-r1.ebuild 1278
+RMD160 cb3b0200e09225212071d6415c62a3f3a857ac91 strace-4.5.15-r1.ebuild 1278
+SHA256 5c1992230a51f4b8e55b4141338419c842a2873e1c2a4d25b4ba27cae151f478 strace-4.5.15-r1.ebuild 1278
 EBUILD strace-4.5.15.ebuild 1208 RMD160 307d9d1c2cebcd483ca78381f039c40fc33f5555 SHA1 4457af0b0cb05484624fd5687e6824596a27ac6e SHA256 60b84720a2a333e798a47d2f0c73098d96626441327878565016ca10ffc0f46c
 MD5 4a39e77e311fd4cb3a01713e53ceeaf7 strace-4.5.15.ebuild 1208
 RMD160 307d9d1c2cebcd483ca78381f039c40fc33f5555 strace-4.5.15.ebuild 1208
 SHA256 60b84720a2a333e798a47d2f0c73098d96626441327878565016ca10ffc0f46c strace-4.5.15.ebuild 1208
-MISC ChangeLog 11379 RMD160 fb2810712266715bf176793fc5f75d9c5b9869b4 SHA1 2783d34502ff9879626db556742f294c25089281 SHA256 80f5227aaa9099ad0ff07f7f1aefef776f8dcec6635ed17b8fa6e2b780271061
-MD5 bcd947500151797c0e55a1423fbb41c8 ChangeLog 11379
-RMD160 fb2810712266715bf176793fc5f75d9c5b9869b4 ChangeLog 11379
-SHA256 80f5227aaa9099ad0ff07f7f1aefef776f8dcec6635ed17b8fa6e2b780271061 ChangeLog 11379
+MISC ChangeLog 11625 RMD160 1c53d7d68ae555a2d4fe117134ceb4014b3be119 SHA1 a228cea93f2d28c7704042a0560a7661d3eaf97d SHA256 5039357c01f9bcd784bfa3d4a64de0fe85d129bf7032e25a40a078fc6dd5157e
+MD5 28565bb6ce486f2b07ddc09396f1377f ChangeLog 11625
+RMD160 1c53d7d68ae555a2d4fe117134ceb4014b3be119 ChangeLog 11625
+SHA256 5039357c01f9bcd784bfa3d4a64de0fe85d129bf7032e25a40a078fc6dd5157e ChangeLog 11625
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -85,10 +93,13 @@ SHA256 5cb98f7afe26e3f97f31d956155dce922df6334d7ce8f6d4c09c176dd1faeec0 files/di
 MD5 80c9289783c55e39c2f2468c04315689 files/digest-strace-4.5.15 244
 RMD160 806438be0f55997ed17003e1d55b4c53a83b9ea9 files/digest-strace-4.5.15 244
 SHA256 a03c34145a567f175deabdc589913d8b7ca08e40639dc704071b969ef999f5b4 files/digest-strace-4.5.15 244
+MD5 80c9289783c55e39c2f2468c04315689 files/digest-strace-4.5.15-r1 244
+RMD160 806438be0f55997ed17003e1d55b4c53a83b9ea9 files/digest-strace-4.5.15-r1 244
+SHA256 a03c34145a567f175deabdc589913d8b7ca08e40639dc704071b969ef999f5b4 files/digest-strace-4.5.15-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGrbZlp/wUKkr7RBoRAm1YAJ9bcRrQCFAzVc0SOqyYuLP85KzzeQCdHQsF
-+uZM8+LhCq59Ucmow9eAzvo=
-=CSEN
+iD8DBQFGrbd6p/wUKkr7RBoRAi4MAKCB27jO/iC+VxSB36nTLxqMSFxQlQCaA9KY
+29E6SnQqwx44jyiEivJ2yZY=
+=SK5E
 -----END PGP SIGNATURE-----
diff --git a/dev-util/strace/files/digest-strace-4.5.15-r1 b/dev-util/strace/files/digest-strace-4.5.15-r1
new file mode 100644
index 000000000000..bf58fb345d1b
--- /dev/null
+++ b/dev-util/strace/files/digest-strace-4.5.15-r1
@@ -0,0 +1,3 @@
+MD5 ef40944118841803391d212cb64d3c5b strace-4.5.15.tar.bz2 455607
+RMD160 0c6aaa8820a0985d89b21a5da9578b27435c8906 strace-4.5.15.tar.bz2 455607
+SHA256 ba8c492c1b2033d4e2131f05df9e3780d4bc35bea87aa32a6052dd53a814e288 strace-4.5.15.tar.bz2 455607
diff --git a/dev-util/strace/files/strace-4.5.15-invalid-time.patch b/dev-util/strace/files/strace-4.5.15-invalid-time.patch
new file mode 100644
index 000000000000..895add8a5b22
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.15-invalid-time.patch
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/186369
+
+--- strace-4.5.15/file.c
++++ strace-4.5.15/file.c
+@@ -684,9 +684,13 @@
+ 		return buf;
+ 	}
+ 	tmp = localtime(&t);
+-	sprintf(buf, "%02d/%02d/%02d-%02d:%02d:%02d",
+-		tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
+-		tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
++	if (tmp == NULL)
++		snprintf(buf, sizeof buf, "%lu",
++			(unsigned long) t);
++	else
++		sprintf(buf, "%02d/%02d/%02d-%02d:%02d:%02d",
++			tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
++			tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+ 	return buf;
+ }
+ 
diff --git a/dev-util/strace/strace-4.5.15-r1.ebuild b/dev-util/strace/strace-4.5.15-r1.ebuild
new file mode 100644
index 000000000000..0735f90d9bed
--- /dev/null
+++ b/dev-util/strace/strace-4.5.15-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.15-r1.ebuild,v 1.1 2007/07/30 10:03:30 vapier Exp $
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static aio"
+
+DEPEND="aio? ( dev-libs/libaio )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#epatch "${FILESDIR}"/${PN}-4.5.11-fbsd.patch
+
+	epatch "${FILESDIR}"/${PN}-4.5.15-invalid-time.patch #186369
+	epatch "${FILESDIR}"/strace-dont-use-REG_SYSCALL-for-sh.patch
+	epatch "${FILESDIR}"/${PN}-4.5.12-superh-update.patch
+	epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch
+	epatch "${FILESDIR}"/${PN}-4.5.15-mips-sprintsigmask.patch
+	epatch "${FILESDIR}"/${PN}-4.5.12-libaio.patch #103427
+
+	eautoreconf
+}
+
+src_compile() {
+	filter-lfs-flags
+
+	use static && append-ldflags -static
+
+	econf $(use_enable aio libaio) || die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog CREDITS NEWS PORTING README* TODO
+}