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

(Portage version: 2.1.3_rc9)

4 files changed, 78 insertions, 1 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/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
+}