From c19ed6ff88b763e78c6914b54a5f384173be64a6 Mon Sep 17 00:00:00 2001 From: Heinrich Wendel Date: Sat, 12 Feb 2005 12:24:13 +0000 Subject: security fixes, bug #77992 (Portage version: 2.0.51-r15) --- app-misc/mc/ChangeLog | 9 +- app-misc/mc/Manifest | 21 ++-- app-misc/mc/files/digest-mc-4.6.0-r11 | 2 - app-misc/mc/files/digest-mc-4.6.0-r13 | 2 + ...mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2 | Bin 0 -> 1550 bytes app-misc/mc/mc-4.6.0-r11.ebuild | 114 -------------------- app-misc/mc/mc-4.6.0-r13.ebuild | 119 +++++++++++++++++++++ 7 files changed, 141 insertions(+), 126 deletions(-) delete mode 100644 app-misc/mc/files/digest-mc-4.6.0-r11 create mode 100644 app-misc/mc/files/digest-mc-4.6.0-r13 create mode 100644 app-misc/mc/files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2 delete mode 100644 app-misc/mc/mc-4.6.0-r11.ebuild create mode 100644 app-misc/mc/mc-4.6.0-r13.ebuild (limited to 'app-misc') 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 + +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 : 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-r11 deleted file mode 100644 index c66b6aee0770..000000000000 --- a/app-misc/mc/files/digest-mc-4.6.0-r11 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676 -MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0.patch.bz2 399920 diff --git a/app-misc/mc/files/digest-mc-4.6.0-r13 b/app-misc/mc/files/digest-mc-4.6.0-r13 new file mode 100644 index 000000000000..c66b6aee0770 --- /dev/null +++ b/app-misc/mc/files/digest-mc-4.6.0-r13 @@ -0,0 +1,2 @@ +MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676 +MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0.patch.bz2 399920 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 Binary files /dev/null and b/app-misc/mc/files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2 differ diff --git a/app-misc/mc/mc-4.6.0-r11.ebuild b/app-misc/mc/mc-4.6.0-r11.ebuild deleted file mode 100644 index f1abdde6fe2b..000000000000 --- a/app-misc/mc/mc-4.6.0-r11.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# 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 $ - -inherit flag-o-matic eutils - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" -IUSE="gpm nls samba ncurses X slang unicode" - -PROVIDE="virtual/editor" - -DEPEND=">=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-r1 ) - samba? ( >=net-fs/samba-3.0.0 ) - unicode? ( >=sys-libs/slang-1.4.9-r1 ) - dev-util/pkgconfig - X? ( virtual/x11 )" - -src_unpack() { - unpack ${P}.tar.gz - cd ${S} - - epatch ${DISTDIR}/${P}-sambalib-3.0.0.patch.bz2 - - 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}-vfs.patch - epatch ${FILESDIR}/${P}-ftp.patch - epatch ${FILESDIR}/${P}-largefile.patch - - if use unicode && use slang; then - epatch ${FILESDIR}/${P}-utf8.patch.bz2 - fi -} - -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-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 - - # install cons.saver setuid, to actually work - chmod u+s ${D}/usr/lib/mc/cons.saver - - dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README* - - insinto /usr/share/mc - doins ${FILESDIR}/mc.gentoo - - insinto /usr/share/mc/syntax - doins ${FILESDIR}/ebuild.syntax - cd ${D}/usr/share/mc/syntax - epatch ${FILESDIR}/${P}-ebuild-syntax.patch -} - -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" -} diff --git a/app-misc/mc/mc-4.6.0-r13.ebuild b/app-misc/mc/mc-4.6.0-r13.ebuild new file mode 100644 index 000000000000..6b539ae67b3c --- /dev/null +++ b/app-misc/mc/mc-4.6.0-r13.ebuild @@ -0,0 +1,119 @@ +# 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-r13.ebuild,v 1.1 2005/02/12 12:24:13 lanius Exp $ + +inherit flag-o-matic eutils + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="gpm nls samba ncurses X slang unicode" + +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 ) + X? ( virtual/x11 )" + +src_unpack() { + unpack ${P}.tar.gz + cd ${S} + + epatch ${DISTDIR}/${P}-sambalib-3.0.0.patch.bz2 + + 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 + fi +} + +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-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 + + # install cons.saver setuid, to actually work + chmod u+s ${D}/usr/lib/mc/cons.saver + + dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README* + + insinto /usr/share/mc + doins ${FILESDIR}/mc.gentoo + + insinto /usr/share/mc/syntax + 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() { + 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" +} -- cgit v1.2.3-65-gdbad