Report invalid mtimes without crashing (#184296)

Package-Manager: portage-2.1.3_rc6

5 files changed, 226 insertions, 8 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 3213d4f007c9..a1253289507a 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.125 2007/06/03 10:17:39 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.126 2007/07/05 21:42:35 truedfx Exp $
+
+*mc-4.6.1-r4 (05 Jul 2007)
+
+  05 Jul 2007; Harald van Dijk <truedfx@gentoo.org>
+  +files/mc-4.6.1-invalid-mtime.patch, +mc-4.6.1-r4.ebuild:
+  Report invalid mtimes without crashing (#184296)
 
   03 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> mc-4.6.1-r3.ebuild:
   Added get_libdir instead of hardcoded lib. Fixes bug 180678.
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index e72fd4149ecd..d830788199bd 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -29,6 +29,10 @@ AUX mc-4.6.1-find.patch 5522 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 SHA
 MD5 3c950491cdf44091df216cfa709d133a files/mc-4.6.1-find.patch 5522
 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 files/mc-4.6.1-find.patch 5522
 SHA256 70afc16da05d7d10bc1965039090546856692ed6013acf51b2a9d9ca85ed6868 files/mc-4.6.1-find.patch 5522
+AUX mc-4.6.1-invalid-mtime.patch 787 RMD160 fb02c6c2c672780551a79d942cd7b3be8eb96c1c SHA1 4ef7584019cc5e7632c2a687705d4b2bd7ba457e SHA256 e6cd8c235aed5362538689daf2a92eddb36e2c79387e26c78d8ac71210224520
+MD5 81930cce827fe93639dcd6bff630a1a4 files/mc-4.6.1-invalid-mtime.patch 787
+RMD160 fb02c6c2c672780551a79d942cd7b3be8eb96c1c files/mc-4.6.1-invalid-mtime.patch 787
+SHA256 e6cd8c235aed5362538689daf2a92eddb36e2c79387e26c78d8ac71210224520 files/mc-4.6.1-invalid-mtime.patch 787
 AUX mc-4.6.1-largefile.patch 6919 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1ca SHA1 1bbe8c7d614aae3ed8225237b0ac2fdc6bc4ca64 SHA256 005bbc46f6b4ee3ff8ce29cf1b8974af69e38b4ca5676512927a3a8cd290ee57
 MD5 80b45ecf38d9b5df6d368c83d14fd89d files/mc-4.6.1-largefile.patch 6919
 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1ca files/mc-4.6.1-largefile.patch 6919
@@ -46,6 +50,7 @@ MD5 7fadf4867e255f1d7254181267759775 files/mc.ini 43
 RMD160 2254610744c484553cd3332a4f45e439b13cceed files/mc.ini 43
 SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1 files/mc.ini 43
 DIST mc-4.6.1-utf8-r1.patch.bz2 30427 RMD160 43f246e3bce44e526fb8d69c095afce34d73d64d SHA1 5ed1468a55c6984b520eec8a8f8cb48cad1e6f91 SHA256 19c8728220ec52849daded5d58eddbd712a2ccc84b11aed41c3916248545df44
+DIST mc-4.6.1-utf8-r2.patch.bz2 30449 RMD160 ffe89eb0cef217ba87398c93b65ebc0e5fefac5d SHA1 f0994ddc412b4f86a7dab83686e846156fc36de2 SHA256 f58de9e412694958c00c7ef831995f2b56b7add7ea1e26567281516db02f483e
 DIST mc-4.6.1-utf8.patch.bz2 30401 RMD160 f23680c85328b4b0435065f9e5cf430e0cd6b0c4 SHA1 f773e13d4ee601fdd0220b589acf32eeaf66b71e SHA256 dbc0f41059c4010665027d6ab756c4ca6d65584bcfb771afa120da3219e8e61b
 DIST mc-4.6.1.tar.gz 3928370 RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b SHA1 92be0802143245e0fb7e3847d70da614cad7d5fb SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e
 DIST u7z-4.16beta.tar.bz2 3041 RMD160 4a682b3b4bc6c09c7414f8d585829763f6c112ea SHA1 5a4898c732ee423bbf9bd38d3b6f0ebab655881c SHA256 668ed6a0484358e51de1be8d8581cc36dd3c915872fb1082550437a2d7aa67dd
@@ -54,14 +59,18 @@ EBUILD mc-4.6.1-r3.ebuild 4207 RMD160 b008adabbea81e8fda511121d49d82e2799f53a7 S
 MD5 c7d7292c75b10da4ff0a1627c3d72b63 mc-4.6.1-r3.ebuild 4207
 RMD160 b008adabbea81e8fda511121d49d82e2799f53a7 mc-4.6.1-r3.ebuild 4207
 SHA256 da2d1744875b6b647ceb102f093a9dfa7cebba9436a95a0fcf9ccc88f84fc609 mc-4.6.1-r3.ebuild 4207
+EBUILD mc-4.6.1-r4.ebuild 4316 RMD160 1e25f74b104c1f6c3d8e98ccd292dfce272d3828 SHA1 608c0b751ad901eb6feed115aae759a0d1adcbc4 SHA256 35831bf8fc9713a0218a637507c2f16aee4dec0b287d49bb6a66c1b01bf86308
+MD5 190fcca42f16c125db43308ae7524496 mc-4.6.1-r4.ebuild 4316
+RMD160 1e25f74b104c1f6c3d8e98ccd292dfce272d3828 mc-4.6.1-r4.ebuild 4316
+SHA256 35831bf8fc9713a0218a637507c2f16aee4dec0b287d49bb6a66c1b01bf86308 mc-4.6.1-r4.ebuild 4316
 EBUILD mc-4.6.1.ebuild 3549 RMD160 3a7cc3fe14bfd9644f18dc1871f70fb3edb78f2c SHA1 a99d3b844d8202a47eb5002291e3c05afee64fe7 SHA256 82e8a754abe7cd8da235bce77e487c72ad730fc88c313ef9009692fc58955c32
 MD5 a8c84f723d1118bef0aa327438ab444f mc-4.6.1.ebuild 3549
 RMD160 3a7cc3fe14bfd9644f18dc1871f70fb3edb78f2c mc-4.6.1.ebuild 3549
 SHA256 82e8a754abe7cd8da235bce77e487c72ad730fc88c313ef9009692fc58955c32 mc-4.6.1.ebuild 3549
-MISC ChangeLog 18212 RMD160 09eb78ff0831df6ad17cfe0dd4987199cfbc5461 SHA1 05ab44e5215af4e73221476ac96de414fd108e9e SHA256 57cf1771a6af71c0ade34930fbfa346e5d66694dcfc39fbb6ce9d6623e011060
-MD5 01e488d5fba4e03a7c6bd66401a790a1 ChangeLog 18212
-RMD160 09eb78ff0831df6ad17cfe0dd4987199cfbc5461 ChangeLog 18212
-SHA256 57cf1771a6af71c0ade34930fbfa346e5d66694dcfc39fbb6ce9d6623e011060 ChangeLog 18212
+MISC ChangeLog 18401 RMD160 8b5877e58f55c56ab2636ef37e1712b7f7eabfd4 SHA1 5514745c060b620533bf99b475ebdd2e0faa1c2b SHA256 87c62b2c35cba8c0857885fa7e5548d25a78ad45c65593baa92633021898bb8e
+MD5 3d27a5bfc8ae0557041202f68cf14b76 ChangeLog 18401
+RMD160 8b5877e58f55c56ab2636ef37e1712b7f7eabfd4 ChangeLog 18401
+SHA256 87c62b2c35cba8c0857885fa7e5548d25a78ad45c65593baa92633021898bb8e ChangeLog 18401
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -72,10 +81,13 @@ SHA256 b20f6209af8c836b2acba79723cf9854b69e0145a41af195932c947e2713123f files/di
 MD5 e44020f133c8e16d56784bd3ae21041e files/digest-mc-4.6.1-r3 708
 RMD160 b4f25a3be25edbcc6ba52ae2be1a087955b3db16 files/digest-mc-4.6.1-r3 708
 SHA256 f9ded44bd363c563a74300baf1026ec9e962cf1ab22376f4cba7281ac008b71a files/digest-mc-4.6.1-r3 708
+MD5 edbc797e75390abdbac4bdfddfeb22e6 files/digest-mc-4.6.1-r4 708
+RMD160 e48d189ffebfbfd6e5e0ad9682d2561fa961d150 files/digest-mc-4.6.1-r4 708
+SHA256 8dc20927f037e905b4a75a9af1e6a292241c10416d8b1da64b374cb9020c3f35 files/digest-mc-4.6.1-r4 708
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGft8lp/wUKkr7RBoRAsWNAKCqDYNDjQjcio9U2BzqVJMyyvSm3QCePlFc
-r+YVNlMt7SYZvO27wx5FTCk=
-=ZLEB
+iD8DBQFGjWX0wnQyISwouHwRAnqcAKC6AeG3LwfjLZFy9iA1LHQEH79sNACgt6GO
+BkGdpb3jS6V6pTIZ2fIv7uo=
+=UXvD
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/digest-mc-4.6.1-r4 b/app-misc/mc/files/digest-mc-4.6.1-r4
new file mode 100644
index 000000000000..1bb42318c1b6
--- /dev/null
+++ b/app-misc/mc/files/digest-mc-4.6.1-r4
@@ -0,0 +1,9 @@
+MD5 f90bffe7f51883e818143dc2077eb98f mc-4.6.1-utf8-r2.patch.bz2 30449
+RMD160 ffe89eb0cef217ba87398c93b65ebc0e5fefac5d mc-4.6.1-utf8-r2.patch.bz2 30449
+SHA256 f58de9e412694958c00c7ef831995f2b56b7add7ea1e26567281516db02f483e mc-4.6.1-utf8-r2.patch.bz2 30449
+MD5 18b20db6e40480a53bac2870c56fc3c4 mc-4.6.1.tar.gz 3928370
+RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b mc-4.6.1.tar.gz 3928370
+SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e mc-4.6.1.tar.gz 3928370
+MD5 d63ffd21654bfa965b5c19b845cb7b34 u7z-4.29.tar.bz2 2951
+RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf u7z-4.29.tar.bz2 2951
+SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d u7z-4.29.tar.bz2 2951
diff --git a/app-misc/mc/files/mc-4.6.1-invalid-mtime.patch b/app-misc/mc/files/mc-4.6.1-invalid-mtime.patch
new file mode 100644
index 000000000000..07b1f6d1c169
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.1-invalid-mtime.patch
@@ -0,0 +1,30 @@
+
+  Invalid timestamps on files caused mc to segfault by passing a null
+  pointer to strftime. Avoid trying to print the time in this case.
+
+  Reported by Maxim Britov <maxim@office.modum.by>
+  at http://bugs.gentoo.org/184296
+
+--- mc-4.6.1/src/util.c
++++ mc-4.6.1/src/util.c
+@@ -717,6 +717,7 @@
+     static size_t i18n_timelength = 0;
+     static const char *fmtyear, *fmttime;
+     const char *fmt;
++    struct tm *whentm;
+ 
+     if (i18n_timelength == 0){
+ 	i18n_timelength = i18n_checktimelength() + 1;
+@@ -740,7 +741,11 @@
+     else
+ 	fmt = fmttime;
+     
+-    strftime (timebuf, i18n_timelength, fmt, localtime(&when));
++    whentm = localtime(&when);
++    if (whentm == NULL)
++	return "(invalid)";
++
++    strftime (timebuf, i18n_timelength, fmt, whentm);
+     return timebuf;
+ }
+ 
diff --git a/app-misc/mc/mc-4.6.1-r4.ebuild b/app-misc/mc/mc-4.6.1-r4.ebuild
new file mode 100644
index 000000000000..eead372609d2
--- /dev/null
+++ b/app-misc/mc/mc-4.6.1-r4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r4.ebuild,v 1.1 2007/07/05 21:42:35 truedfx Exp $
+
+inherit flag-o-matic eutils
+
+U7Z_PV="4.29"
+U7Z="u7z-${U7Z_PV}.tar.bz2"
+DESCRIPTION="GNU Midnight Commander cli-based file manager"
+HOMEPAGE="http://www.ibiblio.org/mc/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-utf8-r2.patch.bz2
+	7zip? ( http://sgh-punk.narod.ru/files/u7z/${U7Z} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="7zip X gpm ncurses nls pam samba slang unicode"
+
+PROVIDE="virtual/editor"
+
+RDEPEND="kernel_linux? ( >=sys-fs/e2fsprogs-1.19 )
+	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
+	=dev-libs/glib-2*
+	pam? ( >=sys-libs/pam-0.72 )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	slang? ( ~sys-libs/slang-1.4.9 )
+	samba? ( >=net-fs/samba-3.0.0 )
+	X? ( || ( (
+			x11-libs/libX11
+			x11-libs/libICE
+			x11-libs/libXau
+			x11-libs/libXdmcp
+			x11-libs/libSM
+			)
+			virtual/x11
+		)
+	)
+	x86? ( 7zip? ( >=app-arch/p7zip-4.16 ) )
+	ppc? ( 7zip? ( >=app-arch/p7zip-4.16 ) )
+	amd64? ( 7zip? ( >=app-arch/p7zip-4.16 ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if use unicode && ! use slang ; then
+		eerror "You must either disable unicode useflag or, if you want a"
+		eerror "unicode-aware mc, set the slang useflag as well."
+		die "set slang or unset unicode"
+	fi
+}
+
+src_unpack() {
+	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
+		unpack ${U7Z}
+	fi
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-find.patch
+	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
+		epatch "${FILESDIR}"/${PN}-4.6.0-7zip.patch
+	fi
+	epatch "${FILESDIR}"/${P}-largefile.patch
+
+	# Don't crash on invalid mtimes
+	# Bug #184296
+	epatch "${FILESDIR}"/${P}-invalid-mtime.patch
+
+	if use slang && use unicode; then
+		epatch "${DISTDIR}"/${P}-utf8-r2.patch.bz2
+	fi
+	epatch "${FILESDIR}"/${P}-nonblock.patch
+	epatch "${FILESDIR}"/${P}-bash-all.patch
+
+	# Prevent lazy bindings in cons.saver binary. (bug #135009)
+	#  - not using bindnow-flags() because cons.saver is only built on GNU/Linux
+	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
+		src/Makefile.in
+
+	# Correctly generate charset.alias.
+	# Fixes bugs  71275, 105960 and 169678
+	epatch "${FILESDIR}"/${P}-charset-locale-aliases.patch
+}
+
+src_compile() {
+	append-flags -I/usr/include/gssapi
+
+	filter-flags -malign-double
+
+	local myconf=""
+
+	if ! use slang && ! use ncurses ; then
+		myconf="${myconf} --with-screen=mcslang"
+	elif use ncurses && ! use slang ; then
+		myconf="${myconf} --with-screen=ncurses"
+	else
+		use slang && myconf="${myconf} --with-screen=slang"
+	fi
+
+	myconf="${myconf} `use_with gpm gpm-mouse`"
+
+	use nls \
+		&& myconf="${myconf} --with-included-gettext" \
+		|| myconf="${myconf} --disable-nls"
+
+	myconf="${myconf} `use_with X x`"
+
+	use samba \
+		&& myconf="${myconf} --with-samba --with-configdir=/etc/samba --with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
+		|| myconf="${myconf} --without-samba"
+
+	econf \
+		--with-vfs \
+		--with-ext2undel \
+		--with-edit \
+		--enable-charset \
+	${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	cat "${FILESDIR}"/chdir-4.6.0.gentoo >>\
+		"${S}"/lib/mc-wrapper.sh
+
+	make install DESTDIR="${D}" || die "make install failed"
+
+	# install cons.saver setuid, to actually work
+	fperms u+s /usr/$(get_libdir)/mc/cons.saver
+
+	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
+
+	insinto /usr/share/mc
+	doins "${FILESDIR}"/mc.gentoo
+	doins "${FILESDIR}"/mc.ini
+
+	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
+		cd ../${U7Z_PV}
+		exeinto /usr/share/mc/extfs
+		doexe u7z
+		dodoc readme.u7z
+		newdoc ChangeLog ChangeLog.u7z
+	fi
+
+	insinto /usr/share/mc/syntax
+	doins "${FILESDIR}"/ebuild.syntax
+	cd "${D}"/usr/share/mc/syntax
+	epatch "${FILESDIR}"/${PN}-4.6.0-ebuild-syntax.patch
+}
+
+pkg_postinst() {
+	elog "Add the following line to your ~/.bashrc to"
+	elog "allow mc to chdir to its latest working dir at exit"
+	elog ""
+	elog "# Midnight Commander chdir enhancement"
+	elog "if [ -f /usr/share/mc/mc.gentoo ]; then"
+	elog "	. /usr/share/mc/mc.gentoo"
+	elog "fi"
+}