commit: 6895321462771307e2d14b334eb3ff2daf58a9d5 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Sep 8 18:19:05 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Sep 8 18:23:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68953214
x11-terms/kitty: drop vulnerable 0.25.2, 0.26.1 Bug: https://bugs.gentoo.org/868543 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-terms/kitty/Manifest | 4 - x11-terms/kitty/files/kitty-0.23.1-flags.patch | 17 ---- x11-terms/kitty/kitty-0.25.2.ebuild | 135 ------------------------- x11-terms/kitty/kitty-0.26.1.ebuild | 131 ------------------------ 4 files changed, 287 deletions(-) diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index ea0aa009806a..f6aeece75d47 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,6 +1,2 @@ -DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6 -DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9 -DIST kitty-0.26.1.tar.xz 4716836 BLAKE2B 1369fe3bb13fc5fb134c5b45f179ddd60b4edb61243d88aa08d8b414b4153b17e5c739859c9ed2db366e096db1b07e207cbef715d95787722037ddf5854582e1 SHA512 ed270c84078acb33921506296c476ada5f19fb33344047c7dad5b2d7b697c2111e2925dc391eb4927a05ef82ae583b35db5eee53e148e3e4d71ce942a1deade2 -DIST kitty-0.26.1.tar.xz.sig 566 BLAKE2B 9cc653d0bb5fb2d46b82d1320a4273402af371783cc6469bd2a8f472dd03a25fa3d6cd0e9b47fedbd733713f422b73106069c66368a4b4a8c07c848050cc4e31 SHA512 2cb03e74e7c8a02a8aca8006662a174bff9ef511140340988dd0a079504e1ca665c927a78f5ddc59c243e92df9cf68d0a531b388ecf148901a855bdef2489ded DIST kitty-0.26.2.tar.xz 4716932 BLAKE2B fbbd1bbeb42bfb5be1348ead4605d45f93a90e31e707444c901b9f4c20b42d470c1e3cec9e0f135f04ad49bb472824fb7445932403127e8cbc639b5dac6ee982 SHA512 4bfb3d9438bb018dc10503be610df4e6e8bb1f9459b5131f46fde6279ba5423e44dbbcb86a2dc2602ee208266edc78074f6496e99761cf43f7081ea9e88175f7 DIST kitty-0.26.2.tar.xz.sig 566 BLAKE2B 4f36d131143ad4c1ea3dbdd7b094cbfd7ece133e573ec95714d5b778a80cb58b3b89ab02f575442aaf1618985e37528285009bb724721e5d48b1ffc611175672 SHA512 8ec0f237eb0b9f868ea703ab8b5cb85405f9360ad8e7402a0e5a3c4f3268a5a127359a9444c0e7cf05f364ea5dfeb31f9657a110fadc34bb6ed870ef939a4ada diff --git a/x11-terms/kitty/files/kitty-0.23.1-flags.patch b/x11-terms/kitty/files/kitty-0.23.1-flags.patch deleted file mode 100644 index 8f23393f8a0e..000000000000 --- a/x11-terms/kitty/files/kitty-0.23.1-flags.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -295,3 +295,3 @@ - fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' -- optimize = df if debug or sanitize else '-O3' -+ optimize = '' - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() -@@ -319,3 +319,3 @@ - 'OVERRIDE_LDFLAGS', -- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') -+ '-Wall ' + ' '.join(sanitize_args) - ) -@@ -807,4 +807,2 @@ - libs.append('-lprofiler') -- else: -- cflags.append('-O3') - if bundle_type.endswith('-freeze'): diff --git a/x11-terms/kitty/kitty-0.25.2.ebuild b/x11-terms/kitty/kitty-0.25.2.ebuild deleted file mode 100644 index 2c71e5584d72..000000000000 --- a/x11-terms/kitty/kitty-0.25.2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"; -else - inherit verify-sig - SRC_URI=" - https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz - verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )" - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg" - KEYWORDS="amd64 ~ppc64 x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/"; - -LICENSE="GPL-3" -SLOT="0" -IUSE="+X debug test transfer wayland" -REQUIRED_USE=" - || ( X wayland ) - ${PYTHON_REQUIRED_USE}" -RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" - -# dlopen: fontconfig,libglvnd -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libglvnd[X?] - media-libs/libpng:= - sys-apps/dbus - sys-libs/zlib:= - x11-libs/libxkbcommon[X?] - x11-misc/xkeyboard-config - ~x11-terms/kitty-shell-integration-${PV} - ~x11-terms/kitty-terminfo-${PV} - X? ( x11-libs/libX11 ) - transfer? ( net-libs/librsync:= ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - ) - wayland? ( dev-libs/wayland-protocols )" -BDEPEND=" - ${PYTHON_DEPS} - sys-libs/ncurses - virtual/pkgconfig - test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) - wayland? ( dev-util/wayland-scanner )" -[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.23.1-flags.patch -) - -src_prepare() { - default - - sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \ - -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \ - -e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \ - -i setup.py || die - - if use !transfer; then - sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die - rm -r kittens/transfer || die - fi - - # test relies on 'who' command which doesn't detect users with pid-sandbox - rm kitty_tests/utmp.py || die - - # test may fail/hang depending on environment and shell initialization scripts - rm kitty_tests/{shell_integration,ssh}.py || die - - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die -} - -src_compile() { - tc-export CC - export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local setup=( - ${EPYTHON} setup.py linux-package - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name=$(get_libdir) - --shell-integration="enabled no-rc" - --update-check-interval=0 - --verbose - $(usev debug --debug) - ) - - echo "${setup[*]}" - "${setup[@]}" || die "setup.py failed to compile ${PN}" - - [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die -} - -src_test() { - PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ - ${EPYTHON} test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x /usr/bin/kitty \ - /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick - optfeature "audio-based terminal bell support" media-libs/libcanberra - optfeature "opening links from the terminal" x11-misc/xdg-utils -} diff --git a/x11-terms/kitty/kitty-0.26.1.ebuild b/x11-terms/kitty/kitty-0.26.1.ebuild deleted file mode 100644 index 3ee9cbb30121..000000000000 --- a/x11-terms/kitty/kitty-0.26.1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"; -else - inherit verify-sig - SRC_URI=" - https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz - verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )" - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg" - KEYWORDS="~amd64 ~ppc64 ~x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/"; - -LICENSE="GPL-3" -SLOT="0" -IUSE="+X test transfer wayland" -REQUIRED_USE=" - || ( X wayland ) - ${PYTHON_REQUIRED_USE}" -RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" - -# dlopen: fontconfig,libglvnd -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/openssl:= - media-libs/fontconfig - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libglvnd[X?] - media-libs/libpng:= - sys-apps/dbus - sys-libs/zlib:= - x11-libs/libxkbcommon[X?] - x11-misc/xkeyboard-config - ~x11-terms/kitty-shell-integration-${PV} - ~x11-terms/kitty-terminfo-${PV} - X? ( x11-libs/libX11 ) - transfer? ( net-libs/librsync:= ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - ) - wayland? ( dev-libs/wayland-protocols )" -BDEPEND=" - ${PYTHON_DEPS} - sys-libs/ncurses - virtual/pkgconfig - test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) - wayland? ( dev-util/wayland-scanner )" -[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" - -src_prepare() { - default - - # seds unfortunately feel easier on maintainenance than patches here - sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \ - -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \ - -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \ - -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \ - -i setup.py || die - - if use !transfer; then - sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die - rm -r kittens/transfer || die - fi - - # test relies on 'who' command which doesn't detect users with pid-sandbox - rm kitty_tests/utmp.py || die - - # test may fail/hang depending on environment and shell initialization scripts - rm kitty_tests/{shell_integration,ssh}.py || die - - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die -} - -src_compile() { - tc-export CC - export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local conf=( - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name=$(get_libdir) - --shell-integration="enabled no-rc" - --update-check-interval=0 - --verbose - ) - - edo ${EPYTHON} setup.py linux-package "${conf[@]}" - use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}" - - [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die -} - -src_test() { - KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty -} - -src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x /usr/bin/kitty \ - /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick - optfeature "audio-based terminal bell support" media-libs/libcanberra - optfeature "opening links from the terminal" x11-misc/xdg-utils -}
