security bug #45957, mark stable

5 files changed, 141 insertions, 5 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 9fb0173c26cf..63315d2391c8 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 
+*mc-4.6.0-r5 (29 Mar 2004)
+
+  29 Mar 2004; Heinrich Wendel <lanius@gentoo.org> mc-4.6.0-r5.ebuild,
+  files/mc-4.6.0-cpan-2003-1023.patch:
+  security bug #45957, mark stable
+
   14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> mc-4.5.55-r7.ebuild,
   mc-4.6.0-r2.ebuild, mc-4.6.0-r3.ebuild, mc-4.6.0-r4.ebuild:
   Don't assign default to S; header fix
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 1867dcbef98e..53d38b326cb7 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,12 +1,15 @@
-MD5 50739dec22d58bfe943a0f491c9650f4 ChangeLog 6023
 MD5 9d5874fc54546772bb7d727a5d1bc672 mc-4.5.55-r7.ebuild 2003
 MD5 a341eb71553cd679309d5a096fedd138 mc-4.6.0-r2.ebuild 2338
-MD5 d2316e10fb2e652ae1d2aa88e77cdd30 mc-4.6.0-r3.ebuild 2766
 MD5 4064fb61022a8690d69bc5588ac6088f mc-4.6.0-r4.ebuild 2622
-MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
+MD5 d2316e10fb2e652ae1d2aa88e77cdd30 mc-4.6.0-r3.ebuild 2766
+MD5 1f8fc1952e273166204e4459ee6a76cb ChangeLog 6197
+MD5 1c26ea69fbba079a1d28f35b33fbabab mc-4.6.0-r5.ebuild 2710
 MD5 d8853d9a555c715676945a15c98030c1 files/digest-mc-4.5.55-r7 125
-MD5 8a984e82187b67b6f31c45005ea0ba3d files/digest-mc-4.6.0-r2 61
-MD5 2d424423db44876676d99d74bbf9d6d9 files/digest-mc-4.6.0-r3 202
 MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
 MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
+MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
+MD5 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
+MD5 8a984e82187b67b6f31c45005ea0ba3d files/digest-mc-4.6.0-r2 61
+MD5 2d424423db44876676d99d74bbf9d6d9 files/digest-mc-4.6.0-r3 202
 MD5 ad3b40a33b55bd202bef8e0d685bdfe1 files/digest-mc-4.6.0-r4 139
+MD5 cb6671a351f7b813ae6c70fa65c5892b files/digest-mc-4.6.0-r5 211
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r5 b/app-misc/mc/files/digest-mc-4.6.0-r5
new file mode 100644
index 000000000000..521c590e6ab2
--- /dev/null
+++ b/app-misc/mc/files/digest-mc-4.6.0-r5
@@ -0,0 +1,3 @@
+MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
+MD5 dda658d40601e29e3478ba48c3d9490e mc-4.6.0-sambalib-3.0.0.patch.bz2 399778
+MD5 3378ef7b8f4029f7aa4ee6944694cf1f mc-4.6.0-sambalib.patch.bz2 337051
diff --git a/app-misc/mc/files/mc-4.6.0-cpan-2003-1023.patch b/app-misc/mc/files/mc-4.6.0-cpan-2003-1023.patch
new file mode 100644
index 000000000000..294ecb587e25
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.0-cpan-2003-1023.patch
@@ -0,0 +1,19 @@
+diff -ru mc-4.5.55/vfs/direntry.c mc-4.5.55.new/vfs/direntry.c
+--- mc-4.5.55/vfs/direntry.c	2001-08-16 15:23:05.000000000 -0700
++++ mc-4.5.55.new/vfs/direntry.c	2004-01-06 16:36:00.000000000 -0800
+@@ -374,6 +374,7 @@
+ 	}
+     }
+ 
++#if 0
+     /* Convert absolute paths to relative ones */
+     if (*linkname == PATH_SEP) {
+ 	char *p, *q;
+@@ -391,6 +392,7 @@
+ 	}
+ 	linkname = buf;
+     }
++#endif
+ 
+     return (MEDATA->find_entry) (me, entry->dir, linkname, follow - 1, 0);
+ }
diff --git a/app-misc/mc/mc-4.6.0-r5.ebuild b/app-misc/mc/mc-4.6.0-r5.ebuild
new file mode 100644
index 000000000000..663e246f8673
--- /dev/null
+++ b/app-misc/mc/mc-4.6.0-r5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r5.ebuild,v 1.1 2004/03/29 10:46:26 lanius Exp $
+
+inherit flag-o-matic
+
+IUSE="gpm nls samba ncurses X slang"
+
+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
+	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2
+	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib.patch.bz2"
+
+DEPEND=">=sys-fs/e2fsprogs-1.19
+	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
+	=dev-libs/glib-2*
+	>=sys-libs/pam-0.72
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	slang? ( >=sys-libs/slang-1.4.2 )
+	samba? ( net-fs/samba )
+	X? ( virtual/x11 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="ia64 x86 ppc sparc alpha mips hppa amd64"
+
+filter-flags -malign-double
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	has_version '>=net-fs/samba-3.0.0' &&
+		epatch ${DISTDIR}/${P}-sambalib-3.0.0.patch.bz2
+	has_version '<net-fs/samba-3.0.0' &&
+		epatch ${DISTDIR}/${P}-sambalib.patch.bz2
+
+	epatch ${FILESDIR}/${P}-find.patch
+	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
+}
+
+src_compile() {
+	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
+
+	use gpm \
+	    && myconf="${myconf} --with-gpm-mouse" \
+	    || myconf="${myconf} --without-gpm-mouse"
+
+	use nls \
+	    && myconf="${myconf} --with-included-gettext" \
+	    || myconf="${myconf} --disable-nls"
+
+	use X \
+	    && myconf="${myconf} --with-x" \
+	    || myconf="${myconf} --without-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-gnu-ld \
+	    --with-ext2undel \
+	    --with-edit \
+		--enable-charset \
+	    ${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
+	 ${S}/lib/mc-wrapper.sh
+
+	einstall || die
+
+	dodoc ABOUT-NLS COPYING* ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
+
+	insinto /usr/share/mc
+	doins ${FILESDIR}/mc.gentoo
+}
+
+pkg_postinst() {
+	einfo "Add the following line to your ~/.bashrc to"
+	einfo "allow mc to chdir to its latest working dir at exit"
+	einfo ""
+	einfo "# Midnight Commander chdir enhancement"
+	einfo "if [ -f /usr/share/mc/mc.gentoo ]; then"
+	einfo "	. /usr/share/mc/mc.gentoo"
+	einfo "fi"
+}