summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2022-05-20 08:27:41 +0200
committerLars Wendler <polynomial-c@gentoo.org>2022-05-20 08:27:41 +0200
commit064a1f6462587573309045cbc97f549cf8b0429f (patch)
tree3bf79be9e62277f3053d162e4ffad12ab0a3e6da
parentsys-kernel/pf-sources: add 5.17-pf5 (diff)
downloadgentoo-064a1f6462587573309045cbc97f549cf8b0429f.tar.gz
gentoo-064a1f6462587573309045cbc97f549cf8b0429f.tar.bz2
gentoo-064a1f6462587573309045cbc97f549cf8b0429f.zip
app-shells/fish: Security cleanup
Bug: https://bugs.gentoo.org/835337 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-rw-r--r--app-shells/fish/Manifest1
-rw-r--r--app-shells/fish/files/3.3.1-don-t-override-linker.patch48
-rw-r--r--app-shells/fish/files/3.3.1-drop-some-tests.patch26
-rw-r--r--app-shells/fish/files/3.3.1-sbin-path-sh-test.patch25
-rw-r--r--app-shells/fish/fish-3.3.1-r1.ebuild106
5 files changed, 0 insertions, 206 deletions
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index b25d455e313f..86348f3b4176 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,2 @@
-DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559 SHA512 fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660
DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423 SHA512 20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
diff --git a/app-shells/fish/files/3.3.1-don-t-override-linker.patch b/app-shells/fish/files/3.3.1-don-t-override-linker.patch
deleted file mode 100644
index cb67498fd2ba..000000000000
--- a/app-shells/fish/files/3.3.1-don-t-override-linker.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c9ab706be64439d1a03f978d3a47450135c87002 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <ya@sysdump.net>
-Date: Tue, 29 Jun 2021 09:40:44 -0700
-Subject: [PATCH] don't override linker
-
----
- CMakeLists.txt | 18 +-----------------
- 1 file changed, 1 insertion(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fda837cd3..507dc8817 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,22 +56,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra \
- # Disable exception handling.
- add_compile_options(-fno-exceptions)
-
--# Prefer lld or the gold linker because they don't emit useless warnings about sys_nerr and
--# _sys_errlist. They're also faster (significantly so in the case of lld).
--if (UNIX)
-- execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version
-- ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-- if ("${LD_VERSION}" MATCHES "LLD ")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
-- elseif (NOT APPLE)
-- execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
-- ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-- if ("${LD_VERSION}" MATCHES "GNU gold")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
-- endif()
-- endif()
--endif()
--
- # Hide the CMake Rules directories in Xcode projects.
- source_group("CMake Rules" REGULAR_EXPRESSION "^$")
-
-@@ -128,7 +112,7 @@ set(FISH_SRCS
- src/proc.cpp src/reader.cpp src/redirection.cpp src/sanity.cpp src/screen.cpp
- src/signal.cpp src/termsize.cpp src/timer.cpp src/tinyexpr.cpp
- src/tokenizer.cpp src/topic_monitor.cpp src/trace.cpp src/utf8.cpp src/util.cpp
-- src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp
-+ src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp
- src/wutil.cpp src/fds.cpp
- )
-
---
-2.32.0
-
diff --git a/app-shells/fish/files/3.3.1-drop-some-tests.patch b/app-shells/fish/files/3.3.1-drop-some-tests.patch
deleted file mode 100644
index 4c4081d77cfa..000000000000
--- a/app-shells/fish/files/3.3.1-drop-some-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ec8844d834cc9fe626e9fc326c6f5410341d532a Mon Sep 17 00:00:00 2001
-From: Fabian Homborg <FHomborg@gmail.com>
-Date: Thu, 14 Oct 2021 18:18:51 +0200
-Subject: [PATCH] Drop tests with resetting match start inside lookaround
-
-This seems to be of little use
-
-Fixes #8353
----
- src/fish_tests.cpp | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
-index 3d71877de81..04058b47ba7 100644
---- a/src/fish_tests.cpp
-+++ b/src/fish_tests.cpp
-@@ -5723,9 +5723,6 @@ static void test_string() {
- {{L"string", L"match", L"-r", L"-a", L"a*", L"b", 0}, STATUS_CMD_OK, L"\n\n"},
- {{L"string", L"match", L"-r", L"foo\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\n"},
- {{L"string", L"match", L"-r", L"(foo)\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\nfoo\n"},
-- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},
-- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},
--
- {{L"string", L"replace", 0}, STATUS_INVALID_ARGS, L""},
- {{L"string", L"replace", L"", 0}, STATUS_INVALID_ARGS, L""},
- {{L"string", L"replace", L"", L"", 0}, STATUS_CMD_ERROR, L""},
diff --git a/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch b/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch
deleted file mode 100644
index ce66e98eb124..000000000000
--- a/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f73c8d923e41442cefd5a58498798971282c701 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <ya@sysdump.net>
-Date: Tue, 29 Jun 2021 09:55:14 -0700
-Subject: [PATCH] sbin path sh test
-
----
- tests/checks/type.fish | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/checks/type.fish b/tests/checks/type.fish
-index 85a2d142a..6ce3a4f68 100644
---- a/tests/checks/type.fish
-+++ b/tests/checks/type.fish
-@@ -31,7 +31,7 @@ echo $status
- # Test that we print a command path
- type sh
- # (we resolve the path, so if /bin is a symlink to /usr/bin this shows /usr/bin/sh)
--# CHECK: sh is {{.*}}/bin/sh
-+# CHECK: sh is {{.*}}/{{s*}}bin/sh
-
- # Test that we print a function definition.
- # The exact definition and description here depends on the system, so we'll ignore the actual code.
---
-2.32.0
-
diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild b/app-shells/fish/fish-3.3.1-r1.ebuild
deleted file mode 100644
index 184f01e1dcab..000000000000
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
-else
- SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/3.3.1-don-t-override-linker.patch"
- "${FILESDIR}/3.3.1-sbin-path-sh-test.patch"
- "${FILESDIR}/3.3.1-drop-some-tests.patch"
-)
-
-RDEPEND="
- >=dev-libs/libpcre2-10.32:=[pcre32]
- sys-apps/coreutils
- sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- dev-tcltk/expect
- $(python_gen_any_dep '
- dev-python/pexpect[${PYTHON_USEDEP}]
- ')
- )
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
- use test || return 0
- has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- # workaround for https://github.com/fish-shell/fish-shell/issues/4883
- sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
- cmake/Tests.cmake || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
- -DCURSES_NEED_NCURSES=ON
- -DINSTALL_DOCS="$(usex doc)"
- -DWITH_GETTEXT="$(usex nls)"
- )
- # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
- if [[ ${PV} == 9999 ]]; then
- mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
- else
- mycmakeargs+=( -DBUILD_DOCS=OFF )
- fi
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
- readme.gentoo_create_doc
-}
-
-src_test() {
- # some tests are fragile, sanitize environment
- local -x COLUMNS=80
- local -x LINES=24
-
- # very fragile, depends on terminal, size, tmux, screen and timing
- rm -v tests/pexpects/terminal.py || die
-
- cmake_build test
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}