From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- app-misc/mc/Manifest | 5 +- app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch | 85 +++++++++++++++++ app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch | 29 ++++++ app-misc/mc/mc-4.8.23-r1.ebuild | 111 +++++++++++++++++++++++ app-misc/mc/mc-9999.ebuild | 2 +- 5 files changed, 230 insertions(+), 2 deletions(-) create mode 100644 app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch create mode 100644 app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch create mode 100644 app-misc/mc/mc-4.8.23-r1.ebuild (limited to 'app-misc/mc') diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 19ed48635ad8..03f28f916399 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,6 +1,9 @@ +AUX mc-4.8.23-3933-iso9660-1.patch 2491 BLAKE2B 30e6db19f3251784dc99fc9fc8bc8961cc2dc2414942ad2fbd62ef7a2d9d6a58416787cd7811bcc33822c3a3407c65f86886117372a3f6828ad2eb83ca516c49 SHA512 3b5e6ee0422a860efd7ec3768746bf3b0a81b4f55d775ac165946ffa5f00507fb1a0d4344d213867088e7152c0f0c12b3bb583b1d247368300b7b9cf2d8f8dd6 +AUX mc-4.8.23-3933-iso9660-2.patch 825 BLAKE2B 6f10685889f42553d54d9473a26fd4644163012d8201fe9ac42e02e5d45ee6764ce7c75f7939bb676295c0ef5d9dd4b182bba3ad198ccb2f1b907f0808be0b97 SHA512 1c9c7c961d3a69081ce5835edd386c76c9b947c7b23467f9bfd8979942248ba4382c74dfe67f8615b92b0a18b3754405486bc9a27ac7014655a2ca2f733dce99 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6 EBUILD mc-4.8.22.ebuild 2856 BLAKE2B 4690f984d23c2397b1934708b3fe03b357e6422516bc59ed50ff9e7a32988e6019ab69cecd7618ef4e60725f30367e76da3a249b4d5b04b7bec4f0346aedb977 SHA512 0976c89075f0dd7cb3028b2855824b441a74cdd981064a892d2446347484e9fbbba236705ee99f7b2b7163e6dd0769d902da85dfb0ae05a66667a82c9c6e911d +EBUILD mc-4.8.23-r1.ebuild 2961 BLAKE2B ee54e3c02f8149df44541d4c9c1427052c54589414f2ba8b5f1cf02420bbc86ff8c8a69529e15e0a19ffa66f346a3777cfa1dd666835a40432f6d852d721f9b4 SHA512 1be001eb1bb3e7beae9949cc653bff29f5a38b1af35e88dc51a98219fba1a026ecf920c8e5e0de5cf90b2139f518d1ab417eafabfcb31ed81b75a72a9fc2d526 EBUILD mc-4.8.23.ebuild 2866 BLAKE2B 05678e4bd3e32278f6a09c65b028fa731997481af928798edc09dd780e7c373d04a92d7dd9a2ce5c6a999ebb11f15a3b5f63b20de31ae11a043f9f01f1491232 SHA512 630ff657da56cde5e2bcfdd3c26b24416515087f4f61246f7d6bfd384a8f8d479ab2d163bb66173d31db03c7bad0be18d9f1a1c1d0e4ddc1b6b4719aef84a579 -EBUILD mc-9999.ebuild 3113 BLAKE2B ec6b556a149078643e7dfd5a3fbd5bc43c174b1cfb5e2d05d578c7ac9dfe084347ee262100d5b2c6d5fe9bbc3feaed504e93252bbc01f8431d49d1794eb63425 SHA512 8693c20e841d2b3f83073a444cca6e8013046e1f7ac7007f12d11a384e2db691ac06930f782f3585e9d7441a964967b143b3bee740c6287d64ac2e04f6277c5e +EBUILD mc-9999.ebuild 3111 BLAKE2B 31c178fdbef8bb48d7ca13c15f7e7e56bb3d3de730ee62bccd75a593d9ad313e5cc6fc6e5dbd60a116ab5770ddcb24d31bc67393b1868b2cb57ea99a8dfb174c SHA512 fc8bbce6e66c343e141fcd0ad6c3a6fd450db0ebc366450589bf24a27556a3e536653c7430b65f2e4766172f8aece01c0206fe8c00a0bfefe4f8676c269e7553 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch b/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch new file mode 100644 index 000000000000..be08e68b296c --- /dev/null +++ b/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch @@ -0,0 +1,85 @@ +From afdc9719f3e37921b621046f01f23fe6b705f059 Mon Sep 17 00:00:00 2001 +From: Andrew Borodin +Date: Sun, 7 Jul 2019 14:44:10 +0300 +Subject: [PATCH 1/2] Ticket #3933: report iso9660 listing errors. + +Variation 1: + +Steps to reproduce: + + * create empty .iso file (touch foo.iso) + * run 'mc' and press enter on empty .iso + +Expected result: some error about invalid file format (sililar to what +F3 view would yield). +Actual result: mc elters a file as if it would be empty valid file. + +Variation 2: +Steps to reproduce: + + * pick valid .iso file + * deinstall all helper tools that handle .sio (isoinfo, xorriso, etc.) + * run 'mc' and press enter on empty .iso + +Expected result: some error about invalid file format (sililar to what +F3 view would yield) +Actual result: mc enters a file as if it would be empty valid file + +Variation 2 is especially confusing for users as it does not hint them +that they should install a tool to get it working. They just observe +silently broken behaviour. + +Signed-off-by: Andrew Borodin +--- + src/vfs/extfs/helpers/iso9660.in | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in +index 8c2240e8e..76273522e 100644 +--- a/src/vfs/extfs/helpers/iso9660.in ++++ b/src/vfs/extfs/helpers/iso9660.in +@@ -93,6 +93,8 @@ xorriso_rm() { + + # tested to comply with isoinfo 2.0's output + test_iso () { ++ which isoinfo 2>/dev/null || (echo "isoinfo not found" >&2; return 1) ++ + CHARSET=$(locale charmap 2>/dev/null) + if test -z "$CHARSET"; then + CHARSET=$(locale 2>/dev/null | @GREP@ LC_CTYPE | sed -n -e 's/.*\.\(.*\)"$/\1/p') +@@ -119,6 +121,8 @@ test_iso () { + } + + mcisofs_list () { ++ local lsl r ++ + # left as a reminder to implement compressed image support =) + case "$1" in + *.lz) MYCAT="lzip -dc";; +@@ -133,7 +137,11 @@ mcisofs_list () { + *) MYCAT="cat";; + esac + +- $ISOINFO -l -i "$1" 2>/dev/null | @AWK@ -v SEMICOLON=$SEMICOLON ' ++ lsl=$($ISOINFO -l -i "$1" 2>/dev/null) ++ r=$? ++ test $r -gt 0 && return $r ++ ++ echo "$lsl" | @AWK@ -v SEMICOLON=$SEMICOLON ' + BEGIN { + dir=""; + # Pattern to match 8 first fields. +@@ -183,8 +191,8 @@ shift + case "$cmd" in + list) + xorriso_list "$@" || { +- test_iso "$@"; +- mcisofs_list "$@"; ++ test_iso "$@" || exit 1 ++ mcisofs_list "$@" || exit 1 + } + exit 0 + ;; +-- +2.22.0 + diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch b/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch new file mode 100644 index 000000000000..173def62eb0b --- /dev/null +++ b/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch @@ -0,0 +1,29 @@ +From c1b6d29b95a373108e8d03ac629dcb03fcec854c Mon Sep 17 00:00:00 2001 +From: Andrew Borodin +Date: Sun, 7 Jul 2019 15:51:28 +0300 +Subject: [PATCH 2/2] iso9660: report errors in copyout in case of isoinfo + usage. + +Signed-off-by: Andrew Borodin +--- + src/vfs/extfs/helpers/iso9660.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in +index 76273522e..f9c6e50ef 100644 +--- a/src/vfs/extfs/helpers/iso9660.in ++++ b/src/vfs/extfs/helpers/iso9660.in +@@ -222,8 +222,8 @@ case "$cmd" in + ;; + copyout) + xorriso_copyout "$@" || { +- test_iso "$@"; +- mcisofs_copyout "$@"; ++ test_iso "$@" || exit 1 ++ mcisofs_copyout "$@" || exit 1 + } + exit 0 + ;; +-- +2.22.0 + diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild new file mode 100644 index 000000000000..322ccb31aed9 --- /dev/null +++ b/app-misc/mc/mc-4.8.23-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +MY_P=${P/_/-} + +DESCRIPTION="GNU Midnight Commander is a text based file manager" +HOMEPAGE="https://www.midnight-commander.org" +SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg" + +REQUIRED_USE="spell? ( edit )" + +RDEPEND=">=dev-libs/glib-2.26.0:2 + gpm? ( sys-libs/gpm ) + kernel_linux? ( sys-fs/e2fsprogs ) + samba? ( net-fs/samba ) + sftp? ( net-libs/libssh2 ) + slang? ( >=sys-libs/slang-2 ) + !slang? ( sys-libs/ncurses:0=[unicode?] ) + spell? ( app-text/aspell ) + X? ( x11-libs/libX11 + x11-libs/libICE + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( dev-libs/check ) + " + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}"/${P}-3933-iso9660-1.patch + "${FILESDIR}"/${P}-3933-iso9660-2.patch +) + +pkg_pretend() { + if use slang && use unicode ; then + ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." + fi +} + +src_configure() { + [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" + + local myeconfargs=( + --disable-dependency-tracking + --disable-silent-rules + --enable-charset + --enable-vfs + --with-homedir=$(usex xdg 'XDG' '.mc') + --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") + $(use_enable kernel_linux vfs-undelfs) + # Today mclib does not expose any headers and is linked to + # single 'mc' binary. Thus there is no advantage of having + # a library. Let's avoid shared library altogether + # as it also conflicts with sci-libs/mc: bug #685938 + --disable-mclib + $(use_enable nls) + $(use_enable samba vfs-smb) + $(use_enable sftp vfs-sftp) + $(use_enable spell aspell) + $(use_enable test tests) + $(use_with gpm gpm-mouse) + $(use_with X x) + $(use_with edit internal-edit) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + # CK_FORK=no to avoid using fork() in check library + # as mc mocks fork() itself: bug #644462. + # + # VERBOSE=1 to make test failures contain detailed + # information. + CK_FORK=no emake check VERBOSE=1 +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS README NEWS + + # fix bug #334383 + if use kernel_linux && [[ ${EUID} == 0 ]] ; then + fowners root:tty /usr/libexec/mc/cons.saver + fperms g+s /usr/libexec/mc/cons.saver + fi + + if ! use xdg ; then + sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ + -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die + fi +} + +pkg_postinst() { + elog "To enable exiting to latest working directory," + elog "put this into your ~/.bashrc:" + elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" +} diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild index a8a30b230b1c..471af7fa7dca 100644 --- a/app-misc/mc/mc-9999.ebuild +++ b/app-misc/mc/mc-9999.ebuild @@ -107,7 +107,7 @@ src_install() { if ! use xdg ; then sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ - -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die + -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die fi } -- cgit v1.2.3