security fixes, bug #77992

(Portage version: 2.0.51-r15)

5 files changed, 28 insertions, 13 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 6f04f24009a1..27f6d66de2fb 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.71 2005/01/02 21:18:05 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.72 2005/02/12 12:24:13 lanius Exp $
+
+*mc-4.6.0-r13 (12 Feb 2005)
+
+  12 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2,
+  -mc-4.6.0-r11.ebuild, +mc-4.6.0-r13.ebuild:
+  security fixes, bug #77992
 
   02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 8d0bf0f12680..66f6578f7ea9 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,18 +1,21 @@
+MD5 fdf6f488a2936badc38d689623385e70 mc-4.6.0-r11.ebuild 3018
+MD5 6863b1cb1c8834d432b64cbc86e4553e mc-4.6.0-r13.ebuild 3209
 MD5 ab179c2f30cd770eb6e0995f6567e434 mc-4.6.0-r12.ebuild 3145
 MD5 85b50ebfb724389cd9a5bdedc9fb5802 ChangeLog 10912
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 fdf6f488a2936badc38d689623385e70 mc-4.6.0-r11.ebuild 3018
+MD5 b07d2f1ccf2c5b607caaeaa82ad1681e files/mc-4.6.0-key.c.patch 811
 MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
-MD5 3f426ce18f8bf82d9e9c3347525d75e8 files/mc-4.6.0-utf8.patch.bz2 30359
+MD5 6356abe34b8907ad2cfedd4cf8ef365e files/mc-4.6.0-ebuild-syntax.patch 296
+MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
+MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r11 139
+MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r12 139
+MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r13 139
 MD5 23a5069637af088015fe5f0de8c42883 files/mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+MD5 af0d3ea62ae2f21e71e77e25a7415dc9 files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2 3244
 MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
-MD5 3bb3f2fa14fdb654e1352bdd406d848f files/mc-4.6.0-largefile.patch 5751
-MD5 b07d2f1ccf2c5b607caaeaa82ad1681e files/mc-4.6.0-key.c.patch 811
-MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
-MD5 99fd5760d0ddfc08292de6a62b573e73 files/mc-4.6.0-ftp.patch 285
 MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
+MD5 3f426ce18f8bf82d9e9c3347525d75e8 files/mc-4.6.0-utf8.patch.bz2 30359
+MD5 3bb3f2fa14fdb654e1352bdd406d848f files/mc-4.6.0-largefile.patch 5751
 MD5 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
-MD5 6356abe34b8907ad2cfedd4cf8ef365e files/mc-4.6.0-ebuild-syntax.patch 296
 MD5 33aafc4a9c8134eb13d62fed6b81888e files/ebuild.syntax 2588
-MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r12 139
-MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r11 139
+MD5 99fd5760d0ddfc08292de6a62b573e73 files/mc-4.6.0-ftp.patch 285
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r11 b/app-misc/mc/files/digest-mc-4.6.0-r13
index c66b6aee0770..c66b6aee0770 100644
--- a/app-misc/mc/files/digest-mc-4.6.0-r11
+++ b/app-misc/mc/files/digest-mc-4.6.0-r13
diff --git a/app-misc/mc/files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2 b/app-misc/mc/files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2
new file mode 100644
index 000000000000..9effb335cf5e
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2
diff --git a/app-misc/mc/mc-4.6.0-r11.ebuild b/app-misc/mc/mc-4.6.0-r13.ebuild
index f1abdde6fe2b..6b539ae67b3c 100644
--- a/app-misc/mc/mc-4.6.0-r11.ebuild
+++ b/app-misc/mc/mc-4.6.0-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r11.ebuild,v 1.19 2005/01/01 15:13:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r13.ebuild,v 1.1 2005/02/12 12:24:13 lanius Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gpm nls samba ncurses X slang unicode"
 
 PROVIDE="virtual/editor"
@@ -19,12 +19,12 @@ PROVIDE="virtual/editor"
 DEPEND=">=sys-fs/e2fsprogs-1.19
 	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
 	=dev-libs/glib-2*
+	dev-util/pkgconfig
 	pam? ( >=sys-libs/pam-0.72 )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	slang? ( >=sys-libs/slang-1.4.9-r1 )
 	samba? ( >=net-fs/samba-3.0.0 )
 	unicode? ( >=sys-libs/slang-1.4.9-r1 )
-	dev-util/pkgconfig
 	X? ( virtual/x11 )"
 
 src_unpack() {
@@ -36,9 +36,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-find.patch
 	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
 	epatch ${FILESDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
+	epatch ${FILESDIR}/${P}-can-2004-1004-1005-1092-1176.patch.bz2
 	epatch ${FILESDIR}/${P}-vfs.patch
 	epatch ${FILESDIR}/${P}-ftp.patch
 	epatch ${FILESDIR}/${P}-largefile.patch
+	epatch ${FILESDIR}/${P}-key.c.patch
 
 	if use unicode && use slang; then
 		epatch ${FILESDIR}/${P}-utf8.patch.bz2
@@ -101,6 +103,9 @@ src_install() {
 	doins ${FILESDIR}/ebuild.syntax
 	cd ${D}/usr/share/mc/syntax
 	epatch ${FILESDIR}/${P}-ebuild-syntax.patch
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=71275
+	rm -f ${D}/usr/share/locale/locale.alias
 }
 
 pkg_postinst() {