summaryrefslogtreecommitdiff
path: root/app-misc
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/Manifest.gzbin49962 -> 49948 bytes
-rw-r--r--app-misc/screen/Manifest2
-rw-r--r--app-misc/screen/files/screen-4.9.0-CVE-2023-24626.patch33
-rw-r--r--app-misc/screen/screen-4.9.0-r2.ebuild147
-rw-r--r--app-misc/tmuxp/Manifest8
-rw-r--r--app-misc/tmuxp/tmuxp-1.15.0.ebuild38
-rw-r--r--app-misc/tmuxp/tmuxp-1.25.0.ebuild37
-rw-r--r--app-misc/tmuxp/tmuxp-1.27.1.ebuild (renamed from app-misc/tmuxp/tmuxp-1.26.0.ebuild)2
-rw-r--r--app-misc/yq/Manifest4
-rw-r--r--app-misc/yq/yq-3.2.1.ebuild (renamed from app-misc/yq/yq-3.1.0-r1.ebuild)9
10 files changed, 190 insertions, 90 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ad4997606676..09a6a525937e 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
Binary files differ
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 361e4e504c11..6dc78d699e06 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,9 +1,11 @@
AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
+AUX screen-4.9.0-CVE-2023-24626.patch 1039 BLAKE2B ba35a0be4d75b02f08d29f0c135103213cc2d875cd4bbd39cd8ae7cc000eb7fb1b0671844220e0bb6ec48283d1c265c4ea889d82e5882af60c8472d71c57c6f9 SHA512 591599518c2a6505b2407834e9c676d8269eb5f2e8165e113885ee5e18a9176b5e0fc99c8a827f672126212c58257a7a5d852a484a46414026e0960c7e233315
AUX screen-4.9.0-configure-implicit-function-decls.patch 16667 BLAKE2B 6079042dae21c51b81176aadf27314cf0502fcee995bd9668102bc114ac0c2fdb6587fe2c647cbd92d994cb9b6fdba9e259a1f0a6bd7cf7d7905c3f7e36e8aff SHA512 c9ff18fccba0a0ed19e64509ea128b91bbb6fac405e8395ce724435f1af2f2015f645342aa1fc1b4cb023927412db6e1c242c8060a81deab2a8c064523dedd4d
AUX screen-9999-no-utempter.patch 465 BLAKE2B be4d690d2f478a2660cb3c0b0f83d9a62328b82b06b85860a84e1b3a924c751080d7e9f35c4b48c3fe6a0152ae75df1dc665b97f8bc70e026bbadd19d4891df1 SHA512 c011936e35e04e7704b0d8d7892f2ebe22fb6993241e7c4b6733e48f6400ca8aeb20c638108018fab006e402332460e89d321e2118f564316e3f7e26a05212d2
AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
EBUILD screen-4.9.0-r1.ebuild 3844 BLAKE2B f67c6e7bfc92895c9779d7eec02b93ce2a1972f08c4ed9815754dbc0ed89bfabde982b717d3902d8d3aee1dd11b5dca3818c07b967fd5555b14f94d154b5825b SHA512 7572fd371099225b3493097c9f2486c14ac37481a241bc1f60297fd75799e5279ccf944be0f341b13ebbaca52bb1bd92d393cd50f0760f74bf1af2ce0c387f45
+EBUILD screen-4.9.0-r2.ebuild 3893 BLAKE2B 732af2a03d882a91be18aabb4b5ba561b341060e257724f8fe88ff83efa3af0f09f044e368553ee7e821a6a4fe16f8163517d5f29975d1c8686805cfbda6af13 SHA512 ad8ae9d67c4b46e9a6fae4cf3ad4a9eb3533bbf88f71c0ba0060c1936deb8b71cc63254462c5bdaa655a308a9f8b5660d7f3096464cdf3b5efd9a00a33295e23
EBUILD screen-9999.ebuild 3782 BLAKE2B 2606ed8495e3531a41bf65489b2dc5af681ff9c5893b12c1de22da9bc246f1d4cb5b1213ce05d8d0fc29878b7bba67e57cf6f9013afc8e9c19141e11755ac01f SHA512 f1d7fb1eca56373b91da540f8097be1b499a8be13315ad980c05c87dbd026bf19865eccf1fb9aa5ebd60c0362db8dc033cebede55c9067b6b63b02cc8936421e
MISC metadata.xml 1894 BLAKE2B 2312aa5911bfd18b3f9202ccb52afa84f2a29462c8282d36a84fb9624f5ff9bcf3d96e06cace55d542ff7c8182eed5560483717265ecc3fc9218e43bdf9d9094 SHA512 a7c331d1614b5bf139d61a72ad27c070184c208039da97c218b55e07a699d635c0db20ec3792c87d93affa2cb038ae834adcf3dc7c37a4b5c2f8aa36b081cfca
diff --git a/app-misc/screen/files/screen-4.9.0-CVE-2023-24626.patch b/app-misc/screen/files/screen-4.9.0-CVE-2023-24626.patch
new file mode 100644
index 000000000000..07dec8ecdd28
--- /dev/null
+++ b/app-misc/screen/files/screen-4.9.0-CVE-2023-24626.patch
@@ -0,0 +1,33 @@
+From e9ad41bfedb4537a6f0de20f00b27c7739f168f7 Mon Sep 17 00:00:00 2001
+From: Alexander Naumov <alexander_naumov@opensuse.org>
+Date: Mon, 30 Jan 2023 17:22:25 +0200
+Subject: fix: missing signal sending permission check on failed query messages
+
+Signed-off-by: Alexander Naumov <alexander_naumov@opensuse.org>
+---
+ socket.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/socket.c b/socket.c
+index 147dc54..54d8cb8 100644
+--- a/socket.c
++++ b/socket.c
+@@ -1285,11 +1285,16 @@ ReceiveMsg()
+ else
+ queryflag = -1;
+
+- Kill(m.m.command.apid,
++ if (CheckPid(m.m.command.apid)) {
++ Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid);
++ }
++ else {
++ Kill(m.m.command.apid,
+ (queryflag >= 0)
+ ? SIGCONT
+ : SIG_BYE); /* Send SIG_BYE if an error happened */
+- queryflag = -1;
++ queryflag = -1;
++ }
+ }
+ break;
+ case MSG_COMMAND:
diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild
new file mode 100644
index 000000000000..bd3ba7101992
--- /dev/null
+++ b/app-misc/screen/screen-4.9.0-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam tmpfiles
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ ${PV} != 9999 ]] ; then
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+ S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+DEPEND=">=sys-libs/ncurses-5.2:=
+ virtual/libcrypt:=
+ pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+ acct-group/utmp
+ selinux? ( sec-policy/selinux-screen )"
+BDEPEND="sys-apps/texinfo"
+
+PATCHES=(
+ # Don't use utempter even if it is found on the system.
+ "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+ "${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+ "${FILESDIR}"/${PN}-4.9.0-configure-implicit-function-decls.patch
+ "${FILESDIR}"/${P}-CVE-2023-24626.patch
+)
+
+src_prepare() {
+ default
+
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+ # Fix manpage
+ sed -i \
+ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+ doc/screen.1 || die
+
+ if [[ ${CHOST} == *-darwin* ]] || use elibc_musl; then
+ sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+ fi
+
+ # disable musl dummy headers for utmp[x]
+ use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
+ # reconfigure
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+ if [[ ${CHOST} == *-solaris* ]]; then
+ # enable msg_header by upping the feature standard compatible
+ # with c99 mode
+ append-cppflags -D_XOPEN_SOURCE=600
+ fi
+
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
+
+ local myeconfargs=(
+ --with-socket-dir="${EPREFIX}/tmp/${PN}"
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc"
+ --with-pty-mode=0620
+ --with-pty-group=5
+ --enable-rxvt_osc
+ --enable-telnet
+ --enable-colors256
+ $(use_enable pam)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
+ emake osdef.h
+
+ emake -C doc screen.info
+ default
+}
+
+src_install() {
+ local DOCS=(
+ README ChangeLog INSTALL TODO NEWS* patchlevel.h
+ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+ )
+
+ emake DESTDIR="${D}" SCREEN="${P}" install
+
+ local tmpfiles_perms tmpfiles_group
+
+ if use multiuser || use prefix ; then
+ fperms 4755 /usr/bin/${P}
+ tmpfiles_perms="0755"
+ tmpfiles_group="root"
+ else
+ fowners root:utmp /usr/bin/${P}
+ fperms 2755 /usr/bin/${P}
+ tmpfiles_perms="0775"
+ tmpfiles_group="utmp"
+ fi
+
+ newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
+
+ insinto /usr/share/${PN}
+ doins terminfo/{screencap,screeninfo.src}
+
+ insinto /etc
+ doins "${FILESDIR}"/screenrc
+
+ if use pam; then
+ pamd_mimic_system screen auth
+ fi
+
+ dodoc "${DOCS[@]}"
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "Some dangerous key bindings have been removed or changed to more safe values."
+ elog "We enable some xterm hacks in our default screenrc, which might break some"
+ elog "applications. Please check /etc/screenrc for information on these changes."
+ fi
+
+ tmpfiles_process screen.conf
+
+ ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}"
+}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 0a76a60929d1..fe23230ce708 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,9 +1,5 @@
-DIST tmuxp-1.15.0.tar.gz 842727 BLAKE2B 7e0e68ae848fdefab46a936511f57a9927b28a220e1dadb8b2531cd26a2cb6cbb7f1fd3a3a279f624a3ac8cebfeb434582cf48803d3c8bbf14b1c6960b5f2ef7 SHA512 4c9c72ddeea283ee4d0595d099dfdc178b3fdd96691ae1b02e9867096f770b4339e1f60abea985a05b974d3d620addd8b571c05db7d2914e8736322e5cf19fb6
-DIST tmuxp-1.25.0.tar.gz 857012 BLAKE2B d472e0bc34b12f6aac87a0f608ec1e78f52bb54c9e068c5fec53fb8a9a0f70041831dc62a070b4d0f81788f8bd4a0d1f1cb3e45a2d744aa010bf3ecd988e2f6c SHA512 a18dfe4a1df22fc76fb70c7ff06bda6d55a3ffafb21eb26a5ff6fb131452d5a4e2677ca1c3f58c9c6b237b6a9791a3c904f6535a2fcd7dbc1dde28da8959a3fa
-DIST tmuxp-1.26.0.tar.gz 861185 BLAKE2B 348cb2f8dfa53f8e541df0fdd2f4cd51b7230485185000a3df5d66fba26adecb159421cd1b3553e433020334c8162b7325bd2ebe499dc8788cbdc5e21a468ee7 SHA512 68459379df6918651100ba5a6c183c46b2f354bed0c484415edf0137f118f74c4104677bbcf8ba1c2fdbae8ca4259ddf756282583ef8d1408e456a016ea9c174
DIST tmuxp-1.27.0.tar.gz 862056 BLAKE2B baad339bc59498d26911507f29de38d55991515e03123edc8dca10159fed1492c1ffe37cf45d6d04ffc73134e0ee312c0ace2ffc53ba9cae258239746169e416 SHA512 a9c450c40a40c284c609011d5e47b12ed1a9b1d5c4036b887df7fd75a3bb6263847c459a7e61fc9dcdb463a3ac20de6ac9038b1559369a5f36641ab0baee755d
-EBUILD tmuxp-1.15.0.ebuild 919 BLAKE2B a4a0c29455e38b0c2e51138d96fe90d3cc6b1d2601dd2356a6d322256894647002857bd518c875af3136eb87f2862dbac208a30a26772cb42cf443f6d63a9101 SHA512 975ec9f9118d59d4df42f6e41dceeec11f606997c1756724bb33a11bdf73d6e0f3200840852fc568281b62de342a4ae2700b72258d5d8d9a060a1ea23d0ded28
-EBUILD tmuxp-1.25.0.ebuild 883 BLAKE2B 72f339f347c3ffd56543596e441590545c812d779bb0c7be5cc23abf6d6b0f564f198ab1c19e9171c71d5f541456bc46ffffa24e96f62704a109f1454bb4eb88 SHA512 9f03e3ed3186e96dc3d7da33f54e9d52c9b05db34c3da29cc7f5eaa9e21da122a68e95d4512fba419f19cdf6e9b5ab97e9344cfc8ff76d23f8c5901cc1344eab
-EBUILD tmuxp-1.26.0.ebuild 1003 BLAKE2B 0e25b020edd649731c332d814d12f100c268a4b5310a6e781c5562d0003a65647ebdaf12b902699162df283308e4ead124ec5da9993d717e9ac0f2e4c0010bb2 SHA512 8d48ce9032f329864057ccdcc14db64c40ec384e56595b3de4f927e685dfc2f5ef9d0b6fc8e0cba1a17d9f9c8d00ad2f5561e4fea68286bdcae255e29736cde8
+DIST tmuxp-1.27.1.tar.gz 861380 BLAKE2B b57d7f4f5c23d1df71abd310b02535c8da7971df4473a3ff2c5feffb2967bd7b0c00e47e45bc04bf56b9503d17b55786b9abfeabec4f6d33989a2f58c5ba49d5 SHA512 3e3d9405a77fe03d2a249bad4ef215982d9135e85dc58899a337d0a3f6d76a4e9f155f5dc37993f5e57955411928ce921ce1c1f1ee7c39f0939d2831a3d600be
EBUILD tmuxp-1.27.0.ebuild 1001 BLAKE2B 7b59c11b0f24ab2f753672043793f1ce4fd4225f63eaf8f5af93a07b0bd7958a9585de01dc8b865ed7aea03e86be3f56c47bf9ad6f69d4124f4120b838822e8d SHA512 292cfa09fa327721b17146fe969b566a9e548078c18dd66ac4c1ff4e736df1596fe6380a19108f590a3a5dd3331622643915cfe03fc3f7d96e4d58377e9858c7
+EBUILD tmuxp-1.27.1.ebuild 1003 BLAKE2B 9cc836241bffb96505f7218f4aa95e72379f969b7079ddc6bd671111af23169f6c563efb4190eaccd61ffa2a96bee92335492dad601a8859a22714be6efd22b7 SHA512 8e3db7314724631ffaee79836b61b93b76f2a7117ac732b5f97a4f2bceb74b72c8af393d1e8bac8fefd446de7d8a7136bc6ef38b2e3a7d28b8c43c3ac5abe605
MISC metadata.xml 342 BLAKE2B 6f33d048b63facba621c206b518ee9dd2eab4d42d5279d55a42b79555356253a28e337c0e67f16a5f8488bb1848e2808889e3c282c346fb139503f250a897f77 SHA512 f3428680ad98ec20e8fa6131e0935f8ed43d4ddfab8944bb65f66bdba1864dd173f6c99a32d316526d4e40527e04ffc106ba57d261b3ab0dc459e2c9e3e8f5a4
diff --git a/app-misc/tmuxp/tmuxp-1.15.0.ebuild b/app-misc/tmuxp/tmuxp-1.15.0.ebuild
deleted file mode 100644
index a39a0f78c14a..000000000000
--- a/app-misc/tmuxp/tmuxp-1.15.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
- >=app-misc/tmux-3.0a
- >=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
- =dev-python/libtmux-0.15*[${PYTHON_USEDEP}]
- >=dev-python/click-8.0[${PYTHON_USEDEP}]
- >=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
- dev-python/pathspec[${PYTHON_USEDEP}]
- >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- >=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
- !dev-python/flaky
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- SHELL="/bin/bash" epytest tests
-}
diff --git a/app-misc/tmuxp/tmuxp-1.25.0.ebuild b/app-misc/tmuxp/tmuxp-1.25.0.ebuild
deleted file mode 100644
index ee3d34211a4b..000000000000
--- a/app-misc/tmuxp/tmuxp-1.25.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
- >=app-misc/tmux-3.0a
- =dev-python/libtmux-0.19.1*[${PYTHON_USEDEP}]
- >=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- >=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
- >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
- !dev-python/flaky
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- SHELL="/bin/bash" epytest tests
-}
diff --git a/app-misc/tmuxp/tmuxp-1.26.0.ebuild b/app-misc/tmuxp/tmuxp-1.27.1.ebuild
index ed443aed13c8..9a1ee04e2a23 100644
--- a/app-misc/tmuxp/tmuxp-1.26.0.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.27.1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
RDEPEND="
>=app-misc/tmux-3.0a
- =dev-python/libtmux-0.20.0*[${PYTHON_USEDEP}]
+ =dev-python/libtmux-0.21.0*[${PYTHON_USEDEP}]
>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
"
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 0f77cf312c50..419c5c841b42 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,8 +1,8 @@
AUX yq-2.13.0-tests.patch 746 BLAKE2B 0d769a32a3e80cdc8a49e0f3575ab9da880bb0a916a564261874e6a8775b35c5570e99fad5a902bdf9bbdf5a6bb080a7bf57324aad461fb1ca7d9de4da787808 SHA512 e6bd60877d628e2fac51d5395b03f96a0cf7a5033c72a676dee8fe353425f6cc7ee585404567778d7765459ded0f7f71b6563e2343de9d520b8cde493012af01
AUX yq-3.1.0-tomli.patch 4426 BLAKE2B ae6b056a2d7c1a5c0603a5fa8c49face53c1b04ab46ef58c6960c8356c16e4f5a085b980031df5623ee6598c964b75b87700f79ace37a2b14760be3133994a5c SHA512 c6c73f03710db12e3b52ebd2d1f8d36e5cb610b57af73b86d15440823dd2b8be8ad13cc3337476efb2972122a626e65857cd67c964586664bc452bd6b98e968a
AUX yq-3.1.1-tomli.patch 3537 BLAKE2B 672b7cb6d9418197bd0163fef51f0e141e59bcd9d7529cbe0aee3c10c13196116fdfcbd1c964ba8deae2cb357d0a634a4061d85dc14bec7cb28c6031e15da9f3 SHA512 bc98a46e112145e44d5c480cd22d9ebd7369a6f0208126242acc188ef1574c60ca446b237b26fdde4130e7fedf3a5c73a4f24498c56dc788dc5cee0fe22b4d0f
-DIST yq-3.1.0.tar.gz 29627 BLAKE2B 9ebeec400462788613b256a29c9706f4d6a06ced8a86b72ce6128cea6bdf258a62ff18b643cea00d5170f68af798d28af324b3908fc3fdea83329bc5feaa5539 SHA512 bb55a9fde5c072d2341faacd76c54d7374fcc70789ddae4d06e36fd48d7ebd6462c8bff13042c39c3fedf191d70752fa2f94af3c69f52f754bca83c3f1f89004
DIST yq-3.1.1.tar.gz 30095 BLAKE2B 0f8ed3d23e1c1b65fae0164f34b19ab774308ee8ec9b5c21547c5eddf930c49750cdbee858b6b48bcd92d4146715f7e4c45dd976141dc5837c788e4ae68a51bc SHA512 f6d372fd406179121849330391ab5657e9bac3b6fb4d33673872d4649337fd60344fe01c534d1382cc35416919cd19b62287350d1f0f825f198fb9cc9bc58c1f
-EBUILD yq-3.1.0-r1.ebuild 1261 BLAKE2B 32ef3212f204d208bb62a2b6f219066d1b1418e6a3e07f0655c8f7747040d4092ec6076bd83db09793469170a4115b1666b7d3e29ebf72f873484024d8a666f3 SHA512 87057325350c7ae4ae0fdfb7f41339ca79fe3842c24f4617746dd93813f2e2dea7536b4c411cbe96893d5fc2b131b188088ea4913d2bd3d0f29d6afc8bda861f
+DIST yq-3.2.1.tar.gz 30333 BLAKE2B ead106995dcd03bc729aabd07c20dff37cf42053378f9d73c20739cb10921619999df73852d69f397431c4a382d40735c751aff9676d66ab9edbc5480a5c6807 SHA512 5b696434c9b6520873f4b956370fe598e3ac8df544d8b4ebc0d7fa935d344e58d9b838f2133b02c9e35a8afc5193c309d36b4cd8dc7792aef17918b9704b58e0
EBUILD yq-3.1.1.ebuild 1250 BLAKE2B a50bec1186b565e8809c0f8e122520141b1165c15f32d79eb7f72771871579a6bca79f8f0ef52900fc6e3b8809b6e12c4381b0121f9ce855fa5429d9f785e39e SHA512 95cd466a5dd4feddc48954fef07fad34d5fc4afab9d7e097e54cdf3d8cc023069f814c891fad2bb7d939be07395394731dbcbc95b0f52d0f47a028048c73efb4
+EBUILD yq-3.2.1.ebuild 1185 BLAKE2B 2a1a8f1fc4cb7c81c891e818c97ba1ee205ce836a6e98499c399861342f4af9b394f6531600c9c89be6b7f447371536653adcd5e29d71985004ae77d76e96083 SHA512 6d81f9fd427097fe2c2a9a8b9dc1379560c2b5ead2c7122335d225e69856b0f3b065ed33e0b941e0ea7f9da79f7aed6dc79d8f6736535597e7ce2580f7e0dd10
MISC metadata.xml 444 BLAKE2B 43250e8368905e7c7613ef6d9555abe4ee58c5d88f1d94dc2fc6d26c99cc71e0253ed830e82356a7cae131c0d8d70397da5e5c6fac41a11a4ed5f18879a4aaba SHA512 f14ad6182b3a82311473ff28308f9f435c2a9ecbf2f1fae996f82366d7547421923c2cebfe255574c3bc57b3d3774ed19bd896b6dda5be1d919d372e1428a143
diff --git a/app-misc/yq/yq-3.1.0-r1.ebuild b/app-misc/yq/yq-3.2.1.ebuild
index d40930f5ff57..01b7d551cff6 100644
--- a/app-misc/yq/yq-3.1.0-r1.ebuild
+++ b/app-misc/yq/yq-3.2.1.ebuild
@@ -4,8 +4,9 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit pypi distutils-r1
DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
HOMEPAGE="
@@ -13,7 +14,6 @@ HOMEPAGE="
https://github.com/kislyuk/yq/
https://pypi.org/project/yq/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -26,9 +26,7 @@ RDEPEND="
dev-python/argcomplete[${PYTHON_USEDEP}]
>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
dev-python/xmltodict[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/tomli[${PYTHON_USEDEP}]
- ' 3.{8..10})
+ >=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
"
DEPEND="
${RDEPEND}
@@ -39,7 +37,6 @@ DEPEND="
PATCHES=(
"${FILESDIR}/yq-2.13.0-tests.patch"
- "${FILESDIR}/${P}-tomli.patch"
)
python_prepare_all() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 16:48:26 +0000