diff options
Diffstat (limited to 'net-misc')
247 files changed, 5664 insertions, 3542 deletions
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest index fa0304d8712d..e3f805ac65a0 100644 --- a/net-misc/anydesk/Manifest +++ b/net-misc/anydesk/Manifest @@ -1,2 +1 @@ -DIST anydesk-6.2.1-amd64.tar.gz 6634159 BLAKE2B 03abb9c3a990a8e4b53505896ebef253c386f578a275ccbec55e85cbb27e5c0f140863c6dc407b1d0cc2f2975b63bcd13487e27425b16cd3fdb42fd71a646e97 SHA512 2a36eb0698d18d7f779a9c7b8a17b2a9964fc10ba1ce65a68555332e58fd316b8541ef5443c8f8a62a30711e8dd19174d599ac2cdccd581da645c6b6a7e000ae -DIST anydesk-6.3.1-amd64.tar.gz 7050869 BLAKE2B d6cb708817947804a6c58a5d6edf7e49765fc962228c23aa89f37f8276f04f8501ca874190fe55ab4bb2efd9aea4e1f63e7750116e2351a7d452c8800f8c561b SHA512 f8985df5a58b17bf2f442b88b8a9211294c953987aeb267b91029bcc639f2a3679248613562916cef16897b87aab05e715313bd2be182c7929168d90ade2238f +DIST anydesk-6.3.2-amd64.tar.gz 7039607 BLAKE2B dfc628baef862bddb944b02d39c3e270a0ac4dbe88704099f8b9022e7e758a367093432b78e86bcc1d9432fabe1c2842c4e811e59541433cb75a9734e09cff08 SHA512 a0fac07d6beb085666f4414f592b5b26b0f699ebc0b1ad5a587317a0c46b0f92a8d3b3e2e0ab08ce9e6c4c1c15789f8396158cc87075e623e32ce714ad071612 diff --git a/net-misc/anydesk/anydesk-6.2.1-r1.ebuild b/net-misc/anydesk/anydesk-6.2.1-r1.ebuild deleted file mode 100644 index 77d78ee0f0c6..000000000000 --- a/net-misc/anydesk/anydesk-6.2.1-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit desktop optfeature systemd xdg-utils - -DESCRIPTION="Feature rich multi-platform remote desktop application" -HOMEPAGE="https://anydesk.com" -SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz - https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz" - -# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash -LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB" -SLOT="0" -KEYWORDS="-* ~amd64" - -# x11-libs/gtkglext is required and cannot be mitigated: https://bugs.gentoo.org/868255 -RDEPEND=" - app-accessibility/at-spi2-core:2 - dev-libs/glib:2 - media-libs/fontconfig:1.0 - media-libs/freetype:2 - media-libs/glu - media-libs/libglvnd - sys-auth/polkit - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/gtkglext - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango -" -BDEPEND="dev-util/patchelf" - -RESTRICT="bindist mirror" - -QA_PREBUILT="opt/${PN}/*" - -src_install() { - local dst="/opt/${PN}" - - exeinto ${dst} - doexe ${PN} - - dodir /opt/bin - dosym "${dst}/${PN}" "/opt/bin/${PN}" - - newinitd "${FILESDIR}/anydesk.init" anydesk - systemd_newunit "${FILESDIR}/anydesk-4.0.1.service" anydesk.service - - insinto /usr/share/polkit-1/actions - doins polkit-1/com.anydesk.anydesk.policy - - insinto /usr/share - doins -r icons - - domenu "${FILESDIR}/anydesk.desktop" - - dodoc copyright README -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "To run AnyDesk as background service use:" - elog - elog "OpenRC:" - elog "# rc-service anydesk start" - elog "# rc-update add anydesk default" - elog - elog "Systemd:" - elog "# systemctl start anydesk.service" - elog "# systemctl enable anydesk.service" - elog - elog "Please see README at /usr/share/doc/${PF}/README.bz2 for" - elog "further information about the linux version of AnyDesk." - elog - fi - - optfeature_header "AnyDesk additional tools:" - optfeature "lsb_release" sys-apps/lsb-release - optfeature "lspci" sys-apps/pciutils - optfeature "lsusb" sys-apps/usbutils - optfeature "sound support" media-libs/libcanberra[gtk2] -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-misc/anydesk/anydesk-6.3.1.ebuild b/net-misc/anydesk/anydesk-6.3.2.ebuild index 8da50cec7b3c..8da50cec7b3c 100644 --- a/net-misc/anydesk/anydesk-6.3.1.ebuild +++ b/net-misc/anydesk/anydesk-6.3.2.ebuild diff --git a/net-misc/asterisk-base/Manifest b/net-misc/asterisk-base/Manifest new file mode 100644 index 000000000000..84b04d08477f --- /dev/null +++ b/net-misc/asterisk-base/Manifest @@ -0,0 +1 @@ +DIST asterisk-base-3.tar.gz 14589 BLAKE2B 854df19a0aa6cbd6c452ec03f8766f166824580f30edbf158f9e23baa451b092388b5f653999cab63d3232d7ff2c1efb7784c8e69d9ea1f2855dd446613ade87 SHA512 e2b53a3db6cb38fcc8456c3c69806452ecdd748f7d5833c6fdc426f436f92b651d69a902f6f588ffc371903c5a1374a9fc0695a74f9b4e47e75df3b1ce50764e diff --git a/net-misc/asterisk-base/asterisk-base-3.ebuild b/net-misc/asterisk-base/asterisk-base-3.ebuild new file mode 100644 index 000000000000..3d9e4d044130 --- /dev/null +++ b/net-misc/asterisk-base/asterisk-base-3.ebuild @@ -0,0 +1,39 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Gentoo Asterisk init scripts" +HOMEPAGE="https://github.com/jkroonza/asterisk-base" +SRC_URI="https://github.com/jkroonza/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + net-misc/asterisk + !<=net-misc/asterisk-16.30.0:0/16 + !<=net-misc/asterisk-18.18.0:0/18 + !<=net-misc/asterisk-20.3.0:0/20 +" + +src_install() { + newinitd initd asterisk + newconfd confd asterisk + dosbin asterisk_wrapper + + systemd_dounit asterisk.service + systemd_install_serviced asterisk.service.conf asterisk.service + + newtmpfiles tmpfiles.conf asterisk.conf + + insinto /etc/logrotate.d + newins logrotate asterisk +} + +pkg_postinst() { + tmpfiles_process asterisk.conf +} diff --git a/net-misc/asterisk-base/metadata.xml b/net-misc/asterisk-base/metadata.xml index 6aebbc46f559..ac7674006c95 100644 --- a/net-misc/asterisk-base/metadata.xml +++ b/net-misc/asterisk-base/metadata.xml @@ -9,4 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">jkroonza/asterisk-base</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest index 25aea5342b23..0ec4c01a6284 100644 --- a/net-misc/babeld/Manifest +++ b/net-misc/babeld/Manifest @@ -1,4 +1,3 @@ DIST babeld-1.13.1.tar.gz 94890 BLAKE2B 78a58ca9b8c4d915e742081d90e210a14c1718c882d56a42926f29d1c99c53ea06ac8bc2c88f11e0af47a2f657d7649b41ccfcec79e4195c542cf5953e7c6d39 SHA512 c1733fbe115c1e07cc2455b1e0a5f61a53d50b1f2e81f24a82b04c988f1d8c6076e215005aae7e4e97f2497965d8459d0ac024fce016a22d8b416929a8569b13 -DIST babeld-1.9.1.tar.gz 94668 BLAKE2B 169932e8d37d683bfa7e945e313d17c3ee633d11031d940ef3f5be3e0a9fbaffb28d47cf9f6d6ef6b25130af9a485ac4a629d0009485021d6f2fe19ec5382788 SHA512 433a9a2da02c56e93f5fc5f9399320f7f4dbac8d87eff9a539300d5740269eeda6be1302a2cf4a4b9c524780b286d9eb7898585fc530129a1f84341faf1e6fd0 DIST babeld-BLAKE2-320c325437539ae91091ce62efec1913cd8093c2.tar.gz 895554 BLAKE2B eecc9cfebba1a9b0ccf64f2aab9bab4db96987cd3d75cffa40e7ba3bb6014f056c00fb6f5dc50477f38e4264625dd1702f2994e93dc8c3f8c1ba933d7e397188 SHA512 db668b6fad82c82a9431db0bad5982d9ba7ea3aeb3ede0a5335702a44fd19d23f2b89207940c060dba992009e1de7d8d892f6719cd8ffdeaed26303bdc7a7a6f DIST babeld-rfc6234-285c8b86c0c6b8e9ffe1c420c5b09fa229629a30.tar.gz 93167 BLAKE2B 64d6a43ca3e1bac434d21a2df5c8449cd3b8eef821ef7af731a4242fc14131b284ad72c11062cd9b5c1f03bff37578931f464165f288589a8a22911b6b4fcd71 SHA512 0adb4a891042fde32451368b93f861015614858e8fe42bb9b7b377e9cbb0b06fa3903dd9e901f93b7b12fd2428df621208295cd0a11ff55fbc6382e15aff8079 diff --git a/net-misc/babeld/babeld-1.9.1.ebuild b/net-misc/babeld/babeld-1.9.1.ebuild deleted file mode 100644 index a0e8e1da80bc..000000000000 --- a/net-misc/babeld/babeld-1.9.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="a loop-free distance-vector routing protocol" -HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/babel/" -SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -src_compile() { - emake CDEBUGFLAGS="${CFLAGS}" -} - -src_install() { - emake "TARGET=${D}" PREFIX="${EPREFIX}"/usr install - dodoc CHANGES README - doinitd "${FILESDIR}"/${PN} -} diff --git a/net-misc/blinkperl/Manifest b/net-misc/blinkperl/Manifest deleted file mode 100644 index 61a148b93d6a..000000000000 --- a/net-misc/blinkperl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST blinkperl-2003-02-08.tar.gz 64918 BLAKE2B 906aabc4e47890c1c30740b4f2575fc2899253eaa41e43fe429a0403788d7d06c0ea0d1197b5affe060c3acadb68826fb1bdfc70965cf812038eac3a6e01144f SHA512 4759e00b179ecc210af7b0a83d0eb18ffd09d1659b38ae4a3de346bc7d5b7d6c319e80f0b28981eb643d165581b2dc35ce78ad59c6b97f1d4b1ce6df33127c9e diff --git a/net-misc/blinkperl/blinkperl-20030301-r2.ebuild b/net-misc/blinkperl/blinkperl-20030301-r2.ebuild deleted file mode 100644 index 5887c9930a6f..000000000000 --- a/net-misc/blinkperl/blinkperl-20030301-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-2003-02-08" -S=${WORKDIR}/${PN} - -DESCRIPTION="blinkperl is a telnet server, which plays BlinkenLight movies" -SRC_URI="mirror://sourceforge/blinkserv/${MY_P}.tar.gz" -HOMEPAGE="http://blinkserv.sourceforge.net/" - -SLOT="0" -KEYWORDS="~hppa x86" -LICENSE="GPL-2" -IUSE="" -DEPEND="" -RDEPEND="dev-lang/perl dev-perl/Term-ANSIScreen" - -PATCHES=( "${FILESDIR}"/${P}-fix-pod2man.patch - "${FILESDIR}"/${P}-non-local.patch - "${FILESDIR}"/${P}-Makefile.patch ) - -src_install() { - default - - newinitd "${FILESDIR}"/blinkperl.rc blinkperl - newconfd "${FILESDIR}"/blinkperl.confd blinkperl -} diff --git a/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch b/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch deleted file mode 100644 index 1f8d3bee0df6..000000000000 --- a/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -Do not install into /usr/man and be consistent about the package name. - ---- blinkperl/Makefile.orig 2003-02-08 15:58:10.000000000 +0100 -+++ blinkperl/Makefile 2008-11-27 21:14:03.000000000 +0100 -@@ -1,12 +1,12 @@ - SHELL=/bin/sh --PREFIX=/usr/local --MANDIR=${PREFIX}/man -+PREFIX=/usr - BINDIR=${PREFIX}/bin - SHAREDIR=${PREFIX}/share -+MANDIR=${SHAREDIR}/man - # - # Be sure to modify $moviedir in blinkserver.pl if you modify it here! - # --BLINKENPERLSHAREDIR=${SHAREDIR}/blinkenperl -+BLINKENPERLSHAREDIR=${SHAREDIR}/blinkperl - MOVIEDIR=${BLINKENPERLSHAREDIR}/movies - - # Enable "make install DESTDIR=some-path" to make it easier diff --git a/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch b/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch deleted file mode 100644 index 01f8703feb95..000000000000 --- a/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- blinkperl/blinkserver.pl.orig 2016-05-03 16:22:49.510379864 -0500 -+++ blinkperl/blinkserver.pl 2016-05-03 16:22:27.172380760 -0500 -@@ -148,6 +148,8 @@ - - =item B<--port>=I<number>: On which Port should the server listen? - -+=back -+ - =head1 DESCRIPTION - - B<This program> will listen on the defined port (current default value: 10001) diff --git a/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch b/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch deleted file mode 100644 index 3394918ebb47..000000000000 --- a/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch +++ /dev/null @@ -1,13 +0,0 @@ -Do not install in locale/share and be consistent about the package name. - ---- blinkperl/blinkserver.pl.orig 2003-02-06 19:38:00.000000000 +0100 -+++ blinkperl/blinkserver.pl 2008-11-27 21:14:24.000000000 +0100 -@@ -21,7 +21,7 @@ - - # be sure to modify ${MOVIEDIR} in the Makefile - # (if you want to use "make install"), if you modify it here! --my $moviedir = "/usr/local/share/blinkenperl/movies" ; # where to find the movies -+my $moviedir = "/usr/share/blinkperl/movies" ; # where to find the movies - my $blmext = "blm" ; # extensions of blm files in the movie directory - - diff --git a/net-misc/blinkperl/files/blinkperl.confd b/net-misc/blinkperl/files/blinkperl.confd deleted file mode 100644 index 3eab7db5a977..000000000000 --- a/net-misc/blinkperl/files/blinkperl.confd +++ /dev/null @@ -1,3 +0,0 @@ -# config what port to listen for telnet connections on -BLINKPORT="10001" - diff --git a/net-misc/blinkperl/files/blinkperl.rc b/net-misc/blinkperl/files/blinkperl.rc deleted file mode 100644 index 4d9aca88eafc..000000000000 --- a/net-misc/blinkperl/files/blinkperl.rc +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting blinkserver" - start-stop-daemon -o --background --quiet --start --exec /usr/bin/blinkserver.pl --pidfile /var/run/blinkserver.pid -- --port=${BLINKPORT} - eend $? -} - -stop() { - ebegin "Stopping blinkserver" - start-stop-daemon -o --quiet --stop --name blinkserver.pl - eend $? -} diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild index 3e16a2565334..4ef170f9f5a7 100644 --- a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild +++ b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2" HOMEPAGE="https://sourceforge.net/projects/cbqinit/" -SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV} -> ${P}" +SRC_URI="https://downloads.sourceforge.net/cbqinit/cbq.init-v${PV} -> ${P}" S="${WORKDIR}" LICENSE="GPL-2+" diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml index 7517f8d97dd7..115e9d64a669 100644 --- a/net-misc/chrome-remote-desktop/metadata.xml +++ b/net-misc/chrome-remote-desktop/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <name>Mike Frysinger</name> - <email>vapier@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/chrony/chrony-4.5.ebuild b/net-misc/chrony/chrony-4.5.ebuild index f6d81c3f64ff..8eb587f88c65 100644 --- a/net-misc/chrony/chrony-4.5.ebuild +++ b/net-misc/chrony/chrony-4.5.ebuild @@ -19,7 +19,7 @@ else SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86" fi fi @@ -81,6 +81,11 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch ) +QA_CONFIG_IMPL_DECL_SKIP=( + # FP, checks with macro afterwards (bug #907877) + recvmmsg +) + src_prepare() { default diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 13628d6f3fc3..75c467aacec7 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -19,7 +19,7 @@ else SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -81,6 +81,11 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch ) +QA_CONFIG_IMPL_DECL_SKIP=( + # FP, checks with macro afterwards (bug #907877) + recvmmsg +) + src_prepare() { default diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest index 40a68b4f4fc7..19ef92df3d5d 100644 --- a/net-misc/cmst/Manifest +++ b/net-misc/cmst/Manifest @@ -1,2 +1 @@ -DIST cmst-2022.11.30.tar.gz 3486817 BLAKE2B 8c0d12a99188ec1aa16faed8d035f1b7c00d090725a547b90171f8e2f352550c64cb8acf4f7bd0900c281b307d361db4a1794b892fe593772ded60a0af6ba777 SHA512 09c5b14607824fab4e46c8f3648fc13951bcce08708ddb8f1574d4c71a14c69de7fbaa1849eba82d9525a02867f8b54cfdc3b073aa4dee1fdcb8845504640327 DIST cmst-2023.03.14.tar.gz 3530182 BLAKE2B 86e873d299bae9d188ebac154b3716ef11c7da12b2b93d9b5cc07b6bf2edb692b81393b0f6c962479d1f23dd61d4466c2b930f29b08601876bb83e43dd8d9833 SHA512 7ebc3f7ca93d6e66c4447f4a4ac8f2eb27617ff8d4919e8878d12a0cdffb7c0d32be9627c73bc74b0f661854c8a2d75975a8fa854924c4edb9c676f1abd6f746 diff --git a/net-misc/cmst/cmst-2022.11.30.ebuild b/net-misc/cmst/cmst-2022.11.30.ebuild deleted file mode 100644 index da5e9cf339c6..000000000000 --- a/net-misc/cmst/cmst-2022.11.30.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qmake-utils xdg-utils - -DESCRIPTION="Qt GUI for Connman with system tray icon" -HOMEPAGE="https://github.com/andrew-bibb/cmst" -SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 -" -RDEPEND="${DEPEND} - net-misc/connman -" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${PN}-${P}" - -src_configure() { - export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}" - eqmake5 DISTRO=gentoo -} - -src_install() { - emake INSTALL_ROOT="${D}" install - rm -r "${D}"/usr/share/licenses || die - gunzip "${D}"/usr/share/man/man1/cmst.1.gz -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-misc/cmst/cmst-2023.03.14-r1.ebuild b/net-misc/cmst/cmst-2023.03.14-r1.ebuild index 086fd50d0951..4e7967b8e329 100644 --- a/net-misc/cmst/cmst-2023.03.14-r1.ebuild +++ b/net-misc/cmst/cmst-2023.03.14-r1.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="qt6" DEPEND="qt6? ( dev-qt/qtbase:6 ) diff --git a/net-misc/cmst/cmst-2023.03.14.ebuild b/net-misc/cmst/cmst-2023.03.14.ebuild deleted file mode 100644 index da5e9cf339c6..000000000000 --- a/net-misc/cmst/cmst-2023.03.14.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qmake-utils xdg-utils - -DESCRIPTION="Qt GUI for Connman with system tray icon" -HOMEPAGE="https://github.com/andrew-bibb/cmst" -SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 -" -RDEPEND="${DEPEND} - net-misc/connman -" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${PN}-${P}" - -src_configure() { - export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}" - eqmake5 DISTRO=gentoo -} - -src_install() { - emake INSTALL_ROOT="${D}" install - rm -r "${D}"/usr/share/licenses || die - gunzip "${D}"/usr/share/man/man1/cmst.1.gz -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild new file mode 100644 index 000000000000..89e484d62819 --- /dev/null +++ b/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools gnome2-utils + +DESCRIPTION="GTK GUI for Connman" +HOMEPAGE="https://github.com/jgke/connman-gtk" +SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openconnect" + +CDEPEND=" + >=dev-libs/glib-2.0:2 + >=x11-libs/gtk+-3.10:3 + openconnect? ( >=net-vpn/openconnect-5.99 ) +" +RDEPEND="${CDEPEND} + net-misc/connman +" +DEPEND="${CDEOEND} + >=dev-util/intltool-0.35.0 + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-gtk_typecasts.patch +) + +src_prepare() { + default + sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die + eautoreconf +} + +src_configure() { + econf \ + --disable-schemas-compile \ + $(use_with openconnect) +} + +pkg_preinst() { + gnome2_schemas_savelist +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/net-misc/connman-gtk/metadata.xml b/net-misc/connman-gtk/metadata.xml index f349009f7349..71feae52b29b 100644 --- a/net-misc/connman-gtk/metadata.xml +++ b/net-misc/connman-gtk/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="openconnect">Support easier authentication to AnyConnect VPNs</flag> </use> diff --git a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r2.ebuild b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r3.ebuild index 2fe35cf86af6..c5fed0b76125 100644 --- a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r2.ebuild +++ b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools vcs-snapshot COMMIT="3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2" @@ -10,10 +10,9 @@ DESCRIPTION="An ncurses UI for connman" HOMEPAGE="https://github.com/eurogiciel-oss/connman-json-client" SRC_URI="https://github.com/eurogiciel-oss/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="dev-libs/json-c:0= >=sys-apps/dbus-1.4 diff --git a/net-misc/connman-ui/connman-ui-0_p20150622.ebuild b/net-misc/connman-ui/connman-ui-0_p20150622-r1.ebuild index 9edf9267b9d3..ab2877fbec31 100644 --- a/net-misc/connman-ui/connman-ui-0_p20150622.ebuild +++ b/net-misc/connman-ui/connman-ui-0_p20150622-r1.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools -inherit autotools vcs-snapshot COMMIT="fce0af94e121bde77c7fa2ebd6a319f0180c5516" DESCRIPTION="A full-featured GTK based trayicon UI for ConnMan" HOMEPAGE="https://github.com/tbursztyka/connman-ui" SRC_URI="https://github.com/tbursztyka/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${COMMIT} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -CDEPEND=" +DEPEND=" dev-libs/glib:2 sys-apps/dbus x11-libs/gtk+:3 " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} net-misc/connman " -DEPEND="${CDEPEND} +BDEPEND=" dev-util/intltool virtual/pkgconfig " diff --git a/net-misc/connman-ui/connman-ui-9999.ebuild b/net-misc/connman-ui/connman-ui-9999.ebuild deleted file mode 100644 index 67ca7343806a..000000000000 --- a/net-misc/connman-ui/connman-ui-9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools git-r3 - -DESCRIPTION="A full-featured GTK based trayicon UI for ConnMan" -HOMEPAGE="https://github.com/tbursztyka/connman-ui" -SRC_URI="" -EGIT_REPO_URI="https://github.com/tbursztyka/connman-ui.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -CDEPEND=" - dev-libs/glib:2 - sys-apps/dbus - x11-libs/gtk+:3 -" -RDEPEND="${CDEPEND} - net-misc/connman -" -DEPEND="${CDEPEND} - dev-util/intltool - virtual/pkgconfig -" - -src_prepare() { - default - eautoreconf -} diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest index ed22cba32e44..5954e4274005 100644 --- a/net-misc/croc/Manifest +++ b/net-misc/croc/Manifest @@ -1,4 +1,2 @@ -DIST croc-9.6.13-vendor.tar.xz 975216 BLAKE2B af70a58b6ae553029ff3c9b0e58c90d5d46ad7b9480e2fb7dd18a92c2b04854a68fde243b0dd149fdc7eba2c267e093510a93f63110f7fe073b25c95361e3d40 SHA512 f1200882ec634971c7c84b313d3a5bb2af533ef500f715d2908046fb9c481ec48fbda3cbb4a2ff93694fc19821a0e62e287b42b578aeca8ec19a3418c0b7bae0 -DIST croc-9.6.13.tar.gz 512627 BLAKE2B a3bf8f844a68af6ef3fc23d82168b70c92fa26485a5bf76b6ea6a4b21b2a328e7318edcd5d38ac860bd5c1fb29c3ddf01583ce9b6bef0f2d7bf98b224f683552 SHA512 c0734f7f73d6bb4eac2558733d0d04d9793760e24b02a12fbadef5a67f88be4d9f2036933a6881c8da613a6c2d47b529b5a40e02830eff7f99319059cb0b61fe -DIST croc-9.6.9-vendor.tar.xz 974884 BLAKE2B d6d061fd8259126dc107de3efcae3a023c9a8db44ba96343350360c6d321d73720d1079d46927f65d9ea1001e6421751241d2fe1c04a4f450ff3c4dadc5c6be1 SHA512 2f4ab17ae0c00bc1ac097aeda9fc791b98d8cf6ad31644bdf600a4c321894dea9974155950723e9d19b15c011eef81ab27dae1b2bc2eb4517611bac77bde590f -DIST croc-9.6.9.tar.gz 512036 BLAKE2B cdd18f9b4460905742d31852ceafda19a3e9c57ef33e6b2e0a21105da9b7d0cac1dfca50f6b217d76be6368d6fb26b540709c165b5b9781ca8952003811e83ad SHA512 5abd9eac5ffd4fae711f8169c4344aa6b61647309aa74267b1442b94d3a9d7ea11962b993862e00c7df8a23a260c20c643d468930836df71995652a5abf8772b +DIST croc-9.6.15-deps.tar.xz 30217856 BLAKE2B 87c34fa60f0bda194ca022648be2ce11da7b4b9a3f3a5f5b16a5127d5b25197ec99bdba1ef388c38b9e632ed4ef0f89a68e3b58368d9df7b07a1f3129b2b9145 SHA512 caa944dc9e8fb0d4883f4447c979282826e2364fe8b196e412861189953c23a09b6de38306aa00eabfeeb12fb4d3ab9e9794494da8ece10c3ee5a0cd72161d17 +DIST croc-9.6.15.tar.gz 512614 BLAKE2B 2a87593b5d944c2b5ea970d30f0b64b2a8325cca672421aaa58e6fd07e440aad88de6acad564fcb9963256a9f499421dd9343f51395babd724deeffe875cc6f7 SHA512 8ae76dc5029e7adc809b0083e147c57c7249e9fbb07f263a0b10d21539ebfc69c5d9d8e60811cca06bbb313ec9a3a143baaef73f77ca599dc102626dc9fccf29 diff --git a/net-misc/croc/croc-9.6.13.ebuild b/net-misc/croc/croc-9.6.15.ebuild index d49781a4bf65..edfe827fbac5 100644 --- a/net-misc/croc/croc-9.6.13.ebuild +++ b/net-misc/croc/croc-9.6.15.ebuild @@ -8,7 +8,7 @@ inherit bash-completion-r1 go-module systemd DESCRIPTION="Easily and securely send things from one computer to another" HOMEPAGE="https://github.com/schollz/croc" SRC_URI="https://github.com/schollz/croc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-vendor.tar.xz +https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz " LICENSE="Apache-2.0 BSD BSD-2 MIT" @@ -43,5 +43,5 @@ src_install() { } src_test() { - ego test -work ./... + ego test -skip "Test(Comm|Send|PublicIP|LocalIP)" -work ./... } diff --git a/net-misc/croc/croc-9.6.9.ebuild b/net-misc/croc/croc-9.6.9.ebuild deleted file mode 100644 index d49781a4bf65..000000000000 --- a/net-misc/croc/croc-9.6.9.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 go-module systemd - -DESCRIPTION="Easily and securely send things from one computer to another" -HOMEPAGE="https://github.com/schollz/croc" -SRC_URI="https://github.com/schollz/croc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-vendor.tar.xz -" - -LICENSE="Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - -RDEPEND=" - acct-group/croc - acct-user/croc -" - -DOCS=( README.md ) - -src_prepare() { - default - # Replace User=nobody with User=croc - sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die - # Rename bash completion function - sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ - src/install/bash_autocomplete || die -} - -src_compile() { - ego build -} - -src_install() { - dobin croc - systemd_dounit croc.service - newbashcomp src/install/bash_autocomplete croc - einstalldocs -} - -src_test() { - ego test -work ./... -} diff --git a/net-misc/curl/curl-8.7.1-r3.ebuild b/net-misc/curl/curl-8.7.1-r3.ebuild new file mode 100644 index 000000000000..a1df53206714 --- /dev/null +++ b/net-misc/curl/curl-8.7.1-r3.ebuild @@ -0,0 +1,368 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" +SLOT="0" +IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3" +IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +# nghttp3 = https://bugs.gentoo.org/912029 +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( + !openssl + alt-svc ) +" + +# cURL's docs and CI/CD are great resources for confirming supported versions +# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) +# However 'supported' vs 'works' are two entirely different things; be sane but +# don't be afraid to require a later version. + +RDEPEND=" + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] + ) + psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + openssl? ( + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( >=net-libs/rustls-ffi-0.12.1:=[${MULTILIB_USEDEP}] + <net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode + _fseeki64 +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${PN}-8.7.1-rustls-fixes.patch + "${FILESDIR}"/${P}-chunked-post.patch + "${FILESDIR}"/${P}-fix-compress-option.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + die "Please file a bug, hit impossible condition w/ USE=ssl handling." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + $(use_with psl libpsl) + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests, but + # this ends up breaking when nproc is huge (like -j80). + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/curl-8.7.1-r4.ebuild b/net-misc/curl/curl-8.7.1-r4.ebuild new file mode 100644 index 000000000000..3c985b74ec75 --- /dev/null +++ b/net-misc/curl/curl-8.7.1-r4.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should subscribe to the 'curl-distros' ML for backports etc +# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/ +# https://lists.haxx.se/listinfo/curl-distros + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" +SLOT="0" +IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3" +IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +# nghttp3 = https://bugs.gentoo.org/912029 +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( + !openssl + alt-svc ) +" + +# cURL's docs and CI/CD are great resources for confirming supported versions +# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) +# However 'supported' vs 'works' are two entirely different things; be sane but +# don't be afraid to require a later version. + +RDEPEND=" + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] + ) + psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + openssl? ( + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( >=net-libs/rustls-ffi-0.12.1:=[${MULTILIB_USEDEP}] + <net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode + _fseeki64 +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${PN}-8.7.1-rustls-fixes.patch + "${FILESDIR}"/${P}-chunked-post.patch + "${FILESDIR}"/${P}-fix-compress-option.patch + "${FILESDIR}"/${P}-http2-git-clone.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + die "Please file a bug, hit impossible condition w/ USE=ssl handling." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + $(use_with psl libpsl) + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests, but + # this ends up breaking when nproc is huge (like -j80). + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild index df12594ad066..684c38ec8a8e 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-9999.ebuild @@ -3,6 +3,10 @@ EAPI=8 +# Maintainers should subscribe to the 'curl-distros' ML for backports etc +# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/ +# https://lists.haxx.se/listinfo/curl-distros + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig diff --git a/net-misc/curl/files/curl-8.7.1-chunked-post.patch b/net-misc/curl/files/curl-8.7.1-chunked-post.patch new file mode 100644 index 000000000000..9d1fef73d383 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-chunked-post.patch @@ -0,0 +1,57 @@ +https://github.com/curl/curl/commit/721941aadf4adf4f6aeb3f4c0ab489bb89610c36 +From: Stefan Eissing <stefan@eissing.org> +Date: Mon, 1 Apr 2024 15:41:18 +0200 +Subject: [PATCH] http: with chunked POST forced, disable length check on read + callback + +- when an application forces HTTP/1.1 chunked transfer encoding + by setting the corresponding header and instructs curl to use + the CURLOPT_READFUNCTION, disregard any POST length information. +- this establishes backward compatibility with previous curl versions + +Applications are encouraged to not force "chunked", but rather +set length information for a POST. By setting -1, curl will +auto-select chunked on HTTP/1.1 and work properly on other HTTP +versions. + +Reported-by: Jeff King +Fixes #13229 +Closes #13257 +--- a/lib/http.c ++++ b/lib/http.c +@@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, Curl_HttpReq httpreq) + else + result = Curl_creader_set_null(data); + } +- else { /* we read the bytes from the callback */ +- result = Curl_creader_set_fread(data, postsize); ++ else { ++ /* we read the bytes from the callback. In case "chunked" encoding ++ * is forced by the application, we disregard `postsize`. This is ++ * a backward compatibility decision to earlier versions where ++ * chunking disregarded this. See issue #13229. */ ++ bool chunked = FALSE; ++ char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding")); ++ if(ptr) { ++ /* Some kind of TE is requested, check if 'chunked' is chosen */ ++ chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"), ++ STRCONST("chunked")); ++ } ++ result = Curl_creader_set_fread(data, chunked? -1 : postsize); + } + return result; + +@@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, + data->req.upload_chunky = + Curl_compareheader(ptr, + STRCONST("Transfer-Encoding:"), STRCONST("chunked")); ++ if(data->req.upload_chunky && ++ Curl_use_http_1_1plus(data, data->conn) && ++ (data->conn->httpversion >= 20)) { ++ infof(data, "suppressing chunked transfer encoding on connection " ++ "using HTTP version 2 or higher"); ++ data->req.upload_chunky = FALSE; ++ } + } + else { + curl_off_t req_clen = Curl_creader_total_length(data); diff --git a/net-misc/curl/files/curl-8.7.1-fix-compress-option.patch b/net-misc/curl/files/curl-8.7.1-fix-compress-option.patch new file mode 100644 index 000000000000..a06a53729533 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-fix-compress-option.patch @@ -0,0 +1,153 @@ +https://github.com/curl/curl/commit/b30d694a027eb771c02a3db0dee0ca03ccab7377 +From: Stefan Eissing <stefan@eissing.org> +Date: Thu, 28 Mar 2024 11:08:15 +0100 +Subject: [PATCH] content_encoding: brotli and others, pass through 0-length + writes + +- curl's transfer handling may write 0-length chunks at the end of the + download with an EOS flag. (HTTP/2 does this commonly) + +- content encoders need to pass-through such a write and not count this + as error in case they are finished decoding + +Fixes #13209 +Fixes #13212 +Closes #13219 +--- a/lib/content_encoding.c ++++ b/lib/content_encoding.c +@@ -300,7 +300,7 @@ static CURLcode deflate_do_write(struct Curl_easy *data, + struct zlib_writer *zp = (struct zlib_writer *) writer; + z_stream *z = &zp->z; /* zlib state structure */ + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + /* Set the compressed input when this function is called */ +@@ -457,7 +457,7 @@ static CURLcode gzip_do_write(struct Curl_easy *data, + struct zlib_writer *zp = (struct zlib_writer *) writer; + z_stream *z = &zp->z; /* zlib state structure */ + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + if(zp->zlib_init == ZLIB_INIT_GZIP) { +@@ -669,7 +669,7 @@ static CURLcode brotli_do_write(struct Curl_easy *data, + CURLcode result = CURLE_OK; + BrotliDecoderResult r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT; + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + if(!bp->br) +@@ -762,7 +762,7 @@ static CURLcode zstd_do_write(struct Curl_easy *data, + ZSTD_outBuffer out; + size_t errorCode; + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + if(!zp->decomp) { +@@ -916,7 +916,7 @@ static CURLcode error_do_write(struct Curl_easy *data, + (void) buf; + (void) nbytes; + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + failf(data, "Unrecognized content encoding type. " +--- a/tests/http/test_02_download.py ++++ b/tests/http/test_02_download.py +@@ -394,6 +394,19 @@ def test_02_27_paused_no_cl(self, env: Env, httpd, nghttpx, repeat): + r = client.run(args=[url]) + r.check_exit_code(0) + ++ @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3']) ++ def test_02_28_get_compressed(self, env: Env, httpd, nghttpx, repeat, proto): ++ if proto == 'h3' and not env.have_h3(): ++ pytest.skip("h3 not supported") ++ count = 1 ++ urln = f'https://{env.authority_for(env.domain1brotli, proto)}/data-100k?[0-{count-1}]' ++ curl = CurlClient(env=env) ++ r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[ ++ '--compressed' ++ ]) ++ r.check_exit_code(code=0) ++ r.check_response(count=count, http_status=200) ++ + def check_downloads(self, client, srcfile: str, count: int, + complete: bool = True): + for i in range(count): +--- a/tests/http/testenv/env.py ++++ b/tests/http/testenv/env.py +@@ -129,10 +129,11 @@ def __init__(self): + self.htdocs_dir = os.path.join(self.gen_dir, 'htdocs') + self.tld = 'http.curl.se' + self.domain1 = f"one.{self.tld}" ++ self.domain1brotli = f"brotli.one.{self.tld}" + self.domain2 = f"two.{self.tld}" + self.proxy_domain = f"proxy.{self.tld}" + self.cert_specs = [ +- CertificateSpec(domains=[self.domain1, 'localhost'], key_type='rsa2048'), ++ CertificateSpec(domains=[self.domain1, self.domain1brotli, 'localhost'], key_type='rsa2048'), + CertificateSpec(domains=[self.domain2], key_type='rsa2048'), + CertificateSpec(domains=[self.proxy_domain, '127.0.0.1'], key_type='rsa2048'), + CertificateSpec(name="clientsX", sub_specs=[ +@@ -376,6 +377,10 @@ def htdocs_dir(self) -> str: + def domain1(self) -> str: + return self.CONFIG.domain1 + ++ @property ++ def domain1brotli(self) -> str: ++ return self.CONFIG.domain1brotli ++ + @property + def domain2(self) -> str: + return self.CONFIG.domain2 +--- a/tests/http/testenv/httpd.py ++++ b/tests/http/testenv/httpd.py +@@ -50,6 +50,7 @@ class Httpd: + 'alias', 'env', 'filter', 'headers', 'mime', 'setenvif', + 'socache_shmcb', + 'rewrite', 'http2', 'ssl', 'proxy', 'proxy_http', 'proxy_connect', ++ 'brotli', + 'mpm_event', + ] + COMMON_MODULES_DIRS = [ +@@ -203,6 +204,7 @@ def _mkpath(self, path): + + def _write_config(self): + domain1 = self.env.domain1 ++ domain1brotli = self.env.domain1brotli + creds1 = self.env.get_credentials(domain1) + domain2 = self.env.domain2 + creds2 = self.env.get_credentials(domain2) +@@ -285,6 +287,24 @@ def _write_config(self): + f'</VirtualHost>', + f'', + ]) ++ # Alternate to domain1 with BROTLI compression ++ conf.extend([ # https host for domain1, h1 + h2 ++ f'<VirtualHost *:{self.env.https_port}>', ++ f' ServerName {domain1brotli}', ++ f' Protocols h2 http/1.1', ++ f' SSLEngine on', ++ f' SSLCertificateFile {creds1.cert_file}', ++ f' SSLCertificateKeyFile {creds1.pkey_file}', ++ f' DocumentRoot "{self._docs_dir}"', ++ f' SetOutputFilter BROTLI_COMPRESS', ++ ]) ++ conf.extend(self._curltest_conf(domain1)) ++ if domain1 in self._extra_configs: ++ conf.extend(self._extra_configs[domain1]) ++ conf.extend([ ++ f'</VirtualHost>', ++ f'', ++ ]) + conf.extend([ # https host for domain2, no h2 + f'<VirtualHost *:{self.env.https_port}>', + f' ServerName {domain2}', diff --git a/net-misc/curl/files/curl-8.7.1-http2-git-clone.patch b/net-misc/curl/files/curl-8.7.1-http2-git-clone.patch new file mode 100644 index 000000000000..b07a3b0a8817 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-http2-git-clone.patch @@ -0,0 +1,342 @@ +https://bugs.gentoo.org/930633 +https://github.com/curl/curl/issues/13474 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -187,6 +187,7 @@ struct h2_stream_ctx { + + int status_code; /* HTTP response status code */ + uint32_t error; /* stream error code */ ++ CURLcode xfer_result; /* Result of writing out response */ + uint32_t local_window_size; /* the local recv window size */ + int32_t id; /* HTTP/2 protocol identifier for stream */ + BIT(resp_hds_complete); /* we have a complete, final response */ +@@ -945,12 +946,39 @@ fail: + return rv; + } + +-static CURLcode recvbuf_write_hds(struct Curl_cfilter *cf, ++static void h2_xfer_write_resp_hd(struct Curl_cfilter *cf, + struct Curl_easy *data, +- const char *buf, size_t blen) ++ struct h2_stream_ctx *stream, ++ const char *buf, size_t blen, bool eos) + { +- (void)cf; +- return Curl_xfer_write_resp(data, (char *)buf, blen, FALSE); ++ ++ /* If we already encountered an error, skip further writes */ ++ if(!stream->xfer_result) { ++ stream->xfer_result = Curl_xfer_write_resp(data, (char *)buf, blen, eos); ++ if(stream->xfer_result) ++ CURL_TRC_CF(data, cf, "[%d] error %d writing %zu bytes of headers", ++ stream->id, stream->xfer_result, blen); ++ } ++} ++ ++static void h2_xfer_write_resp(struct Curl_cfilter *cf, ++ struct Curl_easy *data, ++ struct h2_stream_ctx *stream, ++ const char *buf, size_t blen, bool eos) ++{ ++ ++ /* If we already encountered an error, skip further writes */ ++ if(!stream->xfer_result) ++ stream->xfer_result = Curl_xfer_write_resp(data, (char *)buf, blen, eos); ++ /* If the transfer write is errored, we do not want any more data */ ++ if(stream->xfer_result) { ++ struct cf_h2_ctx *ctx = cf->ctx; ++ CURL_TRC_CF(data, cf, "[%d] error %d writing %zu bytes of data, " ++ "RST-ing stream", ++ stream->id, stream->xfer_result, blen); ++ nghttp2_submit_rst_stream(ctx->h2, 0, stream->id, ++ NGHTTP2_ERR_CALLBACK_FAILURE); ++ } + } + + static CURLcode on_stream_frame(struct Curl_cfilter *cf, +@@ -960,7 +988,6 @@ static CURLcode on_stream_frame(struct Curl_cfilter *cf, + struct cf_h2_ctx *ctx = cf->ctx; + struct h2_stream_ctx *stream = H2_STREAM_CTX(data); + int32_t stream_id = frame->hd.stream_id; +- CURLcode result; + int rv; + + if(!stream) { +@@ -1008,9 +1035,7 @@ static CURLcode on_stream_frame(struct Curl_cfilter *cf, + stream->status_code = -1; + } + +- result = recvbuf_write_hds(cf, data, STRCONST("\r\n")); +- if(result) +- return result; ++ h2_xfer_write_resp_hd(cf, data, stream, STRCONST("\r\n"), stream->closed); + + if(stream->status_code / 100 != 1) { + stream->resp_hds_complete = TRUE; +@@ -1229,7 +1254,6 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags, + struct cf_h2_ctx *ctx = cf->ctx; + struct h2_stream_ctx *stream; + struct Curl_easy *data_s; +- CURLcode result; + (void)flags; + + DEBUGASSERT(stream_id); /* should never be a zero stream ID here */ +@@ -1252,9 +1276,7 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags, + if(!stream) + return NGHTTP2_ERR_CALLBACK_FAILURE; + +- result = Curl_xfer_write_resp(data_s, (char *)mem, len, FALSE); +- if(result && result != CURLE_AGAIN) +- return NGHTTP2_ERR_CALLBACK_FAILURE; ++ h2_xfer_write_resp(cf, data_s, stream, (char *)mem, len, FALSE); + + nghttp2_session_consume(ctx->h2, stream_id, len); + stream->nrcvd_data += (curl_off_t)len; +@@ -1465,16 +1487,12 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, + result = Curl_headers_push(data_s, buffer, CURLH_PSEUDO); + if(result) + return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, STRCONST("HTTP/2 ")); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, (const char *)value, valuelen); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; ++ h2_xfer_write_resp_hd(cf, data_s, stream, STRCONST("HTTP/2 "), FALSE); ++ h2_xfer_write_resp_hd(cf, data_s, stream, ++ (const char *)value, valuelen, FALSE); + /* the space character after the status code is mandatory */ +- result = recvbuf_write_hds(cf, data_s, STRCONST(" \r\n")); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; ++ h2_xfer_write_resp_hd(cf, data_s, stream, STRCONST(" \r\n"), FALSE); ++ + /* if we receive data for another handle, wake that up */ + if(CF_DATA_CURRENT(cf) != data_s) + Curl_expire(data_s, 0, EXPIRE_RUN_NOW); +@@ -1487,18 +1505,13 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, + /* nghttp2 guarantees that namelen > 0, and :status was already + received, and this is not pseudo-header field . */ + /* convert to an HTTP1-style header */ +- result = recvbuf_write_hds(cf, data_s, (const char *)name, namelen); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, STRCONST(": ")); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, (const char *)value, valuelen); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, STRCONST("\r\n")); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; ++ h2_xfer_write_resp_hd(cf, data_s, stream, ++ (const char *)name, namelen, FALSE); ++ h2_xfer_write_resp_hd(cf, data_s, stream, STRCONST(": "), FALSE); ++ h2_xfer_write_resp_hd(cf, data_s, stream, ++ (const char *)value, valuelen, FALSE); ++ h2_xfer_write_resp_hd(cf, data_s, stream, STRCONST("\r\n"), FALSE); ++ + /* if we receive data for another handle, wake that up */ + if(CF_DATA_CURRENT(cf) != data_s) + Curl_expire(data_s, 0, EXPIRE_RUN_NOW); +@@ -1799,7 +1812,12 @@ static ssize_t stream_recv(struct Curl_cfilter *cf, struct Curl_easy *data, + + (void)buf; + *err = CURLE_AGAIN; +- if(stream->closed) { ++ if(stream->xfer_result) { ++ CURL_TRC_CF(data, cf, "[%d] xfer write failed", stream->id); ++ *err = stream->xfer_result; ++ nread = -1; ++ } ++ else if(stream->closed) { + CURL_TRC_CF(data, cf, "[%d] returning CLOSE", stream->id); + nread = http2_handle_stream_close(cf, data, stream, err); + } +--- a/lib/vquic/curl_ngtcp2.c ++++ b/lib/vquic/curl_ngtcp2.c +@@ -152,6 +152,7 @@ struct h3_stream_ctx { + uint64_t error3; /* HTTP/3 stream error code */ + curl_off_t upload_left; /* number of request bytes left to upload */ + int status_code; /* HTTP status code */ ++ CURLcode xfer_result; /* result from xfer_resp_write(_hd) */ + bool resp_hds_complete; /* we have a complete, final response */ + bool closed; /* TRUE on stream close */ + bool reset; /* TRUE on stream reset */ +@@ -759,10 +760,39 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t stream_id, + return 0; + } + +-static CURLcode write_resp_hds(struct Curl_easy *data, +- const char *buf, size_t blen) ++static void h3_xfer_write_resp_hd(struct Curl_cfilter *cf, ++ struct Curl_easy *data, ++ struct h3_stream_ctx *stream, ++ const char *buf, size_t blen, bool eos) + { +- return Curl_xfer_write_resp(data, (char *)buf, blen, FALSE); ++ ++ /* If we already encountered an error, skip further writes */ ++ if(!stream->xfer_result) { ++ stream->xfer_result = Curl_xfer_write_resp(data, (char *)buf, blen, eos); ++ if(stream->xfer_result) ++ CURL_TRC_CF(data, cf, "[%"PRId64"] error %d writing %zu " ++ "bytes of headers", stream->id, stream->xfer_result, blen); ++ } ++} ++ ++static void h3_xfer_write_resp(struct Curl_cfilter *cf, ++ struct Curl_easy *data, ++ struct h3_stream_ctx *stream, ++ const char *buf, size_t blen, bool eos) ++{ ++ ++ /* If we already encountered an error, skip further writes */ ++ if(!stream->xfer_result) ++ stream->xfer_result = Curl_xfer_write_resp(data, (char *)buf, blen, eos); ++ /* If the transfer write is errored, we do not want any more data */ ++ if(stream->xfer_result) { ++ struct cf_ngtcp2_ctx *ctx = cf->ctx; ++ CURL_TRC_CF(data, cf, "[%"PRId64"] error %d writing %zu bytes " ++ "of data, cancelling stream", ++ stream->id, stream->xfer_result, blen); ++ nghttp3_conn_close_stream(ctx->h3conn, stream->id, ++ NGHTTP3_H3_REQUEST_CANCELLED); ++ } + } + + static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id, +@@ -773,7 +803,6 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id, + struct cf_ngtcp2_ctx *ctx = cf->ctx; + struct Curl_easy *data = stream_user_data; + struct h3_stream_ctx *stream = H3_STREAM_CTX(data); +- CURLcode result; + + (void)conn; + (void)stream3_id; +@@ -781,12 +810,7 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id, + if(!stream) + return NGHTTP3_ERR_CALLBACK_FAILURE; + +- result = Curl_xfer_write_resp(data, (char *)buf, blen, FALSE); +- if(result) { +- CURL_TRC_CF(data, cf, "[%" PRId64 "] DATA len=%zu, ERROR receiving %d", +- stream->id, blen, result); +- return NGHTTP3_ERR_CALLBACK_FAILURE; +- } ++ h3_xfer_write_resp(cf, data, stream, (char *)buf, blen, FALSE); + if(blen) { + CURL_TRC_CF(data, cf, "[%" PRId64 "] ACK %zu bytes of DATA", + stream->id, blen); +@@ -819,7 +843,6 @@ static int cb_h3_end_headers(nghttp3_conn *conn, int64_t stream_id, + struct Curl_cfilter *cf = user_data; + struct Curl_easy *data = stream_user_data; + struct h3_stream_ctx *stream = H3_STREAM_CTX(data); +- CURLcode result = CURLE_OK; + (void)conn; + (void)stream_id; + (void)fin; +@@ -828,10 +851,7 @@ static int cb_h3_end_headers(nghttp3_conn *conn, int64_t stream_id, + if(!stream) + return 0; + /* add a CRLF only if we've received some headers */ +- result = write_resp_hds(data, "\r\n", 2); +- if(result) { +- return -1; +- } ++ h3_xfer_write_resp_hd(cf, data, stream, STRCONST("\r\n"), stream->closed); + + CURL_TRC_CF(data, cf, "[%" PRId64 "] end_headers, status=%d", + stream_id, stream->status_code); +@@ -874,7 +894,7 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t stream_id, + ncopy = msnprintf(line, sizeof(line), "HTTP/3 %03d \r\n", + stream->status_code); + CURL_TRC_CF(data, cf, "[%" PRId64 "] status: %s", stream_id, line); +- result = write_resp_hds(data, line, ncopy); ++ h3_xfer_write_resp_hd(cf, data, stream, line, ncopy, FALSE); + if(result) { + return -1; + } +@@ -884,22 +904,12 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t stream_id, + CURL_TRC_CF(data, cf, "[%" PRId64 "] header: %.*s: %.*s", + stream_id, (int)h3name.len, h3name.base, + (int)h3val.len, h3val.base); +- result = write_resp_hds(data, (const char *)h3name.base, h3name.len); +- if(result) { +- return -1; +- } +- result = write_resp_hds(data, ": ", 2); +- if(result) { +- return -1; +- } +- result = write_resp_hds(data, (const char *)h3val.base, h3val.len); +- if(result) { +- return -1; +- } +- result = write_resp_hds(data, "\r\n", 2); +- if(result) { +- return -1; +- } ++ h3_xfer_write_resp_hd(cf, data, stream, ++ (const char *)h3name.base, h3name.len, FALSE); ++ h3_xfer_write_resp_hd(cf, data, stream, ": ", 2, FALSE); ++ h3_xfer_write_resp_hd(cf, data, stream, ( ++ const char *)h3val.base, h3val.len, FALSE); ++ h3_xfer_write_resp_hd(cf, data, stream, "\r\n", 2, FALSE); + } + return 0; + } +@@ -1083,7 +1093,13 @@ static ssize_t cf_ngtcp2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, + goto out; + } + +- if(stream->closed) { ++ if(stream->xfer_result) { ++ CURL_TRC_CF(data, cf, "[%" PRId64 "] xfer write failed", stream->id); ++ *err = stream->xfer_result; ++ nread = -1; ++ goto out; ++ } ++ else if(stream->closed) { + nread = recv_closed_stream(cf, data, stream, err); + goto out; + } +--- a/tests/http/test_02_download.py ++++ b/tests/http/test_02_download.py +@@ -257,6 +257,34 @@ class TestDownload: + ]) + r.check_response(count=count, http_status=200) + ++ @pytest.mark.parametrize("proto", ['h2', 'h3']) ++ def test_02_14_not_found(self, env: Env, httpd, nghttpx, repeat, proto): ++ if proto == 'h3' and not env.have_h3(): ++ pytest.skip("h3 not supported") ++ if proto == 'h3' and env.curl_uses_lib('msh3'): ++ pytest.skip("msh3 stalls here") ++ count = 10 ++ urln = f'https://{env.authority_for(env.domain1, proto)}/not-found?[0-{count-1}]' ++ curl = CurlClient(env=env) ++ r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[ ++ '--parallel' ++ ]) ++ r.check_stats(count=count, http_status=404, exitcode=0) ++ ++ @pytest.mark.parametrize("proto", ['h2', 'h3']) ++ def test_02_15_fail_not_found(self, env: Env, httpd, nghttpx, repeat, proto): ++ if proto == 'h3' and not env.have_h3(): ++ pytest.skip("h3 not supported") ++ if proto == 'h3' and env.curl_uses_lib('msh3'): ++ pytest.skip("msh3 stalls here") ++ count = 10 ++ urln = f'https://{env.authority_for(env.domain1, proto)}/not-found?[0-{count-1}]' ++ curl = CurlClient(env=env) ++ r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[ ++ '--fail' ++ ]) ++ r.check_stats(count=count, http_status=404, exitcode=22) ++ + @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests") + @pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs") + def test_02_20_h2_small_frames(self, env: Env, httpd, repeat): + diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index c7b8244a032f..f84f4bd5e737 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,4 +1,2 @@ -DIST dhcpcd-10.0.3.tar.xz 268872 BLAKE2B c063fbb44b4a6928ffd84c109c1ed8ae0345c81b732fc75ce1c1aebc51c190fa512de9822c1c6865794db126f4ad2aceef97c4da28d6922cca082b1aeedb4760 SHA512 f4437e9aa094ab38f077c455b012f46cc84a39f97a19eae896a0954f24f2064e91407dc7f7be7fae00faf3455a8e50695e94c406f476f88a61b980169a778560 -DIST dhcpcd-10.0.5.tar.xz 269696 BLAKE2B 52435e2afa4fa5563b629af3f69b149b87de75097d20819423429741e8f2d16df136409180c509ff08b28fd060ad74da4d73057556349b8041c716dbeb7dbcc3 SHA512 f8213eee93e83c174ce5d2487364400fe07b39bb0f052d072518e12f7189136704f65e1f4467432b477f195d64eebe6ca167aec160aed1575ea9ef551b43eb43 DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee diff --git a/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild deleted file mode 100644 index f311304756fa..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" - -LICENSE="BSD-2 BSD ISC MIT" -SLOT="0" -IUSE="debug +embedded ipv6 privsep +udev" - -DEPEND="udev? ( virtual/udev )" -RDEPEND=" - ${DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable debug) - $(use_enable embedded) - $(use_enable ipv6) - $(use_enable privsep) - $(usex elibc_glibc '--with-hook=yp.conf' '') - --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") - $(usex privsep '--privsepuser=dhcpcd' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd - systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service -} - -pkg_postinst() { - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild deleted file mode 100644 index 0702947d5bac..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" - -LICENSE="BSD-2 BSD ISC MIT" -SLOT="0" -IUSE="debug +embedded ipv6 privsep +udev" - -DEPEND="udev? ( virtual/udev )" -RDEPEND=" - ${DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -PATCHES=( - "${FILESDIR}"/10.0.5 -) - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable debug) - $(use_enable embedded) - $(use_enable ipv6) - $(use_enable privsep) - $(usex elibc_glibc '--with-hook=yp.conf' '') - --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") - $(usex privsep '--privsepuser=dhcpcd' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd - systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service -} - -pkg_postinst() { - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild deleted file mode 100644 index cd313329537c..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" - -LICENSE="BSD-2 BSD ISC MIT" -SLOT="0" -IUSE="debug +embedded ipv6 privsep +udev" - -DEPEND="udev? ( virtual/udev )" -RDEPEND=" - ${DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -QA_CONFIG_IMPL_DECL_SKIP=( - # These don't exist on Linux/glibc (bug #900264) - memset_explicit - memset_s - setproctitle - strtoi - consttime_memequal - SHA256_Init - hmac -) - -PATCHES=( - "${FILESDIR}"/${PN}-10.0.6-rebinding.patch -) - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable debug) - $(use_enable embedded) - $(use_enable ipv6) - $(use_enable privsep) - $(usex elibc_glibc '--with-hook=yp.conf' '') - --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") - $(usex privsep '--privsepuser=dhcpcd' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd - systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service -} - -pkg_postinst() { - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild index 914373137e7d..3fcb61425cc4 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.6.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,10 @@ LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" -DEPEND="udev? ( virtual/udev )" +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" RDEPEND=" ${DEPEND} privsep? ( @@ -45,6 +48,12 @@ QA_CONFIG_IMPL_DECL_SKIP=( hmac ) +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-rebinding.patch + "${FILESDIR}"/${PN}-10.0.6-crash.patch + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 914373137e7d..1c3bbc87d456 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,10 @@ LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" -DEPEND="udev? ( virtual/udev )" +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" RDEPEND=" ${DEPEND} privsep? ( @@ -45,6 +48,10 @@ QA_CONFIG_IMPL_DECL_SKIP=( hmac ) +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch b/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch deleted file mode 100644 index 632cf402fc94..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/262 -https://github.com/NetworkConfiguration/dhcpcd/commit/584b52db330a96471ff9301b85ce47ebb065a8a4 - -From 584b52db330a96471ff9301b85ce47ebb065a8a4 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 12 Nov 2023 11:30:01 +0000 -Subject: [PATCH] control: Fix hangup for non privsep builds - -Fix related to #262. ---- a/src/control.c -+++ b/src/control.c -@@ -113,8 +113,9 @@ control_handle_read(struct fd_list *fd) - ssize_t bytes; - - bytes = read(fd->fd, buffer, sizeof(buffer) - 1); -- if (bytes == -1) { -+ if (bytes == -1) - logerr(__func__); -+ if (bytes == -1 || bytes == 0) { - control_hangup(fd); - return; - } - diff --git a/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch b/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch deleted file mode 100644 index 44de6a83f843..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/262 -https://github.com/NetworkConfiguration/dhcpcd/commit/21d020b00e60e71b1300d89815f914145d7372f6 - -From 21d020b00e60e71b1300d89815f914145d7372f6 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 12 Nov 2023 12:16:53 +0000 -Subject: [PATCH] dhcpcd: Detach from launcher before stopping root process - -This fixes non privsep builds where the launcher reports dhcpcd -hungup. Unsure why this happens, but it should not be a problem. - -While here, shutdown has no effect on non STREAM sockets and -remove the silly error logging in fork_cb that we read an -error. We already printed the error so this makes no sense. - -Hopefully fixes #262. ---- a/src/dhcpcd.c -+++ b/src/dhcpcd.c -@@ -395,7 +395,6 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - logerr("write"); - ctx->options |= DHCPCD_DAEMONISED; - // dhcpcd_fork_cb will close the socket -- shutdown(ctx->fork_fd, SHUT_RDWR); - #endif - } - -@@ -1877,8 +1876,6 @@ dhcpcd_fork_cb(void *arg, unsigned short events) - if (ctx->options & DHCPCD_FORKED) { - if (exit_code == EXIT_SUCCESS) - logdebugx("forked to background"); -- else -- logerrx("exited with code %d", exit_code); - eloop_exit(ctx->eloop, exit_code); - } else - dhcpcd_signal_cb(exit_code, ctx); -@@ -2738,8 +2735,19 @@ main(int argc, char **argv, char **envp) - if (ps_stopwait(&ctx) != EXIT_SUCCESS) - i = EXIT_FAILURE; - #endif -- if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) -+ if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) { - loginfox(PACKAGE " exited"); -+#ifdef USE_SIGNALS -+ /* Detach from the launch process. -+ * This *should* happen after we stop the root process, -+ * but for some reason non privsep builds get a zero length -+ * read in dhcpcd_fork_cb(). */ -+ if (ctx.fork_fd != -1) { -+ if (write(ctx.fork_fd, &i, sizeof(i)) == -1) -+ logerr("%s: write", __func__); -+ } -+#endif -+ } - #ifdef PRIVSEP - if (ps_root_stop(&ctx) == -1) - i = EXIT_FAILURE; -@@ -2753,12 +2761,6 @@ main(int argc, char **argv, char **envp) - setproctitle_fini(); - #endif - #ifdef USE_SIGNALS -- if (ctx.options & DHCPCD_STARTED) { -- /* Try to detach from the launch process. */ -- if (ctx.fork_fd != -1 && -- write(ctx.fork_fd, &i, sizeof(i)) == -1) -- logerr("%s: write", __func__); -- } - if (ctx.options & (DHCPCD_FORKED | DHCPCD_PRIVSEP)) - _exit(i); /* so atexit won't remove our pidfile */ - #endif diff --git a/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch b/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch deleted file mode 100644 index de4ee353ccf3..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch +++ /dev/null @@ -1,105 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/262 -https://github.com/NetworkConfiguration/dhcpcd/commit/3b4c71859c45b9405f96a5ee8fce04bd3014b2d0 - -From 3b4c71859c45b9405f96a5ee8fce04bd3014b2d0 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 13 Nov 2023 10:24:15 +0000 -Subject: [PATCH] control: Abort control recv path on hangup - -This fixes a crash when we try and re-use it in another function. ---- a/src/control.c -+++ b/src/control.c -@@ -106,7 +106,7 @@ control_hangup(struct fd_list *fd) - control_free(fd); - } - --static void -+static int - control_handle_read(struct fd_list *fd) - { - char buffer[1024]; -@@ -117,7 +117,7 @@ control_handle_read(struct fd_list *fd) - logerr(__func__); - if (bytes == -1 || bytes == 0) { - control_hangup(fd); -- return; -+ return -1; - } - - #ifdef PRIVSEP -@@ -129,21 +129,23 @@ control_handle_read(struct fd_list *fd) - fd->flags &= ~FD_SENDLEN; - if (err == -1) { - logerr(__func__); -- return; -+ return 0; - } - if (err == 1 && - ps_ctl_sendargs(fd, buffer, (size_t)bytes) == -1) { - logerr(__func__); - control_free(fd); -+ return -1; - } -- return; -+ return 0; - } - #endif - - control_recvdata(fd, buffer, (size_t)bytes); -+ return 0; - } - --static void -+static int - control_handle_write(struct fd_list *fd) - { - struct iovec iov[2]; -@@ -170,7 +172,7 @@ control_handle_write(struct fd_list *fd) - logerr("%s: write", __func__); - } - control_hangup(fd); -- return; -+ return -1; - } - - TAILQ_REMOVE(&fd->queue, data, next); -@@ -183,7 +185,7 @@ control_handle_write(struct fd_list *fd) - #endif - - if (TAILQ_FIRST(&fd->queue) != NULL) -- return; -+ return 0; - - #ifdef PRIVSEP - if (IN_PRIVSEP_SE(fd->ctx) && !(fd->flags & FD_LISTEN)) { -@@ -196,9 +198,9 @@ control_handle_write(struct fd_list *fd) - if (eloop_event_add(fd->ctx->eloop, fd->fd, ELE_READ, - control_handle_data, fd) == -1) - logerr("%s: eloop_event_add", __func__); -+ return 0; - } - -- - static void - control_handle_data(void *arg, unsigned short events) - { -@@ -207,10 +209,14 @@ control_handle_data(void *arg, unsigned short events) - if (!(events & (ELE_READ | ELE_WRITE | ELE_HANGUP))) - logerrx("%s: unexpected event 0x%04x", __func__, events); - -- if (events & ELE_WRITE && !(events & ELE_HANGUP)) -- control_handle_write(fd); -- if (events & ELE_READ) -- control_handle_read(fd); -+ if (events & ELE_WRITE && !(events & ELE_HANGUP)) { -+ if (control_handle_write(fd) == -1) -+ return; -+ } -+ if (events & ELE_READ) { -+ if (control_handle_read(fd) == -1) -+ return; -+ } - if (events & ELE_HANGUP) - control_hangup(fd); - } - diff --git a/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch b/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch deleted file mode 100644 index 331f60e739a1..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch +++ /dev/null @@ -1,286 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/262 -https://github.com/NetworkConfiguration/dhcpcd/commit/ea53344a2430736124bf9fa62acb0d3107acd58f - -From ea53344a2430736124bf9fa62acb0d3107acd58f Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 13 Nov 2023 10:29:58 +0000 -Subject: [PATCH] dhcpcd: Remove stdio callback and detach on daemonise - -For some reason, the stdio callback is extremely flaky on -*some* Linux based distributions making it very hard to debug some -things. -Removing it is fine because we now enforce that we have file descriptors -for stdin, stdout and stdrr on launch and dup them to /dev/null on daemonise. - -It's also interesting to see behavioural differences between -some socketpair implementations that emit a HANGUP and some don't. - -As such, we now close the fork socket on daemonise once more AND -in the fork_cb depending on if we hangup or read zero first. - -Fixes #262 ---- a/src/dhcpcd.c -+++ b/src/dhcpcd.c -@@ -364,7 +364,7 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - errno = ENOSYS; - return; - #else -- int i; -+ int exit_code; - - if (ctx->options & DHCPCD_DAEMONISE && - !(ctx->options & (DHCPCD_DAEMONISED | DHCPCD_NOWAITIP))) -@@ -385,16 +385,19 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - return; - - #ifdef PRIVSEP -- ps_daemonised(ctx); -+ if (IN_PRIVSEP(ctx)) -+ ps_daemonised(ctx); -+ else - #else -- dhcpcd_daemonised(ctx); -+ dhcpcd_daemonised(ctx); - #endif - -- i = EXIT_SUCCESS; -- if (write(ctx->fork_fd, &i, sizeof(i)) == -1) -- logerr("write"); -- ctx->options |= DHCPCD_DAEMONISED; -- // dhcpcd_fork_cb will close the socket -+ eloop_event_delete(ctx->eloop, ctx->fork_fd); -+ exit_code = EXIT_SUCCESS; -+ if (write(ctx->fork_fd, &exit_code, sizeof(exit_code)) == -1) -+ logerr(__func__); -+ close(ctx->fork_fd); -+ ctx->fork_fd = -1; - #endif - } - -@@ -1814,30 +1817,6 @@ dhcpcd_readdump(struct dhcpcd_ctx *ctx) - dhcpcd_readdump0, ctx); - } - --static void --dhcpcd_stderr_cb(void *arg, unsigned short events) --{ -- struct dhcpcd_ctx *ctx = arg; -- char log[BUFSIZ]; -- ssize_t len; -- -- if (events & ELE_HANGUP) -- eloop_exit(ctx->eloop, EXIT_SUCCESS); -- -- if (!(events & ELE_READ)) -- return; -- -- len = read(ctx->stderr_fd, log, sizeof(log) - 1); -- if (len == -1) { -- if (errno != ECONNRESET) -- logerr(__func__); -- return; -- } -- -- log[len] = '\0'; -- fprintf(stderr, "%s", log); --} -- - static void - dhcpcd_fork_cb(void *arg, unsigned short events) - { -@@ -1928,7 +1907,7 @@ main(int argc, char **argv, char **envp) - ssize_t len; - #if defined(USE_SIGNALS) || !defined(THERE_IS_NO_FORK) - pid_t pid; -- int fork_fd[2], stderr_fd[2]; -+ int fork_fd[2]; - #endif - #ifdef USE_SIGNALS - int sig = 0; -@@ -2013,22 +1992,17 @@ main(int argc, char **argv, char **envp) - TAILQ_INIT(&ctx.ps_processes); - #endif - -- /* Check our streams for validity */ -- ctx.stdin_valid = fcntl(STDIN_FILENO, F_GETFD) != -1; -- ctx.stdout_valid = fcntl(STDOUT_FILENO, F_GETFD) != -1; -- ctx.stderr_valid = fcntl(STDERR_FILENO, F_GETFD) != -1; -+ logopts = LOGERR_LOG | LOGERR_LOG_DATE | LOGERR_LOG_PID; - -- /* Even we if we don't have input/outputs, we need to -- * ensure they are setup for shells. */ -- if (!ctx.stdin_valid) -+ /* Ensure we have stdin, stdout and stderr file descriptors. -+ * This is important as we do run scripts which expect these. */ -+ if (fcntl(STDIN_FILENO, F_GETFD) == -1) - dup_null(STDIN_FILENO); -- if (!ctx.stdout_valid) -+ if (fcntl(STDOUT_FILENO, F_GETFD) == -1) - dup_null(STDOUT_FILENO); -- if (!ctx.stderr_valid) -+ if (fcntl(STDERR_FILENO, F_GETFD) == -1) - dup_null(STDERR_FILENO); -- -- logopts = LOGERR_LOG | LOGERR_LOG_DATE | LOGERR_LOG_PID; -- if (ctx.stderr_valid) -+ else - logopts |= LOGERR_ERR; - - i = 0; -@@ -2398,17 +2372,13 @@ main(int argc, char **argv, char **envp) - loginfox(PACKAGE "-" VERSION " starting"); - - // We don't need stdin past this point -- if (ctx.stdin_valid) -- dup_null(STDIN_FILENO); -+ dup_null(STDIN_FILENO); - - #if defined(USE_SIGNALS) && !defined(THERE_IS_NO_FORK) - if (!(ctx.options & DHCPCD_DAEMONISE)) - goto start_manager; - -- if (xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, fork_fd) == -1 || -- (ctx.stderr_valid && -- xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, stderr_fd) == -1)) -- { -+ if (xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, fork_fd) == -1) { - logerr("socketpair"); - goto exit_failure; - } -@@ -2429,22 +2399,6 @@ main(int argc, char **argv, char **envp) - dhcpcd_fork_cb, &ctx) == -1) - logerr("%s: eloop_event_add", __func__); - -- /* -- * Redirect stderr to the stderr socketpair. -- * Redirect stdout as well. -- * dhcpcd doesn't output via stdout, but something in -- * a called script might. -- */ -- if (ctx.stderr_valid) { -- if (dup2(stderr_fd[1], STDERR_FILENO) == -1 || -- (ctx.stdout_valid && -- dup2(stderr_fd[1], STDOUT_FILENO) == -1)) -- logerr("dup2"); -- close(stderr_fd[0]); -- close(stderr_fd[1]); -- } else if (ctx.stdout_valid) -- dup_null(STDOUT_FILENO); -- - if (setsid() == -1) { - logerr("%s: setsid", __func__); - goto exit_failure; -@@ -2478,19 +2432,6 @@ main(int argc, char **argv, char **envp) - dhcpcd_fork_cb, &ctx) == -1) - logerr("%s: eloop_event_add", __func__); - -- if (ctx.stderr_valid) { -- ctx.stderr_fd = stderr_fd[0]; -- close(stderr_fd[1]); --#ifdef PRIVSEP_RIGHTS -- if (ps_rights_limit_fd(ctx.stderr_fd) == 1) { -- logerr("ps_rights_limit_fd"); -- goto exit_failure; -- } --#endif -- if (eloop_event_add(ctx.eloop, ctx.stderr_fd, ELE_READ, -- dhcpcd_stderr_cb, &ctx) == -1) -- logerr("%s: eloop_event_add", __func__); -- } - #ifdef PRIVSEP - if (IN_PRIVSEP(&ctx) && ps_managersandbox(&ctx, NULL) == -1) - goto exit_failure; -@@ -2602,6 +2543,7 @@ main(int argc, char **argv, char **envp) - if (ifp->active == IF_ACTIVE_USER) - break; - } -+ - if (ifp == NULL) { - if (ctx.ifc == 0) { - int loglevel; -@@ -2735,24 +2677,22 @@ main(int argc, char **argv, char **envp) - if (ps_stopwait(&ctx) != EXIT_SUCCESS) - i = EXIT_FAILURE; - #endif -- if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) { -+ if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) - loginfox(PACKAGE " exited"); --#ifdef USE_SIGNALS -- /* Detach from the launch process. -- * This *should* happen after we stop the root process, -- * but for some reason non privsep builds get a zero length -- * read in dhcpcd_fork_cb(). */ -- if (ctx.fork_fd != -1) { -- if (write(ctx.fork_fd, &i, sizeof(i)) == -1) -- logerr("%s: write", __func__); -- } --#endif -- } - #ifdef PRIVSEP - if (ps_root_stop(&ctx) == -1) - i = EXIT_FAILURE; - eloop_free(ctx.ps_eloop); - #endif -+ -+#ifdef USE_SIGNALS -+ /* If still attached, detach from the launcher */ -+ if (ctx.options & DHCPCD_STARTED && ctx.fork_fd != -1) { -+ if (write(ctx.fork_fd, &i, sizeof(i)) == -1) -+ logerr("%s: write", __func__); -+ } -+#endif -+ - eloop_free(ctx.eloop); - logclose(); - free(ctx.logfile); -@@ -2760,6 +2700,7 @@ main(int argc, char **argv, char **envp) - #ifdef SETPROCTITLE_H - setproctitle_fini(); - #endif -+ - #ifdef USE_SIGNALS - if (ctx.options & (DHCPCD_FORKED | DHCPCD_PRIVSEP)) - _exit(i); /* so atexit won't remove our pidfile */ ---- a/src/dhcpcd.h -+++ b/src/dhcpcd.h -@@ -116,10 +116,6 @@ struct passwd; - struct dhcpcd_ctx { - char pidfile[sizeof(PIDFILE) + IF_NAMESIZE + 1]; - char vendor[256]; -- bool stdin_valid; /* It's possible stdin, stdout and stderr */ -- bool stdout_valid; /* could be closed when dhcpcd starts. */ -- bool stderr_valid; -- int stderr_fd; /* FD for logging to stderr */ - int fork_fd; /* FD for the fork init signal pipe */ - const char *cffile; - unsigned long long options; ---- a/src/privsep.c -+++ b/src/privsep.c -@@ -172,8 +172,7 @@ ps_dropprivs(struct dhcpcd_ctx *ctx) - * Obviously this won't work if we are using a logfile - * or redirecting stderr to a file. */ - if ((ctx->options & DHC_NOCHKIO) == DHC_NOCHKIO || -- (ctx->logfile == NULL && -- (!ctx->stderr_valid || isatty(STDERR_FILENO) == 1))) -+ (ctx->logfile == NULL && isatty(STDERR_FILENO) == 1)) - { - if (setrlimit(RLIMIT_FSIZE, &rzero) == -1) - logerr("setrlimit RLIMIT_FSIZE"); -@@ -305,14 +304,11 @@ ps_rights_limit_stdio(struct dhcpcd_ctx *ctx) - const int iebadf = CAPH_IGNORE_EBADF; - int error = 0; - -- if (ctx->stdin_valid && -- caph_limit_stream(STDIN_FILENO, CAPH_READ | iebadf) == -1) -+ if (caph_limit_stream(STDIN_FILENO, CAPH_READ | iebadf) == -1) - error = -1; -- if (ctx->stdout_valid && -- caph_limit_stream(STDOUT_FILENO, CAPH_WRITE | iebadf) == -1) -+ if (caph_limit_stream(STDOUT_FILENO, CAPH_WRITE | iebadf) == -1) - error = -1; -- if (ctx->stderr_valid && -- caph_limit_stream(STDERR_FILENO, CAPH_WRITE | iebadf) == -1) -+ if (caph_limit_stream(STDERR_FILENO, CAPH_WRITE | iebadf) == -1) - error = -1; - - return error; diff --git a/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch b/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch deleted file mode 100644 index bafabfcb0275..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/commit/8d12632c670f02d8a685e80c8abad7049d3dd18f - -From 8d12632c670f02d8a685e80c8abad7049d3dd18f Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 13 Nov 2023 15:54:50 +0000 -Subject: [PATCH] Fix privsep builds for prior. - ---- a/src/dhcpcd.c -+++ b/src/dhcpcd.c -@@ -388,9 +388,8 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - if (IN_PRIVSEP(ctx)) - ps_daemonised(ctx); - else --#else -- dhcpcd_daemonised(ctx); - #endif -+ dhcpcd_daemonised(ctx); - - eloop_event_delete(ctx->eloop, ctx->fork_fd); - exit_code = EXIT_SUCCESS; diff --git a/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch b/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch deleted file mode 100644 index 9672dc5b9570..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/commit/6788608eb0fcd32fd23974100cdd42d3174cb8d1 - -From 6788608eb0fcd32fd23974100cdd42d3174cb8d1 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 13 Nov 2023 16:05:04 +0000 -Subject: [PATCH] Fix an unused var warning for capsicum for prior - ---- a/src/privsep.c -+++ b/src/privsep.c -@@ -299,7 +299,7 @@ ps_rights_limit_fdpair(int fd[]) - } - - static int --ps_rights_limit_stdio(struct dhcpcd_ctx *ctx) -+ps_rights_limit_stdio() - { - const int iebadf = CAPH_IGNORE_EBADF; - int error = 0; -@@ -452,7 +452,7 @@ ps_startprocess(struct ps_process *psp, - ctx->ps_log_root_fd = -1; - } - #ifdef PRIVSEP_RIGHTS -- if (ps_rights_limit_stdio(ctx) == -1) { -+ if (ps_rights_limit_stdio() == -1) { - logerr("ps_rights_limit_stdio"); - goto errexit; - } -@@ -666,7 +666,7 @@ ps_managersandbox(struct dhcpcd_ctx *ctx, const char *_pledge) - #ifdef PRIVSEP_RIGHTS - if ((ctx->pf_inet_fd != -1 && - ps_rights_limit_ioctl(ctx->pf_inet_fd) == -1) || -- ps_rights_limit_stdio(ctx) == -1) -+ ps_rights_limit_stdio() == -1) - { - logerr("%s: cap_rights_limit", __func__); - return -1; - diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch new file mode 100644 index 000000000000..0d609822aad1 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch @@ -0,0 +1,16 @@ +--- a/configure ++++ b/configure +@@ -361,11 +361,8 @@ if [ -e "$LDELF" ]; then + echo "LDFLAGS+= -Wl,-rpath=${LIBDIR}" >>$CONFIG_MK + fi + +-if [ -z "$PREFIX" ] || [ "$PREFIX" = / ]; then +- ALLOW_USR_LIBS=false +-else +- ALLOW_USR_LIBS=true +-fi ++ALLOW_USR_LIBS=true ++ + case "$OS" in + linux*|solaris*|sunos*|kfreebsd*|dragonfly*|freebsd*) ;; + *) diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index 34b3afeaf523..f3d702c62cb0 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -1,4 +1,4 @@ DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422 DIST dropbear-2022.83.tar.bz2.asc 833 BLAKE2B 7dfcf13804738aed3136c264412f8c2f96cd3ff71482815af736346c9441c8f00adef26f4e8f89082cbbb4033249501adbc545c08f678e1cac4afc88a8fc9ed0 SHA512 e5cbd01dcbaeabb04dc473bd11933a422fda03ceb5bc02fb5c99abafd0841e3ac1f436cc1798500b33fbbc81923fa03c2a28c971fa26794ed5888d496fb7e2ad -DIST dropbear-2024.84.tar.bz2 2306278 BLAKE2B ba5a433f2a313aeeabc8e3e3696c4d79e96095dfc5cf045f15e6de5912f2f44bdddee103d86f659ee58fe8013fc9c2fb8c3af9cba089ee415e2f28179a365dca SHA512 254daea819c5aeaa65bb43449386fb964f4aa13e3b3037fe11064120205c6e265925e7ef2d84f7ebe66c6a00cf0a22e6010314c065ed49a3815f47137b7aca44 -DIST dropbear-2024.84.tar.bz2.asc 833 BLAKE2B 0b8c9fdf8c24836b03f36d3e98b6b906a3aaeda9bd283b3d2001b9b1e363a19e02a536febfe19c3c851c378d32a3efb067910a68dd4a7b2174b96fd8faedf1b3 SHA512 69ce84ea8f6ba2c7f7718578befa301c3a0342b7f6acb3ecb5d6ac4b82710fb22d0bc11f5632ae00f222c1cc2b50f48e50d16eee4ebb93bf08069774769ebb13 +DIST dropbear-2024.85.tar.bz2 2304594 BLAKE2B 631b71733437a256267057a1c4846afa4d520fa9e29d9c14dfa7df09109c30cc2d649ada990a15c615567f7a1d6ff02340799216b7fa41327d72cb43dd9096e0 SHA512 09619e9874172658b7fc284823e0a619b6a4346a5db41487d1628768b46c1f8eac962bfd8ef73e2a59e466fc4022395f7a194b4309195c954b0d7e0d13254f67 +DIST dropbear-2024.85.tar.bz2.asc 833 BLAKE2B 1d0cc37fb1c528c6f7f6e064d3ec3d7c63617b568d8889592ca162171a325a46e84a23f24c16069b5396c806b2270434552833138ba95c7f34c8b5e6e425fcc7 SHA512 d2ad10b60f53d8d598a7a57337fe890c26c60bea115fb919f6135a01fe3f8f7e5863b0a7ed6c7eacbd5a3b810169b600c0004251a8d748d4b40584933c2c7383 diff --git a/net-misc/dropbear/dropbear-2024.84.ebuild b/net-misc/dropbear/dropbear-2024.85.ebuild index 85944fe6b816..85944fe6b816 100644 --- a/net-misc/dropbear/dropbear-2024.84.ebuild +++ b/net-misc/dropbear/dropbear-2024.85.ebuild diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index 65582d99871d..154df373c00b 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,5 +1,3 @@ DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712 -DIST dropbox-lnx.x86-195.4.4995.tar.gz 113305439 BLAKE2B 87dc38715189e06e98e5895389909f45a38208c8471ec92b9fb278c054ee5711d2acf95bdad01d34c097b96c8e3fe47d230af6bec8d3d2ff6782b1b477e23b61 SHA512 bf9ed46f1a34d96155b0d8f0c9d4a3583344d9eb06585e8e6c04e93dfcae7c55585861f31c2d70e79ba41f0141491aaf2b2c6b28b2baa9faf213ecdd97542fa8 -DIST dropbox-lnx.x86-196.4.6900.tar.gz 113848883 BLAKE2B 05ef3a79d3bbc67a15cd6ede011883424686b7302761ed49a9456735718c05f80a9a273e431283d1b32790b52ec3c6bdbce0253a5a570bdfd47c21f9d02e12be SHA512 652adbace0abbcbfa2729e9e5af11bafd1459924d67180f5be82e3c0feb81b8333307c3cfeb7e528cdcc576062783a1275bba82217bf3761b62b89775d0d3155 -DIST dropbox-lnx.x86_64-195.4.4995.tar.gz 115954161 BLAKE2B 86f349f6813e160eea71a6c32e37ee8213639dfaa6c69b0a560bfee8e90dae6a95fd0f3b822d6c029e3046d73aa088fb097ce9246c1c0786df9c292b40091adc SHA512 e4ad740d873dbdad995f05fcfda824f57a8ed4707acab66576284c97c00329ef1dbe2d55980694f2edc8a00fbc6ab20a08ca7afcc12488d9fb188cddc0c3501f -DIST dropbox-lnx.x86_64-196.4.6900.tar.gz 116604283 BLAKE2B 5398f43c33e488d346c9991952673b607e88f93467915ac7e341e29de6e66cb4f60bcc6311a0e261075df38834e53da7a38ac10b20bd4cf5d41f70394668ba13 SHA512 a43cdee6cb192085c484cbaf1aa54691ce8dc24eb682c3f2fb8f8ff7135f7590e4dbfeed33ec3afbd5dbfe2bb6fd72a8c136329ebd9e8223fcd5c63819d25429 +DIST dropbox-lnx.x86-199.4.6287.tar.gz 113741255 BLAKE2B bb7a9b52bfdad485de61fb5b36f4d0651a39769194fcc4a3960b72d0ebe35f0e82024ac449cc2b5a5f4d05eb23b9aa99faada56887049f2108ee931b59a35d22 SHA512 c9dfc4b19736f4b8eeb5ecde6badace4f6023cecf39a61b9729a96f73da6d866dbb4e46d9f5dd1e937ad85ea9966ad590ec80c7af4ff96b18b5cf3d2e6e4651d +DIST dropbox-lnx.x86_64-199.4.6287.tar.gz 116574689 BLAKE2B 8ab6032081b296d08a60fa4a7dd61399ecf333776381d7832dd3d5cc703c071d3991ca735283bc9421ace08b522cbac31ae0764727c34987c199e0c3506686cf SHA512 244f3f7601722bf2f4a821271187472c8bbbb088cfbf61891a6cdb8f9202cc3ec5deec0df88c1e9c39ca27a3addfa97261c75c880444d6cb393c0d15c815182a diff --git a/net-misc/dropbox/dropbox-196.4.6900.ebuild b/net-misc/dropbox/dropbox-196.4.6900.ebuild deleted file mode 100644 index 7d9715a71882..000000000000 --- a/net-misc/dropbox/dropbox-196.4.6900.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop pax-utils systemd xdg - -DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" -HOMEPAGE="https://www.dropbox.com/" -SRC_URI=" - amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) - x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz ) - https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg -" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -BDEPEND="dev-util/patchelf" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - x11-themes/hicolor-icon-theme - ) - selinux? ( sec-policy/selinux-dropbox ) - app-arch/bzip2 - dev-libs/glib:2 - dev-libs/libffi-compat:6 - media-libs/fontconfig - media-libs/freetype - net-misc/wget - sys-libs/zlib - sys-libs/ncurses-compat:5 - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/libxcb -" - -src_unpack() { - unpack ${A} - mkdir -p "${S}" || die - mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die - mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die - rmdir "${S}"/dropbox-lnx.*-${PV}/ || die - rmdir .dropbox-dist || die -} - -src_prepare() { - default - # we supply all of these in RDEPEND - rm -vf libGL.so.1 libX11* libffi.so.6 || die - # some of these do not appear to be used - rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ - PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ - wmctrl libdrm.so.2 libpopt.so.0 || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf images || die - fi - patchelf --set-rpath '$ORIGIN' \ - apex._apex.*.so \ - nucleus_python.*.so \ - tprt.*.so \ - || die - pax-mark cm dropbox - mv README ACKNOWLEDGEMENTS "${T}" || die -} - -src_install() { - local targetdir="/opt/dropbox" - - insinto "${targetdir}" - doins -r * - fperms a+x "${targetdir}"/{dropbox,dropboxd} - dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - - if use X; then - doicon -s 16 -c status "${T}"/status - newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg - fi - - make_desktop_entry "${PN}" "Dropbox" "dropbox" - - newinitd "${FILESDIR}"/dropbox.initd dropbox - newconfd "${FILESDIR}"/dropbox.conf dropbox - systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" - - dodoc "${T}"/{README,ACKNOWLEDGEMENTS} -} - -pkg_postinst() { - einfo "Warning: while running, dropbox may attempt to autoupdate itself in" - einfo " your user's home directory. To prevent this, run the following as" - einfo " each user who will run dropbox:" - einfo "" - einfo "install -dm0 ~/.dropbox-dist" -} diff --git a/net-misc/dropbox/dropbox-195.4.4995.ebuild b/net-misc/dropbox/dropbox-199.4.6287.ebuild index e90baaad900e..e90baaad900e 100644 --- a/net-misc/dropbox/dropbox-195.4.4995.ebuild +++ b/net-misc/dropbox/dropbox-199.4.6287.ebuild diff --git a/net-misc/email-validator/Manifest b/net-misc/email-validator/Manifest new file mode 100644 index 000000000000..0b9fbb98d60d --- /dev/null +++ b/net-misc/email-validator/Manifest @@ -0,0 +1 @@ +DIST email-validator-1.1.0.tar.gz 17544 BLAKE2B a738c0828881fc65b4fd9a6ec0d660f39ed8337338afd8def452871149907f871b5938f03dd94bd7469be544eb3281dcd82f89fd6f80dcaaf9c5ee402194baa4 SHA512 c6714db0fbaf7aa03e5171347c4efe2485a367345a8a9d50f9143f73c18a0ab609aed62816868826d180370d5020f626fd8e31c08d4524cf5157227d0b200c31 diff --git a/net-misc/email-validator/email-validator-1.1.0.ebuild b/net-misc/email-validator/email-validator-1.1.0.ebuild new file mode 100644 index 000000000000..6157158555f4 --- /dev/null +++ b/net-misc/email-validator/email-validator-1.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CABAL_FEATURES="test-suite" +inherit haskell-cabal + +DESCRIPTION="Basic syntax and deliverability checks on email addresses" +HOMEPAGE="https://michael.orlitzky.com/code/email-validator.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT=test # Ambiguous module name ‘Network.DNS’: dns-4.0.1 resolv-0.1.2.0 + +RDEPEND=">=dev-haskell/cmdargs-0.10:= + >=dev-haskell/dns-2:= + >=dev-haskell/email-validate-2:= + >=dev-haskell/hunit-1.2:= + >=dev-haskell/parallel-io-0.3:= + >=dev-haskell/pcre-light-0.4:= + >=dev-haskell/tasty-0.8:= + >=dev-haskell/tasty-hunit-0.8:= + >=dev-lang/ghc-7.6.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.16.0 + test? ( >=dev-haskell/doctest-0.9 ) +" + +src_install() { + haskell-cabal_src_install + doman "${S}/doc/man1/${PN}.1" +} diff --git a/net-misc/email-validator/metadata.xml b/net-misc/email-validator/metadata.xml new file mode 100644 index 000000000000..ffea1c02a1d2 --- /dev/null +++ b/net-misc/email-validator/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + </maintainer> + <longdescription> + Validate an email address using three techniques: + + * Ensuring that the length of local and domain parts is within the + RFC-specified limits. + + * A syntax check using a regular expression, or the full RFC 5322 + grammar. + + * Confirmation of valid MX records (or, optionally, 'A' + records) for the domain. + </longdescription> +</pkgmetadata> diff --git a/net-misc/etherdfs/etherdfs-20180203-r5.ebuild b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild index 6dae1d2c447e..9329f40b7423 100644 --- a/net-misc/etherdfs/etherdfs-20180203-r5.ebuild +++ b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild @@ -12,8 +12,8 @@ inherit systemd toolchain-funcs DESCRIPTION="An ethernet-based file system for DOS" HOMEPAGE="http://etherdfs.sourceforge.net/" SRC_URI=" - mirror://sourceforge/${PN}/${MY_P}.tar.xz - tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${PN}-tsr-${MY_PV_TSR}.zip ) + https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz + tsr? ( https://downloads.sourceforge.net/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${PN}-tsr-${MY_PV_TSR}.zip ) " S="${WORKDIR}/${MY_P}" diff --git a/net-misc/ethflop/ethflop-20191003-r2.ebuild b/net-misc/ethflop/ethflop-20191003-r2.ebuild index 51efe0cd19d7..714882673aba 100644 --- a/net-misc/ethflop/ethflop-20191003-r2.ebuild +++ b/net-misc/ethflop/ethflop-20191003-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit systemd toolchain-funcs DESCRIPTION="A network-backed floppy emulator for DOS" HOMEPAGE="http://ethflop.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.zip" S="${WORKDIR}" LICENSE="ISC" diff --git a/net-misc/exabgp/exabgp-4.2.21.ebuild b/net-misc/exabgp/exabgp-4.2.21-r1.ebuild index 23eb5f34e950..40fa0522f040 100644 --- a/net-misc/exabgp/exabgp-4.2.21.ebuild +++ b/net-misc/exabgp/exabgp-4.2.21-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools inherit tmpfiles systemd distutils-r1 DESCRIPTION="The BGP swiss army knife of networking" @@ -34,12 +34,14 @@ PATCHES=( "${FILESDIR}/exabgp-4.2.11-healthcheck-allow-disable-metric.patch" "${FILESDIR}/exabgp-4.2.11-healthcheck-fix-log-crash.patch" "${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch" + "${FILESDIR}/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch" + "${FILESDIR}/exabgp-4.2.21-patch-embedded-six-for-py312.patch" ) distutils_enable_tests pytest python_test() { - ./qa/bin/parsing || die "tests fail with ${EPYTHON}" + ./qa/bin/parsing || die "parsing tests fail with ${EPYTHON}" epytest } diff --git a/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch b/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch new file mode 100644 index 000000000000..78d26f73f093 --- /dev/null +++ b/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch @@ -0,0 +1,38 @@ +From: Vincent Bernat <vincent@bernat.ch> +Date: Sun, 2 May 2021 17:47:10 +0200 +Subject: Patch exabgp.service to fix socket creation on start + +Patch from Marco d'Itri. + +Closes: #886568. +--- + etc/systemd/exabgp.service | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/etc/systemd/exabgp.service b/etc/systemd/exabgp.service +index 17ce886..b2da5ba 100644 +--- a/etc/systemd/exabgp.service ++++ b/etc/systemd/exabgp.service +@@ -7,16 +7,13 @@ After=network.target + ConditionPathExists=/etc/exabgp/exabgp.conf + + [Service] +-#User=exabgp +-#Group=exabgp + Environment=exabgp_daemon_daemonize=false +-PermissionsStartOnly=true +-ExecStartPre=-mkfifo /run/exabgp.in +-ExecStartPre=-mkfifo /run/exabgp.out +-ExecStartPre=chmod 600 /run/exabgp.in +-ExecStartPre=chmod 600 /run/exabgp.out +-ExecStartPre=chown exabgp.exabgp /run/exabgp.in +-ExecStartPre=chown exabgp.exabgp /run/exabgp.out ++User=exabgp ++Group=exabgp ++RuntimeDirectory=exabgp ++RuntimeDirectoryMode=0750 ++ExecStartPre=-/usr/bin/mkfifo /run/exabgp/exabgp.in ++ExecStartPre=-/usr/bin/mkfifo /run/exabgp/exabgp.out + ExecStart=/usr/sbin/exabgp /etc/exabgp/exabgp.conf + ExecReload=/bin/kill -USR1 $MAINPID + Restart=always diff --git a/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch b/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch new file mode 100644 index 000000000000..ccbf33021d87 --- /dev/null +++ b/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch @@ -0,0 +1,52 @@ +From: Vincent Bernat <bernat@debian.org> +Date: Mon, 1 Jan 2024 09:15:39 +0100 +Subject: Patch embedded six for Python 3.12 + +Closes: #1058181 +--- + lib/exabgp/vendoring/six.py | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/lib/exabgp/vendoring/six.py b/lib/exabgp/vendoring/six.py +index 20e866a..5f8f3b0 100644 +--- a/lib/exabgp/vendoring/six.py ++++ b/lib/exabgp/vendoring/six.py +@@ -71,6 +71,11 @@ def __len__(self): + MAXSIZE = int((1 << 63) - 1) + del X + ++if PY34: ++ from importlib.util import spec_from_loader ++else: ++ spec_from_loader = None ++ + + def _add_doc(func, doc): + """Add documentation to a function.""" +@@ -182,6 +187,11 @@ def find_module(self, fullname, path=None): + return self + return None + ++ def find_spec(self, fullname, path, target=None): ++ if fullname in self.known_modules: ++ return spec_from_loader(fullname, self) ++ return None ++ + def __get_module(self, fullname): + try: + return self.known_modules[fullname] +@@ -217,9 +227,13 @@ def get_code(self, fullname): + Required, if is_package is implemented""" + self.__get_module(fullname) # eventually raises ImportError + return None +- + get_source = get_code # same as get_code + ++ def create_module(self, spec): ++ return self.load_module(spec.name) ++ ++ def exec_module(self, module): ++ pass + + _importer = _SixMetaPathImporter(__name__) + diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest deleted file mode 100644 index ba261e5f4710..000000000000 --- a/net-misc/felix/Manifest +++ /dev/null @@ -1,81 +0,0 @@ -DIST felix-3.1.3.tar.gz 467553 BLAKE2B 80fc599d5b2d6f57a251b6d679cd7b3ea461827e8f37fd3c798f1b8bbfd319449d037c0a5a6b7dcc77594a8f557897f7a228567fca8f95c00c028a8c4433e425 SHA512 2ba79babd27016a83ad525611917f1ed43707ccbdfda80bf40973698ac343255896aa978a38be58b58e13ecf6956a028caa5c2d0f1cbbef8a088961f449646ff -DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536 -DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b -DIST github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz 78903 BLAKE2B b2480753213e2c387d969c8dc68994cb6d107ebc970ecb986d4bf22b542d460814d0ba0e40b82e9022072142b201cd794fc8dc7bcfcb1531c9613f2c3408b7a3 SHA512 192b544268bd10048ca877d70b35faceb9c648e7298124678b21d727a27d569e61536f42a7030b7e40610ea5822c0bc2264cac03c340ecc90e43f9120b6734d9 -DIST github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz 43033 BLAKE2B 69ce67e0633e03f569908a567831a4625661855e466a072850ce5ca5ce60c31f92e2057fee31ab90a357ea5c563ed7525d3e4e2ae2f09ebe27d762018464ae75 SHA512 f1dd4d3768da18a5aeb2c2af5422400d4adc194c31c79e7208d96d1bd3c65d9a78dda67d174ebc6a8b3dbb7734c50f15bc445e6e834073188135a0b6ebcb4c38 -DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9 -DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d -DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277 -DIST github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz 804453 BLAKE2B 6dff8674476a5667ce4b43922acc1ba752a64d26f720c3554c73b88d5114d211a93fb994bba161911732a61d279b7f5610b5fc218b2985b87ef8a8353e3ca658 SHA512 13716991e01d8192137fa5551607f7320b7a369a5ca7ae29110060a5d9116a0d1c147b9f1fe6539eacbdf331bea2c6abb64c9da4bc921c3621e49e8bc397590e -DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8 -DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc -DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa -DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 BLAKE2B 9c999258dde04fdaeb9dd4cab9d5aaa854f99d0bb2fb6d7e9fa67b829c0d5062139eba06abe3323c1c9d79093b45f8c29e33835797a693dd73c217309ef33286 SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391 -DIST github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz 74285 BLAKE2B f2fe94848736a4f798e3ea31bc8a4e7259c11da56ab2811f47faf0d510ea66888e18ea9b805aa51b58f356809c3208dfd39be075b06811d0d40d1d289808709d SHA512 2ecce57da67d149e3329d76b6f811097760c42de3346c4353b1932af293cef32cb5b9913ec385619e932e632416f44b878aa621665a4cd6db0293e951ee2bb97 -DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6 -DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e -DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb -DIST github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz 34203 BLAKE2B 8eda5e022be1507d92f17ef3d2ca9f02df7a63d4bdae14d3486af05981d4007be0f32d1930341d5a724d20fd6f37d19dbfa9f1a703c14a86923f2940a5b3e2a6 SHA512 fdeb9b80afb13697b9b3084ea17e92fe2c528fec57bc4a18beafa18160201c94a9e31f85751d8eac836f2e41f818e547f5f2038c3a001c3f91a1187e1ba7846f -DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac -DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a -DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe -DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab -DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6 -DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5 -DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6 -DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455 -DIST github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz 1611750 BLAKE2B 510395566152cfb558ad71d8c5e9ad5821948265d58bf6e7943fc4889e92b6a6c95f627feab2750c119d5b303588152772cc5005e0d83fdfdba96256f7c513c5 SHA512 21ef1940bc1f1f854fa9497eb27a87b554e38d608e1ce5e0884fbf7203591f2fd52127062e85c50cbd366edceecbd226d4f75e96bb0014603200ada7d268abd5 -DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9 -DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3 -DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a -DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31 -DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0 -DIST github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz 4549739 BLAKE2B a124e96048fe4bf231b3e87e012d40f84de8541eefc4b3136451c75b6d45991b20893656fb920d014cb53a8ab5177a877c5ca48fc0dc43f92e50aa50d20d7ade SHA512 a4542d75a6326255d2cdfa48a454dcabf577fc04527973b6de00abb6d8bd4b04cfa4e6cf6b26fd3b2a546e6b4de7a36eaae409981dfe790b88a841a85348c83e -DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9 -DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4 -DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557 -DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136 -DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc -DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d -DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d -DIST github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz 5497 BLAKE2B 104080651e0cac64abdc78169b4a184e9c8fda803a6f629fa3ef4210015f0a76df7fc478ea88e3fc460ab49288633a27ceb452979b610d49475040b74cd2ece6 SHA512 8e444831301404454b0f1506a7cf20347bc42639691ad7946e36e30492e7d8108d83ffc974934632eec9c75f03e28ce75e9caf1e92980803a43fff82849145bc -DIST github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz 2806 BLAKE2B c41d5bd53f9f4bdff9e5b1cde8af46f3b3c8518af88b45a33625fa6cc4d89052fd6588d99dcaa1f6fe3ddc2a3e566b2da6ae30a1d218256f6707db4f0ca01c32 SHA512 e8f0a888f8103fca6714f6a13ba80434560488c9be389b47ca505e84a45bd18ecd08a19e88684c6af2ed550ca5c11c6a215791420426a89a79cce0dead452d47 -DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995 -DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c -DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c -DIST github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz 28143 BLAKE2B a2ef3db0067c5cf86ad17376c08f28efdc2d735a62dd10aec5b55ef5e4b711f0f6b281fbd6916a0f91fc9ef1e26415bac3d1184f6281c478506a17b4e6f31ba4 SHA512 e01209547e95f45d51d3794e912fe0a4343c61d54c3fca5f7ec6c13d859aeb7a2eab61b14ddeaa451acd8c7aa6f57bb000cf9b9c77c53a8fd0212be5e5df4687 -DIST github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz 12680 BLAKE2B 852a4445fa50334de624395ea375945e273b7bfdc2a2dccf677e75a18bde34408ddfc9c0f4329edadec31cbe148cb139cd8659b4e7ba5dde829c58e39228de9f SHA512 729b41f0302aeb23b077a7ad913cb70f06982c243a37ccc264d5475d3db693c6e019c5cf9eb6307d809c2c99a4d68d711d4e11fe062e907750247d3f3e1d519d -DIST github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz 5584 BLAKE2B 60e968bab9171dc1f09dfa3bfbe98324b4a536fc7664465154173a97f3a4a28a1adb1b8f659c5494b15c03ab8c788e8f9459fca2d6f0b37b7815da20d74e2072 SHA512 055351c704c9227b8d6cbb95177c2dbd554d582cc0ba4dfb5f8f0f550f80cfbd264c82b2a84010b8b1e9f02d9c759b4317f277f0f1b873a5eeb181cd0b672284 -DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958 -DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77 -DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7 -DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf -DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b -DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d -DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9 -DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0 -DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81 -DIST github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz 8208 BLAKE2B 4cd558c21bd893f17280c05550015f2f8148344d50dbd958f7cc7fa68d06223d0e732ace81c445f0091357d6d0a1564efd7d246af5cf432de0d8728f5cb1d250 SHA512 fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e -DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421 -DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec -DIST github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz 3009 BLAKE2B b68ad69058837306d4988760ab7a052d988a9ea8c297001698aadff3eb0c404b3f0953faca4b2f12a174aae9e5b6f77dbb793b44b356cb9a420bfdabd72d76b0 SHA512 21392e0a444215f0345548e38e5bd439c1d97742fe705060c9e6dd41c0646d4cffb2932b886f7080c4b849fa4f075a8496328f37112dbf87a81967b229f255c9 -DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010 -DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4 -DIST github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz 32162 BLAKE2B 4e7a0c8e4f84c6495f866f12f1da176c99d5ed7bed65238585b177a8edaaadc5981748b2d1c16fe9c8d9b4ec3d065212584462635ef3b25574c859834769adb8 SHA512 1e90f596f2888de1f61247d3f8ea084dd1248f17552408f14fc1dc7b794ddf547c288858d920b43fa5b340703a5385489ecde7b9065392324d457499560f07a7 -DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052 -DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747 -DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593 -DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755 -DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e -DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9 -DIST github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz 231051 BLAKE2B 0d799bcfa6396dc264bcfe1d90343f35444c6f21a5efad57e3358815c939fff4a6af587e75250f259ea243337fa27f2d0405163b002b2a05708016b663c17767 SHA512 c89213b92b36d509714be314bbe4db171e5682afb3ca69d771b4b53ead24e7105b03420040b6d57a7a5836a22f9dd1ef87da28b08e4726eef65ee5987385c4ec -DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a -DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf -DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b -DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507 -DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2 -DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51 -DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7 -DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz 122308 BLAKE2B 3b7e1486b64c0dfd9658b7e7e631b1fc4ae19155dee5392ab57929a51e0734b744399c7902ff558091046ea64f5f1ecacfb2594011d3077880356d659a42c9c7 SHA512 65251591bec228edadf1b0193d4b47f97cefd8eac1a54edd623d20186c70dbf49631562826bc193e81f3af3262a0211dde9b9638ee5a9ca7ded6841a2ebe65ec -DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86 -DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498 diff --git a/net-misc/felix/felix-3.1.3.ebuild b/net-misc/felix/felix-3.1.3.ebuild deleted file mode 100644 index 33172bc354ba..000000000000 --- a/net-misc/felix/felix-3.1.3.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_VENDOR=( -"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang" -"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d" -"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" -"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e" -"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea" -"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8" -"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20" -"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f" -"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594" -"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6" -"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7" -"github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5" -"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98" -"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272" -"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff" -"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72" -"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02" -"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed" -"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7" -"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017" -"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c" -"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba" -"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961" -"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6" -"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9" -"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7" -"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" -"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" -"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc" -"github.com/ipfs/go-log b9df188d0fae32d69c1a519fa81741668a12f55a" -"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c" -"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1" -"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e" -"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342" -"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14" -"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c" -"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0" -"github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade" -"github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c" -"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a" -"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a" -"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026" -"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852" -"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf" -"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240" -"github.com/opentracing/opentracing-go 6c572c00d1830223701e155de97408483dfcd14a" -"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4" -"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6" -"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1" -"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2" -"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56" -"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f" -"github.com/projectcalico/typha 5374e9f32bde159a4aa19c821618920f491004be" -"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1" -"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2" -"github.com/prometheus/common 7600349dcfe1abd18d72d3a1770870d9800a7801" -"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865" -"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4" -"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e" -"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" -"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba" -"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7" -"github.com/vishvananda/netlink dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb" -"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8" -"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390" -"golang.org/x/crypto ab813273cd59e1333f7ae7bff5d027d4aadf528c github.com/golang/crypto" -"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net" -"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2" -"golang.org/x/sys 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys" -"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text" -"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine" -"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto" -"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go" -"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator" -"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf" -"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml" -"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api" -"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery" -"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go" -"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi" -) - -inherit golang-vcs-snapshot - -FELIX_COMMIT="dba3279377fd6ec7baf0ee560bcaec685f25fa86" - -KEYWORDS="~amd64" -DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy" -EGO_PN="github.com/projectcalico/felix" -HOMEPAGE="https://github.com/projectcalico/felix" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+bird" - -RESTRICT="test" - -DEPEND=">=dev-libs/protobuf-3 - dev-go/gogo-protobuf" - -RDEPEND="net-firewall/ipset - bird? ( net-misc/bird )" - -src_compile() { - pushd "src/${EGO_PN}" || die - protoc --gogofaster_out=plugins=grpc:. proto/*.proto || die - GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \ - "-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \ - -X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \ - -X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die - popd || die -} - -src_install() { - pushd "src/${EGO_PN}" || die - dobin "bin/calico-${PN}" - dodoc README.md - insinto /etc/logrotate.d - doins debian/calico-felix.logrotate - insinto /etc/felix - doins etc/felix.cfg.example - newinitd "${FILESDIR}"/felix.initd felix - newconfd "${FILESDIR}"/felix.confd felix -} diff --git a/net-misc/felix/files/felix.confd b/net-misc/felix/files/felix.confd deleted file mode 100644 index 566b9b5aaaf9..000000000000 --- a/net-misc/felix/files/felix.confd +++ /dev/null @@ -1,7 +0,0 @@ -### -# Calico Felix Agent config -# -# The following values are used to configure calico-felix -# - -command_args="" diff --git a/net-misc/felix/files/felix.initd b/net-misc/felix/files/felix.initd deleted file mode 100644 index 92adbb10f489..000000000000 --- a/net-misc/felix/files/felix.initd +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Calico Felix host agent" -pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} -user=${user:-root} -group=${group:-root} - -command="/usr/bin/calico-felix" -command_args="${command_args}" -command_background="true" -start_stop_daemon_args="--user ${user} --group ${group} \ - --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \ - --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" - -depend() { - need net -} diff --git a/net-misc/felix/metadata.xml b/net-misc/felix/metadata.xml deleted file mode 100644 index e27dcb92b466..000000000000 --- a/net-misc/felix/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="bird">Use BIRD, e.g. for route reflection</flag> - </use> - <upstream> - <remote-id type="github">projectcalico/felix</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index e857adf29b43..83c12c3df495 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,3 +1,9 @@ DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd +DIST freerdp-2.11.6.tar.gz 7337387 BLAKE2B 6d6b338710fccc4ad5067f4cf7f17190409f5313cb0c2c4ad84c82326b605897e01e03e2f334346ae5e20642c7813b415d0123558c00565b4b8c11257ebac226 SHA512 4facaff07bc26434474776e2463c9ebf0111190cb6bcf7d3dc7a6b3d8e2de991925a92b7889b2c5dec50ee4cf28f94bb1016c36da207a00ead09005ea0ace36d +DIST freerdp-2.11.6.tar.gz.asc 228 BLAKE2B cfcd673da04fcd749883b5dbbc27f12d6680442991d884006401521222385c7b325af35828683d96e1de866850a9c4eaae5f26d4b3cff4111391dc31f94ca1bd SHA512 4ef9a1fcb6f97295affbe080657a5a812d73e3448e1f480b382774e6f6fd3276a4e251e94cac66fdc83ae974ccc0b9ca9ca2b82b76b5128915885a35fafd18e4 +DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca SHA512 e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e +DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2 SHA512 18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76 DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5 DIST freerdp-3.5.0.tar.gz 9335565 BLAKE2B fc417336cda9dd14a2c7605a2b0172220f711599356b38d4d346130fc865c1ef563e627b57bcb20843dae231d8cfda272261db30d956ea98c29ebf7908c4722c SHA512 5f6f6fc84d0fb3581b3debd8dde8ed7054275af46f71b6ebd618d240b196e26352cf5ea260bd819a2b4464101012184910715b546701a95fc1aa951433150b07 +DIST freerdp-3.5.1.tar.gz 9338947 BLAKE2B dd004333a52046300a5f319346da46ddb460e8acbb5902dc4daa18e3d0b6e3d9ee1d43f43e54f0887fec68cf6a952567be4c7995e807099585b9062a56058506 SHA512 6c7861131e1ae2cf824659fe8cff34e0f608c4e3796b64f02a61aeeaa12dce76aad2bfa5096c821f0f86fde82ffed7e4876f20cd4016ea1adb7555e4828551d8 +DIST freerdp-3.5.1.tar.gz.asc 228 BLAKE2B ae5826e539f0078d3adf7a4886f0b0c249c73fd2fc7ae21dcf815d876ec26f4482c242c076dbd9dcadd18927f4f97199f16fac3b40c0c04b1e43482865af15dc SHA512 ba52d6a5aa3d91fdab988d91b8591ccb075ce3d52bbee0596ffdb50902b54e650b397995f273463296a484199b969bab47708b5dbfc76c4128aa54ec5afcfdf2 diff --git a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild index 207ee831d3b4..6c9b29344718 100644 --- a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild +++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild @@ -15,7 +15,7 @@ else MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" @@ -98,10 +98,13 @@ RDEPEND="${COMMON_DEPEND} server? ( !net-misc/freerdp:3[server] ) " -PATCHES=( - "${FILESDIR}/freerdp-2.11.2-clang.patch" - "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" -) +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + ) + cmake_src_prepare +} option() { usex "$1" ON OFF @@ -155,8 +158,7 @@ src_configure() { } src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) + local myctestargs=( -E TestBacktrace ) cmake_src_test } diff --git a/net-misc/freerdp/freerdp-2.11.5-r2.ebuild b/net-misc/freerdp/freerdp-2.11.5-r2.ebuild deleted file mode 100644 index dfd5ba988b49..000000000000 --- a/net-misc/freerdp/freerdp-2.11.5-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2011-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="https://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" -COMMON_DEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - X? ( x11-libs/libXrandr ) - ) - icu? ( dev-libs/icu:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - kerberos? ( virtual/krb5 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-libs/libpulse ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${COMMON_DEPEND} - valgrind? ( dev-debug/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - !net-misc/freerdp:2 - !net-misc/freerdp:3 -" - -PATCHES=( - "${FILESDIR}/freerdp-2.11.2-clang.patch" - "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" -) - -src_configure() { - # bug #881695 - filter-lto - - local mycmakeargs=( - -Wno-dev - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_ICU=$(usex icu ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_GSSAPI=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_OSS=OFF - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) - ) - cmake_src_configure -} - -src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) - cmake_src_test -} diff --git a/net-misc/freerdp/freerdp-2.11.6.ebuild b/net-misc/freerdp/freerdp-2.11.6.ebuild new file mode 100644 index 000000000000..2a7209cfab84 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.6.ebuild @@ -0,0 +1,172 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + inherit verify-sig + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto +" + +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( sys-apps/pcsc-lite ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + ) + cmake_src_prepare +} + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-2.11.7.ebuild b/net-misc/freerdp/freerdp-2.11.7.ebuild new file mode 100644 index 000000000000..2a7209cfab84 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.7.ebuild @@ -0,0 +1,172 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + inherit verify-sig + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto +" + +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( sys-apps/pcsc-lite ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + ) + cmake_src_prepare +} + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 6a6c319f26f5..2a7209cfab84 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -12,10 +12,14 @@ if [[ ${PV} == *9999 ]]; then 2.*) EGIT_BRANCH="stable-2.0";; esac else + inherit verify-sig MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" @@ -26,7 +30,7 @@ SLOT="2" IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -BDEPEND=" +BDEPEND+=" virtual/pkgconfig app-text/docbook-xml-dtd:4.1.2 app-text/xmlto @@ -98,6 +102,14 @@ RDEPEND="${COMMON_DEPEND} server? ( !net-misc/freerdp:3[server] ) " +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + ) + cmake_src_prepare +} + option() { usex "$1" ON OFF } @@ -150,8 +162,7 @@ src_configure() { } src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) + local myctestargs=( -E TestBacktrace ) cmake_src_test } diff --git a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild index 96042d27fc4e..a616aab29951 100644 --- a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild +++ b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild @@ -15,7 +15,7 @@ else MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" @@ -176,8 +176,7 @@ src_configure() { } src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) + local myctestargs=( -E TestBacktrace ) has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) cmake_src_test } diff --git a/net-misc/freerdp/freerdp-3.5.0.ebuild b/net-misc/freerdp/freerdp-3.5.0.ebuild index 8285a658a86c..78789fee28fc 100644 --- a/net-misc/freerdp/freerdp-3.5.0.ebuild +++ b/net-misc/freerdp/freerdp-3.5.0.ebuild @@ -169,8 +169,7 @@ src_configure() { } src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) + local myctestargs=( -E TestBacktrace ) has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) cmake_src_test } diff --git a/net-misc/freerdp/freerdp-3.5.1.ebuild b/net-misc/freerdp/freerdp-3.5.1.ebuild new file mode 100644 index 000000000000..0c7ce6eacd22 --- /dev/null +++ b/net-misc/freerdp/freerdp-3.5.1.ebuild @@ -0,0 +1,184 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + inherit verify-sig + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="3" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xsl-stylesheets + dev-libs/libxslt +" +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + aad? ( dev-libs/cJSON ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + fuse? ( sys-fs/fuse:3 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] + media-libs/sdl2-ttf + ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( + dev-libs/pkcs11-helper + sys-apps/pcsc-lite + ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:2[client] ) + server? ( !net-misc/freerdp:2[server] ) +" + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + + # https://bugs.gentoo.org/927037 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF + + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_AAD=$(option aad) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CLIENT=$(option client) + -DWITH_CLIENT_SDL=$(option sdl) + -DWITH_SAMPLE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_FUSE=$(option fuse) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_JPEG=$(option jpeg) + -DWITH_KRB5=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PCSC=$(option smartcard) + -DWITH_PKCS11=$(option smartcard) + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_UNICODE_BUILTIN=$(option !icu) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die +} diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 8285a658a86c..0c7ce6eacd22 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -12,10 +12,14 @@ if [[ ${PV} == *9999 ]]; then 2.*) EGIT_BRANCH="stable-2.0";; esac else + inherit verify-sig MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" @@ -26,7 +30,7 @@ SLOT="3" IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -BDEPEND=" +BDEPEND+=" virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt @@ -169,8 +173,7 @@ src_configure() { } src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) + local myctestargs=( -E TestBacktrace ) has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) cmake_src_test } diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest index 33080fee8f38..ed66d088a7ac 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -1 +1,2 @@ DIST frr-9.0.2.tar.gz 10341186 BLAKE2B e9c32bf48dc0adc7dd6c23ad1a2779065c762dc6e461a3f86d6b7afbef245345dc65b33d9dd5b499d4c4a7fb3b80a4416bdec9b42e7d15f2864d80c088e2ad4f SHA512 2cfd1a63cf073b8767fd67d9992d9a775d856234a532b13699304b6b1f15eb68bf1301f2f4c503b151fd5c8191bff67aeac9c7a4dc4a3ddb06f9a5db081423b9 +DIST frr-9.1.tar.gz 10779477 BLAKE2B ba64f9455c38441f8cadce4eed435fb86344244e98bd1b675335887fb098be29adc035d722d3c128e136a4c6b0aa1adcbdc0e22815702e52170da940a5caf20a SHA512 77b278a3ea87da9dfd7b87e4f9ae67f08ed0f24809f6dd228d2ab2e2c29e2b3191d59d50fc474e53e159ac6c79c302481b462125d0657889516f07b8e05e8562 diff --git a/net-misc/frr/frr-9.1.ebuild b/net-misc/frr/frr-9.1.ebuild new file mode 100644 index 000000000000..ba22b713cd72 --- /dev/null +++ b/net-misc/frr/frr-9.1.ebuild @@ -0,0 +1,140 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools pam python-single-r1 systemd + +DESCRIPTION="The FRRouting Protocol Suite" +HOMEPAGE="https://frrouting.org/" +SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz" +# FRR tarballs have weird format. +S="${WORKDIR}/frr-${P}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + acct-user/frr + dev-libs/json-c:0= + dev-libs/protobuf-c:0= + >=net-libs/libyang-2.0.0 + <net-libs/libyang-2.1.111 + sys-libs/libcap + sys-libs/readline:0= + virtual/libcrypt:= + grpc? ( net-libs/grpc:= ) + nhrp? ( net-dns/c-ares:0= ) + pam? ( sys-libs/pam ) + rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) + snmp? ( net-analyzer/net-snmp:= ) +" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc + doc? ( dev-python/sphinx ) +" +DEPEND=" + ${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) + test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) +" +RDEPEND=" + ${COMMON_DEPEND} + $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') +" + +PATCHES=( + "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch + "${FILESDIR}"/${PN}-8.4.1-logrotate.patch +) + +src_prepare() { + default + + python_fix_shebang tools + eautoreconf +} + +src_configure() { + local myconf=( + --with-pkg-extra-version="-gentoo" + --enable-configfile-mask=0640 + --enable-logfile-mask=0640 + --libdir="${EPREFIX}"/usr/lib/frr + --sbindir="${EPREFIX}"/usr/lib/frr + --libexecdir="${EPREFIX}"/usr/lib/frr + --sysconfdir="${EPREFIX}"/etc/frr + --localstatedir="${EPREFIX}"/run/frr + --with-moduledir="${EPREFIX}"/usr/lib/frr/modules + --enable-user=frr + --enable-group=frr + --enable-vty-group=frr + --enable-multipath=64 + $(use_enable doc) + $(use_enable fpm) + $(use_enable grpc) + $(use_enable ipv6 ospf6d) + $(use_enable ipv6 ripngd) + $(use_enable ipv6 rtadv) + $(use_enable kernel_linux realms) + $(use_enable nhrp nhrpd) + $(usex ospfapi '--enable-ospfclient' '' '' '') + $(use_enable rpki) + $(use_enable snmp) + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + + use doc && emake -C doc html +} + +src_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + default +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + # Install user documentation if asked + use doc && dodoc -r doc/user/_build/html + + # Create configuration directory with correct permissions + # Create logs directory with the correct permissions + diropts -ofrr -gfrr -m0775 + keepdir /var/log/frr /etc/frr + + # Install the default configuration files + insinto /etc/frr + doins tools/etc/frr/{vtysh.conf,frr.conf,daemons} + + # Fix permissions/owners. + fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons} + fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons} + + # Install logrotate configuration + insinto /etc/logrotate.d + newins redhat/frr.logrotate frr + + # Install PAM configuration file + use pam && newpamd "${FILESDIR}"/frr.pam frr + + # Install init scripts + systemd_dounit tools/frr.service + newinitd "${FILESDIR}"/frr-openrc-v2 frr + + # Conflict files, installed by net-libs/libsmi, bug #758383 + rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die +} diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index b311af478894..36f39dcc40a0 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,2 +1,2 @@ -DIST gallery-dl-1.26.8.gh.tar.gz 659327 BLAKE2B f0d394c077fefda91fce494fa8bd6ef369a634f06f3303c4f91009b3d5d381a40aa8918e639ed6faddc9000d5a3091a569124d62b794d727c46354bc144c8b63 SHA512 f8093d8e51c815333a182d1cdf5134d2e54d10b44067a0130943993d63e49d4e51d5bb9eb1704b7999639e73ae8ab4cadb6a8d0fb444abbe26ffdc445e5cdb5f +DIST gallery-dl-1.26.9-5227bb6.patch 3415 BLAKE2B 864d6877ba9f6ee6449465ebce9b6648325c176f2ae4062c27e7059852b05983a99f203aabc9e3c361214b14d489bdb450920879171385474ddec50d83f1b937 SHA512 6931eeb00f6fcd6b9005672aa23ed2b0270846758a762a8a86ef51ca860bea2563673b02881abd5a1a224b7518a89e66de46da5cc0a7994d58078886aa090c64 DIST gallery-dl-1.26.9.gh.tar.gz 670467 BLAKE2B 849d20ff6fd802915b3bc4f6bb11d638d1e8f24f1dbdcfd5946461798044d59bf9243faa370cdddcdffe40a24d39d44a43abc79b4c8e89e7c60b40e5e204603a SHA512 54c2a86a67c53b7d5c62e6c23c549fd89503386549dc9d2f9c7de058b52ecb60b5089555e97dd0b63d33686e1bd08a3be940152715a6d26647e6949e641df9cb diff --git a/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild deleted file mode 100644 index 310c7066bc74..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="sqlite,ssl,xml(+)" - -inherit distutils-r1 optfeature - -DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl/" - -if [[ "${PV}" == *9999* ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/mikf/${PN}.git" -else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - - KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] -" - -distutils_enable_tests unittest - -src_prepare() { - # Tests against real servers, some tests always fail and some are subject to change. - rm test/test_results.py || die - - distutils-r1_src_prepare -} - -python_compile_all() { - emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man -} - -pkg_postinst() { - optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg - optfeature "video downloads" net-misc/yt-dlp -} diff --git a/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild index 1e6696f28666..74f78f4c094c 100644 --- a/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild @@ -17,10 +17,14 @@ if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/mikf/${PN}.git" else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" + SRC_URI=" + https://github.com/mikf/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + https://github.com/mikf/${PN}/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch + -> ${P}-5227bb6.patch + " + + KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" fi LICENSE="GPL-2" @@ -30,6 +34,8 @@ RDEPEND=" >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] " +PATCHES=( "${DISTDIR}/${P}-5227bb6.patch" ) + distutils_enable_tests unittest src_prepare() { diff --git a/net-misc/geckodriver/Manifest b/net-misc/geckodriver/Manifest new file mode 100644 index 000000000000..d2b94a05ab3d --- /dev/null +++ b/net-misc/geckodriver/Manifest @@ -0,0 +1,182 @@ +DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b +DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c +DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 +DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16 +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b +DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f +DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 +DIST clap-4.4.12.crate 54784 BLAKE2B d5825ac67b7b7f1567024d1d3c2a54027819e0d6da87e022ec02867060952d2727f9413a2cea8ba11185649c25863a506e1fdd9421bd92eba79399fae86eaf02 SHA512 003c7ee7b71254a1d8977282bde75b57a8e191abb0439f66695c047cbe63ad1bf7ab1a14ed79b415c7bd6144f82d49a77325f618a34c932f258bed98903bb97c +DIST clap_builder-4.4.12.crate 163345 BLAKE2B 37e655a7c9ca21dff4445629e041d5ae2aec1ef0d44e21c09dcb860253c3f52d04dc2bcfd37e2ed7e9839d5c01fa86bb2613d5aba1b4112cda51e879f35f80d2 SHA512 7edcd85a45f17d4f6f87e463bfd9f5e0348067907b13a1f625007f0527544af21476b3805988e2b6f5baabce8ab5deb08f80b3d94ab5d5535fd310c6c668a21e +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST cookie-0.16.2.crate 34632 BLAKE2B 095c8c4fbd8bd2aca5f1bc2bf7f37f231878e3ea9e2646e7c2e63bc7ff824ed0a55f80216e9d1f0466e6fab306a0f211d08c093278f4f23c07762ded9e2033c5 SHA512 f006bb19f63065c6ba9a7553c1d97643e261723f3d5087586811acfe595b3c7d90f7e5c83431a44a50d0b4a36667635ad09e5cb307e323cde14820dfd38e57c6 +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 +DIST cpufeatures-0.2.11.crate 12727 BLAKE2B 5b91dffb779e437606db9b75d2b05c2de19069575a8272112e9a0389f5bd8de0f753cd90330b5a5bb6a3f84c9e794e96328664557db31c43853ba43097229efc SHA512 af179e269a4d5f48b50134a5e98ac541a9a0d6aa34f13fb8fd9ce8d5092352e1b322437254449ecb1bce608d8558b1cca2c79232ac1327efd887193bd1d36031 +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST crossbeam-utils-0.8.18.crate 42383 BLAKE2B f0b58626f3d40c5a889572e0f5fdb468e4c13ce0afc09aec1a75e1c5888cab56fbc644f592c620e1d28aae79687c4446146d9f783d96f8bd177d0a4a559fe8dd SHA512 977f41d7596a8d206fab665570f155479e15a83698fa54e714305d56ce32d78abc6f778b5f6e3c379ed1da27e241639cf4d0cd12922383f774ae85b32a4dc550 +DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f +DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 +DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c +DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b +DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f +DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 +DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284 +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c +DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 +DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3 +DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d +DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 +DIST geckodriver-0.34.0.tar.gz 109474 BLAKE2B fd2b0815b02668eafbc4fc37e81d7adcc7466b366edcf17c50b391a1f1dc466b1e64925dd589c75f8d59d4387ff2285141130b8432f778238a1139070977a221 SHA512 4ef85427db7b3c8a3171d3c9808eb26ad276c734829d3916e1a6b937294befe3e6f0c3980624a21005433aa5caaf270746ce0a383c3fede3ba77b86f6f862b0b +DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d +DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345 +DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25 +DIST h2-0.3.22.crate 166413 BLAKE2B 058456b6799d1ff73dc914b37279c4ad2cf5f8cf4fa2532dc6e1fab76c3f8ba67589c3fd481f5fb02b2df3927ea75c8a4c359943565ef81af6d5759bd679fce5 SHA512 70cc7e246ac554c9a15bf2d53a5473e878f426fa426fa266fd91fc2ebf4071b7b207c4f7f104f84242f6f9163ff4c790432f73b61b43e1ef5231b0ff424ceaab +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 +DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1 +DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd +DIST http-0.2.11.crate 100478 BLAKE2B 1ef12d67fc52392322c24f79ca49c52fcd7dcad0145b761c8aea21fef38682919d664161f242c606a1f3737987368c08432f33e2abfa53d681c6c2aa5cb000cb SHA512 71d98f5fa55c7bdb9fb31e36f898e8b2b7596dcb30ef9b5df3e34581b7306b66a782e82c2797732e28626eec5c9e432cc0475703e5a0e0e47aa1d6f22235ef51 +DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462 +DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f +DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a +DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7 +DIST iana-time-zone-0.1.59.crate 27033 BLAKE2B 5d7c9fa38c85a99ae9da34c881e1b6b626c6a1356d7de412868a26fbb469bdc8408a0baac4fc940354d5223b3004924819a1d1663b129d9addb22689a55f900c SHA512 3c9da44a31423b451cda42b1fd340b29f18c05fc88f4e3c5b0ad5d1e6cf426691cc87b7ffcb9f47c12c4e8d9a3b504e44edc7f6975b867cf8612e93e6eac1f91 +DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 +DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600 +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 +DIST js-sys-0.3.66.crate 80765 BLAKE2B 366f2741a1f7bc76f78068e183080bc221d45fb9adca257da61fd05a3f9044b7c6dd9d1c317e29af30effb28fb969bee2f766ff348f14d9d036f1a7e6bc2e599 SHA512 7244c856b2455d441e02eb12227517a101af28596d676797ae45098512052c09650612a93d912378d27254c5ac64dba9b37057c7493c1e3d3e0d52b2169340ac +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.151.crate 736640 BLAKE2B ba8ea6d22b0eefdc5c1c5ee9fab960b6ea0eb7098a21b032563ec78b5d6e2a8f1d7ca4d5bb721c71de2c5de28e105029f229b9b03cd5168c78a65c7164e6d07d SHA512 2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec +DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41 +DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb +DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707 +DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST marionette-0.5.0.crate 9683 BLAKE2B cd0205fc7d3951467ac73289a405e57dcede6aeb29d4a52886249a17f2e48f6f90f6fd3a0d886cba44aaf6bf02010306fb03a50589303bcc0101c03429c0ca39 SHA512 ccb3ff896b931601de72bd1d6fc2158fc8af61efe26b33c5a1896639ed2178e3afc3dd33eae2d8a9b19107b5fcb8391a854fec743b3a2e1d2d6b04024c28c210 +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 +DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 +DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908 +DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c +DIST mio-0.8.10.crate 102345 BLAKE2B 82bba95cfbb51a02efda75dc85d973825f038f7d23e7fd0a93a60293fbafd304ae064f395a1aeb63a1bc7bc664a0c0dfa3721ac8a553ea5161c0ab2862a6edcb SHA512 680371f7da07824fcdc1e8c10a6771a71b97308c47bb5b295e0338fbcb56e211dfd91e1b400a080984c57055f08db24ca675c167f298a3dd4842a185bde62fb2 +DIST mozdevice-0.5.2.crate 14449 BLAKE2B a3119d355da681ca8abd7db5ae655ec654a271696e0978567ad07d1ac08e3e80548908c995103024f03a20fda42aeda186dd0a77a977b29c1ba0dca23fe23163 SHA512 bd63863bc711083a047c38b2856870ba88bf6d678e050d02d6775ce4956adb70e0d4ec3e6ffaa271f3b60c583c62cb0595fd7637e8a4e096d2f6976e95d36085 +DIST mozprofile-0.9.2.crate 9786 BLAKE2B a5e4e20c11ba6fc009c40dd0b5606bc3d6360d35e6bbed4a2ff7bc8b761e94845ef4a981012fc13130325c6ff9c9d5d86ec4b90f0e930a1888c8ac091c2f2d34 SHA512 031ab3f61ea18d0e23ae2f0212eb6c72984f19859c738ba240a49217ef83aeeacc6f2e4038421b25bcb97001a214dc91c969236485f6af95d0fa3994280d188a +DIST mozrunner-0.15.2.crate 12767 BLAKE2B 791aee5dabfccba57f711678f5e62780539867de5d5e221935ea3f5c0d19846c1bf11551a8569f7dde07a0334c2f52287dda735c00559c22be65a1ef2abe9c2f SHA512 39b9f52b462af39fed42c5a3db0bf4e7b2582ea788710dae8182ee50f608c8be16b2d5d11824911d47e4183878a5bc8660c1545afdfd4254487cf1e222cf0240 +DIST mozversion-0.5.2.crate 4126 BLAKE2B 0d8c72c1f5fe474cd46ce654b835169845bdda568ad945df8b7f30c098cc649c72f86f11ee0ded0450faff3a8274f3bd3436b3a819cab1d8e62d9399005aa026 SHA512 7def4945e11aee02464c1cd11e5954c442101029e546859a72c03c12459e2486f874d24bce2b0daaaed3e4a02df8756f8688f323df9f403833633fedf90897b4 +DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e +DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST pin-project-1.1.3.crate 57740 BLAKE2B 5201a01cee2e98caa0d3ed1ff25d4af8c4a74bb0a6f5a4382c3e2d90bfd5a2cc588759867e77553225f5bef547bd6be8bf1f613516748ecb26da9181d4460b85 SHA512 91b5e0a66e620dbad6b189cc45c41dfe2493d5ce09783f1bd556cee0ac1b3b103507c39c77a393c45fb6eb93dc1f1b9efd4ba5e2a9d4507240978f1020f12aaf +DIST pin-project-internal-1.1.3.crate 27824 BLAKE2B 23b59024481710102677ba35aa8db8e27f6ce0973941addc11bc8a994031c2a4fe04cac197f04fb13c61110e554953883f50b4df15dd632e4c59fc8422fb26b0 SHA512 d2aef23074cdce910fbed47130636dfe3fcb6ab255c6fb4ff822d364d54d181f007c80755ae6f8c7519054888c1a763738d523217a8157542aa35007a77f2288 +DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST plist-1.6.0.crate 47932 BLAKE2B 1996f016b12205fee8a22d52e78d5fccd309407728bc7ef516d7c54e998e76051f405032cc9fd72b8f2d81d509ce6e0aff28e088fe97e1f222e5af0f18a43705 SHA512 025f7a04cc0f16a3f44af0c63b5fbad49bcb7227460ba4e7849499a4436836b86d331c81c936ed246ee700fa2556598f9f745c1d2bf5196e0222625db0a2633b +DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 +DIST proc-macro2-1.0.74.crate 45383 BLAKE2B 926802f43624216a01d355f78e0d14a113b72a2d01cf0a754c7dc29f3722a394546184e157c9a3475de495b8bf8f824847812314d3620d8ea083e53d9419a9c3 SHA512 7bb247f7b0274f4011032fad056bf5c11f2887364479eb997a62ca5659c0c8b1949f020bc9d1c12a50e5bc6ce03d025be55dd1a1c68b3377eef4469af6514c3b +DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST redox_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269 +DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3 +DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 +DIST rust-ini-0.10.3.crate 9938 BLAKE2B dd8956128b164de522b42d6637f984a5f97a1f330afa92517c6a2c459435fb972f39517d036413423c5629bfaa3789a1d7406d66d10e2fa6dd3bd040777710ce SHA512 0ca4cd15d81ed8c5cdf659e6b5ec91bc6a2e014380d6891936711d2ee2639dea3141f825147e4fecd21205fb1df95909798272368a50db5c69e7ede7856b8169 +DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 +DIST rustix-0.38.28.crate 365398 BLAKE2B cd9401511363c806f0c8de5076031aebd22a9c6cdc49963277bd7a58ebdccaa59c33710ee625bc0a07fe2102f370e39143adca0651d123a0dfeb562d32e7a537 SHA512 a48c959c0fbc9700294b1ab0fb71a303bcef89a01b4407c2d7dc7c83b35dfbdb69bb6ac9a364ba7d68b4e561445e6c227af586cab15d9799de9e6622e89ada12 +DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37 +DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 +DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72 +DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c +DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25 +DIST semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35 +DIST serde-1.0.194.crate 76863 BLAKE2B f77db1450d3be27cd2304433d2964745c0de0752c80f4aac03017f097d43470bee8e45af82934b77c182e1a6bb08b39a1008145ebf399bb86a0a2cf5483d4c2f SHA512 8bff0dce77f270303c5a14f9b41bf8f955efd4c794bec2b59e8e0cc1940ad462abb8711cc1a8e2ff6f51cb3ece354be526f81cb27350e0595b92c66a5acde7a9 +DIST serde_derive-1.0.194.crate 55685 BLAKE2B 18e8e061be5f9085c2f0bf8e44baeff2a50248f26365b1a4cf5d64aeec518a0e11ea610bc3cc28965dba69c658e6d645e5c1ca6d5d4714000ead3192495bf8d7 SHA512 4219d286d279aadbc5791f4a8bd922a302458ee5056e75052d4653024b9ec7353c2337dc8ac716488d603aa791c5d848912ed0ef90bc235c4e9d47629245ab02 +DIST serde_json-1.0.110.crate 146448 BLAKE2B 9fb35fa711ea16660bf433dfeb02475b15f216c8f579f70a131a6b7d49cee95e74f88b87e8ca50d1ab35e43e2a5e36f4562f5e3bbf5e4f0da3e2f6c7d5df50e1 SHA512 fb163784981093f30de15e920aa68c8e58179ddcb536d5cdba2318d41f88529c30b8b03193a6900efe954dcd933d4577422756670f4df8841ca70a1196b31284 +DIST serde_repr-0.1.18.crate 9974 BLAKE2B f6a8b2c8bc759bc8cfb3826489faf67da13b1cbe2432c30ec877036924869b9cf7c1ead2809b8e5852e352b51c91f40fa892ca68832ea567e4a7df29f8590a98 SHA512 09d77ccc60a748f8c95998632459f52268cf45949c0e22250f751eeaceb7336c03a457587af7bdc6fbc188cea4e15e77c8bf63d9741a9ae31fd0b8e787cabcde +DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 +DIST serde_yaml-0.8.26.crate 40670 BLAKE2B 78ed7b0d45677e2ff5bb94e9a12be0ab72eb2229e064a3e357a7ea3566648f10fc6c2ad5c07ce6067841392c97d4034da5d54d51939a08d81f64815ccd798642 SHA512 f6bde42539fe35dcb09fd506149c564f2056102f15ce275034b33c40ae666e22d6beaecfed8a0048704547f153fe13d52b8b305c95a61007784ee42f6a8372dd +DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f +DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 +DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.46.crate 250537 BLAKE2B d963daa4b6bffb4de6823cc2e37bece7266f6fb4415f32cd0c33a2840870766e04231ab6ea2d7d09b0886797bce13ac433c8ad30a541e66a98c221b42358d8a5 SHA512 5219718a0f3e8d76066212df4d52f04ab0953e4c2333d64b24a8bd9651de9f5caa41b1b7a6657b9707f2303f4a5db7fc038bfebd25aa08700417f9f9d76e0178 +DIST tempfile-3.9.0.crate 32182 BLAKE2B 4e802990988aff3ab5173bd96dbd906651a8df46b2619e6a500a3b9e7f4a3cd01dc7ee977791343f7875afdc4793a845000bb363d8c1a6599aeb6b1efcce5d56 SHA512 04e06c966bfa7a1567e7185ebd5c2876b96e46e36af14931bf0eba63795cd20d1c3427b6709a4cab2a68b8d289fdabd5537a50e5407a76e3a9fa0dcc7d3ce6d7 +DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681 +DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c695a200aae3e076b55948791cc51a29e8818d64451b17233ed4d095d0ef63ba4fb07502f4ffde5af738b8629c37 SHA512 6b7c856745256d6ef9e7ab2ea0027f9c1ed2c75ed5b075068af57cf706abfd835fd4552d9ec7578bece1f820086828c5dec85a9cbada409569838cdc9d63936c +DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde +DIST time-0.3.31.crate 121762 BLAKE2B af9097f5e44bf1a2d3bfd26e094e5c3bd17697b35ace2549167ce9f766e422d34f619b230fa81e5de6296f6d01de74a58923d7e69f7db04d6ad055d21f177bfa SHA512 e1cf8197f1eb9556e6320268eea35ca4e5ef33020fae94b181cc21d97b56c074b87ea783804cd7b7ff072736e498f0890b7af8e16c5492a12a4597a4cf33c4fa +DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 +DIST time-macros-0.2.16.crate 24356 BLAKE2B 807f56609924cf66dd57eba1d39b0b9302dbadff468562bd624c5413e5e9c36c416f670d558d519a89c0399b9b5aeaa41b2fa2bdbac9113e61bc830d7494a470 SHA512 19345f2bdf626cdc8c44bc11fbe9e13466cb7223cae89228c20ae83e7e9d71e8fe6a037b0461c289f9ceb6c8f08885458bc1db09adeeaddbbb0fbfb0dbfbf6c5 +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST tokio-1.35.1.crate 744407 BLAKE2B a3fed316542c4275aaa5c5b16353ae7e15306c9c6e06b86035b43df3b2a223ee4dbd9e8adbaf5a2426513279b68249afae5162bd53e14a6736b71bb1c0d01167 SHA512 75c14b714341db3764d2fde645c6ffac6f4e32be83b3ccf6315f3240fed96b65c75b8a0936df6e04a0a45cec49b3a781b5b8001282c91704f6a19ce7d188675f +DIST tokio-stream-0.1.14.crate 35881 BLAKE2B ae77512f93bb58c33036c1c0e7b8f29dd1d56274b6168a51b262c39184f0a3d366375414a3fca2a7c6c836f618e236189fdea3dbec39a861155409ffc9a77d3f SHA512 b600ef2dd90e0f46d21e94cd04baba91ec3f586832125cc2f51f350b47e7f9cc1ff5bc7529843347fc60043a61243e5b846d8db8406014969a8935385f161303 +DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c +DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 +DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 +DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 +DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08 +DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 +DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828 +DIST unicode-bidi-0.3.14.crate 56429 BLAKE2B 8670c2bb1ad98d4540d7837e8b395078b5e0eacc0dcb7ef3ecf6ddaff9d69ce136a883b99cc5bdafd3a3d657834432d0145b11a44ea1d8b776a5394e56ba04f1 SHA512 8793d415e33f1f693ba5928d8aa09ad6dc10bca6d8ad338fca527e5b142d1ea1cb84515459a9fa0a821ae68747cae570bd3872646fcf218ebc7167ad41c97379 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b +DIST unix_path-1.0.1.crate 22226 BLAKE2B 0a0fbd0e0489cc9f31139c12d93549990160b140e67c789bf0900468f17b8f3623b72aa2bda89e23e545d6a84efef796166d12a685745a4f9ec9142d50b693ae SHA512 7648ad86bd45f8ca536b33f582d2a9e9772afbec5508abd28de42d5d6eeecdcfcf9905ee85632be4653d1fc15a370fd27825879e285e0c642aeb1663d19b6a46 +DIST unix_str-1.0.0.crate 16226 BLAKE2B 8cebac54cf69825f651067e1ecf3d8cc6387e898775da1440eec9f3f5186bef6fd1dfb983ddaa11fe8dadfc9b2e50beb1653de4e026040d6e71994d2bead3c00 SHA512 3fa234e8a371fe964a2ede29e0be9f1fb91a6858111fa5bd164bd1eb2a248e71db16f9e9faae86a7ab709458d8fee96cdedf51f7894c7bf667cd3dfb1e757859 +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 +DIST uuid-1.6.1.crate 55554 BLAKE2B f9b8eb34f9197734ae9a1437ded396f5e5a8551b54e532053016e0c00c8007644f4fbbd3827c9878cdbf8acaa981d8ae9c94739af7edb6939ec299075ee4b443 SHA512 b9f3dbad176b3640b4b943d127ac8fcd0938e7bc750430626cc603efdcf5faf479f8de7940d64ed1b5b6e6378b42a1aaf3c1e791ee59b9db9394409261cf3c55 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9 +DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 +DIST warp-0.3.6.crate 116794 BLAKE2B ee3396698ba62593e80fe4d0090ada41919f056dadcafdb9533741cbecadb7203a9f436ecfc2d07c21be5034198f12b8c42b6a10e6ae19995d199d71e2a13a6a SHA512 a150a55e1625e2c95aaa0ca3bfc0e9b79e75c5d04898a6ae8cd91fdaad342ebb5c1b2305a6d10640eb0d67b19b3ba8f3fdad3c45b345967da11e29210a131255 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.89.crate 181935 BLAKE2B 88ff35daace267087750053eacdcf81f1d6cfd7653e1b21cd8436799688615a2840ab733e0196cde747dd4a49ffc3d4efc7c64f48e4e75bd9a240a689f7c037c SHA512 e9e3b95547423ac7acb0f0b327b9fde6c8ef3160296509332fe5d9cbf9eb6a4ed6ad30b29552cdcd113a94e95fab4e3ecc1e7a03811514f84fac569972febf5b +DIST wasm-bindgen-backend-0.2.89.crate 28205 BLAKE2B d280d04a6e8df72c0eb0d99b134c017be8c7d378578e23505ebb184510e6eab746fc06ca25333a62c24405565531b6e1c79a5010ae31aebb280c7820d5fe41fd SHA512 9ff63a2401e741013753fbbbc86990948e0e8820ffdb4b16167d2c72f12626306e5d077fef37d8d956acc73eefd699dc7f03250926a5609639b127d4e46daf1b +DIST wasm-bindgen-macro-0.2.89.crate 13906 BLAKE2B 93e4b784eaf75a070f471d7d60b802d42b4bdbfd0c7ec21ecf1dbda554ed2bed62d99c2b28ba1527ad8f6f3e5b6083d132f36f9c36efcfa9f6a9cfab73b1ca0d SHA512 060e0f300bdc42557798f4d7348165ac9dde60e4f7760acca5da6ec02bdf8bac22e2e5b80f733aae625a0c699dbe831e0afc6e66b2af8fe445aa6513c5180381 +DIST wasm-bindgen-macro-support-0.2.89.crate 20008 BLAKE2B 867ed0049f076d37e8c0587928d67209d69071a6beb80afaba35b947c16958d2c61ef1c762d1706de6744f23ed811815cd94f7059b3ad823aa99f30929cc3a33 SHA512 4ff50819d989733b51e6614b8b14992dc7e53e4c283b89c4e21dd50659cdc49a8cec379df7630ee26e04be62f4ff0bc5eeee9153dbeaec213e8217964a149e76 +DIST wasm-bindgen-shared-0.2.89.crate 7265 BLAKE2B 78668ee6af47357983788161c2a50562ff37a8d584e6be61142c5609360aa712571c3fac6b3395215c5d132edb864e0ce8e7b648fd7225433a81f2ae3e6a586b SHA512 02b2252b5b2e6bc8723404ee8cc750684f488b3e80ab60210d97fd7b343a67db2ef8d62aa792a5f02bb351467f4ffbc887512a215007f6fd089b29f8d3a23be3 +DIST webdriver-0.50.0.crate 32046 BLAKE2B 77522b682f4a82ef4450aead5f785a335348deb630588969546633b92b20381da3ba5d1401f5339b5c7dacf1357821f41466179c745dd6925106b5a59c163bd3 SHA512 2f116dc7d2b11432e8343dc888c1854972d754a0ec91cf19e24e4068a7074d54d4b3215daaf2547adac4ac922afe05c323c9b7c4d3c854cc8470b3959c0101dc +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9 +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 +DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c +DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0 +DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef diff --git a/net-misc/geckodriver/files/geckodriver-0.34.0-firefox-125.0-unchained.patch b/net-misc/geckodriver/files/geckodriver-0.34.0-firefox-125.0-unchained.patch new file mode 100644 index 000000000000..a366693def38 --- /dev/null +++ b/net-misc/geckodriver/files/geckodriver-0.34.0-firefox-125.0-unchained.patch @@ -0,0 +1,17 @@ +diff --git a/src/capabilities.rs b/src/capabilities.rs +--- a/src/capabilities.rs ++++ b/src/capabilities.rs +@@ -226,10 +226,7 @@ impl<'a> BrowserCapabilities for FirefoxCapabilities<'a> { + if !data.contains_key("androidPackage") + && self.version(Some(Path::new(binary))).is_err() + { +- return Err(WebDriverError::new( +- ErrorStatus::InvalidArgument, +- format!("{} is not a Firefox executable", &**key), +- )); ++ warn!("{} is not a Mozilla Firefox executable", &**key); + } + } else { + return Err(WebDriverError::new( +-- +2.40.1 diff --git a/net-misc/geckodriver/geckodriver-0.34.0.ebuild b/net-misc/geckodriver/geckodriver-0.34.0.ebuild new file mode 100644 index 000000000000..197a6abe6005 --- /dev/null +++ b/net-misc/geckodriver/geckodriver-0.34.0.ebuild @@ -0,0 +1,229 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.13.2 + +EAPI=8 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + aho-corasick@1.1.2 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstyle@1.0.4 + anyhow@1.0.79 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.21.5 + bitflags@1.3.2 + bitflags@2.4.1 + block-buffer@0.10.4 + bumpalo@3.14.0 + byteorder@1.5.0 + bytes@1.5.0 + cc@1.0.83 + cfg-if@1.0.0 + chrono@0.4.31 + clap@4.4.12 + clap_builder@4.4.12 + clap_lex@0.6.0 + cookie@0.16.2 + core-foundation-sys@0.8.6 + cpufeatures@0.2.11 + crc32fast@1.3.2 + crossbeam-utils@0.8.18 + crypto-common@0.1.6 + deranged@0.3.11 + digest@0.10.7 + dirs-sys@0.3.7 + dirs@4.0.0 + equivalent@1.0.1 + errno@0.3.8 + fastrand@2.0.1 + flate2@1.0.28 + fnv@1.0.7 + form_urlencoded@1.2.1 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + generic-array@0.14.7 + getrandom@0.2.11 + gimli@0.28.1 + h2@0.3.22 + hashbrown@0.12.3 + hashbrown@0.14.3 + headers-core@0.2.0 + headers@0.3.9 + http-body@0.4.6 + http@0.2.11 + httparse@1.8.0 + httpdate@1.0.3 + hyper@0.14.28 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.59 + idna@0.5.0 + indexmap@1.9.3 + indexmap@2.1.0 + itoa@1.0.10 + js-sys@0.3.66 + lazy_static@1.4.0 + libc@0.2.151 + libredox@0.0.1 + line-wrap@0.1.1 + linked-hash-map@0.5.6 + linux-raw-sys@0.4.12 + log@0.4.20 + marionette@0.5.0 + memchr@2.7.1 + mime@0.3.17 + mime_guess@2.0.4 + miniz_oxide@0.7.1 + mio@0.8.10 + mozdevice@0.5.2 + mozprofile@0.9.2 + mozrunner@0.15.2 + mozversion@0.5.2 + num-traits@0.2.17 + object@0.32.2 + once_cell@1.19.0 + percent-encoding@2.3.1 + pin-project-internal@1.1.3 + pin-project-lite@0.2.13 + pin-project@1.1.3 + pin-utils@0.1.0 + plist@1.6.0 + powerfmt@0.2.0 + proc-macro2@1.0.74 + quick-xml@0.31.0 + quote@1.0.35 + redox_syscall@0.4.1 + redox_users@0.4.4 + regex-automata@0.4.3 + regex-syntax@0.8.2 + regex@1.10.2 + rust-ini@0.10.3 + rustc-demangle@0.1.23 + rustix@0.38.28 + rustls-pemfile@1.0.4 + ryu@1.0.16 + safemem@0.3.3 + same-file@1.0.6 + scoped-tls@1.0.1 + semver@1.0.21 + serde@1.0.194 + serde_derive@1.0.194 + serde_json@1.0.110 + serde_repr@0.1.18 + serde_urlencoded@0.7.1 + serde_yaml@0.8.26 + sha1@0.10.6 + slab@0.4.9 + socket2@0.5.5 + strsim@0.10.0 + syn@2.0.46 + tempfile@3.9.0 + terminal_size@0.3.0 + thiserror-impl@1.0.56 + thiserror@1.0.56 + time-core@0.1.2 + time-macros@0.2.16 + time@0.3.31 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-stream@0.1.14 + tokio-util@0.7.10 + tokio@1.35.1 + tower-service@0.3.2 + tracing-core@0.1.32 + tracing@0.1.40 + try-lock@0.2.5 + typenum@1.17.0 + unicase@2.7.0 + unicode-bidi@0.3.14 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unix_path@1.0.1 + unix_str@1.0.0 + url@2.5.0 + uuid@1.6.1 + version_check@0.9.4 + walkdir@2.4.0 + want@0.3.1 + warp@0.3.6 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.89 + wasm-bindgen-macro-support@0.2.89 + wasm-bindgen-macro@0.2.89 + wasm-bindgen-shared@0.2.89 + wasm-bindgen@0.2.89 + webdriver@0.50.0 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.6 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-core@0.52.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + winreg@0.10.1 + yaml-rust@0.4.5 + zip@0.6.6 +" + +inherit cargo + +DESCRIPTION="Proxy for using WebDriver clients to interact with Gecko-based browsers" +HOMEPAGE="https://firefox-source-docs.mozilla.org/testing/geckodriver/ https://github.com/mozilla/geckodriver" +SRC_URI="https://github.com/mozilla/geckodriver/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS}" + +LICENSE="MPL-2.0" +# Dependent crate licenses +LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-DFS-2016" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +IUSE="unchained" + +RDEPEND="!www-client/firefox[geckodriver]" + +pkg_setup() { + QA_FLAGS_IGNORED="/usr/$(get_libdir)/firefox/geckodriver" +} + +src_prepare() { + # Apply the unchained patch from https://github.com/rafiibrahim8/geckodriver-unchained - + # makes geckodriver available on Gecko-based non-Firefox browsers, e.g. Librewolf. + # bgo#930568 + use unchained && eapply "${FILESDIR}"/geckodriver-0.34.0-firefox-125.0-unchained.patch + + default +} + +src_install() { + einstalldocs + + mkdir -p "${D}"/usr/$(get_libdir)/firefox || die "Failed to create /usr/lib*/firefox directory." + exeinto /usr/$(get_libdir)/firefox + doexe target/release/geckodriver + dosym -r /usr/$(get_libdir)/firefox/geckodriver /usr/bin/geckodriver +} diff --git a/net-misc/geckodriver/metadata.xml b/net-misc/geckodriver/metadata.xml new file mode 100644 index 000000000000..d1062f0eabec --- /dev/null +++ b/net-misc/geckodriver/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>mozilla@gentoo.org</email> + <name>Gentoo Mozilla Team</name> + </maintainer> + <use> + <flag name="unchained">Apply the geckodriver-unchained patch, for Gecko-based non-Firefox browsers (e.g. Librewolf)</flag> + </use> + <upstream> + <remote-id type="github">mozilla/geckodriver</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild index c0e08724e787..e614b260fb7e 100644 --- a/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild +++ b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar LICENSE="ISC BSD BSD-2 MIT Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~s390 ~x86" +KEYWORDS="amd64 arm ppc64 ~s390 x86" DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) diff --git a/net-misc/geoipyupdate/Manifest b/net-misc/geoipyupdate/Manifest new file mode 100644 index 000000000000..69b30316f27f --- /dev/null +++ b/net-misc/geoipyupdate/Manifest @@ -0,0 +1 @@ +DIST geoipyupdate-0.0.1.tar.gz 17000 BLAKE2B e68d044fc748f0876745a21cb77e8098367ab7e260ff53e0e6b68ad88d7c1deb4b6f3977eeaf61a1b0a54f30f0fc32e302a89e996a9ccb69f9dc9c48c3d0df03 SHA512 8e78866f083b3ab8ef445d82e4d9081f7f59437348638e951c615f610e382ac5b7f9dc08c3a28735322442a22d276cfed12dcd375ac613f0d18f10ef94b200b7 diff --git a/net-misc/geoipyupdate/geoipyupdate-0.0.1.ebuild b/net-misc/geoipyupdate/geoipyupdate-0.0.1.ebuild new file mode 100644 index 000000000000..6212aa8469a4 --- /dev/null +++ b/net-misc/geoipyupdate/geoipyupdate-0.0.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..12} ) + +inherit distutils-r1 + +DESCRIPTION="Simple python replacement for the MaxMind geoipupdate program" +HOMEPAGE="https://michael.orlitzky.com/code/geoipyupdate.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-python/requests[${PYTHON_USEDEP}]" + +DOCS=( README.rst doc/geoipyupdate-sample.toml ) + +src_install() { + distutils-r1_src_install + doman doc/man1/geoipyupdate.1 +} diff --git a/net-misc/blinkperl/metadata.xml b/net-misc/geoipyupdate/metadata.xml index 76de869b4002..c6418674131d 100644 --- a/net-misc/blinkperl/metadata.xml +++ b/net-misc/geoipyupdate/metadata.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">blinkserv</remote-id> - </upstream> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 35098da2bc35..318fe64ff163 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,2 +1,2 @@ -DIST gns3-gui-2.2.44.1.tar.gz 5056513 BLAKE2B ac9004771dea320dd24db905ae556c47c5950f95f6871272339223e019da804b97f3238677a0758426ec550ec354052196a4b30cbd4cc1cc154a3a437a3b006f SHA512 e9ae8604f6675ce7edc3e491dc5217b985ca948eaf0df69b59d60b236deee6e0d34e245b4779295d28a05b35eb01f93534a2da070817ace36a2d259525a606de DIST gns3-gui-2.2.45.tar.gz 5057093 BLAKE2B 0e5f92a5450f8bd87c67ef3916a949d12d3ba2222b9c894260fe4c486236455c5b0214350e6144081049a6e7a85a9fc60c596b5932dd3f6fa07c7f94cc5d31f5 SHA512 2122dbf88625ea8fbc7eae20d7d1406a72f8dc8a5fea2c9577218127c54c10b9db7b154010c519a170ea9067e1ea774181e0e56936129c091800dab615cb8b3b +DIST gns3-gui-2.2.46.tar.gz 5058596 BLAKE2B 1b3b84d3677c815bfe950f0fe2bf618bca12d1c854bf9d6328611feb41344b952a8579716db936a6010bbe4db772e9d3cc2e57b365b2e66264b9fd4dee576c4b SHA512 25ca6a9bf626182ae16662bc7d9f571c14b107c4036ccba0b4c2d562aa4f26fd7af23765de53e4159f67e48632548d3148dbb9c9ae19bffbef50c48a10f85a01 diff --git a/net-misc/gns3-gui/gns3-gui-2.2.44.1.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.46.ebuild index c0d753adc2e4..9ced99155546 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.44.1.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.46.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,14 +14,15 @@ SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" #net-misc/gns3-server version should always match gns3-gui version RDEPEND=" - >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.6[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}] + >=dev-python/truststore-0.8.0[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] " diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index 6e6ff3bc059d..43955b0fb151 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,2 +1,2 @@ -DIST gns3-server-2.2.44.1.tar.gz 10739635 BLAKE2B 8f9cc5affce48b95ef5ceee452d643f450594f1f5710ceace830ccd5a30281c6a04458a6864c65bcb3b023190b2aebe00d2f4316c80596a4c443616cad161cb6 SHA512 60c66f07242ba64a9bbc9471ee71fc975a95f36fced440798c8076b968a2e29cacccb889928f22b878d5928feb9024b26da854a03e3610b1ba36fa09826023fc DIST gns3-server-2.2.45.tar.gz 10747348 BLAKE2B bb8f45347f9ea2e05e199a5128f73fe7fad6d7b3bebf30dcae009c761934e5d2ee986623fa82bb328db31b43cd39da05f52ac9a3f534d223fbf46ca585f3b433 SHA512 570bac3aab8c0f31144f8ac34f27b04a16efadd02e93faf949d4fe0078bf87c59e479b17ead8feec774b3907703cddeae9a434b9abc7fbd459cc060636478a2e +DIST gns3-server-2.2.46.tar.gz 10745825 BLAKE2B 280c16e76a73b638ea66c1c8a674a0e11eab3f0dee612b40c480d604244bf6e78d32c79f6a4587a95b88ce601ba3911672b6402831fce8c7a721465dcdd2da9d SHA512 6f7e52c0f1fcdbb0af7963cfaf1cd17c7d6af36e1ac89b4b2e725c14ff17d1560a50d286ea351ab2649560c09dcac62b35add9492f06c5068010129751b0848e diff --git a/net-misc/gns3-server/gns3-server-2.2.44.1.ebuild b/net-misc/gns3-server/gns3-server-2.2.46.ebuild index ec1573e4269f..3a083dab53e0 100644 --- a/net-misc/gns3-server/gns3-server-2.2.44.1.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.46.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,13 +21,13 @@ RDEPEND=" acct-user/gns3 app-emulation/dynamips >=dev-python/aiofiles-23.2.1[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.5[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.9.3[${PYTHON_USEDEP}] >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] - >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}] - >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] - >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + >=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.6[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}] net-misc/ubridge @@ -53,9 +53,6 @@ python_install() { systemd_dounit init/gns3.service.systemd newinitd init/gns3.service.openrc gns3server - - rm "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die - ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die } pkg_postinst() { diff --git a/net-misc/gofish/gofish-1.2-r2.ebuild b/net-misc/gofish/gofish-1.2-r2.ebuild index c23940d7517e..6cfd91bf172d 100644 --- a/net-misc/gofish/gofish-1.2-r2.ebuild +++ b/net-misc/gofish/gofish-1.2-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Gofish gopher server" HOMEPAGE="http://gofish.sourceforge.net" -SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/gofish/${P}.tar.gz" S="${WORKDIR}/${PN}" LICENSE="GPL-2+" diff --git a/net-misc/haeredes/Manifest b/net-misc/haeredes/Manifest index fbc46dda4050..9faf252a3817 100644 --- a/net-misc/haeredes/Manifest +++ b/net-misc/haeredes/Manifest @@ -1 +1,2 @@ DIST haeredes-0.5.3.tar.gz 20357 BLAKE2B 54be7f0a4bd09cd85c0cf7b2baed589258749bb2b05764ca61d4656e6c19832dfbd249d425e6a9ede30fc8f5711392491adca4c025014dc6e05c6009108c98dd SHA512 3bf0a14b45f9c3c929cc97559ca03a3df1c542196daf574917171dacd3c47117a908ed0c849b3527bd2dcf8f99a15228845d3a8ae97e051f707162d62cfccc13 +DIST haeredes-0.5.4.tar.gz 20360 BLAKE2B b3dae1cf300fc871d9a3b49431000e9e6100142d55d7a7ea06be069ef58353a59622b7b40dabf48e1bde2e9fcab20825b5e00d9d8c8856ab81a4c713c0f33475 SHA512 6ed9b4d69a42c661a771746a584d76602988626064b239e90405e8a7930dc7495075e20b51560556b4d10ddf2df422a0e7d56fab5e424242ec3792743701a5ce diff --git a/net-misc/haeredes/haeredes-0.5.4.ebuild b/net-misc/haeredes/haeredes-0.5.4.ebuild new file mode 100644 index 000000000000..e9ac2f7ab731 --- /dev/null +++ b/net-misc/haeredes/haeredes-0.5.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CABAL_FEATURES="test-suite" +inherit haskell-cabal + +DESCRIPTION="Confirm delegation of NS and MX records" +HOMEPAGE="https://michael.orlitzky.com/code/haeredes.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +# The test suite requires network access. +RESTRICT="test" + +RDEPEND=">=dev-haskell/cmdargs-0.10:= + >=dev-haskell/dns-1.4:= + >=dev-haskell/iproute-1.2:= + >=dev-haskell/parallel-io-0.3:= + >=dev-lang/ghc-9.0.0:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0 + test? ( >=dev-haskell/doctest-0.9 + >=dev-haskell/filemanip-0.3.6 + dev-util/shelltestrunner ) +" + +src_install() { + haskell-cabal_src_install + doman "${S}/doc/man1/${PN}.1" +} diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest index feae8c85fb73..de4f86033bcc 100644 --- a/net-misc/hath/Manifest +++ b/net-misc/hath/Manifest @@ -1 +1,2 @@ DIST hath-0.5.7.tar.gz 31087 BLAKE2B 2449872bae187dfd67ab94da7df55bec7a9735bcd85a9dbd96ef7ce1afdd3f83ed666eb02b6de54719ba32b96de75ff168136f07760023ea2db7bb55bf51f70e SHA512 daa1ae22e8a01f63db6849c7c9e90917051644c681848c66bbd5cb7178326a125868c9f52d506bb5561595fd1bb8b16ae922b91e1be44ccb86e346fc1730a6dd +DIST hath-0.5.8.tar.gz 31116 BLAKE2B 3d6f91b1e286bbb88feab5f30a9164f19ae0bb886d39dd8c945b4c2b61106b6d9a233511b704b96c15176e9152f63d891f72a3ad11b64c8043e03c20ff705365 SHA512 c5a50e8c976f92f5d8fa3750098850f50198a3a07342e6fa3a2fa2faeb5e850780aef17d648781379a419671011f24749a0f24ca5c9d98cd48c94b0e5c871017 diff --git a/net-misc/hath/hath-0.5.8.ebuild b/net-misc/hath/hath-0.5.8.ebuild new file mode 100644 index 000000000000..80c9fd8405e9 --- /dev/null +++ b/net-misc/hath/hath-0.5.8.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CABAL_FEATURES="test-suite" +inherit haskell-cabal + +DESCRIPTION="Manipulate network blocks in CIDR notation" +HOMEPAGE="https://michael.orlitzky.com/code/hath.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +RDEPEND=">=dev-haskell/cmdargs-0.10:= + >=dev-haskell/split-0.2:= + >=dev-haskell/tasty-0.8:= + >=dev-haskell/tasty-hunit-0.8:= + >=dev-haskell/tasty-quickcheck-0.8.1:= + >=dev-lang/ghc-9.0.0:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0.0 + test? ( + dev-util/shelltestrunner + sys-apps/grep[pcre] + ) +" + +src_install() { + cabal_src_install + doman "${S}/doc/man1/${PN}.1" +} diff --git a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild index 3ac43d29785a..01719be53c47 100644 --- a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild +++ b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit linux-info DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2" HOMEPAGE="https://sourceforge.net/projects/htbinit/" -SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}" +SRC_URI="https://downloads.sourceforge.net/htbinit/htb.init-v${PV}" S="${WORKDIR}" LICENSE="GPL-2+" diff --git a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild index 438692db1db6..f76c703881dc 100644 --- a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild +++ b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit linux-info DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2" HOMEPAGE="https://sourceforge.net/projects/htbinit/" -SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}" +SRC_URI="https://downloads.sourceforge.net/htbinit/htb.init-v${PV}" S="${WORKDIR}" LICENSE="GPL-2+" diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index 37b4fc74d5dd..9e0e985fa467 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1 +1,2 @@ DIST httpie-3.2.1.gh.tar.gz 1276550 BLAKE2B 627aa3db762e9e407f882be2c4267f5227301b189695537e7ac69ff140d6d39292251e131f9b9e7761e904a736d112bb4c1f5c6708c1468c6309474ee8c140b6 SHA512 ffcf6050138c49d5acb01f214d9b3fee6c78502c4c6dc45a295bafc88aafd1789f97a69c922f6e093fb48a402c1f83a7fff5307849130df81c4bcb2d595a03bf +DIST httpie-3.2.2.gh.tar.gz 1279161 BLAKE2B aa5df73acbbe635fbfd3db458a2289042091a27d7b1791e9739874c1882e436814f74eec2b695f8acd76f9b9dd210f43dd9f8b7c0feea0cf4782b30f0e53b91a SHA512 5e95eba5a5ca8017dfd76ace525c57d2931d8918d51e84e8744eb9393cda5ae8e6cd6a1455c4aa82e50fa35edc35468a8b3582169c8f94858e61b09548cfa13d diff --git a/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch b/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch new file mode 100644 index 000000000000..be3dc48d16b7 --- /dev/null +++ b/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch @@ -0,0 +1,599 @@ +https://github.com/httpie/cli/commit/3524ccf0baa9f2b3029368ab07ba5f64e62dcb1f +https://github.com/httpie/cli/commit/db16bbee961ceb93b7831fe1ec44a72d56a33e38 + +From 3524ccf0baa9f2b3029368ab07ba5f64e62dcb1f Mon Sep 17 00:00:00 2001 +From: Jakub Roztocil <jakub@roztocil.co> +Date: Mon, 4 Mar 2024 16:27:52 +0100 +Subject: [PATCH] Drop dependency on the abandoned python-lazy-fixture + +--- a/setup.py ++++ b/setup.py +@@ -11,7 +11,6 @@ + tests_require = [ + 'pytest', + 'pytest-httpbin>=0.0.6', +- 'pytest-lazy-fixture>=0.0.6', + 'responses', + 'pytest-mock', + 'werkzeug<2.1.0' +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -3,14 +3,14 @@ + import pytest + from pytest_httpbin import certs + +-from .utils import ( # noqa ++from .utils import ( # noqa + HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN, + HTTPBIN_WITH_CHUNKED_SUPPORT, + REMOTE_HTTPBIN_DOMAIN, + IS_PYOPENSSL, + mock_env + ) +-from .utils.plugins_cli import ( # noqa ++from .utils.plugins_cli import ( # noqa + broken_plugin, + dummy_plugin, + dummy_plugins, +@@ -18,7 +18,9 @@ + httpie_plugins_success, + interface, + ) +-from .utils.http_server import http_server, localhost_http_server # noqa ++from .utils.http_server import http_server, localhost_http_server # noqa ++# noinspection PyUnresolvedReferences ++from .fixtures import pytest_lazy_fixture + + + @pytest.fixture(scope='function', autouse=True) +--- /dev/null ++++ b/tests/fixtures/pytest_lazy_fixture.py +@@ -0,0 +1,99 @@ ++""" ++Replacement for the abandoned `pytest.lazy_fixture` <https://github.com/TvoroG/pytest-lazy-fixture> ++ ++Based on <https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1914581161> ++ ++""" ++import dataclasses ++import typing ++ ++import pytest ++ ++ ++@dataclasses.dataclass ++class LazyFixture: ++ """Lazy fixture dataclass.""" ++ ++ name: str ++ ++ ++def lazy_fixture(name: str) -> LazyFixture: ++ """Mark a fixture as lazy.""" ++ return LazyFixture(name) ++ ++ ++# NOTE: Mimic the original API ++pytest.lazy_fixture = lazy_fixture ++ ++ ++def is_lazy_fixture(value: object) -> bool: ++ """Check whether a value is a lazy fixture.""" ++ return isinstance(value, LazyFixture) ++ ++ ++def pytest_make_parametrize_id( ++ config: pytest.Config, ++ val: object, ++ argname: str, ++) -> str | None: ++ """Inject lazy fixture parametrized id. ++ ++ Reference: ++ - https://bit.ly/48Off6r ++ ++ Args: ++ config (pytest.Config): pytest configuration. ++ value (object): fixture value. ++ argname (str): automatic parameter name. ++ ++ Returns: ++ str: new parameter id. ++ """ ++ if is_lazy_fixture(val): ++ return typing.cast(LazyFixture, val).name ++ return None ++ ++ ++@pytest.hookimpl(tryfirst=True) ++def pytest_fixture_setup( ++ fixturedef: pytest.FixtureDef, ++ request: pytest.FixtureRequest, ++) -> object | None: ++ """Lazy fixture setup hook. ++ ++ This hook will never take over a fixture setup but just simply will ++ try to resolve recursively any lazy fixture found in request.param. ++ ++ Reference: ++ - https://bit.ly/3SyvsXJ ++ ++ Args: ++ fixturedef (pytest.FixtureDef): fixture definition object. ++ request (pytest.FixtureRequest): fixture request object. ++ ++ Returns: ++ object | None: fixture value or None otherwise. ++ """ ++ if hasattr(request, "param") and request.param: ++ request.param = _resolve_lazy_fixture(request.param, request) ++ return None ++ ++ ++def _resolve_lazy_fixture(__val: object, request: pytest.FixtureRequest) -> object: ++ """Lazy fixture resolver. ++ ++ Args: ++ __val (object): fixture value object. ++ request (pytest.FixtureRequest): pytest fixture request object. ++ ++ Returns: ++ object: resolved fixture value. ++ """ ++ if isinstance(__val, list | tuple): ++ return tuple(_resolve_lazy_fixture(v, request) for v in __val) ++ if isinstance(__val, typing.Mapping): ++ return {k: _resolve_lazy_fixture(v, request) for k, v in __val.items()} ++ if not is_lazy_fixture(__val): ++ return __val ++ lazy_obj = typing.cast(LazyFixture, __val) ++ return request.getfixturevalue(lazy_obj.name) + +From db16bbee961ceb93b7831fe1ec44a72d56a33e38 Mon Sep 17 00:00:00 2001 +From: Jakub Roztocil <jakub@roztocil.co> +Date: Mon, 4 Mar 2024 18:05:26 +0100 +Subject: [PATCH] Drop dependency on the abandoned python-lazy-fixture II. + +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -2,6 +2,7 @@ + + import pytest + from pytest_httpbin import certs ++from pytest_httpbin.serve import Server as PyTestHttpBinServer + + from .utils import ( # noqa + HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN, +@@ -19,8 +20,10 @@ + interface, + ) + from .utils.http_server import http_server, localhost_http_server # noqa +-# noinspection PyUnresolvedReferences +-from .fixtures import pytest_lazy_fixture ++ ++ ++# Patch to support `url = str(server)` in addition to `url = server + '/foo'`. ++PyTestHttpBinServer.__str__ = lambda self: self.url + + + @pytest.fixture(scope='function', autouse=True) +@@ -72,8 +75,15 @@ def _remote_httpbin_available(): + + @pytest.fixture + def remote_httpbin(_remote_httpbin_available): ++ + if _remote_httpbin_available: +- return 'http://' + REMOTE_HTTPBIN_DOMAIN ++ class Server(str): ++ """Look like `pytest_httpbin.serve.Server` but only provide URL info.""" ++ @property ++ def url(self): ++ return self ++ ++ return Server('http://' + REMOTE_HTTPBIN_DOMAIN) + pytest.skip(f'{REMOTE_HTTPBIN_DOMAIN} not resolvable') + + +--- a/tests/fixtures/pytest_lazy_fixture.py ++++ /dev/null +@@ -1,99 +0,0 @@ +-""" +-Replacement for the abandoned `pytest.lazy_fixture` <https://github.com/TvoroG/pytest-lazy-fixture> +- +-Based on <https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1914581161> +- +-""" +-import dataclasses +-import typing +- +-import pytest +- +- +-@dataclasses.dataclass +-class LazyFixture: +- """Lazy fixture dataclass.""" +- +- name: str +- +- +-def lazy_fixture(name: str) -> LazyFixture: +- """Mark a fixture as lazy.""" +- return LazyFixture(name) +- +- +-# NOTE: Mimic the original API +-pytest.lazy_fixture = lazy_fixture +- +- +-def is_lazy_fixture(value: object) -> bool: +- """Check whether a value is a lazy fixture.""" +- return isinstance(value, LazyFixture) +- +- +-def pytest_make_parametrize_id( +- config: pytest.Config, +- val: object, +- argname: str, +-) -> str | None: +- """Inject lazy fixture parametrized id. +- +- Reference: +- - https://bit.ly/48Off6r +- +- Args: +- config (pytest.Config): pytest configuration. +- value (object): fixture value. +- argname (str): automatic parameter name. +- +- Returns: +- str: new parameter id. +- """ +- if is_lazy_fixture(val): +- return typing.cast(LazyFixture, val).name +- return None +- +- +-@pytest.hookimpl(tryfirst=True) +-def pytest_fixture_setup( +- fixturedef: pytest.FixtureDef, +- request: pytest.FixtureRequest, +-) -> object | None: +- """Lazy fixture setup hook. +- +- This hook will never take over a fixture setup but just simply will +- try to resolve recursively any lazy fixture found in request.param. +- +- Reference: +- - https://bit.ly/3SyvsXJ +- +- Args: +- fixturedef (pytest.FixtureDef): fixture definition object. +- request (pytest.FixtureRequest): fixture request object. +- +- Returns: +- object | None: fixture value or None otherwise. +- """ +- if hasattr(request, "param") and request.param: +- request.param = _resolve_lazy_fixture(request.param, request) +- return None +- +- +-def _resolve_lazy_fixture(__val: object, request: pytest.FixtureRequest) -> object: +- """Lazy fixture resolver. +- +- Args: +- __val (object): fixture value object. +- request (pytest.FixtureRequest): pytest fixture request object. +- +- Returns: +- object: resolved fixture value. +- """ +- if isinstance(__val, list | tuple): +- return tuple(_resolve_lazy_fixture(v, request) for v in __val) +- if isinstance(__val, typing.Mapping): +- return {k: _resolve_lazy_fixture(v, request) for k, v in __val.items()} +- if not is_lazy_fixture(__val): +- return __val +- lazy_obj = typing.cast(LazyFixture, __val) +- return request.getfixturevalue(lazy_obj.name) +--- a/tests/test_cookie_on_redirects.py ++++ b/tests/test_cookie_on_redirects.py +@@ -2,54 +2,47 @@ + from .utils import http + + +-def _stringify(fixture): +- return fixture + '' +- +- +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_explicit_user_set_cookie(httpbin, instance): +- # User set cookies ARE NOT persisted within redirects +- # when there is no session, even on the same domain. +- ++def test_explicit_user_set_cookie(httpbin, target_httpbin, request): ++ """User set cookies ARE NOT persisted within redirects when there is no session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + r = http( + '--follow', + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin.url}/cookies', + 'Cookie:a=b' + ) + assert r.json == {'cookies': {}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, instance): +- # User set cookies ARE persisted within redirects +- # when there is A session, even on the same domain. +- ++def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request): ++ """User set cookies ARE persisted within redirects when there is A session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + r = http( + '--follow', + '--session', + str(tmp_path / 'session.json'), + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin}/cookies', + 'Cookie:a=b' + ) + assert r.json == {'cookies': {'a': 'b'}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_saved_user_set_cookie_in_session(tmp_path, httpbin, instance): +- # User set cookies ARE persisted within redirects +- # when there is A session, even on the same domain. +- ++def test_saved_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request): ++ """User set cookies ARE persisted within redirects when there is A session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + http( + '--follow', + '--session', +@@ -62,32 +55,33 @@ def test_saved_user_set_cookie_in_session(tmp_path, httpbin, instance): + '--session', + str(tmp_path / 'session.json'), + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin}/cookies', + ) + assert r.json == {'cookies': {'a': 'b'}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) + @pytest.mark.parametrize('session', [True, False]) +-def test_explicit_user_set_headers(httpbin, tmp_path, instance, session): +- # User set headers ARE persisted within redirects +- # even on different domains domain with or without +- # an active session. ++def test_explicit_user_set_headers(httpbin, tmp_path, target_httpbin, session, request): ++ """ ++ User set headers ARE persisted within redirects even on different domains domain with or without an active session. ++ ++ """ ++ target_httpbin = request.getfixturevalue(target_httpbin) + session_args = [] + if session: + session_args.extend([ + '--session', + str(tmp_path / 'session.json') + ]) +- + r = http( + '--follow', + *session_args, + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/get', ++ f'url=={target_httpbin}/get', + 'X-Custom-Header:value' + ) + assert 'X-Custom-Header' in r.json['headers'] +@@ -95,16 +89,13 @@ def test_explicit_user_set_headers(httpbin, tmp_path, instance, session): + + @pytest.mark.parametrize('session', [True, False]) + def test_server_set_cookie_on_redirect_same_domain(tmp_path, httpbin, session): +- # Server set cookies ARE persisted on the same domain +- # when they are forwarded. +- ++ """Server set cookies ARE persisted on the same domain when they are forwarded.""" + session_args = [] + if session: + session_args.extend([ + '--session', + str(tmp_path / 'session.json') + ]) +- + r = http( + '--follow', + *session_args, +@@ -136,8 +127,7 @@ def test_server_set_cookie_on_redirect_different_domain(tmp_path, http_server, h + + + def test_saved_session_cookies_on_same_domain(tmp_path, httpbin): +- # Saved session cookies ARE persisted when making a new +- # request to the same domain. ++ """Saved session cookies ARE persisted when making a new request to the same domain.""" + http( + '--session', + str(tmp_path / 'session.json'), +@@ -152,8 +142,7 @@ def test_saved_session_cookies_on_same_domain(tmp_path, httpbin): + + + def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_httpbin): +- # Saved session cookies ARE persisted when making a new +- # request to a different domain. ++ """Saved session cookies ARE persisted when making a new request to a different domain.""" + http( + '--session', + str(tmp_path / 'session.json'), +@@ -167,45 +156,49 @@ def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_htt + assert r.json == {'cookies': {}} + + +-@pytest.mark.parametrize('initial_domain, first_request_domain, second_request_domain, expect_cookies', [ ++@pytest.mark.parametrize(['initial_domain', 'first_request_domain', 'second_request_domain', 'expect_cookies'], [ + ( + # Cookies are set by Domain A + # Initial domain is Domain A + # Redirected domain is Domain A +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), ++ 'httpbin', ++ 'httpbin', ++ 'httpbin', + True, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain B + # Redirected domain is Domain B +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++ 'httpbin', ++ 'remote_httpbin', ++ 'remote_httpbin', + False, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain A + # Redirected domain is Domain B +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++ 'httpbin', ++ 'httpbin', ++ 'remote_httpbin', + False, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain B + # Redirected domain is Domain A +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), +- pytest.lazy_fixture('httpbin'), ++ 'httpbin', ++ 'remote_httpbin', ++ 'httpbin', + True, + ), + ]) +-def test_saved_session_cookies_on_redirect(tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies): ++def test_saved_session_cookies_on_redirect( ++ tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies, request): ++ initial_domain = request.getfixturevalue(initial_domain) ++ first_request_domain = request.getfixturevalue(first_request_domain) ++ second_request_domain = request.getfixturevalue(second_request_domain) + http( + '--session', + str(tmp_path / 'session.json'), +@@ -216,7 +209,7 @@ def test_saved_session_cookies_on_redirect(tmp_path, initial_domain, first_reque + str(tmp_path / 'session.json'), + '--follow', + first_request_domain + '/redirect-to', +- f'url=={_stringify(second_request_domain)}/cookies' ++ f'url=={second_request_domain}/cookies' + ) + if expect_cookies: + expected_data = {'cookies': {'a': 'b'}} +--- a/tests/test_sessions.py ++++ b/tests/test_sessions.py +@@ -821,16 +821,17 @@ def test_session_multiple_headers_with_same_name(basic_session, httpbin): + 'server, expected_cookies', + [ + ( +- pytest.lazy_fixture('localhost_http_server'), ++ 'localhost_http_server', + {'secure_cookie': 'foo', 'insecure_cookie': 'bar'} + ), + ( +- pytest.lazy_fixture('remote_httpbin'), ++ 'remote_httpbin', + {'insecure_cookie': 'bar'} + ) + ] + ) +-def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies): ++def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies, request): ++ server = request.getfixturevalue(server) + session_path = tmp_path / 'session.json' + http( + '--session', str(session_path), +--- a/tests/test_update_warnings.py ++++ b/tests/test_update_warnings.py +@@ -132,10 +132,10 @@ def test_check_updates_first_invocation( + + + @pytest.mark.parametrize( +- 'should_issue_warning, build_channel', ++ ['should_issue_warning', 'build_channel'], + [ +- (False, pytest.lazy_fixture('lower_build_channel')), +- (True, pytest.lazy_fixture('higher_build_channel')), ++ (False, 'lower_build_channel'), ++ (True, 'higher_build_channel'), + ], + ) + def test_check_updates_first_time_after_data_fetch( +@@ -145,7 +145,9 @@ def test_check_updates_first_time_after_data_fetch( + static_fetch_data, + should_issue_warning, + build_channel, ++ request, + ): ++ request.getfixturevalue(build_channel) + http('fetch_updates', '--daemon', env=with_warnings) + r = http(httpbin + '/get', env=with_warnings) + +@@ -176,14 +178,15 @@ def test_cli_check_updates( + + + @pytest.mark.parametrize( +- "build_channel", [ +- pytest.lazy_fixture("lower_build_channel"), +- pytest.lazy_fixture("unknown_build_channel") ++ 'build_channel', [ ++ 'lower_build_channel', ++ 'unknown_build_channel', + ] + ) + def test_cli_check_updates_not_shown( +- static_fetch_data, build_channel ++ static_fetch_data, build_channel, request + ): ++ request.getfixturevalue(build_channel) + r = httpie('cli', 'check-updates') + assert r.exit_status == ExitStatus.SUCCESS + assert not check_update_warnings(r) diff --git a/net-misc/httpie/httpie-3.2.1-r1.ebuild b/net-misc/httpie/httpie-3.2.1-r1.ebuild deleted file mode 100644 index 8408d5324ea8..000000000000 --- a/net-misc/httpie/httpie-3.2.1-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="ssl(+)" -DISTUTILS_USE_PEP517=setuptools - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-python/charset-normalizer[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/multidict[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] - >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/responses[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-3.2.2.ebuild b/net-misc/httpie/httpie-3.2.2.ebuild new file mode 100644 index 000000000000..d6672c06715a --- /dev/null +++ b/net-misc/httpie/httpie-3.2.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="ssl(+)" +DISTUTILS_USE_PEP517=setuptools + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Modern command line HTTP client" +HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" +SRC_URI="https://github.com/httpie/cli/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/cli-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/charset-normalizer[${PYTHON_USEDEP}] + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/multidict[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] + >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + ${RDEPEND} + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-httpbin[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.2.1-pytest-fixtures.patch" +) + +EPYTEST_DESELECT=( + # https://github.com/httpie/cli/issues/1530 + tests/test_compress.py::test_compress_form + tests/test_binary.py::TestBinaryResponseData + + # Needs network + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie_in_session[remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie[remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[False-remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[True-remote_httpbin]' + tests/test_cookie_on_redirects.py::test_saved_session_cookie_pool + tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_different_domain + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-httpbin-remote_httpbin-False]' + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-httpbin-True]' + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-remote_httpbin-False]' + 'tests/test_cookie_on_redirects.py::test_saved_user_set_cookie_in_session[remote_httpbin]' + 'tests/test_sessions.py::test_secure_cookies_on_localhost[remote_httpbin-expected_cookies1]' + tests/test_tokens.py::test_verbose_chunked + tests/test_uploads.py::test_chunked_form + tests/test_uploads.py::test_chunked_json + tests/test_uploads.py::test_chunked_raw + tests/test_uploads.py::test_chunked_stdin + tests/test_uploads.py::test_chunked_stdin_multiple_chunks + tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked + tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked +) + +EPYTEST_IGNORE=( + # Assumes installation in a clean venv + tests/test_plugins_cli.py +) + +distutils_enable_tests pytest + +python_install_all() { + newbashcomp extras/httpie-completion.bash http + insinto /usr/share/fish/vendor_completions.d + newins extras/httpie-completion.fish http.fish + distutils-r1_python_install_all +} diff --git a/net-misc/httptype/httptype-1.3.9-r1.ebuild b/net-misc/httptype/httptype-1.3.9-r1.ebuild index fa20651575b5..01c030b8e90e 100644 --- a/net-misc/httptype/httptype-1.3.9-r1.ebuild +++ b/net-misc/httptype/httptype-1.3.9-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Returns the http host software of a website" HOMEPAGE="http://httptype.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-1" SLOT="0" diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r4.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r4.ebuild index 785abcca90b6..e7c00f66c073 100644 --- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r4.ebuild +++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems" HOMEPAGE="https://hylafax.sourceforge.io/" -SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/hylafax/${MY_P}.tar.gz" # bug #886303 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-tiff-4.5.0.patch.xz" S="${WORKDIR}"/${MY_P} diff --git a/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild index 708f599e6d9d..3216b0c2b29c 100644 --- a/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild +++ b/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line" HOMEPAGE="https://sourceforge.net/projects/iaxmodem/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild index 5f924efa8a42..69dcef7955cf 100644 --- a/net-misc/iperf/iperf-2.0.14a.ebuild +++ b/net-misc/iperf/iperf-2.0.14a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP" HOMEPAGE="https://sourceforge.net/projects/iperf2/" -SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}2/${PN}-2.0.13.tar.gz" S="${WORKDIR}/${PN}-2.0.13" LICENSE="HPND" diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 2c411fe395c2..72c97487d6f6 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -71,11 +71,15 @@ pkg_setup() { src_prepare() { default - cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + if use test; then + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + fi # brand the version with Gentoo sed -i \ - -e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@lists.isc.org])/g" \ + -e 's/KEA_SRCID="tarball"/KEA_SRCID="gentoo"/g' \ + -e 's/AC_MSG_RESULT("tarball")/AC_MSG_RESULT("gentoo")/g' \ + -e "s/EXTENDED_VERSION=\"\${EXTENDED_VERSION} (\$KEA_SRCID)\"/EXTENDED_VERSION=\"${PVR} (\$KEA_SRCID)\"/g" \ configure.ac || die sed -i \ @@ -105,7 +109,6 @@ src_configure() { --with-log4cplus $(use_enable debug) $(use_enable doc generate-docs) - $(use_enable test gtest) $(use_enable shell) $(use_with mysql) $(use_with openssl) @@ -115,7 +118,8 @@ src_configure() { } src_install() { - default + emake -j1 install DESTDIR="${D}" + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest index 315533a72d56..543ceb211369 100644 --- a/net-misc/kio-zeroconf/Manifest +++ b/net-misc/kio-zeroconf/Manifest @@ -1,2 +1,2 @@ DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6 -DIST kio-zeroconf-24.02.2.tar.xz 44388 BLAKE2B d1724dc433715bc2477fe146469feb66b6535b56cba2172bd66cd5f5b4629a6227a63adb19b50a714ba0330aae5af7c61d4d0899bd281ea5d87c302f3ef12b61 SHA512 8152414cdb7ae3087a03d83471e2c107e9a98cfb9f9f86f451d0e4b00bfbd93450011fa8a7c5e4cc47212169efc9058ae42f24cfcae64960616980a7dca40e01 +DIST kio-zeroconf-24.04.90.tar.xz 44420 BLAKE2B bb3745ef9d2cfa297010a5e7ff41b80145ab762834783cae00d2e624d11ead93359ecff9989d819fe8b59cdc00b9e93e0ab609bf2df4f70bfa15bc54b1397944 SHA512 510796b2b622c638baf050142cecd6c30d62c5c5dfcd73dcbfaf589624e5929c8d720976cff081035c3df3d07e17a23de4fd93df9dc8eddd51d592ef02f92366 diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.02.2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.04.90.ebuild index d4d2fb728f5d..d4d2fb728f5d 100644 --- a/net-misc/kio-zeroconf/kio-zeroconf-24.02.2.ebuild +++ b/net-misc/kio-zeroconf/kio-zeroconf-24.04.90.ebuild diff --git a/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild b/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild index 5dcd7cb600b7..98eef1987757 100644 --- a/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild +++ b/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ MY_P=${PN}-${PV//./-} DESCRIPTION="Protocol definitions of l7-filter kernel modules" HOMEPAGE="http://l7-filter.sourceforge.net/protocols https://l7-filter.clearos.com/docs/start" -SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/l7-filter/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild index fc52f8c6f1d3..7de2da4788c9 100644 --- a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild +++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="networked mud that can be used for different types of collaborative software" HOMEPAGE="https://sourceforge.net/projects/lambdamoo/" -SRC_URI="mirror://sourceforge/lambdamoo/LambdaMOO-${PV}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/lambdamoo/LambdaMOO-${PV}.tar.gz" LICENSE="LambdaMOO GPL-2" SLOT="0" diff --git a/net-misc/linuxptp/linuxptp-4.1.ebuild b/net-misc/linuxptp/linuxptp-4.1.ebuild index f121905d932c..51e65f46d2d1 100644 --- a/net-misc/linuxptp/linuxptp-4.1.ebuild +++ b/net-misc/linuxptp/linuxptp-4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit linux-info systemd toolchain-funcs DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" HOMEPAGE="https://linuxptp.nwtime.org/" -SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/linuxptp/linuxptp-4.2.ebuild b/net-misc/linuxptp/linuxptp-4.2.ebuild index 782ff196d132..8665d7add0d6 100644 --- a/net-misc/linuxptp/linuxptp-4.2.ebuild +++ b/net-misc/linuxptp/linuxptp-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,11 +7,11 @@ inherit linux-info systemd toolchain-funcs DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" HOMEPAGE="https://linuxptp.nwtime.org/" -SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" DEPEND="elibc_musl? ( sys-libs/queue-standalone )" diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index a12e11a145d6..d661d34ba878 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -1,6 +1,3 @@ -DIST memcached-1.6.21.tar.gz 1127623 BLAKE2B 13feb4872f5d196c1c3ded0159c16c2b09661b95f2486fbffb012d3f0bc86a94cbcf82aea9d4e59a9beac7cc4251fb60efd9e2f4c066831cb9b582bd44631d28 SHA512 9d8ba8964474e7ed40095e414747a3ce76860ee32b9d8bac19fc7932a79d4bb9947e4cbe810933b6d271f4b0ee5576e25089ca40f414b25faf9245733bfbd369 -DIST memcached-1.6.22.tar.gz 1135926 BLAKE2B 872594e087e2302ac7901481797aa6fda98a73e39b8ad64e084c87834e86d7026abcdc3a87b016d0c7eb80bc96621ac9a0da8fcc0b46fc93e7c042cc30848cac SHA512 a30adc4f14c32051d2fc112eaa71de96f7ba614bd7f940ab5dd86365fe5e4df1399fa6fe6591cee903c8b914f2156050edef3139bafe38cd4a2b6424ba973e8e -DIST memcached-1.6.23.tar.gz 1166511 BLAKE2B 4e0d4cc49781a78e6900d843750d495d87f72829eabf6dcb1b959725a4f1df388a4cb44e87677f80ca19ea76102df997bb292137f626e8829113ec01e0b26e06 SHA512 b531a58f8fd1ff9ae821319302093ccf44a6c911ad680a15cc29390144a153340814f45c0a1ea9eebf999743399579e655abea671b27b85c1202d70945ce902a -DIST memcached-1.6.24.tar.gz 1168521 BLAKE2B f68b9111c179865dba8ec126775195bc1dc0efb1ad76b121a06ca019a8fba675866b6d6c243d91412db259bc79cf54ef126b7c7c800198d5c980e1c48f6307a2 SHA512 e43386c2a6c0b95cefdccfe7f6b3890c59ca8b5c2636efc2e910b9617b20a5cf6de9bfedaafe0fb05c91bebb175fbdf033f5e0e512cb041b73af5af0d1854265 DIST memcached-1.6.25.tar.gz 1178044 BLAKE2B a00fb61cf6fbad07d18ecf878c08b250bcc2206f5bc1bbf91d2d1524ba14bba15743a3cc2d919fbdf0388d01ec26671dcfd0e4511b477747497ee564d796828f SHA512 70b11244fdedbea29cceda0f6db94fcd3723f70643f614db1163bae90d9b9792fe247233aa08b894869252f7b8340e85e41213cd04195b5f4ba288901ede80f7 DIST memcached-1.6.26.tar.gz 1178446 BLAKE2B 95919a83bd46bcddc7d055467954da6d64d42d0b9d1ee8e373e6c2a79cf518b768e0bd5d10f25a0eb27e642dd5fbc825f24c968d12034aa6e885a945a018e761 SHA512 7bd0d0dc0d228cde2fc3841c8973a2dde86bd50a4819f9737a22e12435f61d7459655029da390b63b8e6c3ca555b92a9c4c125a7c0bef5e6b051216414f1d49e +DIST memcached-1.6.27.tar.gz 1189608 BLAKE2B 056f9555dda758ebb46f62c7eb65712107b1e50b4e4e9696ad4962abdd584df0e0d398590b0e6bfabad33ca18f2a7596d9410d8b35fe069bce6f812ecedd3c35 SHA512 d9de26887339d456e1cace60bf5b2cc2a78231a52ec6f6f36ed7d3ad373eaf231419601be46e80963a3a0254638d03198141647f81fa530b85dbdc4a6071c4cd diff --git a/net-misc/memcached/memcached-1.6.21-r1.ebuild b/net-misc/memcached/memcached-1.6.21-r1.ebuild deleted file mode 100644 index 53e00ffd929c..000000000000 --- a/net-misc/memcached/memcached-1.6.21-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic systemd - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance, distributed memory object caching system" -HOMEPAGE="http://memcached.org/" -SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz - https://www.memcached.org/files/old/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later - -RDEPEND=">=dev-libs/libevent-1.4:= - dev-lang/perl - sasl? ( dev-libs/cyrus-sasl ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sec-policy/selinux-memcached ) - ssl? ( >=dev-libs/openssl-1.1.0g:= )" -DEPEND="${RDEPEND} - acct-user/memcached - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" -) - -src_prepare() { - default - - sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die - - eautoreconf - - use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN - - # Tweak upstream systemd unit to use Gentoo variables/envfile. - # As noted by bug #587440 - sed -i -e '/^ExecStart/{ - s,{USER},{MEMCACHED_RUNAS},g; - s,{CACHESIZE},{MEMUSAGE},g; - s,OPTIONS,MISC_OPTS,g; - }; - /Environment=/{s,OPTIONS,MISC_OPTS,g;}; - /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;}; - ' \ - "${S}"/scripts/memcached.service -} - -src_configure() { - econf \ - --disable-docs \ - --disable-werror \ - $(use_enable sasl) \ - $(use_enable ssl tls) - # The xml2rfc tool to build the additional docs requires TCL :-( - # `use_enable doc docs` -} - -src_compile() { - # There is a heavy degree of per-object compile flags - # Users do NOT know better than upstream. Trying to compile the testapp and - # the -debug version with -DNDEBUG _WILL_ fail. - append-flags -UNDEBUG -pthread - emake testapp memcached-debug CFLAGS="${CFLAGS}" - - filter-flags -UNDEBUG - emake -} - -src_test() { - emake -j1 test -} - -src_install() { - emake DESTDIR="${D}" install - dobin scripts/memcached-tool - use debug && dobin memcached-debug - - dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt} - - newconfd "${FILESDIR}/memcached.confd" memcached - newinitd "${FILESDIR}/memcached.init2" memcached - systemd_dounit "${S}/scripts/memcached.service" -} - -pkg_postinst() { - elog "With this version of Memcached Gentoo now supports multiple instances." - elog "To enable this you should create a symlink in /etc/init.d/ for each instance" - elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/" - elog "Please see Gentoo bug #122246 for more info" -} diff --git a/net-misc/memcached/memcached-1.6.22.ebuild b/net-misc/memcached/memcached-1.6.22.ebuild deleted file mode 100644 index 53e00ffd929c..000000000000 --- a/net-misc/memcached/memcached-1.6.22.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic systemd - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance, distributed memory object caching system" -HOMEPAGE="http://memcached.org/" -SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz - https://www.memcached.org/files/old/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later - -RDEPEND=">=dev-libs/libevent-1.4:= - dev-lang/perl - sasl? ( dev-libs/cyrus-sasl ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sec-policy/selinux-memcached ) - ssl? ( >=dev-libs/openssl-1.1.0g:= )" -DEPEND="${RDEPEND} - acct-user/memcached - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" -) - -src_prepare() { - default - - sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die - - eautoreconf - - use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN - - # Tweak upstream systemd unit to use Gentoo variables/envfile. - # As noted by bug #587440 - sed -i -e '/^ExecStart/{ - s,{USER},{MEMCACHED_RUNAS},g; - s,{CACHESIZE},{MEMUSAGE},g; - s,OPTIONS,MISC_OPTS,g; - }; - /Environment=/{s,OPTIONS,MISC_OPTS,g;}; - /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;}; - ' \ - "${S}"/scripts/memcached.service -} - -src_configure() { - econf \ - --disable-docs \ - --disable-werror \ - $(use_enable sasl) \ - $(use_enable ssl tls) - # The xml2rfc tool to build the additional docs requires TCL :-( - # `use_enable doc docs` -} - -src_compile() { - # There is a heavy degree of per-object compile flags - # Users do NOT know better than upstream. Trying to compile the testapp and - # the -debug version with -DNDEBUG _WILL_ fail. - append-flags -UNDEBUG -pthread - emake testapp memcached-debug CFLAGS="${CFLAGS}" - - filter-flags -UNDEBUG - emake -} - -src_test() { - emake -j1 test -} - -src_install() { - emake DESTDIR="${D}" install - dobin scripts/memcached-tool - use debug && dobin memcached-debug - - dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt} - - newconfd "${FILESDIR}/memcached.confd" memcached - newinitd "${FILESDIR}/memcached.init2" memcached - systemd_dounit "${S}/scripts/memcached.service" -} - -pkg_postinst() { - elog "With this version of Memcached Gentoo now supports multiple instances." - elog "To enable this you should create a symlink in /etc/init.d/ for each instance" - elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/" - elog "Please see Gentoo bug #122246 for more info" -} diff --git a/net-misc/memcached/memcached-1.6.24.ebuild b/net-misc/memcached/memcached-1.6.24.ebuild deleted file mode 100644 index bd837580012f..000000000000 --- a/net-misc/memcached/memcached-1.6.24.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic systemd - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance, distributed memory object caching system" -HOMEPAGE="http://memcached.org/" -SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz - https://www.memcached.org/files/old/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later - -RDEPEND=">=dev-libs/libevent-1.4:= - dev-lang/perl - sasl? ( dev-libs/cyrus-sasl ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sec-policy/selinux-memcached ) - ssl? ( >=dev-libs/openssl-1.1.0g:= )" -DEPEND="${RDEPEND} - acct-user/memcached - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" -) - -src_prepare() { - default - - sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die - - eautoreconf - - use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN - - # Tweak upstream systemd unit to use Gentoo variables/envfile. - # As noted by bug #587440 - sed -i -e '/^ExecStart/{ - s,{USER},{MEMCACHED_RUNAS},g; - s,{CACHESIZE},{MEMUSAGE},g; - s,OPTIONS,MISC_OPTS,g; - }; - /Environment=/{s,OPTIONS,MISC_OPTS,g;}; - /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;}; - ' \ - "${S}"/scripts/memcached.service -} - -src_configure() { - econf \ - --disable-docs \ - --disable-werror \ - $(use_enable sasl) \ - $(use_enable ssl tls) - # The xml2rfc tool to build the additional docs requires TCL :-( - # `use_enable doc docs` -} - -src_compile() { - # There is a heavy degree of per-object compile flags - # Users do NOT know better than upstream. Trying to compile the testapp and - # the -debug version with -DNDEBUG _WILL_ fail. - append-flags -UNDEBUG -pthread - emake testapp memcached-debug CFLAGS="${CFLAGS}" - - filter-flags -UNDEBUG - emake -} - -src_test() { - emake -j1 test -} - -src_install() { - emake DESTDIR="${D}" install - dobin scripts/memcached-tool - use debug && dobin memcached-debug - - dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt} - - newconfd "${FILESDIR}/memcached.confd" memcached - newinitd "${FILESDIR}/memcached.init2" memcached - systemd_dounit "${S}/scripts/memcached.service" -} - -pkg_postinst() { - elog "With this version of Memcached Gentoo now supports multiple instances." - elog "To enable this you should create a symlink in /etc/init.d/ for each instance" - elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/" - elog "Please see Gentoo bug #122246 for more info" -} diff --git a/net-misc/memcached/memcached-1.6.25.ebuild b/net-misc/memcached/memcached-1.6.25.ebuild index 9561a6bf3beb..bd837580012f 100644 --- a/net-misc/memcached/memcached-1.6.25.ebuild +++ b/net-misc/memcached/memcached-1.6.25.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/memcached/memcached-1.6.26.ebuild b/net-misc/memcached/memcached-1.6.26.ebuild index 9561a6bf3beb..bd837580012f 100644 --- a/net-misc/memcached/memcached-1.6.26.ebuild +++ b/net-misc/memcached/memcached-1.6.26.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/memcached/memcached-1.6.23.ebuild b/net-misc/memcached/memcached-1.6.27.ebuild index 9561a6bf3beb..9561a6bf3beb 100644 --- a/net-misc/memcached/memcached-1.6.23.ebuild +++ b/net-misc/memcached/memcached-1.6.27.ebuild diff --git a/net-misc/midentd/midentd-2.3.1-r2.ebuild b/net-misc/midentd/midentd-2.3.1-r3.ebuild index c48d07205eae..1abe32b1057f 100644 --- a/net-misc/midentd/midentd-2.3.1-r2.ebuild +++ b/net-misc/midentd/midentd-2.3.1-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="ident daemon with masquerading and fake replies support" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" @@ -10,9 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~sparc x86" -IUSE="" -DEPEND="" RDEPEND="dev-lang/perl" src_prepare() { diff --git a/net-misc/moonlight/moonlight-5.0.1-r2.ebuild b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild index a6dc05e965aa..33e79bb06086 100644 --- a/net-misc/moonlight/moonlight-5.0.1-r2.ebuild +++ b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ RDEPEND=" dev-qt/qtwidgets:5 media-libs/libglvnd media-libs/libpulse - media-libs/libsdl2[haptic,kms,joystick,sound,video] + media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video] media-libs/opus media-libs/sdl2-ttf media-video/ffmpeg:=[cuda?,libdrm?] diff --git a/net-misc/moonlight/moonlight-9999.ebuild b/net-misc/moonlight/moonlight-9999.ebuild index a6dc05e965aa..33e79bb06086 100644 --- a/net-misc/moonlight/moonlight-9999.ebuild +++ b/net-misc/moonlight/moonlight-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ RDEPEND=" dev-qt/qtwidgets:5 media-libs/libglvnd media-libs/libpulse - media-libs/libsdl2[haptic,kms,joystick,sound,video] + media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video] media-libs/opus media-libs/sdl2-ttf media-video/ffmpeg:=[cuda?,libdrm?] diff --git a/net-misc/mulk/mulk-0.7.0-r1.ebuild b/net-misc/mulk/mulk-0.7.0-r1.ebuild index 5c73349451a6..39a38b8fca99 100644 --- a/net-misc/mulk/mulk-0.7.0-r1.ebuild +++ b/net-misc/mulk/mulk-0.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="Download agent similar to wget/curl" HOMEPAGE="http://mulk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" diff --git a/net-misc/nemesis/nemesis-1.8.ebuild b/net-misc/nemesis/nemesis-1.8.ebuild index 11179c95c875..34fb4277a9dd 100644 --- a/net-misc/nemesis/nemesis-1.8.ebuild +++ b/net-misc/nemesis/nemesis-1.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libnet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~sparc ~x86" +KEYWORDS="~alpha amd64 sparc x86" RDEPEND=" net-libs/libnet:1.1 diff --git a/net-misc/netdate/netdate-1.2-r2.ebuild b/net-misc/netdate/netdate-1.2-r2.ebuild index 832dd2e23b62..53aa311fc857 100644 --- a/net-misc/netdate/netdate-1.2-r2.ebuild +++ b/net-misc/netdate/netdate-1.2-r2.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ~mips ~s390 ~sparc x86" DOCS=( README ) diff --git a/net-misc/netevent/Manifest b/net-misc/netevent/Manifest index de7b2ab75191..b0334a79634a 100644 --- a/net-misc/netevent/Manifest +++ b/net-misc/netevent/Manifest @@ -1,2 +1 @@ -DIST netevent-2.0_p20200217.tar.gz 39237 BLAKE2B 543456de89c6c57c7fe086d6697ca687ce0a04fce67efda7162e516eb1dca3f31b6ce31e1f5d7481fe538364f9f597103e3b77f3864c41456c6fe9080bfb424a SHA512 921982c8d9153e627c7931059e6163213ba2ac907f4ae98bcde62645e774cc41077ee728b698f3fad6a639fda19f99f9e43103006abe645f1a4ac4d68cf393c7 -DIST netevent-2.2.1.tar.gz 40826 BLAKE2B 7620ecaead747f0684bd9f9ce0c8c3126cc67b9eafa747f43986f9e0f162f771604b4ec0e9aa070f773d4bd535a98d3164dbc9a868e1dc72ddd8063f0cd45559 SHA512 f597b82f7343b9f22c9c8533d9821763e82aeb0afddcfa109499555a6ed1e32f00f3cc9f36fe3eb5d524ad594e861382e33168ea4033a68abd15385b8edaeab9 +DIST netevent-2.2.2.tar.gz 40889 BLAKE2B a52a6b352d8f842aeb85f7c4d82ed1c5008966893ec7bc3236d212b988470a051d0c5d6dca1f36029b3a83c4c908cd7d64e5cd0203b0677857dd66613a0f2c5a SHA512 bd993529d69b18a1774042f61fe891fedba96d2d630dbe066c9d9b88d18268eaad49062c76f688712a927e495f29e7b176da64676c6ef6109b2e92117ef00e1b diff --git a/net-misc/netevent/files/netevent-2.2.1-gcc13.patch b/net-misc/netevent/files/netevent-2.2.1-gcc13.patch deleted file mode 100644 index 89a7ba359b38..000000000000 --- a/net-misc/netevent/files/netevent-2.2.1-gcc13.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/Blub/netevent/pull/29 - -From 85f5db586dac20b69de1345c197e24be6123439d Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Tue, 18 Apr 2023 07:40:05 +0100 -Subject: [PATCH] Fix build with GCC 13 - -GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some -are no longer transitively included. - -See https://gnu.org/software/gcc/gcc-13/porting_to.html. - -Bug: https://bugs.gentoo.org/895142 ---- a/src/socket.cpp -+++ b/src/socket.cpp -@@ -6,6 +6,7 @@ - * SPDX-License-Identifier: GPL-2.0-or-later - */ - #include "socket.h" -+#include <cstdint> - #include <sys/socket.h> - #include <sys/un.h> - - diff --git a/net-misc/netevent/netevent-2.0_p20200217.ebuild b/net-misc/netevent/netevent-2.0_p20200217.ebuild deleted file mode 100644 index 2b5d47a93e73..000000000000 --- a/net-misc/netevent/netevent-2.0_p20200217.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -COMMIT="c2066fa55db6f51090e00a240889d2f0cbd0ab4d" -DESCRIPTION="Tool to share Linux event devices with other machines" -HOMEPAGE="https://github.com/Blub/netevent" -SRC_URI="https://github.com/Blub/netevent/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" -IUSE="doc" - -BDEPEND=" - doc? ( dev-python/docutils ) -" - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_configure() { - tc-export CXX - - # Not Autoconf. - RST2MAN=rst2man.py \ - ./configure \ - --prefix="${EPREFIX}"/usr \ - $(use_enable doc) \ - || die -} - -src_compile() { - emake CPPFLAGS="-Wall -Wno-unknown-pragmas" -} diff --git a/net-misc/netevent/netevent-2.2.1.ebuild b/net-misc/netevent/netevent-2.2.2.ebuild index 01deb12b4c43..c882e035e5cd 100644 --- a/net-misc/netevent/netevent-2.2.1.ebuild +++ b/net-misc/netevent/netevent-2.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,15 +17,11 @@ BDEPEND=" doc? ( dev-python/docutils ) " -PATCHES=( - "${FILESDIR}"/${PN}-2.2.1-gcc13.patch -) - src_configure() { tc-export CXX # Not Autoconf. - RST2MAN=rst2man.py \ + RST2MAN=$(type -P rst2man rst2man.py) \ ./configure \ --prefix="${EPREFIX}"/usr \ $(use_enable doc) \ diff --git a/net-misc/netifrc/netifrc-0.7.8.ebuild b/net-misc/netifrc/netifrc-0.7.8.ebuild index 40e121512a2c..5357dd17292d 100644 --- a/net-misc/netifrc/netifrc-0.7.8.ebuild +++ b/net-misc/netifrc/netifrc-0.7.8.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" fi LICENSE="BSD-2 GPL-2" diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index fbfa83286f18..e3de7d74c3ed 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -2,4 +2,5 @@ DIST nextcloud-client-3.11.1.tar.gz 13598448 BLAKE2B b1e9070c55972facd72c65b5711 DIST nextcloud-client-3.12.1.tar.gz 13640266 BLAKE2B 25ce7db16496e5e51bba40cf578fb21b21b9d606f73342032bb0ebafcd48cbb77e16fbd7f2efbd79501b8ca6a3976bc6e39984001b18abd7af5019103987fc5f SHA512 0ec00322d546abfc62645cb0674044e5f6dd12e0cab5e9cac0053f9bc42d42659fbb52f996d41cf166d45ed1750006cdd86669c6daee73b657e4b6807e4bae9a DIST nextcloud-client-3.12.2.tar.gz 13645095 BLAKE2B af79e3ea7686255be0424dba8a1a90416bc8a5c53d302c9ee7fe1d7ed29ded7e558be1838405195c7eef6f008724e6b8827edc0e0e7bdaa21ca330a695f225b1 SHA512 fc8956b435d91f9caefc1e334739c99bf0745e8feef5badd825d8e9a141b0f4e202a0b522d0ce01a19e137763342f9b3841fefaf233179116d759aceab86b8f3 DIST nextcloud-client-3.12.3.tar.gz 13642292 BLAKE2B 9cf2dcb507e2eca71a57b308dfa7d104393dc3bd8d8f6293ad07d1172446e641e7618d3744ac13f9b19a8725440ae9211600b21d03979e64ac26075a886f8763 SHA512 e333354b70102fd596c4fe18f69860c5c9313348359579cd552297a7e67dbb8a6ba7a9f09e9676e96298649f75fb649f2a9aa10d524ebedcf4b6aa244877fd62 +DIST nextcloud-client-3.13.0.tar.gz 13779791 BLAKE2B a0817a13af27e7fb57bb8a5644654cf3f8a461b7cb4afc71762b7bde5a7611ec57168939c07670d159e54ab11a49e991eda609a855e756d39ecca839a8f79586 SHA512 bf41a63a92e7e970e0b85d6df6e53e6ed8cd2c70fdfdfc86b144b01f82759a05f4bb016fd3009516bb405a589f26f84a8c6cf54191dc906a37d3dddf20dbcfbb DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4 diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild new file mode 100644 index 000000000000..0812c7b1c004 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake virtualx xdg + +DESCRIPTION="Desktop Syncing Client for Nextcloud" +HOMEPAGE="https://github.com/nextcloud/desktop" +SRC_URI=" + https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/desktop-${PV/_/-}" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="doc dolphin nautilus test webengine" +RESTRICT="!test? ( test )" + +# slot op for qtqui as this package uses private API parts of qtqui +# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h> +RDEPEND=" + >=dev-db/sqlite-3.34:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain:=[qt5(+)] + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5= + dev-qt/qtnetwork:5[ssl] + dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwebsockets:5 + dev-qt/qtwidgets:5 + net-libs/libcloudproviders + kde-frameworks/karchive:5 + sys-libs/zlib + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +DEPEND=" + ${RDEPEND} + dev-qt/qtconcurrent:5 + dev-qt/qtxml:5 + || ( gnome-base/librsvg media-gfx/inkscape ) + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + test? ( + dev-qt/qttest:5 + dev-util/cmocka + ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + dolphin? ( kde-frameworks/extra-cmake-modules ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch +) + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DBUILD_UPDATER=OFF + $(cmake_use_find_package doc Sphinx) + $(cmake_use_find_package doc PdfLatex) + $(cmake_use_find_package webengine Qt5WebEngine) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + TEST_VERBOSE=1 virtx cmake_src_test +} + +src_compile() { + local compile_targets=(all) + if use doc; then + compile_targets+=(doc doc-man) + fi + cmake_src_compile ${compile_targets[@]} +} + +pkg_postinst() { + xdg_pkg_postinst + + if ! has_version -r "dev-libs/qtkeychain[keyring]"; then + elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag." + elog "Please consider enabling the 'keyring' USE flag. Otherwise you may" + elog "have to authenticate manually every time you start the nextlcoud client." + elog "See https://bugs.gentoo.org/912844 for more information." + fi +} diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 38ee02fb9e65..39399cdf6cee 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -1,3 +1,4 @@ -DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1 DIST ntpsec-1.2.2a.tar.gz 2710790 BLAKE2B b069433598697ab1e8110dbd005316a295d14c1e180fe0af2d19494bdff941d01234f0b4e9f38a150e27e450e1bd1f4dcf4535f9ff51c253670d11c5cb67382d SHA512 7a2cc04bde49800a745c74933e565a4764a22be484faffc5ea933231b74507af737a691cd0bb3aa024e81c083be0718c8d7b30dd152b0b0d386ae72fda426db9 DIST ntpsec-1.2.2a.tar.gz.asc 833 BLAKE2B ce21b020d2a8590b731fdd4c171041fadbd699d60b9e10b2dc548675eed2efc04b9d5ae75fa8f77cc9c8e55db0f609d1eee5c5f2f7c7d804e1b087eb9ea95e1d SHA512 c1b0c1c6b534b11ef172d5ab68ada47bbd9e3f0298400c684e8745447221db16e4f4de436f06b0f6ab374e437b0506853a3a3da2bbe17c148cdf7de62c769f28 +DIST ntpsec-1.2.3.tar.gz 2725081 BLAKE2B d39a4d08790949afb28b843739a410624a8d862bfc25afd4e6c7dc55be43e41f3c89823406c60fb911496e7a3db51d6fa83c8bcda9b9686708c36154c2fe9686 SHA512 6baecf32f499fc12c2ef0b44360072b61ab9e8b52ec7ead64ff43a27b5a57431db939d4ce1fad92d38def981f6256a1d8ede0c0cdc5abb50d861be729255eee2 +DIST ntpsec-1.2.3.tar.gz.asc 833 BLAKE2B f0d6a0b163a7f9214da6d6eb1982f87387a7087efb740ec146f55362381aa101a5a8e40c27f121ca6607c0a5c429b1e06ecaf9a9ab5392d836535430cf6575fa SHA512 17280e3092e7e9de0ddae0723637a261d3a740d916ce0f016c44c6010672cfe2fc39b45f86257cfa5bd29f1f11895f8bd583c76765c6484489027cbc82dbe6b2 diff --git a/net-misc/ntpsec/ntpsec-1.2.2.ebuild b/net-misc/ntpsec/ntpsec-1.2.2.ebuild deleted file mode 100644 index 0b9c2a939cc3..000000000000 --- a/net-misc/ntpsec/ntpsec-1.2.2.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='threads(+)' -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 flag-o-matic waf-utils systemd toolchain-funcs - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" -else - SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~riscv ~x86" -fi - -DESCRIPTION="The NTP reference implementation, refactored" -HOMEPAGE="https://www.ntpsec.org/" - -NTPSEC_REFCLOCK=( - oncore trimble truetime gpsd jjy generic spectracom - shm pps hpgps zyfer arbiter nmea modem local -) - -IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} - -LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" -SLOT="0" -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice -REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" - -# net-misc/pps-tools oncore,pps -DEPEND="${PYTHON_DEPS} - dev-libs/openssl:= - dev-python/psutil[${PYTHON_USEDEP}] - sys-libs/libcap - libbsd? ( dev-libs/libbsd:0= ) - seccomp? ( sys-libs/libseccomp ) - rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools )" -RDEPEND="${DEPEND} - !net-misc/ntp - !net-misc/openntpd - acct-group/ntp - acct-user/ntp - ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )" -BDEPEND=">=app-text/asciidoc-8.6.8 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - app-alternatives/yacc" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" -) - -WAF_BINARY="${S}/waf" - -src_prepare() { - default - - # Remove autostripping of binaries - sed -i -e '/Strip binaries/d' wscript || die - if ! use libbsd ; then - eapply "${FILESDIR}/${PN}-no-bsd.patch" - fi - # remove extra default pool servers - sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die - - python_copy_sources -} - -src_configure() { - tc-is-lto && filter-flags -fuse-linker-plugin - filter-lto - - local string_127="" - local rclocks=""; - local CLOCKSTRING="" - - for refclock in ${NTPSEC_REFCLOCK[@]} ; do - if use rclock_${refclock} ; then - string_127+="$refclock," - fi - done - CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" - - myconf=( - --notests - --nopyc - --nopyo - --enable-pylib ext - --refclock="${CLOCKSTRING}" - #--build-epoch="$(date +%s)" - $(use doc || echo "--disable-doc") - $(use early && echo "--enable-early-droproot") - $(use gdb && echo "--enable-debug-gdb") - $(use samba && echo "--enable-mssntp") - $(use seccomp && echo "--enable-seccomp") - $(use smear && echo "--enable-leap-smear") - $(use debug && echo "--enable-debug") - ) - - distutils-r1_src_configure -} - -python_configure() { - waf-utils_src_configure "${myconf[@]}" -} - -python_compile() { - waf-utils_src_compile --notests -} - -python_test() { - waf-utils_src_compile check -} - -src_install() { - distutils-r1_src_install - - # Install heat generating scripts - use heat && dosbin "${S}"/contrib/ntpheat{,usb} - - # Install the openrc files - newinitd "${FILESDIR}"/ntpd.rc-r3 ntp - newconfd "${FILESDIR}"/ntpd.confd ntp - - # Install the systemd unit file - systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service - - # Prepare a directory for the ntp.drift file - mkdir -pv "${ED}"/var/lib/ntp - chown ntp:ntp "${ED}"/var/lib/ntp - chmod 770 "${ED}"/var/lib/ntp - keepdir /var/lib/ntp - - # Install a log rotate script - mkdir -pv "${ED}"/etc/logrotate.d - cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd - - # Install the configuration file and sample configuration - cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf - cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ - - # move doc files to /usr/share/doc/"${P}" - use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html -} - -python_install() { - waf-utils_src_install --notests - python_fix_shebang "${ED}" - python_optimize -} - -pkg_postinst() { - einfo "If you want to serve time on your local network, then" - einfo "you should disable all the ref_clocks unless you have" - einfo "one and can get stable time from it. Feel free to try" - einfo "it but PPS probably won't work unless you have a UART" - einfo "GPS that actually provides PPS messages." -} diff --git a/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3.ebuild index 8dccc88c556e..ca1b744563fb 100644 --- a/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3.ebuild @@ -3,23 +3,34 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 flag-o-matic waf-utils systemd toolchain-funcs +inherit distutils-r1 flag-o-matic waf-utils systemd if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else - SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc + inherit verify-sig + SRC_URI=" + https://ftp.ntpsec.org/pub/releases/${P}.tar.gz + verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc ) + " KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )" fi DESCRIPTION="The NTP reference implementation, refactored" HOMEPAGE="https://www.ntpsec.org/" +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" + NTPSEC_REFCLOCK=( oncore trimble truetime gpsd jjy generic spectracom shm pps hpgps zyfer arbiter nmea modem local @@ -27,30 +38,37 @@ NTPSEC_REFCLOCK=( IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} -LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" -SLOT="0" -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" # net-misc/pps-tools oncore,pps -DEPEND="${PYTHON_DEPS} +DEPEND=" + ${PYTHON_DEPS} dev-libs/openssl:= dev-python/psutil[${PYTHON_USEDEP}] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools )" -RDEPEND="${DEPEND} + rclock_pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp - ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )" -BDEPEND=">=app-text/asciidoc-8.6.8 + ntpviz? ( + media-fonts/liberation-fonts + sci-visualization/gnuplot + ) +" +BDEPEND+=" + >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets - app-alternatives/yacc" + app-alternatives/yacc +" PATCHES=( "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" @@ -74,7 +92,6 @@ src_prepare() { } src_configure() { - tc-is-lto && filter-flags -fuse-linker-plugin filter-lto local string_127="" @@ -97,7 +114,6 @@ src_configure() { #--build-epoch="$(date +%s)" $(use doc || echo "--disable-doc") $(use early && echo "--enable-early-droproot") - $(use gdb && echo "--enable-debug-gdb") $(use samba && echo "--enable-mssntp") $(use seccomp && echo "--enable-seccomp") $(use smear && echo "--enable-leap-smear") @@ -138,7 +154,7 @@ src_install() { chmod 770 "${ED}"/var/lib/ntp keepdir /var/lib/ntp - # Install a log rotate script + # Install a logrotate script mkdir -pv "${ED}"/etc/logrotate.d cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index cc9e877c051b..ca1b744563fb 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no @@ -38,7 +38,7 @@ NTPSEC_REFCLOCK=( IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" # net-misc/pps-tools oncore,pps @@ -114,7 +114,6 @@ src_configure() { #--build-epoch="$(date +%s)" $(use doc || echo "--disable-doc") $(use early && echo "--enable-early-droproot") - $(use gdb && echo "--enable-debug-gdb") $(use samba && echo "--enable-mssntp") $(use seccomp && echo "--enable-seccomp") $(use smear && echo "--enable-leap-smear") diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild index 01e20ce031b4..3a112d2be6bb 100644 --- a/net-misc/nx/nx-3.5.99.26.ebuild +++ b/net-misc/nx/nx-3.5.99.26.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="NX compression technology core libraries" HOMEPAGE="https://github.com/ArcticaProject/nx-libs" @@ -72,6 +72,13 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861680 + # + # inherited from libX11 vendored code. libX11 passes this flag already. + append-flags -fno-strict-aliasing + filter-lto + # From xorg-x11-6.9.0-r3.ebuild pushd nx-X11 || die HOSTCONF="config/cf/host.def" diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild index e054f77bb1e5..60a90c7c8d28 100644 --- a/net-misc/nx/nx-3.5.99.27.ebuild +++ b/net-misc/nx/nx-3.5.99.27.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="NX compression technology core libraries" HOMEPAGE="https://github.com/ArcticaProject/nx-libs" @@ -66,6 +66,13 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861680 + # + # inherited from libX11 vendored code. libX11 passes this flag already. + append-flags -fno-strict-aliasing + filter-lto + # From xorg-x11-6.9.0-r3.ebuild pushd nx-X11 || die HOSTCONF="config/cf/host.def" diff --git a/net-misc/nyx/nyx-2.1.0-r6.ebuild b/net-misc/nyx/nyx-2.1.0-r6.ebuild index 4211aadc685b..11c917f7f5e2 100644 --- a/net-misc/nyx/nyx-2.1.0-r6.ebuild +++ b/net-misc/nyx/nyx-2.1.0-r6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{9..12} pypy3 ) PYTHON_REQ_USE='ncurses,sqlite(-)' DISTUTILS_USE_PEP517=setuptools diff --git a/net-misc/omniORB/omniORB-4.3.0.ebuild b/net-misc/omniORB/omniORB-4.3.0.ebuild index 8c5b5b6367f9..49ee886822a3 100644 --- a/net-misc/omniORB/omniORB-4.3.0.ebuild +++ b/net-misc/omniORB/omniORB-4.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ inherit python-single-r1 MY_P="${P/_p/-}" DESCRIPTION="A robust, high-performance CORBA 2 ORB" HOMEPAGE="http://omniorb.sourceforge.net/" -SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/omniorb/${MY_P}.tar.bz2" LICENSE="LGPL-2 GPL-2" SLOT="0" diff --git a/net-misc/openssh-contrib/files/openssh-8.6_p1-hpn-version.patch b/net-misc/openssh-contrib/files/openssh-8.6_p1-hpn-version.patch deleted file mode 100644 index 6dc290d6737b..000000000000 --- a/net-misc/openssh-contrib/files/openssh-8.6_p1-hpn-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kex.c b/kex.c -index 34808b5c..88d7ccac 100644 ---- a/kex.c -+++ b/kex.c -@@ -1205,7 +1205,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, - if (version_addendum != NULL && *version_addendum == '\0') - version_addendum = NULL; - if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", -- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, -+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, - version_addendum == NULL ? "" : " ", - version_addendum == NULL ? "" : version_addendum)) != 0) { - oerrno = errno; diff --git a/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild index 4f323c2a427c..6aca37ef3cb8 100644 --- a/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild +++ b/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild @@ -33,7 +33,7 @@ DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches" HOMEPAGE="https://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz ${HPN_VER:+hpn? ( - $(printf "mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}") + $(printf "https://downloads.sourceforge.net/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}") https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz )} ${X509_VER:+X509? ( diff --git a/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r1.ebuild index bc719634c185..f9f2c349c740 100644 --- a/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r1.ebuild +++ b/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r1.ebuild @@ -33,7 +33,7 @@ DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches" HOMEPAGE="https://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz ${HPN_VER:+hpn? ( - $(printf "mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}") + $(printf "https://downloads.sourceforge.net/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}") https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz )} ${X509_VER:+X509? ( diff --git a/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch b/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch deleted file mode 100644 index 7e9334a781d2..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -257,6 +257,15 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_statx - SC_DENY(__NR_statx, EACCES), - #endif -+#ifdef __NR_shmget -+ SC_DENY(__NR_shmget, EACCES), -+#endif -+#ifdef __NR_shmat -+ SC_DENY(__NR_shmat, EACCES), -+#endif -+#ifdef __NR_shmdt -+ SC_DENY(__NR_shmdt, EACCES), -+#endif - - /* Syscalls to permit */ - #ifdef __NR_brk diff --git a/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch b/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch new file mode 100644 index 000000000000..cf06b80cd5fa --- /dev/null +++ b/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch @@ -0,0 +1,20 @@ +xmss_hash.c: In function ‘core_hash_SHA2’: +xmss_hash.c:56:5: error: implicit declaration of function ‘SHA256’ [-Wimplicit-function-declaration] + 56 | SHA256(buf, inlen + keylen + n, out); + | ^~~~~~ +xmss_hash.c:61:7: error: implicit declaration of function ‘SHA512’ [-Wimplicit-function-declaration] + 61 | SHA512(buf, inlen + keylen + n, out); + | ^~~~~~ + +diff --git a/xmss_hash.c b/xmss_hash.c +index 70c126ae2..cb17de2af 100644 +--- a/xmss_hash.c ++++ b/xmss_hash.c +@@ -12,6 +12,7 @@ Public domain. + #include "xmss_hash_address.h" + #include "xmss_commons.h" + #include "xmss_hash.h" ++#include <openssl/sha.h> + + #include <stddef.h> + #ifdef HAVE_STDINT_H diff --git a/net-misc/openssh/openssh-9.6_p1-r3.ebuild b/net-misc/openssh/openssh-9.6_p1-r3.ebuild index 8156cd96d1b4..c944856ebe5b 100644 --- a/net-misc/openssh/openssh-9.6_p1-r3.ebuild +++ b/net-misc/openssh/openssh-9.6_p1-r3.ebuild @@ -78,7 +78,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" - "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" ) diff --git a/net-misc/openssh/openssh-9.6_p1-r4.ebuild b/net-misc/openssh/openssh-9.6_p1-r4.ebuild new file mode 100644 index 000000000000..8d611b8b20b5 --- /dev/null +++ b/net-misc/openssh/openssh-9.6_p1-r4.ebuild @@ -0,0 +1,390 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND=" + ${RDEPEND} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" + "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + econf "${myconf[@]}" +} + +src_test() { + local tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + +# Gentoo tweaks to default config files. +tweak_ssh_configs() { + local locale_vars=( + # These are language variables that POSIX defines. + # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 + LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME + + # These are the GNU extensions. + # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html + LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE + ) + + dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + if use pam ; then + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + fi +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + tweak_ssh_configs + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + diropts -m 0700 + dodir /etc/skel/.ssh + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi +} diff --git a/net-misc/openssh/openssh-9.7_p1-r2.ebuild b/net-misc/openssh/openssh-9.7_p1-r2.ebuild index 3b0c7f2125a0..ce9e1d1a47c2 100644 --- a/net-misc/openssh/openssh-9.7_p1-r2.ebuild +++ b/net-misc/openssh/openssh-9.7_p1-r2.ebuild @@ -76,7 +76,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" ) diff --git a/net-misc/openssh/openssh-9.7_p1-r3.ebuild b/net-misc/openssh/openssh-9.7_p1-r3.ebuild new file mode 100644 index 000000000000..9bb9c924093a --- /dev/null +++ b/net-misc/openssh/openssh-9.7_p1-r3.ebuild @@ -0,0 +1,404 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND=" + ${RDEPEND} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + econf "${myconf[@]}" +} + +tweak_ssh_configs() { + cat <<-EOF >> ssh_config.out || die + + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> sshd_config.out || die + + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF +} + +create_config_dropins() { + local locale_vars=( + # These are language variables that POSIX defines. + # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 + LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME + + # These are the GNU extensions. + # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html + LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE + ) + + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + if use pam ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + fi +} + +src_compile() { + default + tweak_ssh_configs + create_config_dropins +} + +src_test() { + local tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' + + # Install dropins with explicit mode, bug 906638, 915840 + diropts -m0755 + insopts -m0644 + insinto /etc/ssh + doins -r "${WORKDIR}"/etc/ssh/ssh_config.d + doins "${WORKDIR}"/etc/ssh/ssh_revoked_hosts + diropts -m0700 + insopts -m0600 + doins -r "${WORKDIR}"/etc/ssh/sshd_config.d +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi +} diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 7acfe647114a..19823fb47223 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1,2 @@ -DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5 SHA512 c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1 +DIST openvswitch-2.17.9.tar.gz 8136490 BLAKE2B cdb5ec81fb9ac04786fc1230d60c6c9bbf7ec2929cf5ab40bb1e0e7442480383d0ad8f24f14df4901cab8f39a6532445cf1810c9b9e3a779d7d15bfe35101a37 SHA512 b91212f9c10a208bca9d15cd5a219ae24b7e9bf8b5c8fdebc21cd9fa8229bc655f9f3591d79dd30c1a8212daed15d5a26bf9532b3496e3660bc8b62012f45636 diff --git a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch b/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch deleted file mode 100644 index 3035005ae52e..000000000000 --- a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch +++ /dev/null @@ -1,145 +0,0 @@ -https://bugs.gentoo.org/910196 -https://github.com/openvswitch/ovs/commit/a45b3afbf82e1c1702d25a5097a25c45923c6fae -https://github.com/openvswitch/ovs/commit/6929485d318e08c11e8e98f7847d5cefcb36c21c -https://github.com/openvswitch/ovs/commit/93412e00e7a1f61c5eb4771d150bdbf504ff59aa - -From a45b3afbf82e1c1702d25a5097a25c45923c6fae Mon Sep 17 00:00:00 2001 -From: gordonwwang <gordonwwang@tencent.com> -Date: Thu, 17 Aug 2023 11:04:39 +0800 -Subject: [PATCH] ovs.tmac: Fix troff warning in versions above groff-1.23. - -When the compilation dependency is groff-1.23, the following message is -displayed in the compilation log, and the compilation fails: - - troff:vswitchd/ovs-vswitchd.8:1298: warning: cannot select font 'CW' - make[1]: *** [Makefile:6761: manpage-check] Error 1 - -CW font was removed and and now groff warns about non-existent font: - https://git.savannah.gnu.org/cgit/groff.git/commit/?id=d75ea8b2e283e37bd560e821fa4597065f36725f) - -Fix that by replacing CW with CR. CW supposed to be an alias of CR -anyway. - -Submitted-at: https://github.com/openvswitch/ovs/pull/416 -Co-authored-by: Xiaojie Chen <jackchanx@163.com> -Signed-off-by: Xiaojie Chen <jackchanx@163.com> -Signed-off-by: gordonwwang <gordonwwang@tencent.com> -Signed-off-by: Ilya Maximets <i.maximets@ovn.org> ---- - lib/ovs.tmac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ovs.tmac b/lib/ovs.tmac -index 5f8f20afa4a..97b6fa3df76 100644 ---- a/lib/ovs.tmac -+++ b/lib/ovs.tmac -@@ -175,7 +175,7 @@ - . nr mE \\n(.f - . nf - . nh --. ft CW -+. ft CR - .. - . - . - -From 6929485d318e08c11e8e98f7847d5cefcb36c21c Mon Sep 17 00:00:00 2001 -From: Frode Nordahl <frode.nordahl@canonical.com> -Date: Mon, 21 Aug 2023 15:53:33 +0200 -Subject: [PATCH] docs: Add `nowarn` region option to tables. - -Starting with groff 1.23.0 a warning is produced if the tbl -preprocessor is not run. A side effect of enabling it is that -new warnings on table formatting is printed. - -As requested during the review [0] of a series [1] attempting to -address this, this patch makes use of the `nowarn` region option -as opposed to attempting to change the formatting. - -0: https://patchwork.ozlabs.org/project/openvswitch/patch/ZM00Wfa80rOb2oCA@riva.ucam.org/#3164177 -1: https://patchwork.ozlabs.org/project/openvswitch/list/?series=367378&state=* - -Reported-by: Lucas Nussbaum <lucas@debian.org> -Reported-at: https://bugs.debian.org/1042358 -Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com> -Signed-off-by: Ilya Maximets <i.maximets@ovn.org> ---- - build-aux/extract-ofp-fields | 6 +++--- - lib/meta-flow.xml | 1 + - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields -index 8766995d9ab..7a9788be968 100755 ---- a/build-aux/extract-ofp-fields -+++ b/build-aux/extract-ofp-fields -@@ -578,7 +578,7 @@ def field_to_xml(field_node, f, body, summary): - body += [""".PP - \\fB%s Field\\fR - .TS --tab(;); -+tab(;),nowarn; - l lx. - """ % title] - -@@ -655,7 +655,7 @@ def group_xml_to_nroff(group_node, fields): - '.SH \"%s\"\n' % build.nroff.text_to_nroff(title.upper() + " FIELDS"), - '.SS "Summary:"\n', - '.TS\n', -- 'tab(;);\n', -+ 'tab(;),nowarn;\n', - 'l l l l l l l.\n', - 'Name;Bytes;Mask;RW?;Prereqs;NXM/OXM Support\n', - '\_;\_;\_;\_;\_;\_\n'] -@@ -665,7 +665,7 @@ def group_xml_to_nroff(group_node, fields): - return ''.join(content) - - def make_oxm_classes_xml(document): -- s = '''tab(;); -+ s = '''tab(;),nowarn; - l l l. - Prefix;Vendor;Class - \_;\_;\_ -diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml -index ff81fddc5e7..fe80ee930d0 100644 ---- a/lib/meta-flow.xml -+++ b/lib/meta-flow.xml -@@ -3517,6 +3517,7 @@ actions=clone(load:0->NXM_OF_IN_PORT[],output:123) - </p> - - <tbl> -+nowarn; - r r r r r. - Criteria OpenFlow 1.0 OpenFlow 1.1 OpenFlow 1.2+ NXM - \_ \_ \_ \_ \_ -From 93412e00e7a1f61c5eb4771d150bdbf504ff59aa Mon Sep 17 00:00:00 2001 -From: Colin Watson <cjwatson@ubuntu.com> -Date: Mon, 21 Aug 2023 15:53:34 +0200 -Subject: [PATCH] docs: Run tbl preprocessor in manpage-check rule. - -If we omit this, groff 1.23.0 warns: - - tbl preprocessor failed, or it or soelim was not run; table(s) likely - not rendered (TE macro called with TW register undefined) - -Reported-by: Lucas Nussbaum <lucas@debian.org> -Reported-at: https://bugs.debian.org/1042358 -Signed-off-by: Colin Watson <cjwatson@ubuntu.com> -Signed-off-by: Ilya Maximets <i.maximets@ovn.org> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index cb8076433e8..2a41e63ad90 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -368,7 +368,7 @@ ALL_LOCAL += manpage-check - manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS) - @error=false; \ - for manpage in $?; do \ -- LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ -+ LANG=en_US.UTF-8 groff -t -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ - if grep warning: $@.tmp; then error=:; fi; \ - rm -f $@.tmp; \ - done; \ - diff --git a/net-misc/openvswitch/openvswitch-2.17.8.ebuild b/net-misc/openvswitch/openvswitch-2.17.8.ebuild index b8af26f3b838..03f00817ad77 100644 --- a/net-misc/openvswitch/openvswitch-2.17.8.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.8.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild index ff783ad71bfb..1053a8bdd80b 100644 --- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 MODULES_OPTIONAL_USE="modules" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools linux-mod python-single-r1 systemd tmpfiles +inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org" @@ -14,14 +14,14 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Check python/ovs/version.py in tarball for dev-python/ovs dep RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' - ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] + ~dev-python/ovs-2.17.9[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] ') @@ -39,7 +39,6 @@ BDEPEND="virtual/pkgconfig PATCHES=( "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" - "${FILESDIR}/openvswitch-2.17.6-groff-1.23.0.patch" ) CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" @@ -51,7 +50,7 @@ pkg_setup() { CONFIG_CHECK+=" ~!OPENVSWITCH" kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" - linux-mod_pkg_setup + linux-mod-r1_pkg_setup else CONFIG_CHECK+=" ~OPENVSWITCH" linux-info_pkg_setup @@ -106,7 +105,7 @@ src_configure() { src_compile() { default - use modules && linux-mod_src_compile + use modules && linux-mod-r1_src_compile } src_install() { @@ -144,11 +143,11 @@ src_install() { insinto /etc/logrotate.d newins rhel/etc_logrotate.d_openvswitch openvswitch - use modules && linux-mod_src_install + use modules && linux-mod-r1_src_install } pkg_postinst() { - use modules && linux-mod_pkg_postinst + use modules && linux-mod-r1_pkg_postinst tmpfiles_process openvswitch.conf diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest index 11f5c4743bd1..58e08ceca1b8 100644 --- a/net-misc/passt/Manifest +++ b/net-misc/passt/Manifest @@ -1,5 +1,4 @@ -DIST passt-2023.12.04.tar.xz 188136 BLAKE2B f1d72fbb4bbb25f6a11e9ff87a91cf9bac06e047b8cb9a8b40402ced1422c23b105fa7e64646698d38ad747efa449c34cfdaecf492a3e4984114cbcf60656cdc SHA512 febd9fa22363438b52b2688481183d81c22966e1775139fc559dbfa50437c9b00ba09800db867738d25fcea8ac05d4589b75dcd2d0c88eeffefc0598d4236001 -DIST passt-2023.12.30.tar.xz 188596 BLAKE2B 75712a7cb7a00fea20427979153090d938b8c7b0e3da61c83cabb3751786034df35ebbe8afbd991d582a680f55b12792547b68efa931a5576dc181040b31e5fd SHA512 4b19d191e2526bacc61bb8ab2964f5da4e0535656b094a7592f91d6b437c855a586fc772e2abd89138ff4f89aae12ade494c6e0fe7bee1502fe319215200d8f0 -DIST passt-2024.03.20.tar.xz 195332 BLAKE2B 1bed740ddd235f300a4233fb2024f155758809589f1fdd2174ab99a8a93dd16044ab41814b215d12eb1e557966a73a3754bbff2b9acd752b45b385edd88ba3c7 SHA512 3701820e539545771d0f867fe0b8977cb5967e7501413f717fed08d2d2c141f17d86ed7238177b4fb4cf4cfc01c6c9d07e3c218c34b48e0a5a1f2b2ce8a5b903 DIST passt-2024.03.26.tar.xz 195348 BLAKE2B d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c SHA512 da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7 DIST passt-2024.04.05.tar.xz 195772 BLAKE2B 4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a SHA512 bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b +DIST passt-2024.04.26.tar.xz 196148 BLAKE2B f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68 SHA512 f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98 +DIST passt-2024.05.10.tar.xz 195992 BLAKE2B 9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae SHA512 04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3 diff --git a/net-misc/passt/passt-2023.12.04.ebuild b/net-misc/passt/passt-2023.12.04.ebuild deleted file mode 100644 index 5683bd6f8693..000000000000 --- a/net-misc/passt/passt-2023.12.04.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" -HOMEPAGE="https://passt.top/" - -RELEASE_COMMIT="b86afe3" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://passt.top/passt" -else - SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" - S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - KEYWORDS="~amd64" -fi - -LICENSE="BSD GPL-2+" -SLOT="0" -IUSE="static" - -src_compile() { - [[ ${PV} != 9999* ]] && export VERSION="${PV}" - export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" - - emake $(usev static) -} diff --git a/net-misc/passt/passt-2024.03.20.ebuild b/net-misc/passt/passt-2024.04.26.ebuild index ed54ff64b6be..c73a0f7c146b 100644 --- a/net-misc/passt/passt-2024.03.20.ebuild +++ b/net-misc/passt/passt-2024.04.26.ebuild @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" HOMEPAGE="https://passt.top/" -RELEASE_COMMIT="71dd405" +RELEASE_COMMIT="d03c4e2" if [[ ${PV} == 9999* ]]; then inherit git-r3 diff --git a/net-misc/passt/passt-2023.12.30.ebuild b/net-misc/passt/passt-2024.05.10.ebuild index cf2c6784ce85..9e4992ffaab0 100644 --- a/net-misc/passt/passt-2023.12.30.ebuild +++ b/net-misc/passt/passt-2024.05.10.ebuild @@ -3,10 +3,12 @@ EAPI=8 +inherit toolchain-funcs + DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" HOMEPAGE="https://passt.top/" -RELEASE_COMMIT="f091893" +RELEASE_COMMIT="7288448" if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -14,13 +16,22 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - KEYWORDS="~amd64 ~riscv" + KEYWORDS="~amd64 ~arm64 ~riscv" fi LICENSE="BSD GPL-2+" SLOT="0" IUSE="static" +PATCHES=( + "${FILESDIR}"/Makefile-2024.03.20.patch +) + +src_prepare() { + default + tc-export CC +} + src_compile() { [[ ${PV} != 9999* ]] && export VERSION="${PV}" export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" diff --git a/net-misc/passt/passt-9999.ebuild b/net-misc/passt/passt-9999.ebuild index e4201215e520..9e4992ffaab0 100644 --- a/net-misc/passt/passt-9999.ebuild +++ b/net-misc/passt/passt-9999.ebuild @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" HOMEPAGE="https://passt.top/" -RELEASE_COMMIT="954589b" +RELEASE_COMMIT="7288448" if [[ ${PV} == 9999* ]]; then inherit git-r3 diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest index 8f822449e20c..ea0c572650c4 100644 --- a/net-misc/pedro/Manifest +++ b/net-misc/pedro/Manifest @@ -1,2 +1,2 @@ -DIST pedro-1.12.tgz 1181678 BLAKE2B ed882ab3dae0912519283229d10ff6f12ef4f623d72beaf22b8467e8072752fbd57836a0ebbad0f0ce3da1b4837049161bcb12673e3c38c94eb167e16c0c0a1e SHA512 936b2c6cac526d9d3c0e146b53dc65ed0508c6abd1b66c97656fa5b4011d7dd11912d1c0bf091a29b56e13c3e19ec3e0ad7760d44d4887b939699cdd2389c819 +DIST pedro-1.14.tgz 1213309 BLAKE2B 104f3816d79534411ba5d78517a744d9a0bf892cf99a1c654a94b9041f4ff038c00d029b182b8f825cfe80cb9861e9440b4e73de3be1f74945a34dbaefb995e7 SHA512 ffe32c296c8325ea31a4bf5d937504e9076654253f19dea17b234f53ba62a4b96e8611cab1dbf545f30734cfd8924e4140b08956180886ac21849546b9ad0cad DIST pedro-manual-1.x.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99 diff --git a/net-misc/pedro/files/pedro-1.12-portage.patch b/net-misc/pedro/files/pedro-1.14-portage.patch index 17b027cebdf0..2bd26d0d92e6 100644 --- a/net-misc/pedro/files/pedro-1.12-portage.patch +++ b/net-misc/pedro/files/pedro-1.14-portage.patch @@ -1,14 +1,18 @@ ---- pedro-1.12.orig/configure.ac 2021-01-06 21:02:47.000000000 -0000 -+++ pedro-1.12/configure.ac 2021-05-31 18:52:32.205375746 -0000 -@@ -4,30 +4,31 @@ +Adapted Gentoo patch from version 1.12 + +diff --git a/configure.ac b/configure.ac +index 21f803d..d89b296 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,30 +4,21 @@ AM_INIT_AUTOMAKE AC_PROG_CC - AC_PROG_LEX + AC_PROG_LEX([noyywrap]) AC_PROG_INSTALL +AM_PROG_AR AC_PROG_RANLIB #AC_PROG_LIBTOOL PKG_CHECK_MODULES([GLIB],[glib-2.0 >= 2.12]) - AM_CONFIG_HEADER(config.h) + AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -CPPFLAGS="-DNDEBUG -O2 -g `pkg-config --cflags glib-2.0`" +CPPFLAGS="`${PKG_CONFIG} --cflags glib-2.0`" @@ -19,27 +23,23 @@ - LDFLAGS="" - #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" -+ #LDFLAGS="" -+ #LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" - ;; - *x86*) - WIN32="no" +- ;; +- *x86*) +- WIN32="no" - LDFLAGS="" - #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" -+ #LDFLAGS="" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ #LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" ++ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" ;; *) WIN32="no" - #LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LDFLAGS="" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" -+ #LDFLAGS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ #LDFLAGS="" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" ++ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" ;; esac - AC_OUTPUT(Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile) + AC_CONFIG_FILES([Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile]) +-- +2.43.2 + diff --git a/net-misc/pedro/pedro-1.12.ebuild b/net-misc/pedro/pedro-1.14.ebuild index e66bf2c9ece4..44f6236944f0 100644 --- a/net-misc/pedro/pedro-1.12.ebuild +++ b/net-misc/pedro/pedro-1.14.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools toolchain-funcs diff --git a/net-misc/portfwd/portfwd-0.29-r2.ebuild b/net-misc/portfwd/portfwd-0.29-r2.ebuild index 98f201afdb05..1b230495fa9e 100644 --- a/net-misc/portfwd/portfwd-0.29-r2.ebuild +++ b/net-misc/portfwd/portfwd-0.29-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools systemd DESCRIPTION="Port Forwarding Daemon" HOMEPAGE="http://portfwd.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r2.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r2.ebuild index 2451c9339969..b0938ec85d0f 100644 --- a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r2.ebuild +++ b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit desktop xdg DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3" HOMEPAGE="https://github.com/ps3mediaserver/ps3mediaserver" -SRC_URI="mirror://sourceforge/project/ps3mediaserver/pms-${PV}-generic-linux-unix.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/ps3mediaserver/pms-${PV}-generic-linux-unix.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/puf/puf-1.0.0-r2.ebuild b/net-misc/puf/puf-1.0.0-r2.ebuild index ab3729ad5e25..bb6d8e87f1c2 100644 --- a/net-misc/puf/puf-1.0.0-r2.ebuild +++ b/net-misc/puf/puf-1.0.0-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Download tool for UNIX-like systems" HOMEPAGE="https://puf.sourceforge.net/" -SRC_URI="mirror://sourceforge/puf/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/puf/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest index beb1f064be86..e13e75e9f078 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -1,2 +1,2 @@ -DIST putty-0.80.tar.gz 2831433 BLAKE2B 95769ed372ee57f1cd0b9c9b26aab47c710b3eac2dd2f40b511179f1e06dae6c59ef5fd270eddc6b0531d8ed135897490ea029e0ca8c1febefe64743ddada341 SHA512 c8a6b6fa54ecd8bcf4ec274fef51343dd9996e6458b250b5555c4dc88ded25e87f97277da482c29858510e65635112d541f559ab683635bd950572d850129f90 +DIST putty-0.81.tar.gz 2844616 BLAKE2B f4f687555ae6d043f9eb868eccb1086227a0fa3ec1a5eff68ab7ccd96c877fd87afad9c9639930e899e0fc16058ea0f4553a3035ab477761038d6257332d64af SHA512 d86f2fd0e126b18275d58cf64334b3b27c450899a1c2be2502de9faa2ef58f7fc8efc5d45f25c8395623f1e21917aa02407343bb2fee44c4c00b9f81267d5ecd DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 diff --git a/net-misc/putty/putty-0.80.ebuild b/net-misc/putty/putty-0.81.ebuild index fdd92be3c643..fdd92be3c643 100644 --- a/net-misc/putty/putty-0.80.ebuild +++ b/net-misc/putty/putty-0.81.ebuild diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml index c59a75f5deff..4ff4504747c1 100644 --- a/net-misc/qtm/metadata.xml +++ b/net-misc/qtm/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">catkin</remote-id> </upstream> diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest index 81aa650817b3..e6a6b380d23b 100644 --- a/net-misc/r8125/Manifest +++ b/net-misc/r8125/Manifest @@ -2,3 +2,4 @@ DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5 DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe DIST r8125-9.011.01.tar.bz2 97867 BLAKE2B 0981c71795d3e839b97f7b41dbaddcc0743676c6bd0b656258e6e9b2e0879128ae4869e9ab3ab837d0ae10eb8c963177c3779b4e4a69d8a5c3d95b7b8d54f9c5 SHA512 833199cc0ce8179ef93c202fc89d4c4368b73e9515d1ef2550ebb209243dd2c8943aa9f267903d8fa21c46304b7703410f1c354d4ce1b6f6aee7ece97017dba2 +DIST r8125-9.013.02.tar.bz2 105923 BLAKE2B 0ae1a6a7ad651d30ac2ca29ab98af06c6facc26bfacac8ce5b51e92e8c7955c150a995c424f875a9a1cb315fe41f474ea3429cd7675ceec1ef82d454ad2bd434 SHA512 acb16992182c4c6b79357a511cfcedb53bb6513185caec91a5cb76aa41dc922e6c74099546886b32dba584d614f9bcaf36d31e40f3328b9ebc4ccd6b91296065 diff --git a/net-misc/r8125/r8125-9.013.02.ebuild b/net-misc/r8125/r8125-9.013.02.ebuild new file mode 100644 index 000000000000..f331c3c35866 --- /dev/null +++ b/net-misc/r8125/r8125-9.013.02.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" +# Mirrored to avoid captcha +SRC_URI="https://github.com/Karlson2k/r8125/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="+multi-tx-q ptp +rss use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP + ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 9ead16377f3e..fc4b6790183e 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,2 +1,3 @@ DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca DIST r8168-8.052.01.tar.bz2 126861 BLAKE2B dccee164ea1151859752d525390a3786d31d445e05188a86d2d17c9cbd4435aac788dc5ca1350fcc719bba1c42bd358f39221666f8575d52a9cbf9c78b65c70d SHA512 ae90e108ba3eaaa1c8a639392b21ff98e71abdba514a19b2f286603fbdae69c88592380d9dacda2c10d711348797006a8b518383e4a0519d1bd26dc60266b4b5 +DIST r8168-8.053.00.tar.gz 169102 BLAKE2B 4be044fec5edb78d3050c66f92ffce56487347c171da6d0e29593584e23b173536e48a18ffaf47df4e99999867a65b658a0deace333948bb0d77cd0f5c619719 SHA512 c44a63b04eb5cfb2b8ae434b26098c96067f7a2d6193e206801236fa38832b4f20a0b1a05a374f1d7d5b7ce973d38b6f49744f8b029e22930ebbd2763fbc6440 diff --git a/net-misc/r8168/r8168-8.051.02.ebuild b/net-misc/r8168/r8168-8.051.02.ebuild deleted file mode 100644 index 8f0c5b529c63..000000000000 --- a/net-misc/r8168/r8168-8.051.02.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info linux-mod - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -# "GBE Ethernet LINUX driver r8168 for kernel up to 5.19" from above link, -# we need to mirror it to avoid users from needing to fill a captcha to -# download -SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -IUSE="use-firmware" - -CONFIG_CHECK="~!R8169" -WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." - -PATCHES=( - "${FILESDIR}/${PN}-8.051.02-6.1-fix.patch" - "${FILESDIR}/${P}-6.4.10-fix.patch" # bug 912242 -) - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" -} - -src_install() { - linux-mod_src_install - einstalldocs -} diff --git a/net-misc/r8168/r8168-8.053.00.ebuild b/net-misc/r8168/r8168-8.053.00.ebuild new file mode 100644 index 000000000000..c413c7299d97 --- /dev/null +++ b/net-misc/r8168/r8168-8.053.00.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/Download/List?cate_id=584" +SRC_URI="https://github.com/mtorromeo/${PN}/archive/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest index e9e8b85e7266..d920dc4e4452 100644 --- a/net-misc/rclone/Manifest +++ b/net-misc/rclone/Manifest @@ -4,3 +4,5 @@ DIST rclone-1.63.0-deps.tar.xz 297987608 BLAKE2B cfda8663ca32b36f5e56db74a724bde DIST rclone-1.63.0.tar.gz 16291884 BLAKE2B 540755808dd73fac061c481e2ea4f1ee241bcd55ccabda9b05343f2074f1672868c4246baff42471ecc7000455fe2c2a04c93578faa994aa0323e0033681bb38 SHA512 5f4590a5244d4eb1a51fc15a4ebef70941af94db8790d3ea1bd56b91f399f580b2cd1cc168c5d5e1fd9ee4bc4a3a4a908c8720aead8f8c24bcee3eacc6423ef3 DIST rclone-1.63.1-deps.tar.xz 298002884 BLAKE2B e9dc1dcd3240d4a649b26606109f4ceb9e4e03448da8d27a11c19ed0dc6df39569c3f4714194c3a62e3d80c7a22591ac392d4187df464a4cf203c6135438ec5b SHA512 fff9e6d8ec7721abfd6c95220163478cf1bb3c8fd551a4310641b1213c072ed853e3ca40fd4109ff642d621cc441434f93608af590bb1b07ac2854ddd1d54147 DIST rclone-1.63.1.tar.gz 16294505 BLAKE2B ccb83d5c748f8b68ba7eb7f5910f9b3e8e503407855b4bdd10d5feafaaa96bbf113305cb90952d05922a0ccae6e8efe88737271f4a193cf7a38f79820439c007 SHA512 fff03146ae7de4b47b883576b67852f9ff0558137ecb966300bd357c706d4b71c20ad0f87d0028c90b570d9351024f4ae8ddcce13333df1cabd0e76e08b29063 +DIST rclone-1.66.0-deps.tar.xz 367625224 BLAKE2B 244dc6c77315d1e1038b5e784deb55ca597ce728df34b0619a62ebd40524547a8e12c90f85385bf8515eb69f5cb07d5db6dbcb0de2c7a259edb1d934ce1eb747 SHA512 b238069636da506826deb99ddab869789bf7bda58d4eb47e47101c5011dd35dfd9a39f481f1c874d57a3330fa8b969fed2b98bb1d13ec8e79495f55403cf6001 +DIST rclone-1.66.0.tar.gz 17066102 BLAKE2B 587208635c2154782a9f3285c7972a567625120140d1b43096b572d19ab74ae9c7e12b485d6a74d88f1ef4bbce9656bea8f21c67c641227756dd48856a4da9a7 SHA512 955ed1457ebe7e6ac2288484109ba263601e147f767ce71b70e14ddcf3f97659d90704de094e4e83c0820267e0f41b1950fc3db534bb3577bcf27f0a2401eb84 diff --git a/net-misc/rclone/metadata.xml b/net-misc/rclone/metadata.xml index 92b54863ba1f..77f51273cdf6 100644 --- a/net-misc/rclone/metadata.xml +++ b/net-misc/rclone/metadata.xml @@ -5,7 +5,12 @@ <email>perfinion@gentoo.org</email> <name>Jason Zaman</name> </maintainer> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> <upstream> + <bugs-to>https://gitlab.com/rclone/rclone/-/issues/</bugs-to> <remote-id type="github">rclone/rclone</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/rclone/rclone-1.63.1.ebuild b/net-misc/rclone/rclone-1.63.1.ebuild index 715bda67b36e..9087a250f9f2 100644 --- a/net-misc/rclone/rclone-1.63.1.ebuild +++ b/net-misc/rclone/rclone-1.63.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit bash-completion-r1 go-module -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" SRC_URI=" https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz diff --git a/net-misc/rclone/rclone-1.66.0-r1.ebuild b/net-misc/rclone/rclone-1.66.0-r1.ebuild new file mode 100644 index 000000000000..b59ebe324c66 --- /dev/null +++ b/net-misc/rclone/rclone-1.66.0-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 check-reqs edo go-module + +DESCRIPTION="A program to sync files to and from various cloud storage providers" +HOMEPAGE="https://rclone.org/ + https://github.com/rclone/rclone/" +SRC_URI=" + https://github.com/rclone/rclone/archive/v${PV}.tar.gz + -> ${P}.tar.gz + https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz +" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +RDEPEND=" + sys-fs/fuse:3 +" + +CHECKREQS_DISK_BUILD="2500M" + +pkg_setup() { + check-reqs_pkg_setup +} + +src_compile() { + local go_ldflags=" + -X github.com/rclone/rclone/fs.Version=${PV} + " + local -a go_buildargs=( + -ldflags "${go_ldflags}" + -mod=readonly + -o ./ + ) + ego build "${go_buildargs[@]}" . + + edob ./rclone genautocomplete bash "${PN}.bash" + edob ./rclone genautocomplete zsh "${PN}.zsh" +} + +src_test() { + # Setting CI skips unreliable tests, see "fstest/testy/testy.go" + # "TestAddPlugin" and "TestRemovePlugin" fail. + local -x CI="true" + local -x RCLONE_CONFIG="/not_found" + + edob go test -mod=readonly -v -run "!Test.*Plugin" ./... +} + +src_install() { + exeinto /usr/bin + doexe "${PN}" + dosym -r "/usr/bin/${PN}" /usr/bin/mount.rclone + dosym -r "/usr/bin/${PN}" /usr/bin/rclonefs + + newbashcomp "${PN}.bash" "${PN}" + insinto /usr/share/zsh/site-functions + newins "${PN}.zsh" "_${PN}" + + doman "${PN}.1" + einstalldocs +} diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 6b1761e3817b..f9c5e481ca42 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,2 +1 @@ -DIST Remmina-v1.4.31.tar.bz2 2078380 BLAKE2B daee0b68305e3ec0eedcc8cb3622ed5649303562fccd766bf5cc6ed1e96f27c1608286afa1b9bbaf44480bdc210f71a863bf442974ebbc1c50ebfbcf2dfeea35 SHA512 288e7fb5b5251d251e9502ec310f2bfe526f1a28a91c9dd9e79c712191c5d2b287844bd994596dc5097ec50ed8282d0af11144f6c5f0a74cb444aa4c6a8f6838 DIST Remmina-v1.4.35.tar.bz2 2150047 BLAKE2B 3ba730cd4009a797ee7d66bbe4390e9db221ee5cf0b008e0eb3df4a992d7260ddc65983c8c34d1aa1bb2190ed1104653e269369565d7e4eecaf3078ffc84330c SHA512 36dc419b4473c71f6b3e53338f4a3cf7a1fe60534ea0dce375b4c9fd00cd9d8a618c4376be4d031bdee1eed8b4aade4538a6cc414629ef6dde41cdcd513a6d36 diff --git a/net-misc/remmina/remmina-1.4.31-r2.ebuild b/net-misc/remmina/remmina-1.4.31-r2.ebuild deleted file mode 100644 index d1554f95410e..000000000000 --- a/net-misc/remmina/remmina-1.4.31-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake python-single-r1 xdg - -MY_P="${PN^}-v${PV}" - -DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client" -HOMEPAGE="https://remmina.org/" -SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND=" - dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libpcre2 - dev-libs/libsodium:= - dev-libs/openssl:0= - x11-libs/gdk-pixbuf - x11-libs/gtk+:3[wayland?] - x11-libs/libX11 - x11-libs/libxkbfile - appindicator? ( dev-libs/libayatana-appindicator ) - crypt? ( dev-libs/libgcrypt:0= ) - keyring? ( app-crypt/libsecret ) - gvnc? ( net-libs/gtk-vnc ) - kwallet? ( kde-frameworks/kwallet:5 ) - python? ( ${PYTHON_DEPS} ) - rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129:0=[X] - <net-misc/freerdp-3:0[X] - cups? ( net-print/cups:= ) ) - spice? ( net-misc/spice-gtk[gtk3] ) - ssh? ( net-libs/libssh:0=[sftp] - x11-libs/vte:2.91 ) - vnc? ( net-libs/libvncserver[jpeg] ) - webkit? ( net-libs/webkit-gtk:4.1 ) - zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) -" - -DEPEND=" - ${COMMON_DEPEND} - spice? ( app-emulation/spice-protocol ) -" - -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -RDEPEND=" - ${COMMON_DEPEND} - virtual/freedesktop-icon-theme -" - -DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - xdg_environment_reset - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF) - -DWITH_AVAHI=$(usex zeroconf) - -DWITH_CUPS=$(usex cups) - -DWITH_EXAMPLES=$(usex examples) - -DWITH_FREERDP=$(usex rdp) - -DWITH_FREERDP3=OFF - -DWITH_GCRYPT=$(usex crypt) - -DWITH_GETTEXT=$(usex nls) - -DWITH_ICON_CACHE=OFF - -DWITH_KF5WALLET=$(usex kwallet) - -DWITH_LIBSECRET=$(usex keyring) - -DWITH_LIBSSH=$(usex ssh) - -DWITH_LIBVNCSERVER=$(usex vnc) - -DWITH_PYTHONLIBS=$(usex python ON OFF) - -DWITH_SPICE=$(usex spice) - -DWITH_TRANSLATIONS=$(usex nls) - -DWITH_UPDATE_DESKTOP_DB=OFF - -DWITH_VTE=$(usex ssh) - -DWITH_WWW=$(usex webkit) - -DWITH_X2GO=OFF - # when this feature is stable, add python eclass usage to optionally enable - -DWITH_PYTHON=OFF - ) - cmake_src_configure -} diff --git a/net-misc/rsync/rsync-3.3.0.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild index fc6198dfa4d7..c6b7365a04b0 100644 --- a/net-misc/rsync/rsync-3.3.0.ebuild +++ b/net-misc/rsync/rsync-3.3.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index fc6198dfa4d7..c6b7365a04b0 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest index 231a44ca6e2c..c24a6a7adafa 100644 --- a/net-misc/rygel/Manifest +++ b/net-misc/rygel/Manifest @@ -1,2 +1 @@ -DIST rygel-0.42.4.tar.xz 1700196 BLAKE2B b83f9534c2294b88a180b20f90df6c43a220db83473429a41b034bfe3fff501f0f4e1f17deaa72001b8e3a886477f2c788dcf457463a275165652cc8c33da6e8 SHA512 b346e9ebfa6349c32b67557bef57bf7ddcf92782d112e875d64b7bd26718cbf89d7c5178b03defeba606ddfeb5bc94c685c10bdbd3fbd14f6942c72d96a9331a DIST rygel-0.42.5.tar.xz 1704072 BLAKE2B a00be296956def2bc90b978df5b8c4b23a122b9c30adfa66c634249b5daafe8d21de1cac40417095d72d42e80522ce58fe678a7f7780bd1e134aa2cd66f3d2bf SHA512 cd1aaff4e2eb2c25931197d70f518a30dab75604d62b9f071bc560570c352371d132a10caaf94956d34ecd24505ccd9a7b9f5bf324d544c676ca1f47b124f533 diff --git a/net-misc/rygel/rygel-0.42.4.ebuild b/net-misc/rygel/rygel-0.42.4.ebuild deleted file mode 100644 index 53fd5ee1a17e..000000000000 --- a/net-misc/rygel/rygel-0.42.4.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson systemd vala xdg - -DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer" -HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode" -RESTRICT="!test? ( test )" - -# x11-libs/libX11 from qa-vdb -DEPEND=" - >=net-libs/gupnp-1.5.2:1.6=[vala] - >=dev-libs/libgee-0.8:0.8= - >=net-libs/gssdp-1.5.0:1.6=[vala] - >=dev-libs/glib-2.62.0:2 - >=dev-libs/libxml2-2.7:2 - >=net-libs/gupnp-av-0.14.1:=[vala] - >=media-libs/gupnp-dlna-0.9.4:2.0= - >=net-libs/libsoup-3:3.0 - sqlite? ( - >=dev-db/sqlite-3.5:3 - dev-libs/libunistring:= - ) - >=media-libs/gstreamer-1.20:1.0 - >=media-libs/gst-plugins-base-1.20:1.0 - media-libs/gstreamer-editing-services:1.0 - >=media-libs/libmediaart-0.7:2.0[vala] - media-plugins/gst-plugins-soup:1.0 - x11-libs/gdk-pixbuf:2 - >=sys-apps/util-linux-2.20 - x11-misc/shared-mime-info - introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) - tracker? ( app-misc/tracker:3=[vala(+)] ) - transcode? ( - media-libs/gst-plugins-bad:1.0 - media-plugins/gst-plugins-twolame:1.0 - media-plugins/gst-plugins-libav:1.0 - ) - gtk? ( >=x11-libs/gtk+-3.22:3 ) - - x11-libs/libX11 -" -RDEPEND="${DEPEND}" -BDEPEND=" - $(vala_depend) - app-text/docbook-xml-dtd:4.5 - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig -" -# Maintainer only -# app-text/docbook-xsl-stylesheets -# >=dev-lang/vala-0.36 -# dev-libs/libxslt - -src_prepare() { - vala_setup - default - # Disable test triggering call to gst-plugins-scanner which causes - # sandbox issues when plugins such as clutter are installed - #sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \ - # -i tests/rygel-playbin-renderer-test.c || die - - #default -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc api-docs) - -Dman_pages=true - -Dsystemd-user-units-dir=$(systemd_get_userunitdir) - -Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3") - -Dengines=gstreamer - -Dexamples=false - $(meson_use test tests) - -Dgstreamer=enabled - $(meson_feature gtk) - $(meson_feature introspection) - ) - meson_src_configure -} diff --git a/net-misc/rygel/rygel-0.42.5.ebuild b/net-misc/rygel/rygel-0.42.5.ebuild index 79b6f1fe1ace..2e511bf9e740 100644 --- a/net-misc/rygel/rygel-0.42.5.ebuild +++ b/net-misc/rygel/rygel-0.42.5.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" LICENSE="LGPL-2.1+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode" RESTRICT="!test? ( test )" diff --git a/net-misc/s3cmd/s3cmd-2.2.0.ebuild b/net-misc/s3cmd/s3cmd-2.2.0.ebuild index abdc01352a90..ff60617f838c 100644 --- a/net-misc/s3cmd/s3cmd-2.2.0.ebuild +++ b/net-misc/s3cmd/s3cmd-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ inherit distutils-r1 DESCRIPTION="Command line client for Amazon S3" HOMEPAGE="https://s3tools.org/s3cmd" -SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz" S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2" diff --git a/net-misc/s3cmd/s3cmd-2.3.0.ebuild b/net-misc/s3cmd/s3cmd-2.3.0.ebuild index fcf7f1de78a0..8a1ddd1d49f9 100644 --- a/net-misc/s3cmd/s3cmd-2.3.0.ebuild +++ b/net-misc/s3cmd/s3cmd-2.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ inherit distutils-r1 DESCRIPTION="Command line client for Amazon S3" HOMEPAGE="https://s3tools.org/s3cmd" -SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz" S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2" diff --git a/net-misc/s3cmd/s3cmd-2.4.0.ebuild b/net-misc/s3cmd/s3cmd-2.4.0.ebuild index 6ae5ece00f1b..4dcbaecc0089 100644 --- a/net-misc/s3cmd/s3cmd-2.4.0.ebuild +++ b/net-misc/s3cmd/s3cmd-2.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ inherit distutils-r1 DESCRIPTION="Command line client for Amazon S3" HOMEPAGE="https://s3tools.org/s3cmd" -SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz" S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2" diff --git a/net-misc/scponly/scponly-4.8-r8.ebuild b/net-misc/scponly/scponly-4.8-r8.ebuild index 7a1600c22c27..93ddd8138d29 100644 --- a/net-misc/scponly/scponly-4.8-r8.ebuild +++ b/net-misc/scponly/scponly-4.8-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" HOMEPAGE="https://github.com/scponly/scponly" -SRC_URI="mirror://sourceforge/scponly/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/scponly/${P}.tgz" LICENSE="BSD-2" SLOT="0" diff --git a/net-misc/secpanel/secpanel-0.6.1-r1.ebuild b/net-misc/secpanel/secpanel-0.6.1-r1.ebuild index cf5470690f02..ba7d33d0c425 100644 --- a/net-misc/secpanel/secpanel-0.6.1-r1.ebuild +++ b/net-misc/secpanel/secpanel-0.6.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Graphical frontend for managing and running SSH and SCP connections" HOMEPAGE="https://themediahost.de/secpanel/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/ser2net/ser2net-2.10.0-r1.ebuild b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild index 6e1a55411988..72d5a604c80c 100644 --- a/net-misc/ser2net/ser2net-2.10.0-r1.ebuild +++ b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Serial To Network Proxy" -SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz" HOMEPAGE="https://sourceforge.net/projects/ser2net" KEYWORDS="amd64 ppc x86" diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch new file mode 100644 index 000000000000..59b8e089b5a4 --- /dev/null +++ b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/921255 +--- a/src/ftp.c ++++ b/src/ftp.c +@@ -634,7 +634,7 @@ static int dtp_open_active(ftp_session *sess, const char *command) + char *a, *p; + int ret; + int listener; +- size_t alen; ++ socklen_t alen; + struct sockaddr_in addr; + + ret = ftp_open(sess); diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild new file mode 100644 index 000000000000..d309794b2639 --- /dev/null +++ b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools + +DESCRIPTION="Maintain remote web sites with ease" +HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/" +SRC_URI="mirror://gentoo/${P}.tar.gz + https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="expat nls rsh ssl webdav xml zlib" + +RDEPEND=" + rsh? ( net-misc/netkit-rsh ) + >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] + <=net-libs/neon-0.32.9999[zlib?,ssl?,expat?] + xml? ( >=net-libs/neon-0.24.6:=[-expat] ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # SiteCopy patches are being currently pulled & ported from + # http://ftp.debian.org/debian/pool/main/s/sitecopy/ + # Consider SiteCopy to be more or less being actively maintained by + # Debian maintainers, but GPL patches ported into Gentoo. + + eapply \ + "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \ + "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \ + "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \ + "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \ + "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \ + "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \ + "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \ + "${FILESDIR}/sitecopy-0.16.6-32-neon-0.31.patch" \ + "${FILESDIR}/sitecopy-0.16.6-33-c99-build-fix.patch" \ + "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch" + + # Source package uses incorrect '/usr/doc' for the doc folder. So use + # sed to correct this error. + sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \ + Makefile.in || die "Documentation directory patching failed" + + mv configure.in configure.ac || die + eautoconf + eautomake +} + +src_configure() { + econf \ + $(use_with ssl ssl openssl) \ + $(use_enable webdav) \ + $(use_enable nls) \ + $(use_enable rsh) \ + $(use_with expat) \ + $(use_with xml libxml2 ) \ + --with-neon +} diff --git a/net-misc/smb4k/smb4k-3.2.5-r1.ebuild b/net-misc/smb4k/smb4k-3.2.5-r1.ebuild index 56d37ec89dc5..b164be6392cd 100644 --- a/net-misc/smb4k/smb4k-3.2.5-r1.ebuild +++ b/net-misc/smb4k/smb4k-3.2.5-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/smb4k/ https://sourceforge.net/p/smb4k/home/Home/" if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" KEYWORDS="amd64 ~arm64 ~riscv x86" fi diff --git a/net-misc/smb4k/smb4k-3.2.5-r2.ebuild b/net-misc/smb4k/smb4k-3.2.5-r2.ebuild index ed3f554c0e32..4480250673e4 100644 --- a/net-misc/smb4k/smb4k-3.2.5-r2.ebuild +++ b/net-misc/smb4k/smb4k-3.2.5-r2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/smb4k/ https://sourceforge.net/p/smb4k/home/Home/" if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz https://dev.gentoo.org/~asturm/distfiles/${PN}-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz" KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi diff --git a/net-misc/smbc/smbc-1.2.2-r3.ebuild b/net-misc/smbc/smbc-1.2.2-r3.ebuild index 434ea97b5718..67bb75f96311 100644 --- a/net-misc/smbc/smbc-1.2.2-r3.ebuild +++ b/net-misc/smbc/smbc-1.2.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Text mode (ncurses) SMB network commander. Features: resume and UTF-8" HOMEPAGE="https://sourceforge.net/projects/smbc/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch b/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch new file mode 100644 index 000000000000..b6197fb15ba3 --- /dev/null +++ b/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch @@ -0,0 +1,167 @@ +https://gitlab.freedesktop.org/spice/spice-gtk/-/merge_requests/121 +https://bugs.gentoo.org/915210 + +From 7e87382b585a799ced543b0c3fd127b2a813285f Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio <freddy77@gmail.com> +Date: Fri, 23 Jun 2023 21:17:26 +0100 +Subject: [PATCH] Split symbol file in 2 files + +One file for spice-glib and another for spice-gtk. +This avoid having duplicate exports in the future. +spice_g_signal_connect_object, spice_util_get_debug, +spice_util_get_version_string, spice_util_set_debug and +spice_uuid_to_string are exported by both libraries to keep ABI +compatibility. + +Signed-off-by: Frediano Ziglio <freddy77@gmail.com> +--- + src/{map-file => map-file-glib} | 22 --------------------- + src/map-file-gtk | 35 +++++++++++++++++++++++++++++++++ + src/meson.build | 17 ++++++++++------ + 3 files changed, 46 insertions(+), 28 deletions(-) + rename src/{map-file => map-file-glib} (89%) + create mode 100644 src/map-file-gtk + +diff --git a/src/map-file b/src/map-file-glib +similarity index 89% +rename from src/map-file +rename to src/map-file-glib +index c0d8ca6e..ef0a31f3 100644 +--- a/src/map-file ++++ b/src/map-file-glib +@@ -31,18 +31,8 @@ spice_display_channel_get_primary; + spice_display_channel_get_type; + spice_display_channel_gl_draw_done; + spice_display_get_gl_scanout; +-spice_display_get_grab_keys; +-spice_display_get_pixbuf; + spice_display_get_primary; +-spice_display_get_type; + spice_display_gl_draw_done; +-spice_display_key_event_get_type; +-spice_display_keyboard_ungrab; +-spice_display_mouse_ungrab; +-spice_display_new; +-spice_display_new_with_monitor; +-spice_display_send_keys; +-spice_display_set_grab_keys; + spice_file_transfer_task_cancel; + spice_file_transfer_task_get_filename; + spice_file_transfer_task_get_progress; +@@ -52,17 +42,7 @@ spice_file_transfer_task_get_type; + spice_get_option_group; + spice_gl_scanout_free; + spice_gl_scanout_get_type; +-spice_grab_sequence_as_string; +-spice_grab_sequence_copy; +-spice_grab_sequence_free; +-spice_grab_sequence_get_type; +-spice_grab_sequence_new; +-spice_grab_sequence_new_from_string; + spice_g_signal_connect_object; +-spice_gtk_session_copy_to_guest; +-spice_gtk_session_get; +-spice_gtk_session_get_type; +-spice_gtk_session_paste_from_guest; + spice_inputs_button_press; + spice_inputs_button_release; + spice_inputs_channel_button_press; +@@ -185,8 +165,6 @@ spice_usb_device_manager_is_redirecting; + spice_usb_device_manager_allocate_device_for_file_descriptor; + spice_usb_device_manager_create_shared_cd_device; + spice_usb_device_manager_is_device_shared_cd; +-spice_usb_device_widget_get_type; +-spice_usb_device_widget_new; + spice_usbredir_channel_get_type; + spice_util_get_debug; + spice_util_get_version_string; +diff --git a/src/map-file-gtk b/src/map-file-gtk +new file mode 100644 +index 00000000..ca5dd446 +--- /dev/null ++++ b/src/map-file-gtk +@@ -0,0 +1,35 @@ ++SPICEGTK_1 { ++global: ++spice_display_get_grab_keys; ++spice_display_get_pixbuf; ++spice_display_get_type; ++spice_display_key_event_get_type; ++spice_display_keyboard_ungrab; ++spice_display_mouse_ungrab; ++spice_display_new; ++spice_display_new_with_monitor; ++spice_display_send_keys; ++spice_display_set_grab_keys; ++spice_grab_sequence_as_string; ++spice_grab_sequence_copy; ++spice_grab_sequence_free; ++spice_grab_sequence_get_type; ++spice_grab_sequence_new; ++spice_grab_sequence_new_from_string; ++spice_gtk_session_copy_to_guest; ++spice_gtk_session_get; ++spice_gtk_session_get_type; ++spice_gtk_session_paste_from_guest; ++spice_usb_device_widget_get_type; ++spice_usb_device_widget_new; ++ ++/* FIXME: remove the following 5 duplicated symbols in next ABI break */ ++spice_g_signal_connect_object; ++spice_util_get_debug; ++spice_util_get_version_string; ++spice_util_set_debug; ++spice_uuid_to_string; ++ ++local: ++*; ++}; +diff --git a/src/meson.build b/src/meson.build +index 852217ac..68fe7ab2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -185,14 +185,20 @@ test_syms_path = meson.current_source_dir() / 'test-map-file' + test_version_script = '-Wl,--version-script=@0@'.format(test_syms_path) + spice_has_version_script = compiler.has_link_argument(test_version_script) + +-spice_client_glib_syms = files('map-file') +-spice_client_glib_syms_path = meson.current_source_dir() / 'map-file' +-spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) +-if not spice_has_version_script ++if spice_has_version_script ++ spice_client_glib_syms = files('map-file-glib') ++ spice_client_gtk_syms = files('map-file-gtk') ++ spice_client_glib_syms_path = meson.current_source_dir() / 'map-file-glib' ++ spice_client_gtk_syms_path = meson.current_source_dir() / 'map-file-gtk' ++ spice_glib_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) ++ spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_gtk_syms_path) ++else + if host_machine.system() == 'linux' + error('Version scripts should be supported on Linux') + endif + spice_client_glib_syms = [] ++ spice_client_gtk_syms = [] ++ spice_glib_version_script = [] + spice_gtk_version_script = [] + endif + +@@ -210,7 +216,7 @@ spice_client_glib_lib = library('spice-client-glib-2.0', spice_client_glib_sourc + version : spice_client_glib_so_version, + install : true, + include_directories : spice_gtk_include, +- link_args : [spice_gtk_version_script], ++ link_args : [spice_glib_version_script], + link_depends : spice_client_glib_syms, + dependencies : spice_glib_deps) + +@@ -377,7 +383,6 @@ if spice_gtk_has_gtk + # + # libspice-client-gtk.so + # +- spice_client_gtk_syms = spice_client_glib_syms + + # soversion + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +-- +GitLab + diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild new file mode 100644 index 000000000000..677217bfee91 --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg + +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" +HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" + inherit git-r3 + + SPICE_PROTOCOL_VER=9999 +else + SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + + SPICE_PROTOCOL_VER=0.14.3 +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND=" + >=dev-libs/glib-2.46:2 + dev-libs/json-glib:0= + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gstreamer:1.0[introspection?] + media-libs/opus + media-libs/libjpeg-turbo:= + sys-libs/zlib + >=x11-libs/cairo-1.2 + >=x11-libs/pixman-0.17.7 + x11-libs/libX11 + gtk3? ( x11-libs/gtk+:3[introspection?] ) + introspection? ( dev-libs/gobject-introspection ) + dev-libs/openssl:= + lz4? ( app-arch/lz4 ) + policykit? ( + >=sys-auth/polkit-0.110-r1 + ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/qemu[smartcard] ) + usbredir? ( + sys-apps/hwdata + >=sys-apps/usbredir-0.4.2 + virtual/acl + virtual/libusb:1 + ) + webdav? ( + net-libs/phodav:3.0 + net-libs/libsoup:3.0 + ) +" +# TODO: spice-gtk has an automagic dependency on media-libs/libva without a +# configure knob. The package is relatively lightweight so we just depend +# on it unconditionally for now. It would be cleaner to transform this into +# a USE="vaapi" conditional and patch the buildsystem... +RDEPEND=" + ${RDEPEND} + amd64? ( media-libs/libva:= ) + arm64? ( media-libs/libva:= ) + x86? ( media-libs/libva:= ) +" +DEPEND=" + ${RDEPEND} + >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} + valgrind? ( dev-debug/valgrind ) +" +BDEPEND=" + $(python_gen_any_dep ' + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + dev-perl/Text-CSV + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.42-libtool-export-symbols-fix.patch" + "${FILESDIR}/${PN}-0.42-lld17-fix.patch" +) + +python_check_deps() { + python_has_version "dev-python/six[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen + + use vala && vala_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature gtk-doc gtk_doc) + $(meson_feature gtk3 gtk) + $(meson_feature introspection) + $(meson_use mjpeg builtin-mjpeg) + $(meson_feature policykit polkit) + $(meson_feature lz4) + $(meson_feature sasl) + $(meson_feature smartcard) + $(meson_feature usbredir) + $(meson_feature vala vapi) + $(meson_use valgrind) + $(meson_feature webdav) + $(meson_feature wayland wayland-protocols) + ) + + if use elibc_musl; then + emesonargs+=( + -Dcoroutine=gthread + ) + fi + + if use usbredir; then + emesonargs+=( + -Dusb-acl-helper-dir=/usr/libexec + -Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + if use usbredir && use policykit; then + # bug #775554 (and bug #851657) + fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper + fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper + fi + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse +} diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild index 37eef00f49c0..5f81513a6c11 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg diff --git a/net-misc/sshpass/sshpass-1.09-r1.ebuild b/net-misc/sshpass/sshpass-1.09-r1.ebuild index d9bb7d1c42f9..319f78fa5220 100644 --- a/net-misc/sshpass/sshpass-1.09-r1.ebuild +++ b/net-misc/sshpass/sshpass-1.09-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Tool for noninteractively performing password authentication with ssh" HOMEPAGE="https://sourceforge.net/projects/sshpass/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/sshpass/sshpass-1.10.ebuild b/net-misc/sshpass/sshpass-1.10.ebuild index 0bfe3645bcaa..5f9c807632cf 100644 --- a/net-misc/sshpass/sshpass-1.10.ebuild +++ b/net-misc/sshpass/sshpass-1.10.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="Tool for non-interactively performing password authentication with ssh" HOMEPAGE="https://sourceforge.net/projects/sshpass/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index ff20f6265bb2..ba17f3fd47bf 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1,2 +1,3 @@ DIST sslh-1.22c.tar.gz 146954 BLAKE2B 1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473 SHA512 f13560fbe74b5b08e9b360985d6afd27f2c7e157d220919162e354f3711b90f43bb81f9bda341fb21fef2651acd488f52e9a04dc2da28861540f579e7ca798c4 DIST sslh-2.1.1.tar.gz 212402 BLAKE2B fbde666b49e30950ff4c5c2f6aa563e538fd070ed0edecf2c19a85884379ea8a699488fd23e742c672656cc89b6911bdb764a0989f3b967ecc75aefe5634ea4b SHA512 f689394028ec25e16dd59a5f1aa4c18a760108f0acf23b4eb2ccf000dc09adf1428272c3e93f5b0012f9603076ab1408a3e1aca98adb3e69743d184cb898a9a4 +DIST sslh-2.1.2.tar.gz 214091 BLAKE2B 220841c7105032b02351b6073ffd994a22efb0241ebec96704bd2ec534197a19c366d925ebf07a494773e89d83df5f284567e34d419b887edb73545523abb71e SHA512 4f0b3c61e6153b912b11c49baba2df1a9df6732ea9fcdee628bf02043efc1b6505ac97eec97740c67d09f7d58a1bb79e0e06d949cb7fabcffa1fb91733372631 diff --git a/net-misc/sslh/files/sslh.service b/net-misc/sslh/files/sslh.service new file mode 100644 index 000000000000..9d58362220f0 --- /dev/null +++ b/net-misc/sslh/files/sslh.service @@ -0,0 +1,28 @@ +# /etc/systemd/system/sslh.service +[Unit] +Description=SSL/SSH multiplexer (fork mode) for %I +After=network.target + +[Service] +EnvironmentFile=/etc/conf.d/sslh +ExecStart=/usr/sbin/sslh -f $DAEMON_OPTS +KillMode=process +#Hardening +PrivateTmp=true +CapabilityBoundingSet=CAP_NET_BIND_SERVICE +AmbientCapabilities=CAP_NET_BIND_SERVICE +SecureBits=noroot-locked +ProtectSystem=strict +ProtectHome=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +MountFlags=private +NoNewPrivileges=true +PrivateDevices=true +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +MemoryDenyWriteExecute=true +DynamicUser=true + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/sslh/sslh-2.1.2.ebuild b/net-misc/sslh/sslh-2.1.2.ebuild new file mode 100644 index 000000000000..efb4eb40c48d --- /dev/null +++ b/net-misc/sslh/sslh-2.1.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" +HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" + inherit git-r3 +else + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" + SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${P} +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps libev systemd tcpd" + +RDEPEND="caps? ( sys-libs/libcap ) + dev-libs/libpcre2:= + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + dev-libs/libconfig:= + libev? ( dev-libs/libev ) + >=dev-libs/libconfig-1.5:=" +DEPEND="${RDEPEND} + dev-lang/perl" + +RESTRICT="test" + +src_prepare() { + sed -i \ + -e '/MAN/s:| gzip -9 - >:>:' \ + -e '/MAN=sslh.8.gz/s:.gz::' \ + Makefile.in || die + default +} + +src_compile() { + append-lfs-flags + + # On older versions of GCC, the default gnu89 variant + # will reject within-for-loop initializers, bug #595426 + # Furthermore, we need to use the gnu variant (gnu99) instead + # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro + # to be defined. + append-cflags -std=gnu99 + + emake \ + CC="$(tc-getCC)" \ + USELIBCAP=$(usev caps) \ + USELIBEV=$(usev libev) \ + USELIBWRAP=$(usev tcpd) \ + USESYSTEMD=$(usev systemd) +} + +src_install() { + dosbin sslh-{fork,select} + if use libev; then + dosbin sslh-ev + dosym sslh-fork /usr/sbin/sslh + else + dosym sslh-fork /usr/sbin/sslh + fi + + doman ${PN}.8 + + dodoc ChangeLog README.md + + newinitd "${FILESDIR}"/sslh.init.d-3 sslh + newconfd "${FILESDIR}"/sslh.conf.d-2 sslh + + if use systemd; then + # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin + systemd_newunit "${FILESDIR}/sslh.service" sslh.service + exeinto /usr/lib/systemd/system-generators/ + doexe systemd-sslh-generator + fi +} diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild index 1a3dc9b9f8e3..efb4eb40c48d 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-9999.ebuild @@ -76,8 +76,7 @@ src_install() { if use systemd; then # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service + systemd_newunit "${FILESDIR}/sslh.service" sslh.service exeinto /usr/lib/systemd/system-generators/ doexe systemd-sslh-generator fi diff --git a/net-misc/sstp-client/sstp-client-1.0.17.ebuild b/net-misc/sstp-client/sstp-client-1.0.17.ebuild index e7364793aeaa..4a71dd40ab74 100644 --- a/net-misc/sstp-client/sstp-client-1.0.17.ebuild +++ b/net-misc/sstp-client/sstp-client-1.0.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools linux-info DESCRIPTION="Client implementation of Secure Socket Tunneling Protocol (SSTP)" HOMEPAGE="https://sstp-client.sourceforge.net/" -SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/sstp-client/${P}.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" diff --git a/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild index 709e731bdb8a..d6088e295a23 100644 --- a/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild +++ b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools linux-info DESCRIPTION="Client implementation of Secure Socket Tunneling Protocol (SSTP)" HOMEPAGE="https://sstp-client.sourceforge.net/" -SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/sstp-client/${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ppp-2.5.0-patches.tar.xz" LICENSE="GPL-2+-with-openssl-exception" diff --git a/net-misc/sstp-client/sstp-client-1.0.18.ebuild b/net-misc/sstp-client/sstp-client-1.0.18.ebuild index 8a46124cca58..77e7c733052f 100644 --- a/net-misc/sstp-client/sstp-client-1.0.18.ebuild +++ b/net-misc/sstp-client/sstp-client-1.0.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools linux-info DESCRIPTION="Client implementation of Secure Socket Tunneling Protocol (SSTP)" HOMEPAGE="https://sstp-client.sourceforge.net/" -SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/sstp-client/${P}.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" diff --git a/net-misc/suite3270/suite3270-4.0_p13.ebuild b/net-misc/suite3270/suite3270-4.0_p13.ebuild index abd0aab0e1a6..de091ec1bdc9 100644 --- a/net-misc/suite3270/suite3270-4.0_p13.ebuild +++ b/net-misc/suite3270/suite3270-4.0_p13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -17,7 +17,7 @@ inherit font DESCRIPTION="Complete 3270 access package" HOMEPAGE="http://x3270.bgp.nu/" -SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild index cbad0ff3e1ac..cc4d1e248b1d 100644 --- a/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild +++ b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ inherit autotools font DESCRIPTION="Complete 3270 (S390) access package" HOMEPAGE="http://x3270.bgp.nu/" -SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/suite3270/suite3270-4.2_p5-r2.ebuild b/net-misc/suite3270/suite3270-4.2_p5-r2.ebuild index 0f9ce2f4b484..b04eebf8fc56 100644 --- a/net-misc/suite3270/suite3270-4.2_p5-r2.ebuild +++ b/net-misc/suite3270/suite3270-4.2_p5-r2.ebuild @@ -16,7 +16,7 @@ inherit autotools font DESCRIPTION="Complete 3270 (S390) access package" HOMEPAGE="http://x3270.bgp.nu/" -SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/suite3270/suite3270-4.3_p6.ebuild b/net-misc/suite3270/suite3270-4.3_p6.ebuild index 99b045b00d0b..6566aedd07d5 100644 --- a/net-misc/suite3270/suite3270-4.3_p6.ebuild +++ b/net-misc/suite3270/suite3270-4.3_p6.ebuild @@ -16,7 +16,7 @@ inherit autotools font DESCRIPTION="Complete 3270 (S390) access package" HOMEPAGE="http://x3270.bgp.nu/" -SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest index a4b01b37ac79..2efe3ef8929a 100644 --- a/net-misc/sunshine/Manifest +++ b/net-misc/sunshine/Manifest @@ -5,6 +5,6 @@ DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370f DIST moonlight-common-c-cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e.tar.gz 148691 BLAKE2B 2650e48ef5d08b5e4a901e0b394364335503cd717ae75b4ecf5329395f39d3312a9bbfe08137d2b7697f7b1672749d148e100fbaa5c7f87d190ab8157f158639 SHA512 f1d7848138b85a88abf798774f12f6491e19ae5e7699715b0454bfccc184439fba0ebf7e05327fd649e320e5d1ad610c57fe71190f92cf2248c8f974f9d79aaf DIST moonlight-enet-04e27590670a87a7cd40f5a05cda97467e4e25a3.tar.gz 86434 BLAKE2B 8a5535843e4c650b945882abac1542bf8c79dc420607b88433d239aa5a17380f02e77bb8f1fcbe45dcb8ef894e6c9b4d940f4d3b34b956ce42d86f6a8ca5227a SHA512 6d2e9447e546489365b1fb563ed52664a91981717a3a3a9faa9600ab62be5ac09bd24ee9dd505833d31981ce6222f5ef430268a9f92aa83fa288b5b8d681e2aa DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd7c0884ffd38b63d61a7872337797529ef2012f9de0950088a5004cb32a2fb2c14bcab2ec6719968864e5e6b9a67e96afa39466e2071bf4a0cd752ae4b29 SHA512 548be25650619a6c31944cd7a745fd40d5bc5008f2d7f91e0207a10b923764cb88fd2ddcb71eaed7c4863ec89b34d61011b666e292da071ac3b4429e4d7dd027 -DIST sunshine-0.22.2.tar.gz 24109406 BLAKE2B b37ef02e33af7257a0173e11fcf230cb044ef641103ef82631bd4751e5a5fd8aa0e8dc64a7835789a6741951f19289cc11f819e2e580dc39681a10cf00a845f5 SHA512 0913571ace3aefe1db27b7b0612fdb97fa7b072543dadd08f6276c1c9cde9d1d3aa4cf2bf137a96c866da9915b72ccbbb9bda096dcd86d61034c67a58fac4bda -DIST sunshine-npm-cache-0.22.2.tar.xz 22457340 BLAKE2B e843ada90c183ab0d33182a419150e47e2ee8f348150082df2617416a80d636086a1f34231045800363cc97adc44cfab22a46d6700c330104fb33a9894a39ded SHA512 fb465b62dc8a064eda3bc811ff4acf9ac56a42bcb87e68bf63502ffeb087f12f26f60b37da76fc0eb4e83c328e0c9bc471f79d42cde932b8e43b8a1456ab7523 -DIST wlr-protocols-4264185db3b7e961e7f157e1cc4fd0ab75137568.tar.bz2 19574 BLAKE2B 65666095f186857e3c5274b23d5c40b40b0ba5d945c7b34331a06320128cb69a36a76baf2381b635858736ca6ed438c2ed67c03fac1c20e1ec4d71de27037e42 SHA512 0e6afde055d9b76bcb8c717433b78814f2cf9338ead451d3119f62463198ef272029767898e8f7d32896f2732be3aaa2a0373c671d8196e745d62f6116cd1583 +DIST sunshine-0.23.1.tar.gz 24503568 BLAKE2B 0c589f38a7d638c49af6385def2676de04af422f85d37228988bd7c822ffc006dbac0a1695e01527ac7a1d5ee28103cff00d78a97d57f61247772a6e6cc1fe18 SHA512 7a9150baf4ecdad1035666993c60744390e227ebeaf467447c53675dc0aecc7031cd9c9b253fbbbbac072f5592c3690c6acfde41f38d441497a17157417f1e16 +DIST sunshine-assets-0.23.1.tar.xz 1269348 BLAKE2B 36dd00fbf4bb1bfa213d53fd9dc78ed1fee9e12efcfb138dbd54932c3f19447d832da506175a982be7564408e06b0699b0b7cb4b9811ab81b47e30681c915bab SHA512 9fe9e0ee29864faa0f67dd4d501d116be1476f2c7ec688646b91eb87cb38e9e9d2baecb8335df29075fd3f60bf05b900c20dcb8406306d68a62c30ff55d1b7aa +DIST wlr-protocols-2b8d43325b7012cc3f9b55c08d26e50e42beac7d.tar.bz2 19708 BLAKE2B fe20f21ee8282d7afcdbb8f3863e50b217fb71e7814f404f288b0d09d30c9e30135769b12342d9e9126a8cb2ab35d6ced0c5562807d274b1d97224f5f3d02511 SHA512 7935b5089820304aa8cb0e1a8f4e0db6ccd5285973a3f3554ccc935dd88e379eb03c3b2dd199da97b6ff8dfbbbf124ca65fb1c12821a168d34bd7e26d8514edb diff --git a/net-misc/sunshine/files/sunshine-find-npm.patch b/net-misc/sunshine/files/sunshine-find-npm.patch new file mode 100644 index 000000000000..ab25b4527b78 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-find-npm.patch @@ -0,0 +1,92 @@ +From 66740900522f42564a2b0bd4e8a435ed24a61725 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 12 May 2024 17:26:14 +0100 +Subject: [PATCH] Unify asset building and use find_program to find NPM (#2522) + +--- + cmake/targets/common.cmake | 33 +++++++++++++++++++++------------ + cmake/targets/unix.cmake | 6 ------ + cmake/targets/windows.cmake | 6 ------ + 3 files changed, 21 insertions(+), 24 deletions(-) + +diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake +index ee79528c..941ef0b7 100644 +--- a/cmake/targets/common.cmake ++++ b/cmake/targets/common.cmake +@@ -3,18 +3,6 @@ + + add_executable(sunshine ${SUNSHINE_TARGET_FILES}) + +-# Homebrew build fails the vite build if we set these environment variables +-# this block must be before the platform specific code +-if(${SUNSHINE_BUILD_HOMEBREW}) +- set(NPM_SOURCE_ASSETS_DIR "") +- set(NPM_ASSETS_DIR "") +- set(NPM_BUILD_HOMEBREW "true") +-else() +- set(NPM_SOURCE_ASSETS_DIR ${SUNSHINE_SOURCE_ASSETS_DIR}) +- set(NPM_ASSETS_DIR ${CMAKE_BINARY_DIR}) +- set(NPM_BUILD_HOMEBREW "") +-endif() +- + # platform specific target definitions + if(WIN32) + include(${CMAKE_MODULE_PATH}/targets/windows.cmake) +@@ -49,6 +37,27 @@ endif() + + target_compile_options(sunshine PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${SUNSHINE_COMPILE_OPTIONS}>;$<$<COMPILE_LANGUAGE:CUDA>:${SUNSHINE_COMPILE_OPTIONS_CUDA};-std=c++17>) # cmake-lint: disable=C0301 + ++# Homebrew build fails the vite build if we set these environment variables ++if(${SUNSHINE_BUILD_HOMEBREW}) ++ set(NPM_SOURCE_ASSETS_DIR "") ++ set(NPM_ASSETS_DIR "") ++ set(NPM_BUILD_HOMEBREW "true") ++else() ++ set(NPM_SOURCE_ASSETS_DIR ${SUNSHINE_SOURCE_ASSETS_DIR}) ++ set(NPM_ASSETS_DIR ${CMAKE_BINARY_DIR}) ++ set(NPM_BUILD_HOMEBREW "") ++endif() ++ ++#WebUI build ++find_program(NPM npm REQUIRED) ++add_custom_target(web-ui ALL ++ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" ++ COMMENT "Installing NPM Dependencies and Building the Web UI" ++ COMMAND "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" install ++ COMMAND "${CMAKE_COMMAND}" -E env "SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW}" "SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}" "SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}" "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" run build # cmake-lint: disable=C0301 ++ COMMAND_EXPAND_LISTS ++ VERBATIM) ++ + # tests + if(BUILD_TESTS) + add_subdirectory(tests) +diff --git a/cmake/targets/unix.cmake b/cmake/targets/unix.cmake +index 5527a987..047a0b3d 100644 +--- a/cmake/targets/unix.cmake ++++ b/cmake/targets/unix.cmake +@@ -1,8 +1,2 @@ + # unix specific target definitions + # put anything here that applies to both linux and macos +- +-#WebUI build +-add_custom_target(web-ui ALL +- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +- COMMENT "Installing NPM Dependencies and Building the Web UI" +- COMMAND sh -c \"npm install && SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW} SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR} npm run build\") # cmake-lint: disable=C0301 +diff --git a/cmake/targets/windows.cmake b/cmake/targets/windows.cmake +index e429feaa..341d7c2e 100644 +--- a/cmake/targets/windows.cmake ++++ b/cmake/targets/windows.cmake +@@ -4,9 +4,3 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll") + find_library(ZLIB ZLIB1) + list(APPEND SUNSHINE_EXTERNAL_LIBRARIES + Wtsapi32.lib) +- +-#WebUI build +-add_custom_target(web-ui ALL +- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +- COMMENT "Installing NPM Dependencies and Building the Web UI" +- COMMAND cmd /C "npm install && set \"SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}\" && set \"SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}\" && npm run build") # cmake-lint: disable=C0301 +-- +2.44.0 + diff --git a/net-misc/sunshine/sunshine-0.22.2.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild index d4852f3d0dbe..f700216a63b6 100644 --- a/net-misc/sunshine/sunshine-0.22.2.ebuild +++ b/net-misc/sunshine/sunshine-0.23.1.ebuild @@ -10,16 +10,13 @@ MOONLIGHT_COMMIT="cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e" NANORS_COMMIT="e9e242e98e27037830490b2a752895ca68f75f8b" TRAY_COMMIT="4d8b798cafdd11285af9409c16b5f792968e0045" SWS_COMMIT="27b41f5ee154cca0fce4fe2955dd886d04e3a4ed" -WLRP_COMMIT="4264185db3b7e961e7f157e1cc4fd0ab75137568" +WLRP_COMMIT="2b8d43325b7012cc3f9b55c08d26e50e42beac7d" FFMPEG_VERSION="6.1.1" -# To make the node-modules tarball: +# To make the assets tarball: # PV= -# git fetch -# git checkout v$PV -# rm -rf node_modules npm_cache package-lock.json -# npm_config_cache="${PWD}"/npm_cache npm install --logs-max=0 --omit=optional -# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-npm-cache-$PV.tar.xz npm_cache package-lock.json +# EGIT_OVERRIDE_COMMIT_LIZARDBYTE_SUNSHINE=v$PV ebuild sunshine-9999.ebuild clean compile +# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-assets-$PV.tar.xz -C /var/tmp/portage/net-misc/sunshine-9999/work/sunshine-9999 assets/ if [[ ${PV} = 9999* ]]; then inherit git-r3 @@ -40,7 +37,7 @@ else https://gitlab.com/eidheim/Simple-Web-Server/-/archive/${SWS_COMMIT}/Simple-Web-Server-${SWS_COMMIT}.tar.bz2 https://gitlab.freedesktop.org/wlroots/wlr-protocols/-/archive/${WLRP_COMMIT}/wlr-protocols-${WLRP_COMMIT}.tar.bz2 https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.xz - https://dev.gentoo.org/~chewi/distfiles/${PN}-npm-cache-${PV}.tar.xz + https://dev.gentoo.org/~chewi/distfiles/${PN}-assets-${PV}.tar.xz " KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/Sunshine-${PV}" @@ -181,6 +178,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-custom-ffmpeg.patch "${FILESDIR}"/${PN}-0.22.0-nvcodec.patch + "${FILESDIR}"/${PN}-find-npm.patch ) # Make this mess a bit simpler. @@ -188,7 +186,6 @@ CMAKE_IN_SOURCE_BUILD=1 # Make npm behave. export npm_config_audit=false -export npm_config_cache="${S}"/npm_cache export npm_config_color=false export npm_config_foreground_scripts=true export npm_config_loglevel=verbose @@ -337,6 +334,7 @@ src_configure() { CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_configure local mycmakeargs=( + -DBUILD_TESTS=no -DCMAKE_DISABLE_FIND_PACKAGE_Git=yes -DFFMPEG_PLATFORM_LIBRARIES="$(usex svt-av1 SvtAv1Enc '');$(usex vaapi 'va;va-drm' '');$(usev x264);$(usev x265)" -DFFMPEG_PREPARED_BINARIES="${S}"/third-party/ffmpeg @@ -352,6 +350,7 @@ src_configure() { -DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir) -DUDEV_RULES_INSTALL_DIR=$(get_udevdir)/rules.d ) + [[ ${PV} = 9999* ]] || mycmakeargs+=( -DNPM="${BROOT}"/bin/true ) CMAKE_USE_DIR="${S}" cmake_src_configure } diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild index d4852f3d0dbe..daa9608b1d60 100644 --- a/net-misc/sunshine/sunshine-9999.ebuild +++ b/net-misc/sunshine/sunshine-9999.ebuild @@ -10,16 +10,13 @@ MOONLIGHT_COMMIT="cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e" NANORS_COMMIT="e9e242e98e27037830490b2a752895ca68f75f8b" TRAY_COMMIT="4d8b798cafdd11285af9409c16b5f792968e0045" SWS_COMMIT="27b41f5ee154cca0fce4fe2955dd886d04e3a4ed" -WLRP_COMMIT="4264185db3b7e961e7f157e1cc4fd0ab75137568" +WLRP_COMMIT="2b8d43325b7012cc3f9b55c08d26e50e42beac7d" FFMPEG_VERSION="6.1.1" -# To make the node-modules tarball: +# To make the assets tarball: # PV= -# git fetch -# git checkout v$PV -# rm -rf node_modules npm_cache package-lock.json -# npm_config_cache="${PWD}"/npm_cache npm install --logs-max=0 --omit=optional -# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-npm-cache-$PV.tar.xz npm_cache package-lock.json +# EGIT_OVERRIDE_COMMIT_LIZARDBYTE_SUNSHINE=v$PV ebuild sunshine-9999.ebuild clean compile +# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-assets-$PV.tar.xz -C /var/tmp/portage/net-misc/sunshine-9999/work/sunshine-9999 assets/ if [[ ${PV} = 9999* ]]; then inherit git-r3 @@ -40,7 +37,7 @@ else https://gitlab.com/eidheim/Simple-Web-Server/-/archive/${SWS_COMMIT}/Simple-Web-Server-${SWS_COMMIT}.tar.bz2 https://gitlab.freedesktop.org/wlroots/wlr-protocols/-/archive/${WLRP_COMMIT}/wlr-protocols-${WLRP_COMMIT}.tar.bz2 https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.xz - https://dev.gentoo.org/~chewi/distfiles/${PN}-npm-cache-${PV}.tar.xz + https://dev.gentoo.org/~chewi/distfiles/${PN}-assets-${PV}.tar.xz " KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/Sunshine-${PV}" @@ -179,7 +176,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-custom-ffmpeg.patch "${FILESDIR}"/${PN}-0.22.0-nvcodec.patch ) @@ -188,7 +184,6 @@ CMAKE_IN_SOURCE_BUILD=1 # Make npm behave. export npm_config_audit=false -export npm_config_cache="${S}"/npm_cache export npm_config_color=false export npm_config_foreground_scripts=true export npm_config_loglevel=verbose @@ -337,6 +332,7 @@ src_configure() { CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_configure local mycmakeargs=( + -DBUILD_TESTS=no -DCMAKE_DISABLE_FIND_PACKAGE_Git=yes -DFFMPEG_PLATFORM_LIBRARIES="$(usex svt-av1 SvtAv1Enc '');$(usex vaapi 'va;va-drm' '');$(usev x264);$(usev x265)" -DFFMPEG_PREPARED_BINARIES="${S}"/third-party/ffmpeg @@ -352,6 +348,7 @@ src_configure() { -DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir) -DUDEV_RULES_INSTALL_DIR=$(get_udevdir)/rules.d ) + [[ ${PV} = 9999* ]] || mycmakeargs+=( -DNPM="${BROOT}"/bin/true ) CMAKE_USE_DIR="${S}" cmake_src_configure } diff --git a/net-misc/tipcutils/tipcutils-2.0.3.ebuild b/net-misc/tipcutils/tipcutils-2.0.3.ebuild index 99555442ba6f..02ececd6a08d 100644 --- a/net-misc/tipcutils/tipcutils-2.0.3.ebuild +++ b/net-misc/tipcutils/tipcutils-2.0.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)" HOMEPAGE="https://tipc.sourceforge.net" -SRC_URI="mirror://sourceforge/tipc/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/tipc/${P}.tar.gz" LICENSE="|| ( BSD-2 GPL-2 )" SLOT="0" diff --git a/net-misc/tipcutils/tipcutils-3.0.6.ebuild b/net-misc/tipcutils/tipcutils-3.0.6.ebuild index 2a97c078e6ff..07f286dd8ddd 100644 --- a/net-misc/tipcutils/tipcutils-3.0.6.ebuild +++ b/net-misc/tipcutils/tipcutils-3.0.6.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)" HOMEPAGE="https://tipc.sourceforge.net" -SRC_URI="mirror://sourceforge/tipc/${P/-/_}.tgz" +SRC_URI="https://downloads.sourceforge.net/tipc/${P/-/_}.tgz" S="${WORKDIR}"/${PN} LICENSE="|| ( BSD-2 GPL-2 )" diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest index bd303a7aa894..16968ac79828 100644 --- a/net-misc/tuba/Manifest +++ b/net-misc/tuba/Manifest @@ -1 +1,2 @@ DIST Tuba-0.6.3.gh.tar.gz 1124191 BLAKE2B b5a7107c94d9adf89fc02224891c12b71fc2b640e962006fbfcf1d0673e5f3f73b11423b6d66e8952e2aef122ade6a57607cced5d4707bd91193157fd561ce11 SHA512 b987b9b8434a0abd086a3197154b27bd4a0bca69df07bcec26c59a2da51cf447943e7a05a83529a99670f2b1b7ea1a7dce1da39148844d23706940f3a0a423d8 +DIST Tuba-0.7.2.gh.tar.gz 1388074 BLAKE2B 6785225612db57592f351d2e0937b9578f4861230e999190f64b1068f344624ad41e69afcb199913c0a8e5b5eadb1438b7c6c48746b3582e1978afe6e09cde32 SHA512 bbabadbf2131233a737d6ccded50fde0af44330c7a69d1e0688a6ef42fe548826cacbe714a61df78dbe5afe867940b1dbae868efc3dfae707342b9f7ce5a9835 diff --git a/net-misc/tuba/tuba-9999.ebuild b/net-misc/tuba/tuba-0.7.2.ebuild index e6f63c24642f..ddb73ceb06b5 100644 --- a/net-misc/tuba/tuba-9999.ebuild +++ b/net-misc/tuba/tuba-0.7.2.ebuild @@ -3,27 +3,34 @@ EAPI=8 -inherit git-r3 gnome2-utils meson optfeature vala +inherit gnome2-utils meson optfeature vala +MY_P=${P^} DESCRIPTION="Browse the Fediverse (GTK client)" HOMEPAGE=" https://tuba.geopjr.dev/ https://github.com/GeopJr/Tuba/ " -EGIT_REPO_URI="https://github.com/GeopJr/Tuba.git" +SRC_URI=" + https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} LICENSE="GPL-3 CC-BY-SA-4.0" SLOT="0" +KEYWORDS="~amd64 ~arm64" # TODO: optional dep on libspelling-1 DEPEND=" app-crypt/libsecret[introspection,vala] >=dev-libs/glib-2.76.0:2 + dev-libs/icu:= >=dev-libs/json-glib-1.4.4[introspection] >=dev-libs/libgee-0.8.5:0.8[introspection] dev-libs/libxml2 - >=gui-libs/gtk-4.11.3:4[gstreamer,introspection] - >=gui-libs/libadwaita-1.4:1[introspection,vala] + >=gui-libs/gtk-4.13.4:4[gstreamer,introspection] + >=gui-libs/libadwaita-1.5:1[introspection,vala] >=gui-libs/gtksourceview-5.6.0:5[introspection,vala] net-libs/libsoup:3.0[introspection,vala] " diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild index 6d231ef02de7..5fe5ec3d9908 100644 --- a/net-misc/vconfig/vconfig-1.9.ebuild +++ b/net-misc/vconfig/vconfig-1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~loong ~ppc ~ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~ppc ~ppc64 ~riscv sparc x86" IUSE="static" S="${WORKDIR}/${MY_PN}" diff --git a/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch new file mode 100644 index 000000000000..5c4fbb152e9e --- /dev/null +++ b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch @@ -0,0 +1,20 @@ +diff -ru vmnet-0.4.orig/vmnet.c vmnet-0.4/vmnet.c +--- vmnet-0.4.orig/vmnet.c 2024-04-02 08:35:41.521216356 +0000 ++++ vmnet-0.4/vmnet.c 2024-04-02 08:37:34.760604906 +0000 +@@ -50,6 +50,7 @@ + */ + + #define _GNU_SOURCE ++#define _XOPEN_SOURCE 700 + #include <errno.h> + #include <fcntl.h> + #include <pwd.h> +@@ -197,7 +198,7 @@ + int master, slave; + char name[1024]; + +- master = getpt(); ++ master = posix_openpt(O_RDWR); + if (master < 0) { + return 0; + } diff --git a/net-misc/vmnet/vmnet-0.4-r1.ebuild b/net-misc/vmnet/vmnet-0.4-r2.ebuild index 1fadcfdf151c..573adbc16276 100644 --- a/net-misc/vmnet/vmnet-0.4-r1.ebuild +++ b/net-misc/vmnet/vmnet-0.4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="A simple virtual networking program - SLIP over stdin/out" HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/" @@ -11,13 +11,14 @@ HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/" # So this might be better but it's a different filename # http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz # We use the debian patch anyway -SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz" +SRC_URI=" + ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz +" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc x86" -IUSE="" RDEPEND="sys-apps/net-tools" DEPEND="${RDEPEND}" @@ -25,11 +26,12 @@ DEPEND="${RDEPEND}" PATCHES=( "${WORKDIR}"/${P/-/_}-1.diff "${FILESDIR}"/${PN}-0.4-Fix-build-with-Clang-16.patch + "${FILESDIR}"/${PN}-0.4-replace-missing-musl-function.patch ) src_compile() { append-ldflags -Wl,-z,now - emake + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild index 242eeee574a7..899cb2c1f2f7 100644 --- a/net-misc/vmpsd/vmpsd-1.4.ebuild +++ b/net-misc/vmpsd/vmpsd-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="An open-source VLAN management system" HOMEPAGE="http://vmps.sourceforge.net" -SRC_URI="mirror://sourceforge/vmps/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/vmps/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild index 082dd8ddf017..c38602a82395 100644 --- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild +++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers" HOMEPAGE="http://vncsnapshot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest index 9a753e86eb47..ff0f05077753 100644 --- a/net-misc/vrrpd/Manifest +++ b/net-misc/vrrpd/Manifest @@ -1 +1,2 @@ +DIST vrrpd-1.15.tar.bz2 148430 BLAKE2B 787fa185ce64a0711403718b2627d9d2d8867ef3956090b93196f62d92428e0e02ee4440bc23fda46cdca70ca6693b76ed28a5e469a31e86fa4e36dc25c6a82a SHA512 4e7fa17e01d9b667f538204fbe84decea47ac7d84da8adf2e8e3bcf042d233a704a99347d3d97531993f2693c145ff54fb3ac346ade33f5d99cfbbac405ed784 DIST vrrpd-1.9.tar.gz 542249 BLAKE2B a412559be70791515c6b82639a8e1d5fc33954963fbf00aa3c549434ac0748b9d0ea657b2d02b1a3537a30742c18fe6d6db832a11c23b6989151c5f04c771d05 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b diff --git a/net-misc/vrrpd/metadata.xml b/net-misc/vrrpd/metadata.xml index f1c67d2187e4..ee849f0e1dd3 100644 --- a/net-misc/vrrpd/metadata.xml +++ b/net-misc/vrrpd/metadata.xml @@ -6,7 +6,7 @@ <name>Robin H. Johnson</name> </maintainer> <upstream> - <remote-id type="github">fredbcode/Vrrpd</remote-id> + <remote-id type="gitlab">fredbcode/Vrrpd</remote-id> <remote-id type="sourceforge">vrrpd</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/vrrpd/vrrpd-1.15.ebuild b/net-misc/vrrpd/vrrpd-1.15.ebuild new file mode 100644 index 000000000000..89e3f7fe5ba8 --- /dev/null +++ b/net-misc/vrrpd/vrrpd-1.15.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual Router Redundancy Protocol Daemon" +HOMEPAGE="https://gitlab.com/fredbcode/Vrrpd/" +GITLAB_SHA1="a318281271973c7430cfa520b540585153454c4b" +SRC_URI="https://gitlab.com/fredbcode/Vrrpd/-/archive/v${PV}/${P}.tar.bz2" + +S="${WORKDIR}/Vrrpd-v${PV}-${GITLAB_SHA1}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_prepare() { + default + + # Don't hardcore GCC + sed -e '/CC=/d' -i Makefile || die + + emake mrproper +} + +src_compile() { + local myemakeargs=( + DBG_OPT="" + MACHINEOPT="${CFLAGS}" + PROF_OPT="${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + dosbin vrrpd atropos + doman vrrpd.8 + dodoc FAQ Changes TODO scott_example README.md + dodoc doc/* +} diff --git a/net-misc/whois/whois-5.5.21.ebuild b/net-misc/whois/whois-5.5.21.ebuild index afbc87e1ae4d..b5be510bfed5 100644 --- a/net-misc/whois/whois-5.5.21.ebuild +++ b/net-misc/whois/whois-5.5.21.ebuild @@ -17,7 +17,7 @@ else SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #S="${WORKDIR}"/${PN} - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" diff --git a/net-misc/wol/wol-0.7.1-r4.ebuild b/net-misc/wol/wol-0.7.1-r4.ebuild index 1ead57765ef2..612394b1d861 100644 --- a/net-misc/wol/wol-0.7.1-r4.ebuild +++ b/net-misc/wol/wol-0.7.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="Implements Wake On LAN (Magic Paket) functionality in a small program" HOMEPAGE="http://ahh.sourceforge.net/wol/" -SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ahh/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild index c5722a566a9f..b721e93da415 100644 --- a/net-misc/wput/wput-0.6.2.ebuild +++ b/net-misc/wput/wput-0.6.2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP" HOMEPAGE="https://wput.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11-r1.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11-r1.ebuild index 44e2c7becb8c..ab922fa168dc 100644 --- a/net-misc/wput/wput-0.6.2_p20130413_p11-r1.ebuild +++ b/net-misc/wput/wput-0.6.2_p20130413_p11-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ if [[ ${PV} == *_p* ]] ; then SRC_URI+=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5)-$(ver_cut 7).debian.tar.xz" S="${WORKDIR}"/${PN}-${MY_PV}+git$(ver_cut 5) else - SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-${MY_PV}.tgz" fi LICENSE="GPL-2+" diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild index 8e78b06cf2b7..44e3ab8667a5 100644 --- a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild +++ b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ if [[ ${PV} == *_p* ]] ; then SRC_URI+=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5)-$(ver_cut 7).debian.tar.xz" S="${WORKDIR}"/${PN}-${MY_PV}+git$(ver_cut 5) else - SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-${MY_PV}.tgz" fi LICENSE="GPL-2+" diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest index cdc42fdf3e2f..11c6350d5b95 100644 --- a/net-misc/xmrig/Manifest +++ b/net-misc/xmrig/Manifest @@ -1,3 +1,2 @@ -DIST xmrig-6.18.1.tar.gz 2394259 BLAKE2B 4d7ed3ce7b6c9dce9b25da7c316df4542046b014167ce090c5c2ec4dbf61607e4238ce8a8407a396f1eb47dc76cbfac08e0131835d9c4bbff8f4e5920d2f19a6 SHA512 bb297b17f820ad38f0c68aebfe1be8e82e85aede99a9e2a7692935ed57dab06a36566d13c16f850123dc6e829dfb56bc9253c46b94e6a703fe169a0126feb37b DIST xmrig-6.21.1.tar.gz 2416545 BLAKE2B 72ecdfc8c999aee91aef4f540211c5d5a6f1992c76211162a623e89391cedfcc2d5540f291d9915ee4180b83f58ef7f2eb1e3aff8dee49c72f41f90878d7ef62 SHA512 a9267708e61084db7116381adb2256a04c30eba0c84b571764cc73ccafc9276f55b6665529eb7b9c1785d582d0d280ced6ee7ca88a5e98f9bbdef2a9176a9794 -DIST xmrig-6.21.2.tar.gz 2426759 BLAKE2B df2b25177ae4b60eff0f518cfe0aa513820fdce1811c329a33d16ee74c9f387b26bf41e8a2bf84471f0c1eef4deceee164e82a245c9a7813d633a08747bf6cfd SHA512 e6fefa091c5884ebd30a938472032efcf68fccde1ba492bd045dc50fef1ec95bb951bbbf1ed1832670bc241400629754f31318477ae634080a89790e9fa27957 +DIST xmrig-6.21.3.tar.gz 2426720 BLAKE2B 11563169e51402313399109860e04dd13dfc9911504db571968d6a97112990ebb68a3019da836a4ac19a589c94ab4b5f2ebcbadce59452c278ea923e8abf475a SHA512 91e92f61e385b75715b0b00fcb772bf997f3db19ef47f43c4bda3662aec6276273551ac915a7a6eeef253deb8da5b0ec0b45e02f0b84211ab8f0f5a37f34c87e diff --git a/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch b/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch deleted file mode 100644 index 1726c3b01523..000000000000 --- a/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch +++ /dev/null @@ -1,70 +0,0 @@ -From bd14e6034ba2de0056278c3ad9923199b7f4d20f Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matthew@gentoo.org> -Date: Mon, 20 Feb 2023 16:09:19 +0000 -Subject: [PATCH] Fix build with gcc 13 - -Now some header files are not included transistively with new -libstdc++. - -Bug: https://bugs.gentoo.org/895226 ---- a/src/backend/opencl/runners/OclBaseRunner.cpp -+++ b/src/backend/opencl/runners/OclBaseRunner.cpp -@@ -23,6 +23,9 @@ - */ - - -+#include <stdexcept> -+ -+ - #include "backend/opencl/runners/OclBaseRunner.h" - #include "backend/opencl/cl/OclSource.h" - #include "backend/opencl/OclCache.h" ---- a/src/backend/opencl/runners/OclCnRunner.cpp -+++ b/src/backend/opencl/runners/OclCnRunner.cpp -@@ -16,6 +16,9 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include <stdexcept> -+ -+ - #include "backend/opencl/runners/OclCnRunner.h" - #include "backend/opencl/kernels/Cn0Kernel.h" - #include "backend/opencl/kernels/Cn1Kernel.h" ---- a/src/backend/opencl/runners/OclKawPowRunner.cpp -+++ b/src/backend/opencl/runners/OclKawPowRunner.cpp -@@ -16,6 +16,9 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include <stdexcept> -+ -+ - #include "backend/opencl/runners/OclKawPowRunner.h" - #include "backend/common/Tags.h" - #include "3rdparty/libethash/ethash_internal.h" ---- a/src/backend/opencl/runners/OclRxJitRunner.cpp -+++ b/src/backend/opencl/runners/OclRxJitRunner.cpp -@@ -16,6 +16,9 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include <stdexcept> -+ -+ - #include "backend/opencl/runners/OclRxJitRunner.h" - #include "backend/opencl/cl/rx/randomx_run_gfx803.h" - #include "backend/opencl/cl/rx/randomx_run_gfx900.h" ---- a/src/base/net/http/HttpResponse.h -+++ b/src/base/net/http/HttpResponse.h -@@ -21,6 +21,7 @@ - #define XMRIG_HTTPRESPONSE_H - - -+#include <cstdint> - #include <map> - #include <string> - --- -2.39.2 - diff --git a/net-misc/xmrig/metadata.xml b/net-misc/xmrig/metadata.xml index e7d991de9b98..daf9832980db 100644 --- a/net-misc/xmrig/metadata.xml +++ b/net-misc/xmrig/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>matthew@gentoo.org</email> - <name>Matthew Smith</name> - </maintainer> - <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> diff --git a/net-misc/xmrig/xmrig-6.18.1-r2.ebuild b/net-misc/xmrig/xmrig-6.18.1-r2.ebuild deleted file mode 100644 index 7152c4ad7635..000000000000 --- a/net-misc/xmrig/xmrig-6.18.1-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic systemd toolchain-funcs - -DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" -HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64" -fi - -LICENSE="Apache-2.0 GPL-3+ MIT" -SLOT="0" -IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl" - -DEPEND=" - dev-libs/libuv:= - hwloc? ( >=sys-apps/hwloc-2.5.0:= ) - opencl? ( virtual/opencl ) - ssl? ( dev-libs/openssl:= ) -" -RDEPEND=" - ${DEPEND} - !arm64? ( sys-apps/msr-tools ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.12.2-nonotls.patch - "${FILESDIR}"/${PN}-6.18.1-gcc-13.patch -) - -src_prepare() { - if ! use donate ; then - sed -i 's/1;/0;/g' src/donate.h || die - fi - - cmake_src_prepare -} - -src_configure() { - # JIT broken with FORTIFY_SOURCE=3 - # Bug #913420 - if tc-enables-fortify-source; then - filter-flags -D_FORTIFY_SOURCE=3 - append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 - fi - - local mycmakeargs=( - -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1) - -DWITH_HWLOC=$(usex hwloc) - -DWITH_TLS=$(usex ssl) - -DWITH_OPENCL=$(usex opencl) - -DWITH_CUDA=OFF - ) - - cmake_src_configure -} - -src_install() { - default - keepdir /etc/xmrig - systemd_dounit "${FILESDIR}"/xmrig.service - dobin "${BUILD_DIR}/xmrig" - dobin "${S}/scripts/enable_1gb_pages.sh" - dobin "${S}/scripts/randomx_boost.sh" -} diff --git a/net-misc/xmrig/xmrig-6.21.2.ebuild b/net-misc/xmrig/xmrig-6.21.3.ebuild index 2061563b6ac5..2061563b6ac5 100644 --- a/net-misc/xmrig/xmrig-6.21.2.ebuild +++ b/net-misc/xmrig/xmrig-6.21.3.ebuild diff --git a/net-misc/you-get/files/you-get-python3.12.patch b/net-misc/you-get/files/you-get-python3.12.patch new file mode 100644 index 000000000000..c48b3e7e19d7 --- /dev/null +++ b/net-misc/you-get/files/you-get-python3.12.patch @@ -0,0 +1,39 @@ +Subject: [PATCH] Use importlib instead of imp + +Fix the deprecated warning. +Ref: https://stackoverflow.com/a/67692/3342190 +Bug: https://bugs.gentoo.org/929733 +--- + setup.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 24dc9fb2..78a8e832 100755 +--- a/setup.py ++++ b/setup.py +@@ -5,7 +5,8 @@ PACKAGE_NAME = 'you_get' + + PROJ_METADATA = '%s.json' % PROJ_NAME + +-import os, json, imp ++import os, json ++import importlib.util + here = os.path.abspath(os.path.dirname(__file__)) + proj_info = json.loads(open(os.path.join(here, PROJ_METADATA), encoding='utf-8').read()) + try: +@@ -13,7 +14,11 @@ try: + except: + README = "" + CHANGELOG = open(os.path.join(here, 'CHANGELOG.rst'), encoding='utf-8').read() +-VERSION = imp.load_source('version', os.path.join(here, 'src/%s/version.py' % PACKAGE_NAME)).__version__ ++version_spec = importlib.util.spec_from_file_location( ++ 'version', os.path.join(here, 'src/%s/version.py' % PACKAGE_NAME)) ++version = importlib.util.module_from_spec(version_spec) ++version_spec.loader.exec_module(version) ++VERSION = version.__version__ + + from setuptools import setup, find_packages + setup( +-- +2.44.0 + diff --git a/net-misc/you-get/you-get-0.4.1650-r1.ebuild b/net-misc/you-get/you-get-0.4.1650-r1.ebuild new file mode 100644 index 000000000000..3d5b58a7cb5c --- /dev/null +++ b/net-misc/you-get/you-get-0.4.1650-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +DESCRIPTION="Utility to download media contents from the web" +HOMEPAGE="https://you-get.org" +SRC_URI="https://github.com/soimort/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RESTRICT="test" +PROPERTIES="test_network" + +RDEPEND=" + media-video/ffmpeg +" + +PATCHES=( "${FILESDIR}/${PN}-python3.12.patch" ) + +distutils_enable_tests unittest diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest index 3a5a8a641a5d..556a1232c71f 100644 --- a/net-misc/yt-dlp/Manifest +++ b/net-misc/yt-dlp/Manifest @@ -1,2 +1 @@ -DIST yt-dlp-2024.03.10.tar.gz 5515436 BLAKE2B ce25d2ce78ebd107deab12a117ac9efa634052264d780c62531226c7128b1ba5ca52c952dc85dcefe137aadf08cffa417a135b996f864315866c35fd7209ec6b SHA512 6bfe1aeab98f559a2b23ffa12b63b40974312709039313695f41c7beb16d29f21953c61ab633d567e42deeec72fb0932950ddeb4b821fffb93fbae9ae0cb30a2 DIST yt-dlp-2024.04.09.tar.gz 5589808 BLAKE2B ada1c3be28c4615a96b4fef9d39144b49548e97be6fab003596f11db905efa2607ea3d62ba529aee8391320bf4e3cd3c9367a5eab0439822fd98407fde2807fb SHA512 5eada1c6a3d656c4f70552824a59ed677ecc102e1a2c3475a12fccff78ea267d7391e778060d708bf0aca1bdf92f4bf413785e0cd65b43259535577e92755556 diff --git a/net-misc/yt-dlp/yt-dlp-2024.03.10.ebuild b/net-misc/yt-dlp/yt-dlp-2024.03.10.ebuild deleted file mode 100644 index b7afca90955e..000000000000 --- a/net-misc/yt-dlp/yt-dlp-2024.03.10.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 distutils-r1 optfeature wrapper - -DESCRIPTION="youtube-dl fork with additional features and fixes" -HOMEPAGE="https://github.com/yt-dlp/yt-dlp/" -SRC_URI=" - https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz - -> ${P}.tar.gz -" -S="${WORKDIR}/${PN}" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] - !net-misc/youtube-dl[-yt-dlp(-)] -" - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - - # adjust pycryptodome and drop optional dependencies (bug #828466) - sed -Ei pyproject.toml \ - -e 's/("pycryptodome)x/\1/' \ - -e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die -} - -python_test() { - local EPYTEST_DESELECT=( - # fails with FEATURES=distcc, bug #915614 - test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] - ) - - epytest -m 'not download' -} - -python_install_all() { - dodoc README.md Changelog.md supportedsites.md - doman yt-dlp.1 - - dobashcomp completions/bash/yt-dlp - - insinto /usr/share/fish/vendor_completions.d - doins completions/fish/yt-dlp.fish - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_yt-dlp - - rm -r "${ED}"/usr/share/doc/yt_dlp || die - - make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl" -} - -pkg_postinst() { - optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg - has_version media-video/atomicparsley || # allow fallback but don't advertise - optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen - optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage - - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' - elog 'as "youtube-dl". This is strictly for compatibility and it is' - elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' - fi -} diff --git a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild index 605d4eb28f65..0d06867b5465 100644 --- a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild +++ b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild @@ -20,7 +20,7 @@ else SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="MIT" diff --git a/net-misc/zssh/zssh-1.5c-r2.ebuild b/net-misc/zssh/zssh-1.5c-r2.ebuild index e63204a2c9bb..3d3cfc636134 100644 --- a/net-misc/zssh/zssh-1.5c-r2.ebuild +++ b/net-misc/zssh/zssh-1.5c-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="SSH wrapper enabling zmodem up/download in ssh" HOMEPAGE="https://zssh.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" |