diff options
Diffstat (limited to 'net-misc')
787 files changed, 21149 insertions, 15101 deletions
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest index f0a2cd9b4276..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.0-amd64.tar.gz 7050807 BLAKE2B f7a4eddb619d9dca50b97a43f45a7d3f87ac574ed8df0883f050827b2a9c433ca79a4715b9e8ba01f8d992b9adeeaea64743d31ba167c899f69620cba2923b61 SHA512 72a6b1a7427780fa33f5927d59485cc1ebdda6d20364cc6dde3eeacdaf7514852ebd6771669fbdfc113a069dd97eec3f2d18290a5cdd3a8d416d30610ef955b2 +DIST anydesk-6.3.2-amd64.tar.gz 7039607 BLAKE2B dfc628baef862bddb944b02d39c3e270a0ac4dbe88704099f8b9022e7e758a367093432b78e86bcc1d9432fabe1c2842c4e811e59541433cb75a9734e09cff08 SHA512 a0fac07d6beb085666f4414f592b5b26b0f699ebc0b1ad5a587317a0c46b0f92a8d3b3e2e0ab08ce9e6c4c1c15789f8396158cc87075e623e32ce714ad071612 diff --git a/net-misc/anydesk/anydesk-6.3.0.ebuild b/net-misc/anydesk/anydesk-6.3.0.ebuild deleted file mode 100644 index 77d78ee0f0c6..000000000000 --- a/net-misc/anydesk/anydesk-6.3.0.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.2.1-r1.ebuild b/net-misc/anydesk/anydesk-6.3.2.ebuild index 77d78ee0f0c6..8da50cec7b3c 100644 --- a/net-misc/anydesk/anydesk-6.2.1-r1.ebuild +++ b/net-misc/anydesk/anydesk-6.3.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" diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild index 3f1113b4af76..a97170d14427 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-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 @@ -36,6 +36,9 @@ PATCHES=( "${FILESDIR}/${PN}-3.3.1-flags.patch" "${FILESDIR}/${PN}-3.5-perl-syntax.patch" "${FILESDIR}/${PN}-3.6-optional-systemd.patch" + "${FILESDIR}/${PN}-3.7.4-strlcpy-glibc-2.38.patch" + "${FILESDIR}/${PN}-3.7.4-musl.patch" + "${FILESDIR}/${PN}-3.7.4-gcc14.patch" ) S="${WORKDIR}/${MY_P}" diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild index c68f0b584466..b3920920cb47 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.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=7 +EAPI=8 inherit cmake git-r3 tmpfiles diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch new file mode 100644 index 000000000000..345d7d5c80e4 --- /dev/null +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch @@ -0,0 +1,39 @@ +--- a/src/aconnect.cc ++++ b/src/aconnect.cc +@@ -6,6 +6,7 @@ + #include "debug.h" + #include "portutils.h" + ++#include <algorithm> + #include <future> + + #include <sys/types.h> +--- a/src/acregistry.cc ++++ b/src/acregistry.cc +@@ -5,6 +5,7 @@ + #include "cleaner.h" + #include "evabase.h" + ++#include <algorithm> + #include <list> + + #define IN_ABOUT_ONE_DAY 100000 +--- a/src/caddrinfo.cc ++++ b/src/caddrinfo.cc +@@ -1,5 +1,6 @@ + #include "meta.h" + ++#include <algorithm> + #include <deque> + #include <memory> + #include <list> +--- a/src/header.cc ++++ b/src/header.cc +@@ -10,6 +10,7 @@ + #include "filereader.h" + #include "httpdate.h" + ++#include <algorithm> + #include <map> + #include <iostream> + diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch new file mode 100644 index 000000000000..01fb990fc98c --- /dev/null +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/716564 +--- a/src/meta.h ++++ b/src/meta.h +@@ -20,6 +20,7 @@ + #include <strings.h> + #include <cstdlib> + #include <errno.h> ++#include <sys/time.h> + + #include "astrop.h" + diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch new file mode 100644 index 000000000000..4d97d6b0d05c --- /dev/null +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/913133 + +From 7f4bb9de7c84bf55c446c98056259e4e6d8b61e7 Mon Sep 17 00:00:00 2001 +From: Richard Liu <richliu@techarea.org> +Date: Fri, 19 Jan 2024 00:38:27 +0800 +Subject: [PATCH] fix compile error + +--- + src/meta.cc | 2 +- + src/meta.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/meta.cc b/src/meta.cc +index 9a2053f..5b15eff 100644 +--- a/src/meta.cc ++++ b/src/meta.cc +@@ -831,7 +831,7 @@ bool scaseequals(string_view a, string_view b) + return true; + } + +-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY ++#if !defined(HAVE_STRLCPY) + size_t strlcpy(char *tgt, const char *src, size_t tgtSize) + { + auto p = src; +diff --git a/src/meta.h b/src/meta.h +index a1f4080..dafb754 100644 +--- a/src/meta.h ++++ b/src/meta.h +@@ -323,7 +323,7 @@ class NoCaseStringMap : public std::map<mstring, mstring, ltstring> + static constexpr string_view svRN = szRN; + static constexpr string_view svLF = "\n"; + +-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY ++#if !defined(HAVE_STRLCPY) + size_t strlcpy(char *tgt, const char *src, size_t tgtSize); + #endif + } +-- +2.43.0 + diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest index 35240d12d207..eab5c84fe4d4 100644 --- a/net-misc/aria2/Manifest +++ b/net-misc/aria2/Manifest @@ -1,2 +1 @@ -DIST aria2-1.36.0.tar.xz 1619036 BLAKE2B 7894ec705f6fefdbc6c4844efa8a645b3e7674e36d04535ac96b9daf5098a453d047109bad0db16e6fd656f63a3ec0bab5746e8ba7d549149e2364395a94399f SHA512 8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542 DIST aria2-1.37.0.tar.xz 1705256 BLAKE2B 4714dd0806fb7693f45e854d544dadd87312a98eef93518f8e8ea5f3332d362724dead16c7ebfdbe594b8403ef7b44e09f4180629894506e333ec2a423828244 SHA512 df3b8b4de8fa8d78f203ea00c059e43585e18a229009f202e42e6a9e59db67d09df0dbba8a016e99ed73c82f59e4f8b26f86c2288afdbb96a6807cbe2c56e6b3 diff --git a/net-misc/aria2/aria2-1.36.0-r1.ebuild b/net-misc/aria2/aria2-1.36.0-r1.ebuild deleted file mode 100644 index 39236f9eb903..000000000000 --- a/net-misc/aria2/aria2-1.36.0-r1.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 - -DESCRIPTION="A download utility with segmented downloading with BitTorrent support" -HOMEPAGE="https://aria2.github.io/" -SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" - -LICENSE="GPL-2+-with-openssl-exception" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE=" - adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle - nls sqlite scripts ssh ssl tcmalloc test xmlrpc -" -# xmlrpc has no explicit switch, it's turned out by any XML library -# so metalink implicitly forces it on -REQUIRED_USE=" - ?? ( jemalloc tcmalloc ) - metalink? ( xmlrpc ) -" -RESTRICT="!test? ( test )" - -# Crazy GnuTLS/OpenSSL/etc. logic below: -# 1. Those libraries are used for two purposes: TLS & MD. -# 2. Upstream preferences are: -# 1) gnutls [tls] -# 2) !gnutls? -> openssl [tls+md] -# 3) !openssl? -> nettle [md] -# 4) !openssl? !nettle? -> gcrypt [md] -# 5) !*? -> bundled md routines (we don't use them) -# 3. There's also gmp usage for bittorrent with nettle. -# 4. You can't really control features, just dependencies. -# (we are skipping native Apple/Windows TLS support) -# -# We map this into: -# ssl? -> openssl || (gnutls + (nettle || libgcrypt )) -# !ssl? -> nettle || libgcrypt -RDEPEND=" - sys-libs/zlib:0= - adns? ( >=net-dns/c-ares-1.5.0:0= ) - jemalloc? ( dev-libs/jemalloc ) - libuv? ( >=dev-libs/libuv-1.13:0= ) - metalink? ( - libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) - !libxml2? ( dev-libs/expat:0= ) - ) - sqlite? ( dev-db/sqlite:3= ) - ssh? ( net-libs/libssh2:= ) - ssl? ( - app-misc/ca-certificates - gnutls? ( - >=net-libs/gnutls-1.2.9:0= - nettle? ( - >=dev-libs/nettle-2.4:0= - bittorrent? ( - >=dev-libs/nettle-2.4:0=[gmp] - >=dev-libs/gmp-6:0= - ) - ) - !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) - ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - !ssl? ( - nettle? ( - >=dev-libs/nettle-2.4:0= - bittorrent? ( - >=dev-libs/nettle-2.4:0=[gmp] - >=dev-libs/gmp-6:0= - ) - ) - !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) - ) - tcmalloc? ( dev-util/google-perftools ) - xmlrpc? ( - libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) - !libxml2? ( dev-libs/expat:0= ) - ) -" - -DEPEND=" - ${RDEPEND} - test? ( >=dev-util/cppunit-1.12.0:0 ) -" -RDEPEND+=" - nls? ( virtual/libiconv virtual/libintl ) - scripts? ( dev-lang/ruby ) -" -BDEPEND="app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -pkg_setup() { - if use scripts && ! use xmlrpc; then - ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc" - ewarn "and aria2mon scripts against the local aria2." - fi -} - -src_prepare() { - default - sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed" - # Fails with USE=bittorrent && FEATURES=network-sandbox - sed -i -E \ - -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageDispatcherTest/d' \ - -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageReceiverTest/d' \ - test/Makefile.in || die -} - -src_configure() { - local myconf=( - # threads, epoll: check for best portability - - # do not try to compile and run a test LIBXML program - --disable-xmltest - # enable the shared library - --enable-libaria2 - # zlib should always be available anyway - --with-libz - --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" - - # optional features - $(use_enable bittorrent) - $(use_enable metalink) - $(use_enable nls) - $(use_with adns libcares) - $(use_with jemalloc) - $(use_with libuv) - $(use_with sqlite sqlite3) - $(use_with ssh libssh2) - $(use_with tcmalloc) - - # forces bundled wslay - --disable-websocket - ) - - # See TLS/MD logic described above deps. - if use ssl && ! use gnutls; then - # 1. if ssl & !gnutls, use openssl and disable gnutls - myconf+=( --without-gnutls --with-openssl ) - else - myconf+=( - # 2. otherwise, disable openssl - --without-openssl - # 3. if ssl & gnutls, use gnutls - $(use_with ssl gnutls) - - # 4. switch between nettle & libgcrypt - $(use_with nettle libnettle) - $(use_with !nettle libgcrypt) - ) - - # 5. if bittorrent is used along with nettle, use libgmp - if use bittorrent && use nettle; then - myconf+=( --with-libgmp ) - else - myconf+=( --without-libgmp ) - fi - fi - - # metalink+xmlrpc := libxml2 / expat - # USE=(metalink || xmlrpc) - # + USE=libxml2 -> libxml2 - # + USE=-libxml2 -> expat - - if use metalink || use xmlrpc; then - myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) ) - else - myconf+=( --without-libexpat --without-libxml2 ) - fi - - # Note: - # - always enable gzip/http compression since zlib should always be available anyway - # - always enable epoll since we can assume kernel 2.6.x - # - other options for threads: solaris, pth, win32 - econf "${myconf[@]}" -} - -src_install() { - default - rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die - - dobashcomp doc/bash_completion/aria2c - use scripts && dobin doc/xmlrpc/aria2{mon,rpc} -} - -pkg_postinst() { - if use xmlrpc; then - elog "If you would like to use the additional aria2mon and aria2rpc tools," - elog "you need to have \033[1mdev-lang/ruby\033[0m installed." - fi -} diff --git a/net-misc/aria2/aria2-1.37.0.ebuild b/net-misc/aria2/aria2-1.37.0.ebuild index 5aad543edb93..c22966b826cd 100644 --- a/net-misc/aria2/aria2-1.37.0.ebuild +++ b/net-misc/aria2/aria2-1.37.0.ebuild @@ -1,16 +1,16 @@ -# 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 +inherit bash-completion-r1 libtool DESCRIPTION="A download utility with segmented downloading with BitTorrent support" HOMEPAGE="https://aria2.github.io/" SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" LICENSE="GPL-2+-with-openssl-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE=" adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle @@ -112,6 +112,8 @@ src_prepare() { -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageDispatcherTest/d' \ -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageReceiverTest/d' \ test/Makefile.in || die + + elibtoolize } src_configure() { @@ -185,6 +187,7 @@ src_configure() { src_install() { default + find "${D}" -name '*.la' -delete || die rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die dobashcomp doc/bash_completion/aria2c diff --git a/net-misc/arpd/Manifest b/net-misc/arpd/Manifest deleted file mode 100644 index 6fa7ee7fb6cb..000000000000 --- a/net-misc/arpd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST arpd-0.2.tar.gz 49437 BLAKE2B 6739954b5cb1da3d23251b526c5bc39b1563f6d54e74e5ff8d8e9c3f9b0ed1ecedc7caf805e51321849036d3dc49ab2e7f244599c7c2ef2b02d65160a8cf669c SHA512 24bd4626188d74e172a46312790f8453619af2ac634c23379d1922c789ed97ef5db8a73ae13fccd98c94457da79682d6a1d7ccc3236c787f9d2eb15f64716ea2 diff --git a/net-misc/arpd/arpd-0.2-r1.ebuild b/net-misc/arpd/arpd-0.2-r1.ebuild deleted file mode 100644 index de6e16c1ce37..000000000000 --- a/net-misc/arpd/arpd-0.2-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="ARP server claiming all unassigned addresses (for network monitoring/simulation)" -HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/" -SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86" -IUSE="" - -DEPEND=" - >=dev-libs/libdnet-1.4 - >=dev-libs/libevent-0.6 - net-libs/libpcap - !sys-apps/iproute2" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN} - -PATCHES=( - "${FILESDIR}"/arpd.c.patch - "${FILESDIR}"/${P}-libevent.patch - - # bug 337481, replace test on libevent.a with libevent.so - "${FILESDIR}"/${P}-buildsystem-libevent-test.patch -) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - econf \ - --with-libdnet="${EPREFIX}"/usr \ - --with-libevent="${EPREFIX}"/usr -} - -src_install() { - dosbin arpd - doman arpd.8 -} diff --git a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch deleted file mode 100644 index 598fd0b73777..000000000000 --- a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -62,7 +62,7 @@ - ;; - *) - AC_MSG_RESULT($withval) -- if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then -+ if test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then - owd=`pwd` - if cd $withval; then withval=`pwd`; cd $owd; fi - EVENTINC="-I$withval/include" diff --git a/net-misc/arpd/files/arpd-0.2-libevent.patch b/net-misc/arpd/files/arpd-0.2-libevent.patch deleted file mode 100644 index 367ae551ad98..000000000000 --- a/net-misc/arpd/files/arpd-0.2-libevent.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/arpd.c -+++ b/arpd.c -@@ -445,9 +445,6 @@ - void - terminate_handler(int sig) - { -- extern int event_gotsig; -- -- event_gotsig = 1; - arpd_sig = sig; - } - -@@ -464,7 +461,6 @@ - main(int argc, char *argv[]) - { - struct event recv_ev; -- extern int (*event_sigcb)(void); - char *dev; - int c, debug; - FILE *fp; -@@ -524,7 +520,6 @@ - perror("signal"); - return (-1); - } -- event_sigcb = arpd_signal; - - event_dispatch(); - diff --git a/net-misc/arpd/files/arpd.c.patch b/net-misc/arpd/files/arpd.c.patch deleted file mode 100644 index b8d2bbdb94b0..000000000000 --- a/net-misc/arpd/files/arpd.c.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/arpd.c -+++ b/arpd.c -@@ -265,7 +265,7 @@ - spa->addr_ip, tha->addr_eth, tpa->addr_ip); - - if (op == ARP_OP_REQUEST) { -- syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s", -+ syslog(LOG_DEBUG, __FUNCTION__, ": who-has %s tell %s", - addr_ntoa(tpa), addr_ntoa(spa)); - } else if (op == ARP_OP_REPLY) { - syslog(LOG_INFO, "arp reply %s is-at %s", -@@ -282,7 +282,7 @@ - int error; - - if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) { -- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", -+ syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s", - addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr)); - return (0); - } -@@ -291,10 +291,10 @@ - error = arp_get(arpd_arp, &arpent); - - if (error == -1) { -- syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s", -+ syslog(LOG_DEBUG, __FUNCTION__, ": no entry for %s", - addr_ntoa(addr)); - } else { -- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", -+ syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s", - addr_ntoa(addr), addr_ntoa(&arpent.arp_ha)); - } - return (error); -@@ -423,7 +423,7 @@ - if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) { - addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS, - ethip->ar_sha, ETH_ADDR_LEN); -- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", -+ syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s", - addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha)); - - /* This address is claimed */ diff --git a/net-misc/arpd/metadata.xml b/net-misc/arpd/metadata.xml deleted file mode 100644 index 115e9d64a669..000000000000 --- a/net-misc/arpd/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-misc/asahi-btsync/Manifest b/net-misc/asahi-btsync/Manifest new file mode 100644 index 000000000000..d6effe408e76 --- /dev/null +++ b/net-misc/asahi-btsync/Manifest @@ -0,0 +1,64 @@ +DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 +DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68 +DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159 +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 +DIST anstyle-query-1.0.1.crate 8620 BLAKE2B 65d81d089b6f84e062276807e180e6a8b793cdf570e4e82a88dd1670ed1e15f6edc9ca8f55873069273efe170c2dbbbf75dd3b2b773c78d23c896c0d6f3bb237 SHA512 70178a50e4025a0ded9fa7235d045cd965889efe63bc319e418a3e34406a66a42c19a2d7684d8d607046cd8419ba9b789607fe5c50aeeeabb23d72de6ad43039 +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 +DIST asahi-btsync-0.2.0.tar.gz 20839 BLAKE2B 2b09167cc6bf1ccb376666c06491a04872790de5917950d6877e791f2cec0591375b5fd1aa829b7ef43466d2c656d0ff87748505ce5c6c34d3bf8b7fd6e16267 SHA512 70149a1f3eab442e460c057ee2bc85936dcc98c0ec9039e0343ed3edd4cb7bb6fd77da9ec61afb47f5bfb73765ae31ad9aad7b355ed9d77b4a9a1842ce31b305 +DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.3.3.crate 34320 BLAKE2B da9f42fc888e31d50d0b2f0d0cc1bddfa97e0c2d3eac60fd2cc451670f000b5148e58c3c40c348ef1bd516c7a568bcc3a97742ac5bdb9ef4772048eb922171af SHA512 8f063ba2bc3f638ca9200722e1c4370102589fb07aef25efcf63993fbf283cc86d554d11d24719f728ecabe540a47a90ce4113d8719f8e773f2344a66d21ff78 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea +DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b +DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4 +DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167 +DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST crc-3.0.1.crate 9950 BLAKE2B 2afbaee34f754953396e452260290422d19416dad4b88333e4501592deff3b3350363ca4c2b37d573ecd4e64a762b702b79445460f15fc90bdb8214fe43c0945 SHA512 aabe9d4058fb4710405146e978ec5881bce5ce8971618b69a7ff873b0fff15fc78e5c48ff0136ca6d37663a53905bc3c5daa0ed3a2ed4d8d721e90c3b0ec28a5 +DIST crc-catalog-2.2.0.crate 9931 BLAKE2B b9c36e7f41e67daafc31f6ee6bf37ef78980171cd84565c103770a57bbed1e04f2b7a7261e7917252b3b6be96837e8138a8b9829380be93a69ee6f33ea332397 SHA512 9fcd42c44c66798c97ed36b36a902dff6e83a96d86da0f146c0db287ed6a00c8827d6749bfcdd090083bb81103bb2397e388a0e2a21698d65550360a45453396 +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST dlv-list-0.3.0.crate 11920 BLAKE2B 2f5d52dd47c97799e6e7fead83c0f239daca5422f7fd2f3662d3d4a22714b2a64a4b65df3a451ad43675d828e3265a10ae30428204c33f4e1efa8bcd6933ca8d SHA512 3efa93e5ee5ee2e480a7e8dbc6d5baeb289279871f8b9f4858a24abf3f8b57cf1fd36369a6b5a1e667c121985197063c8834141b220a58453c8399edc9da4206 +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST gpt-3.1.0.crate 47134 BLAKE2B 24a1b4607ee07e590c89c1a68bb7f20251a99f5078c38e937cf4f4d0f83508830a9b62b7f5a1eb5475095c41c80d56ebfce91e65f25a61b161b2a088e1c0e179 SHA512 dd298a4b6b6a200482193ba560241bc3f3e2e9e790c06d016447f58004d1aeb37e554f99fc1d5b166e4062978ad19883d021405c08b9648a34159a002316e3b5 +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e +DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038 +DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157 +DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST ordered-multimap-0.4.3.crate 19599 BLAKE2B 1287938e6bcb26c3e377fff6c492adfff7ca05fcdb5881d76edcf08aa89160180e6a2c2ad40b162e75997bc9fe36204c50d839d4305911de231bfd408345975a SHA512 92d02f260d912c70bc51a4e943ecf7be7e8211ff515dd6aa6029fbb0d0f67b8c689966b23e32520fc5b437caebab650e18a16cdd8b2a036edc91645faa9e47e8 +DIST os_str_bytes-6.5.1.crate 22778 BLAKE2B 1d3daa82b41e6e360ec17051be2c5b1a394fe49ae349b2888e6f30fccf99d102c71357f76c3f68118de59e24480221b352a223ed01f26f11bf707b1c7de81941 SHA512 6d7a4475398daaae4e3d55ad58a8fba729517acf5744a5a6296f477207ee91e5bc36c2b54e58f6f9b15ce9bc75286e9ba62a59d577f0171d8151d3aaa01311b8 +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST rust-ini-0.18.0.crate 15439 BLAKE2B e225973af6e7d8a8ebf0d37efa913f5eacf8beb42d30f759135b18ae6fed091537466afc7e2aacfe1d00514a76eb4a8bd99ff281859ca0f7c7e0db3c6d6fb1a9 SHA512 2907d0891ff2164deacb2f217b4b8484bee9b2c2d32c354518e9b4d74069639bab55190d0d8ca6fb0751180cf2be1477ed9b100e3a5cc9f02af52ea26f32ccf4 +DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 +DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 +DIST uuid-1.4.0.crate 55200 BLAKE2B 11e641e76f2f25f94430cbb473887cfa052f73527d7df2625d304d101c25ba0148c901460798dea962611df1f5af41119c29ff2aea25fd09bfd64368a2df8aab SHA512 92acf08ee1f36a3a394422ce9b1cdbe0ccf3fb8d878efe068fd025832af677466622bd1260e853c5232f18b4f5411136595aa07311a3f9886904800bee7cfaa0 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +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.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 diff --git a/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild b/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild new file mode 100644 index 000000000000..38625d6d5889 --- /dev/null +++ b/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + adler32@1.2.0 + ahash@0.7.6 + anstream@0.6.4 + anstyle-parse@0.2.3 + anstyle-query@1.0.1 + anstyle-wincon@3.0.2 + anstyle@1.0.4 + atty@0.2.14 + autocfg@1.1.0 + bitflags@1.3.2 + bitflags@2.3.3 + cfg-if@1.0.0 + clap@3.2.25 + clap@4.4.11 + clap_builder@4.4.11 + clap_derive@4.4.7 + clap_lex@0.2.4 + clap_lex@0.6.0 + colorchoice@1.0.0 + crc-catalog@2.2.0 + crc32fast@1.3.2 + crc@3.0.1 + dlv-list@0.3.0 + getrandom@0.2.10 + gpt@3.1.0 + hashbrown@0.12.3 + heck@0.4.1 + hermit-abi@0.1.19 + indexmap@1.9.3 + libc@0.2.147 + log@0.4.19 + memoffset@0.7.1 + nix@0.26.2 + once_cell@1.18.0 + ordered-multimap@0.4.3 + os_str_bytes@6.5.1 + pin-utils@0.1.0 + proc-macro2@1.0.70 + quote@1.0.33 + rust-ini@0.18.0 + static_assertions@1.1.0 + strsim@0.10.0 + syn@2.0.39 + termcolor@1.2.0 + textwrap@0.16.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uuid@1.4.0 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.52.0 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.52.0 +" + +inherit cargo linux-info + +# Releases are not tagged +COMMIT="11e47cfa7ddbec0059d683e6d98a4e0f95e3ffa3" +MY_P="asahi-nvram-${COMMIT}" +DESCRIPTION="Bluetooth pairing data handoff from macOS for Apple Silicon Macs" +HOMEPAGE="https://github.com/WhatAmISupposedToPutHere/asahi-nvram" + +SRC_URI=" + ${CARGO_CRATE_URIS} + https://github.com/WhatAmISupposedToPutHere/asahi-nvram/archive/${COMMIT}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/${MY_P}/asahi-btsync" + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" MIT Unicode-DFS-2016 ZLIB" +SLOT="0" +KEYWORDS="~arm64" + +pkg_pretend() { + if use kernel_linux; then + linux_config_exists || die "No suitable kernel configuration could be found" + CONFIG_EXTRA="~MTD_SPI_NOR" + check_extra_config + fi +} diff --git a/net-misc/asahi-btsync/metadata.xml b/net-misc/asahi-btsync/metadata.xml new file mode 100644 index 000000000000..c0d4d6d29036 --- /dev/null +++ b/net-misc/asahi-btsync/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>jcalligeros99@gmail.com</email> + <name>James Calligeros</name> + </maintainer> + <maintainer type="project"> + <email>asahi@gentoo.org</email> + <name>Gentoo Asahi Project</name> + </maintainer> + <upstream> + <remote-id type="github">WhatAmISupposedToPutHere/asahi-nvram</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/asahi-wifisync/Manifest b/net-misc/asahi-wifisync/Manifest new file mode 100644 index 000000000000..d1a4c14fc0ee --- /dev/null +++ b/net-misc/asahi-wifisync/Manifest @@ -0,0 +1,64 @@ +DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 +DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68 +DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159 +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 +DIST anstyle-query-1.0.1.crate 8620 BLAKE2B 65d81d089b6f84e062276807e180e6a8b793cdf570e4e82a88dd1670ed1e15f6edc9ca8f55873069273efe170c2dbbbf75dd3b2b773c78d23c896c0d6f3bb237 SHA512 70178a50e4025a0ded9fa7235d045cd965889efe63bc319e418a3e34406a66a42c19a2d7684d8d607046cd8419ba9b789607fe5c50aeeeabb23d72de6ad43039 +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 +DIST asahi-wifisync-0.2.0.tar.gz 20839 BLAKE2B 2b09167cc6bf1ccb376666c06491a04872790de5917950d6877e791f2cec0591375b5fd1aa829b7ef43466d2c656d0ff87748505ce5c6c34d3bf8b7fd6e16267 SHA512 70149a1f3eab442e460c057ee2bc85936dcc98c0ec9039e0343ed3edd4cb7bb6fd77da9ec61afb47f5bfb73765ae31ad9aad7b355ed9d77b4a9a1842ce31b305 +DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.3.3.crate 34320 BLAKE2B da9f42fc888e31d50d0b2f0d0cc1bddfa97e0c2d3eac60fd2cc451670f000b5148e58c3c40c348ef1bd516c7a568bcc3a97742ac5bdb9ef4772048eb922171af SHA512 8f063ba2bc3f638ca9200722e1c4370102589fb07aef25efcf63993fbf283cc86d554d11d24719f728ecabe540a47a90ce4113d8719f8e773f2344a66d21ff78 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea +DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b +DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4 +DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167 +DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST crc-3.0.1.crate 9950 BLAKE2B 2afbaee34f754953396e452260290422d19416dad4b88333e4501592deff3b3350363ca4c2b37d573ecd4e64a762b702b79445460f15fc90bdb8214fe43c0945 SHA512 aabe9d4058fb4710405146e978ec5881bce5ce8971618b69a7ff873b0fff15fc78e5c48ff0136ca6d37663a53905bc3c5daa0ed3a2ed4d8d721e90c3b0ec28a5 +DIST crc-catalog-2.2.0.crate 9931 BLAKE2B b9c36e7f41e67daafc31f6ee6bf37ef78980171cd84565c103770a57bbed1e04f2b7a7261e7917252b3b6be96837e8138a8b9829380be93a69ee6f33ea332397 SHA512 9fcd42c44c66798c97ed36b36a902dff6e83a96d86da0f146c0db287ed6a00c8827d6749bfcdd090083bb81103bb2397e388a0e2a21698d65550360a45453396 +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST dlv-list-0.3.0.crate 11920 BLAKE2B 2f5d52dd47c97799e6e7fead83c0f239daca5422f7fd2f3662d3d4a22714b2a64a4b65df3a451ad43675d828e3265a10ae30428204c33f4e1efa8bcd6933ca8d SHA512 3efa93e5ee5ee2e480a7e8dbc6d5baeb289279871f8b9f4858a24abf3f8b57cf1fd36369a6b5a1e667c121985197063c8834141b220a58453c8399edc9da4206 +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST gpt-3.1.0.crate 47134 BLAKE2B 24a1b4607ee07e590c89c1a68bb7f20251a99f5078c38e937cf4f4d0f83508830a9b62b7f5a1eb5475095c41c80d56ebfce91e65f25a61b161b2a088e1c0e179 SHA512 dd298a4b6b6a200482193ba560241bc3f3e2e9e790c06d016447f58004d1aeb37e554f99fc1d5b166e4062978ad19883d021405c08b9648a34159a002316e3b5 +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e +DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038 +DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157 +DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST ordered-multimap-0.4.3.crate 19599 BLAKE2B 1287938e6bcb26c3e377fff6c492adfff7ca05fcdb5881d76edcf08aa89160180e6a2c2ad40b162e75997bc9fe36204c50d839d4305911de231bfd408345975a SHA512 92d02f260d912c70bc51a4e943ecf7be7e8211ff515dd6aa6029fbb0d0f67b8c689966b23e32520fc5b437caebab650e18a16cdd8b2a036edc91645faa9e47e8 +DIST os_str_bytes-6.5.1.crate 22778 BLAKE2B 1d3daa82b41e6e360ec17051be2c5b1a394fe49ae349b2888e6f30fccf99d102c71357f76c3f68118de59e24480221b352a223ed01f26f11bf707b1c7de81941 SHA512 6d7a4475398daaae4e3d55ad58a8fba729517acf5744a5a6296f477207ee91e5bc36c2b54e58f6f9b15ce9bc75286e9ba62a59d577f0171d8151d3aaa01311b8 +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST rust-ini-0.18.0.crate 15439 BLAKE2B e225973af6e7d8a8ebf0d37efa913f5eacf8beb42d30f759135b18ae6fed091537466afc7e2aacfe1d00514a76eb4a8bd99ff281859ca0f7c7e0db3c6d6fb1a9 SHA512 2907d0891ff2164deacb2f217b4b8484bee9b2c2d32c354518e9b4d74069639bab55190d0d8ca6fb0751180cf2be1477ed9b100e3a5cc9f02af52ea26f32ccf4 +DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 +DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 +DIST uuid-1.4.0.crate 55200 BLAKE2B 11e641e76f2f25f94430cbb473887cfa052f73527d7df2625d304d101c25ba0148c901460798dea962611df1f5af41119c29ff2aea25fd09bfd64368a2df8aab SHA512 92acf08ee1f36a3a394422ce9b1cdbe0ccf3fb8d878efe068fd025832af677466622bd1260e853c5232f18b4f5411136595aa07311a3f9886904800bee7cfaa0 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +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.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 diff --git a/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild b/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild new file mode 100644 index 000000000000..4ab24a1b1b1e --- /dev/null +++ b/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + adler32@1.2.0 + ahash@0.7.6 + anstream@0.6.4 + anstyle-parse@0.2.3 + anstyle-query@1.0.1 + anstyle-wincon@3.0.2 + anstyle@1.0.4 + atty@0.2.14 + autocfg@1.1.0 + bitflags@1.3.2 + bitflags@2.3.3 + cfg-if@1.0.0 + clap@3.2.25 + clap@4.4.11 + clap_builder@4.4.11 + clap_derive@4.4.7 + clap_lex@0.2.4 + clap_lex@0.6.0 + colorchoice@1.0.0 + crc-catalog@2.2.0 + crc32fast@1.3.2 + crc@3.0.1 + dlv-list@0.3.0 + getrandom@0.2.10 + gpt@3.1.0 + hashbrown@0.12.3 + heck@0.4.1 + hermit-abi@0.1.19 + indexmap@1.9.3 + libc@0.2.147 + log@0.4.19 + memoffset@0.7.1 + nix@0.26.2 + once_cell@1.18.0 + ordered-multimap@0.4.3 + os_str_bytes@6.5.1 + pin-utils@0.1.0 + proc-macro2@1.0.70 + quote@1.0.33 + rust-ini@0.18.0 + static_assertions@1.1.0 + strsim@0.10.0 + syn@2.0.39 + termcolor@1.2.0 + textwrap@0.16.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uuid@1.4.0 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.52.0 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.52.0 +" + +inherit cargo linux-info + +# Releases are not tagged +COMMIT="11e47cfa7ddbec0059d683e6d98a4e0f95e3ffa3" +MY_P="asahi-nvram-${COMMIT}" +DESCRIPTION="WiFi network handoff from macOS for Apple Silicon Macs" +HOMEPAGE="https://github.com/WhatAmISupposedToPutHere/asahi-nvram" + +SRC_URI=" + ${CARGO_CRATE_URIS} + https://github.com/WhatAmISupposedToPutHere/asahi-nvram/archive/${COMMIT}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/${MY_P}/asahi-wifisync" + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" MIT Unicode-DFS-2016 ZLIB" +SLOT="0" +KEYWORDS="~arm64" + +pkg_pretend() { + if use kernel_linux; then + linux_config_exists || die "No suitable kernel configuration could be found" + CONFIG_EXTRA="~MTD_SPI_NOR" + check_extra_config + fi +} diff --git a/net-misc/asahi-wifisync/metadata.xml b/net-misc/asahi-wifisync/metadata.xml new file mode 100644 index 000000000000..c0d4d6d29036 --- /dev/null +++ b/net-misc/asahi-wifisync/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>jcalligeros99@gmail.com</email> + <name>James Calligeros</name> + </maintainer> + <maintainer type="project"> + <email>asahi@gentoo.org</email> + <name>Gentoo Asahi Project</name> + </maintainer> + <upstream> + <remote-id type="github">WhatAmISupposedToPutHere/asahi-nvram</remote-id> + </upstream> +</pkgmetadata> 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-2.ebuild b/net-misc/asterisk-base/asterisk-base-2.ebuild index 7d89202ca56f..98bf283c86b7 100644 --- a/net-misc/asterisk-base/asterisk-base-2.ebuild +++ b/net-misc/asterisk-base/asterisk-base-2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" RDEPEND=" net-misc/asterisk 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/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild index afa1249c00e6..65915f0e5c61 100644 --- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild +++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.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" @@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86" S="${WORKDIR}" diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild index c4e002184790..6cdfb0808711 100644 --- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild +++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.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" @@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86" BLACKLIST=("astcc-followed-by-the-pound-key") diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild index c62b6daea016..ba68b2878ec9 100644 --- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild +++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.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" @@ -22,7 +22,7 @@ amd64? ( LICENSE="Digium" SLOT="0/${AST_PV}" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND="=net-misc/asterisk-$(ver_cut 1)*" diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild index c62b6daea016..ba68b2878ec9 100644 --- a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild +++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.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" @@ -22,7 +22,7 @@ amd64? ( LICENSE="Digium" SLOT="0/${AST_PV}" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND="=net-misc/asterisk-$(ver_cut 1)*" diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild index 9c5c1bcc2ef4..0cc3c194bb3b 100644 --- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild +++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.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" @@ -17,7 +17,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86" S="${WORKDIR}" diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index ae3e82f39208..1f8a2ef7e547 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -3,5 +3,11 @@ DIST asterisk-16.30.1.tar.gz 28234979 BLAKE2B a9cd732feb00408876f90328d7f14dbfe4 DIST asterisk-18.17.0.tar.gz 28293243 BLAKE2B 8a162d7cac92df2b6dd430fedc1446a302b1b9c1061ddd4a236fd5797e8be17d53d7179d23a7c8bd4260c73d34dea2db2b9ebffd4eebb2ed714a286838bc5ddf SHA512 1a5dd9715811a8b699d49b057ef42f68ddc88cc22a568836a6a778f6ff22d3923f81840aef425819bb59f28bb27e321154ef9e1d3deba5ed7d39c7eca562e40e DIST asterisk-18.18.0.tar.gz 28407407 BLAKE2B 2e49da8b93651268e2aa2f7f5e2b8ffb2f74c39eb74a4514593be39826912774584c4c33f3839a951ec068218e8db43153fee0a543a9adb94a90cc9338ad40c3 SHA512 bf3d73ef5b6a196d599771c913ae95596b0bfae8fc35cdf66181d7b56ffb4bd78078e25627e271c62988ed6342e69162a1f120cae6049dda6f1596d0759bee59 DIST asterisk-18.18.1.tar.gz 28407009 BLAKE2B b3c3325a8958fa25364c735508357e35e4ad3ea2390b4f83d7b132c4263b2b0b56a65abab60f337e55cbc3edd4df580f3904164ba76abd4198ce1be112c93d38 SHA512 d5058399beffd2f74a17b0fdcc97720e08540383facb2f3691376cb2086e3d2f8df5b0c9110699d09cffe1ed6b2fbdfe9926d0698af0fce39c6c0a9bb4643d30 +DIST asterisk-18.20.2.tar.gz 28448635 BLAKE2B 9949033f93d770673e80a86cd48a084da853d0cbb51aa50159e813653bb39efd062772331aeb5d127f0c1c58724d9c6d748d45a2e0803f276e83bc804b942c2c SHA512 3ee44047a2d9823550b031933b709e8fd7d6a2a0a4cfb2221187da0983f8d22e411b93fde22934753ae9a7272390c7feebc8addabf7e0943eb57ae7f2fa71b3c +DIST asterisk-18.21.0.tar.gz 28446501 BLAKE2B 15a0f928f9c20eb676ffa25af8ac771494a417744758e6e9304451502ee2981c09e1c89c7012ec11edfb9a6bfd15599d462922a373a8f8d7d5074ea0b8c7e7cf SHA512 4a3c57af70b74918b61e1c67423667a876fcc519376f1795054a55700acb5d05da8e4e0a3e3187760203bc262678a6c29eae07ed2a5e2df84a9a555ec79cb48f DIST asterisk-20.3.0.tar.gz 28176546 BLAKE2B 488cfe449c040c282afe438847d14f6cc20d1fb034fbb33555f8e43803b481d3f2b890ac01cc7d43278b41040093f8cedfc609c025cfab73fd8b9d23a0f67016 SHA512 332c24c089abca7059d80794b37a4f5dc34f0468a07f5534b0df26c5103e0508c9c5f3f35a02826ed6b33973c26503be2829fd51fa23a8056a58fa2b50b17730 DIST asterisk-20.3.1.tar.gz 28176262 BLAKE2B 9ee75ee297dc4df37f51f75444d46af083b794cb444ae77b601f17308889db22240939edf04761eb3d41e74e2a67a3329d427861a5a5d34fec6016d6660793bd SHA512 4e34de731211aebe916d19948c41aff370187bfadc1202837a96ebc7f218e5bd7c3936b5b4e34ba6e79c079f77eb5ed038239c903800d5a56ceda2f342218613 +DIST asterisk-20.5.2.tar.gz 28215394 BLAKE2B d9baddc5b2134fd8d7c23dc1407abc37ee937f4dc3ac6dacca43126e0f3ee45b5eca1b8a66834e267d8bb02eb35c8b2e73d854b0a234a85f2dc4048b9d1c4a99 SHA512 ff2d6ddd5b6031b6e4fcb15c82149c3272031b617bf5bca87af1d085464fcd9af6bd373e9431077ce58a558b50c6b2c9cd4d94e739ecc312371cd605e4746a84 +DIST asterisk-20.6.0.tar.gz 28208707 BLAKE2B 7eaebcec7dd58912bc4ef6eccf46c0f10b328997889febaa0bf03e2a60197c9d2db97a0ccfd2870085c87eb97ca3b45286138857504199f09ba2071b9a0c50a2 SHA512 31af71a325cdcb9eb5c6b8bb72f523e7da8dcb1b2d33eaa04a493a922421f90c2019bbed01ff5bc8aa46cd02fa72b80a48074ecb146f5399d62bc504a0e4c053 +DIST asterisk-21.0.2.tar.gz 26280477 BLAKE2B 4bcf2f42bf75b869e2279780c4bb3999786d844e57d48eb5fd8570e0f4ecea0de73d71077e5a5fe6ce64c1c36ef694c987872281fd30e9434bc67d91a3ce1249 SHA512 419d8c2abfa680bb1a812fcbea939f2505dc9f95f860c263c303731fb4e0870060e433787b344136832ccf9d0e34dc64da25240ab3651fb499f416ec3098a711 +DIST asterisk-21.1.0.tar.gz 26268701 BLAKE2B eae9bab916198ab6fba39142d96c6391ffa711c4ac5a4dd7926c0494dabcd1606bab0525e24477f453ff419329efb0a3abf5e9a012abd2a39f6f818505dd196a SHA512 1d4aea4f02950becb492af49e2d434df725676185651b4c1e5dc502f21c8380ce1368f75726bca124d41128ea01a8210d1e229883c442a42bbdb03530fc981c8 diff --git a/net-misc/asterisk/asterisk-16.30.1-r1.ebuild b/net-misc/asterisk/asterisk-16.30.1-r1.ebuild new file mode 100644 index 000000000000..e396518bc948 --- /dev/null +++ b/net-misc/asterisk/asterisk-16.30.1-r1.ebuild @@ -0,0 +1,365 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" + +IUSE_VOICEMAIL_STORAGE=( + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch" + "${FILESDIR}/asterisk-16.30.1-r1-iax2_jitterbuffer.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.9:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + SED=sed \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-18.20.2.ebuild b/net-misc/asterisk/asterisk-18.20.2.ebuild new file mode 100644 index 000000000000..a16cf2d20212 --- /dev/null +++ b/net-misc/asterisk/asterisk-18.20.2.ebuild @@ -0,0 +1,362 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-18.21.0.ebuild b/net-misc/asterisk/asterisk-18.21.0.ebuild new file mode 100644 index 000000000000..1d3b1fdda21d --- /dev/null +++ b/net-misc/asterisk/asterisk-18.21.0.ebuild @@ -0,0 +1,362 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc README* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-20.5.2.ebuild b/net-misc/asterisk/asterisk-20.5.2.ebuild new file mode 100644 index 000000000000..53593c91aac6 --- /dev/null +++ b/net-misc/asterisk/asterisk-20.5.2.ebuild @@ -0,0 +1,358 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro chan_sip res_monitor + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-20.6.0.ebuild b/net-misc/asterisk/asterisk-20.6.0.ebuild new file mode 100644 index 000000000000..020f846fa16f --- /dev/null +++ b/net-misc/asterisk/asterisk-20.6.0.ebuild @@ -0,0 +1,357 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro chan_sip res_monitor + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + dodoc README* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-21.0.2.ebuild b/net-misc/asterisk/asterisk-21.0.2.ebuild new file mode 100644 index 000000000000..b4ed5f80b54c --- /dev/null +++ b/net-misc/asterisk/asterisk-21.0.2.ebuild @@ -0,0 +1,345 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-21.1.0.ebuild b/net-misc/asterisk/asterisk-21.1.0.ebuild new file mode 100644 index 000000000000..53ef3dcce988 --- /dev/null +++ b/net-misc/asterisk/asterisk-21.1.0.ebuild @@ -0,0 +1,344 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + dodoc README* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch b/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch new file mode 100644 index 000000000000..67fb68b3cf42 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch @@ -0,0 +1,65 @@ +From 73103bdcd5b342ce5dfa32039333ffadad551151 Mon Sep 17 00:00:00 2001 +From: Naveen Albert <asterisk@phreaknet.org> +Date: Wed, 14 Dec 2022 16:00:51 +0000 +Subject: [PATCH] chan_iax2: Fix jitterbuffer regression prior to receiving + audio. + +ASTERISK_29392 (a security fix) introduced a regression by +not processing frames when we don't have an audio format. + +Currently, chan_iax2 only calls jb_get to read frames from +the jitterbuffer when the voiceformat has been set on the pvt. +However, this only happens when we receive a voice frame, which +means that prior to receiving voice frames, other types of frames +get stalled completely in the jitterbuffer. + +To fix this, we now fallback to using the format negotiated during +call setup until we've actually received a voice frame with a format. +This ensures we're always able to read from the jitterbuffer. + +ASTERISK-30354 #close +ASTERISK-30162 #close + +Change-Id: Ie4fd1e8e088a145ad89e0427c2100a530e964fe9 +--- + channels/chan_iax2.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c +index ab6bd61638..5b3caf03b5 100644 +--- a/channels/chan_iax2.c ++++ b/channels/chan_iax2.c +@@ -4158,9 +4158,19 @@ static void __get_from_jb(const void *p) + now.tv_usec += 1000; + + ms = ast_tvdiff_ms(now, pvt->rxcore); +- +- voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat); +- if (voicefmt && ms >= (next = jb_next(pvt->jb))) { ++ if (ms >= (next = jb_next(pvt->jb))) { ++ voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat); ++ if (!voicefmt) { ++ /* pvt->voiceformat won't be set if we haven't received any voice frames yet. ++ * In this case, fall back to using the format negotiated during call setup, ++ * so we don't stall the jitterbuffer completely. */ ++ voicefmt = ast_format_compatibility_bitfield2format(pvt->peerformat); ++ } ++ if (!voicefmt) { ++ /* Really shouldn't happen, but if it does, should be looked into */ ++ ast_log(LOG_WARNING, "No voice format and no peer format available on %s, backlogging frame\n", ast_channel_name(pvt->owner)); ++ goto cleanup; /* Don't crash if there's no voice format */ ++ } + ret = jb_get(pvt->jb, &frame, ms, ast_format_get_default_ms(voicefmt)); + switch(ret) { + case JB_OK: +@@ -4202,6 +4212,7 @@ static void __get_from_jb(const void *p) + break; + } + } ++cleanup: + if (pvt) + update_jbsched(pvt); + ast_mutex_unlock(&iaxsl[callno]); +-- +2.41.0 + diff --git a/net-misc/autossh/autossh-1.4g-r1.ebuild b/net-misc/autossh/autossh-1.4g-r1.ebuild deleted file mode 100644 index 4a227c8620c6..000000000000 --- a/net-misc/autossh/autossh-1.4g-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Automatically restart SSH sessions and tunnels" -HOMEPAGE="https://www.harding.motd.ca/autossh/" -SRC_URI="https://www.harding.motd.ca/${PN}/${P}.tgz" - -LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -SLOT="0" - -RDEPEND="virtual/openssh" - -src_install() { - dobin autossh - dodoc CHANGES README autossh.host rscreen - doman autossh.1 -} diff --git a/net-misc/autossh/autossh-1.4g-r2.ebuild b/net-misc/autossh/autossh-1.4g-r2.ebuild index d792505d9987..f35e6439a315 100644 --- a/net-misc/autossh/autossh-1.4g-r2.ebuild +++ b/net-misc/autossh/autossh-1.4g-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.harding.motd.ca/autossh/" SRC_URI="https://www.harding.motd.ca/${PN}/${P}.tgz" LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" DEPEND="dev-libs/libbsd" diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest index d026c72ad173..b42411cbe095 100644 --- a/net-misc/autoupnp/Manifest +++ b/net-misc/autoupnp/Manifest @@ -1,2 +1,2 @@ -DIST autoupnp-0.4.7.tar.bz2 264916 BLAKE2B 3542c577a32f5ba3a8ea60c6f2ebb3d5cea76fa440d281e6895c246252d3ba70720aaafa4d843f06a23f1b022942cddb2a0b37b41eff91919db55fbbd87f28b5 SHA512 2c6bb3421fecbffea2a63ea1e930b7c789459d4626a0f281abe0e9bb62e5efc772475d4bf0c9f13fe2e9e13417940c6eb17408e6aae28bc24a4fc2e16d4dc8de DIST autoupnp-0.5.0.tar.gz 7402 BLAKE2B b6de76a45e6811e57cfb15bf41d3305ad4e8ed9b1459270426724b016d33a9a398bae5bca4d3d87360d712614fcad0fa5d8571db88ce632afd43220539ba992d SHA512 0118b20fdb225673348c3ba469bfde6c37e79fba42e7dbf7bca6a0c25dd9f853b0ee73860c5dbb8165e97125cb71b2794d4e88ece0a1155c85f4c83390131dbc +DIST autoupnp-0.5.1.tar.gz 14091 BLAKE2B 0df03b00dbf6623512c4598b7a9d9222e01317cbeba04006bec00f071ae1397986358fa2af5af38c712648e31ad7c89e81a32d73fcd2be332e75630a86f03826 SHA512 6d5d34dbb008f3be979c2692b16cc1d45a8b3062ef9fd60c268bb26a066f898e974301157e8d7fdcef7d279804504b4d2703bc09f83c8cc1173529673febf10a diff --git a/net-misc/autoupnp/autoupnp-0.4.7.ebuild b/net-misc/autoupnp/autoupnp-0.4.7.ebuild deleted file mode 100644 index 787951d2ea25..000000000000 --- a/net-misc/autoupnp/autoupnp-0.4.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Automatic open port forwarder using UPnP" -HOMEPAGE="https://github.com/projg2/autoupnp/" -SRC_URI="https://github.com/projg2/autoupnp/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libnotify" - -RDEPEND="net-libs/miniupnpc:0= - libnotify? ( x11-libs/libtinynotify:0= )" -DEPEND="${RDEPEND}" - -src_configure() { - local myconf=( - $(use_with libnotify) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-misc/autoupnp/autoupnp-0.5.0.ebuild b/net-misc/autoupnp/autoupnp-0.5.0.ebuild index 9f5acac5c152..46dbe3d77c75 100644 --- a/net-misc/autoupnp/autoupnp-0.5.0.ebuild +++ b/net-misc/autoupnp/autoupnp-0.5.0.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 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" IUSE="libnotify" DEPEND=" - net-libs/miniupnpc:0= + <net-libs/miniupnpc-2.2.8:0= libnotify? ( x11-libs/libtinynotify:0= ) " RDEPEND=" diff --git a/net-misc/autoupnp/autoupnp-0.5.1.ebuild b/net-misc/autoupnp/autoupnp-0.5.1.ebuild new file mode 100644 index 000000000000..511f1373b8e6 --- /dev/null +++ b/net-misc/autoupnp/autoupnp-0.5.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Automatic open port forwarder using UPnP" +HOMEPAGE="https://github.com/projg2/autoupnp/" +SRC_URI=" + https://github.com/projg2/autoupnp/archive/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libnotify" + +DEPEND=" + net-libs/miniupnpc:0= + libnotify? ( x11-libs/libtinynotify:0= ) +" +RDEPEND=" + ${DEPEND} +" + +src_configure() { + local emesonargs=( + $(meson_feature libnotify) + ) + meson_src_configure +} diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest index 270463f6930d..545feeb4f3b6 100644 --- a/net-misc/axel/Manifest +++ b/net-misc/axel/Manifest @@ -1,2 +1,3 @@ DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437 DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1 +DIST axel-2.17.13.tar.xz 224788 BLAKE2B 07b3918277fa2a4b0cda5e989c3c001058cc0c8da52e479d56bd88956362cb1bbfa927b85ed870c5b0ddc599839fadb25aa5733bd295f060879d31c211913e16 SHA512 e36129de893c3c56fe89f7ff3accba9803b4e6d3b5094ed4266c10b33639b973c2fdc41beaf0a80d4fb5e62339580383497a15b4b7caad7d70c8fc581c0c4fc2 diff --git a/net-misc/axel/axel-2.17.13.ebuild b/net-misc/axel/axel-2.17.13.ebuild new file mode 100644 index 000000000000..d2b41dac25da --- /dev/null +++ b/net-misc/axel/axel-2.17.13.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Light Unix download accelerator" +HOMEPAGE="https://github.com/axel-download-accelerator/axel" +SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="nls ssl" + +DEPEND="ssl? ( dev-libs/openssl:0= )" +RDEPEND="${DEPEND} + nls? ( virtual/libintl virtual/libiconv )" +BDEPEND="nls? ( sys-devel/gettext )" + +DOCS=( doc/. ) + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_with ssl ssl=openssl) +} + +pkg_postinst() { + einfo 'To use axel with Portage, one can configure make.conf with:' + einfo + einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""' + einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""' +} diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest index 22dd4987aa40..0ec4c01a6284 100644 --- a/net-misc/babeld/Manifest +++ b/net-misc/babeld/Manifest @@ -1 +1,3 @@ -DIST babeld-1.9.1.tar.gz 94668 BLAKE2B 169932e8d37d683bfa7e945e313d17c3ee633d11031d940ef3f5be3e0a9fbaffb28d47cf9f6d6ef6b25130af9a485ac4a629d0009485021d6f2fe19ec5382788 SHA512 433a9a2da02c56e93f5fc5f9399320f7f4dbac8d87eff9a539300d5740269eeda6be1302a2cf4a4b9c524780b286d9eb7898585fc530129a1f84341faf1e6fd0 +DIST babeld-1.13.1.tar.gz 94890 BLAKE2B 78a58ca9b8c4d915e742081d90e210a14c1718c882d56a42926f29d1c99c53ea06ac8bc2c88f11e0af47a2f657d7649b41ccfcec79e4195c542cf5953e7c6d39 SHA512 c1733fbe115c1e07cc2455b1e0a5f61a53d50b1f2e81f24a82b04c988f1d8c6076e215005aae7e4e97f2497965d8459d0ac024fce016a22d8b416929a8569b13 +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.13.1.ebuild b/net-misc/babeld/babeld-1.13.1.ebuild new file mode 100644 index 000000000000..c4d5c377a8e8 --- /dev/null +++ b/net-misc/babeld/babeld-1.13.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +BLAKE2_COMMIT=320c325437539ae91091ce62efec1913cd8093c2 +RFC6234_COMMIT=285c8b86c0c6b8e9ffe1c420c5b09fa229629a30 + +DESCRIPTION="a loop-free distance-vector routing protocol" +HOMEPAGE="https://github.com/jech/babeld" +SRC_URI=" + https://github.com/jech/babeld/archive/${P}.tar.gz + https://github.com/BLAKE2/BLAKE2/archive/${BLAKE2_COMMIT}.tar.gz + -> ${PN}-BLAKE2-${BLAKE2_COMMIT}.tar.gz + https://github.com/massar/rfc6234/archive/${RFC6234_COMMIT}.tar.gz + -> ${PN}-rfc6234-${RFC6234_COMMIT}.tar.gz +" +S=${WORKDIR}/${PN}-${P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_unpack() { + default + cd "${S}" + rm -r BLAKE2 rfc6234 || die + ln -s ../BLAKE2-${BLAKE2_COMMIT} BLAKE2 || die + ln -s ../rfc6234-${RFC6234_COMMIT} rfc6234 || die +} + +src_compile() { + emake CDEBUGFLAGS="${CFLAGS}" +} + +src_install() { + emake TARGET="${ED}" PREFIX="/usr" install + dodoc CHANGES README + doinitd "${FILESDIR}"/${PN} +} 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/babeld/metadata.xml b/net-misc/babeld/metadata.xml index 2d9fb915a937..8a20628f200b 100644 --- a/net-misc/babeld/metadata.xml +++ b/net-misc/babeld/metadata.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"><email>heroxbd@gentoo.org</email></maintainer> + <maintainer type="person"> + <email>heroxbd@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">jech/babeld</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/balance/balance-3.57-r1.ebuild b/net-misc/balance/balance-3.57-r1.ebuild index 1dbfe6c842cd..b432ff4b7e02 100644 --- a/net-misc/balance/balance-3.57-r1.ebuild +++ b/net-misc/balance/balance-3.57-r1.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 -inherit fcaps toolchain-funcs +inherit fcaps flag-o-matic toolchain-funcs DESCRIPTION="TCP Load Balancing Port Forwarder" HOMEPAGE="https://balance.inlab.net" @@ -25,6 +25,18 @@ src_prepare() { tc-export CC } +src_compile() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861599 + # https://sourceforge.net/p/balance/bugs/13/ + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + default +} + src_install() { default diff --git a/net-misc/balance/metadata.xml b/net-misc/balance/metadata.xml index 115e9d64a669..9103896e5803 100644 --- a/net-misc/balance/metadata.xml +++ b/net-misc/balance/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="sourceforge">balance</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest deleted file mode 100644 index fbc08dabb6e7..000000000000 --- a/net-misc/bfgminer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb diff --git a/net-misc/bfgminer/bfgminer-5.5.0-r3.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r3.ebuild deleted file mode 100644 index b2d490f666fe..000000000000 --- a/net-misc/bfgminer/bfgminer-5.5.0-r3.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C" -HOMEPAGE="https://bitcointalk.org/?topic=168174" -SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" - -# TODO: knc (needs i2c-tools header) -# TODO: kncasic & titan (need systemwide knc-asic install) -# TODO: minergate (needs actual miner_gate) -IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex" -REQUIRED_USE=" - || ( keccak scrypt sha256d ) - || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) - adl? ( opencl ) - alchemist? ( scrypt ) - avalon? ( sha256d ) - avalonmm? ( sha256d ) - bitmain? ( sha256d ) - bfsb? ( sha256d bitfury ) - bfx? ( sha256d bitfury libusb ) - bifury? ( sha256d ) - bigpic? ( sha256d bitfury ) - bitforce? ( sha256d ) - bitfury? ( sha256d ) - cointerra? ( sha256d ) - drillbit? ( sha256d bitfury ) - dualminer? ( || ( sha256d scrypt ) icarus ) - gridseed? ( scrypt ) - hashbuster? ( sha256d bitfury ) - hashbuster2? ( sha256d bitfury libusb ) - hashfast? ( sha256d ) - icarus? ( || ( scrypt sha256d ) ) - jingtian? ( sha256d ) - keccak? ( || ( cpumining opencl proxy ) ) - klondike? ( sha256d libusb ) - littlefury? ( sha256d bitfury ) - lm-sensors? ( opencl ) - metabank? ( sha256d bitfury ) - minion? ( sha256d ) - modminer? ( sha256d ) - nanofury? ( sha256d bitfury ) - scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) ) - sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) - unicode? ( ncurses ) - proxy? ( || ( proxy_getwork proxy_stratum ) ) - proxy_getwork? ( proxy ) - proxy_stratum? ( proxy ) - rockminer? ( sha256d ) - twinfury? ( bitfury sha256d ) - x6500? ( sha256d libusb ) - zeusminer? ( scrypt icarus ) - ztex? ( sha256d libusb ) -" - -DEPEND=" - net-misc/curl - ncurses? ( - sys-libs/ncurses:=[unicode(+)?] - ) - >=dev-libs/jansson-2:= - dev-libs/libbase58 - net-libs/libblkmaker - udev? ( - virtual/udev - ) - hashbuster? ( - dev-libs/hidapi - ) - libusb? ( - virtual/libusb:1 - ) - lm-sensors? ( - sys-apps/lm-sensors - ) - nanofury? ( - dev-libs/hidapi - ) - proxy_getwork? ( - net-libs/libmicrohttpd:= - ) - proxy_stratum? ( - dev-libs/libevent - ) - screen? ( - app-misc/screen - || ( - >=sys-apps/coreutils-8.15 - app-misc/realpath - ) - ) -" -RDEPEND="${DEPEND} - opencl? ( virtual/opencl ) -" -DEPEND="${DEPEND} - virtual/pkgconfig - >=dev-libs/uthash-1.9.7 - cpumining? ( - amd64? ( - >=dev-lang/yasm-1.0.1 - ) - x86? ( - >=dev-lang/yasm-1.0.1 - ) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.5.0-fno-common.patch" - "${FILESDIR}/${PN}-5.5.0-cpus-undefined.patch" -) - -src_configure() { - local CFLAGS="${CFLAGS}" - local with_curses - use hardened && CFLAGS="${CFLAGS} -no-pie" - - if use ncurses; then - if use unicode; then - with_curses="--with-curses=ncursesw" - else - with_curses="--with-curses=ncurses" - fi - else - with_curses="--without-curses" - fi - - CFLAGS="${CFLAGS}" \ - econf \ - $(use_enable adl) \ - $(use_enable alchemist)\ - $(use_enable avalon) \ - $(use_enable avalonmm) \ - $(use_enable bifury) \ - $(use_enable bitforce) \ - $(use_enable bitmain) \ - $(use_enable bfsb) \ - $(use_enable bfx) \ - $(use_enable bigpic) \ - $(use_enable bitfury) \ - $(use_enable cointerra) \ - $(use_enable cpumining) \ - $(use_enable drillbit) \ - $(use_enable dualminer) \ - $(use_enable gridseed) \ - $(use_enable hashbuster) \ - $(use_enable hashbuster2 hashbusterusb) \ - $(use_enable hashfast) \ - $(use_enable icarus) \ - $(use_enable jingtian) \ - $(use_enable keccak) \ - $(use_enable klondike) \ - $(use_enable littlefury) \ - $(use_enable metabank) \ - $(use_enable minion) \ - $(use_enable modminer) \ - $(use_enable nanofury) \ - $(use_enable opencl) \ - $(use_enable rockminer) \ - $(use_enable scrypt) \ - $(use_enable sha256d) \ - $(use_enable twinfury) \ - --with-system-libblkmaker \ - ${with_curses} \ - $(use_with udev libudev) \ - $(use_enable udev-broad-rules broad-udevrules) \ - $(use_with lm-sensors sensors) \ - $(use_with proxy_getwork libmicrohttpd) \ - $(use_with proxy_stratum libevent) \ - $(use_enable x6500) \ - $(use_enable zeusminer) \ - $(use_enable ztex) -} - -src_install() { - emake install DESTDIR="${D}" - - if ! use examples; then - rm -r "${ED}/usr/share/doc/${PF}/rpc-examples" - fi - if ! use screen; then - rm "${ED}/usr/bin/start-bfgminer.sh" - fi -} diff --git a/net-misc/bfgminer/files/bfgminer-5.5.0-cpus-undefined.patch b/net-misc/bfgminer/files/bfgminer-5.5.0-cpus-undefined.patch deleted file mode 100644 index f9f0f43609ed..000000000000 --- a/net-misc/bfgminer/files/bfgminer-5.5.0-cpus-undefined.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/775560 - -commit 83f83d2cbc5e3044b314b914beb32dbb83a0055e -Author: Luke Dashjr <luke-jr+git@utopios.org> -Date: Tue Feb 9 15:39:56 2021 +0000 - - Bugfix: miner: Can't free cpus in non-cpumining builds anymore - -diff --git a/miner.c b/miner.c -index 075ea4655..de62f13a0 100644 ---- a/miner.c -+++ b/miner.c -@@ -11197,8 +11197,10 @@ void _bfg_clean_up(bool restarting) - print_summary(); - } - -+#ifdef USE_CPUMINING - if (opt_n_threads > 0) - free(cpus); -+#endif - - curl_global_cleanup(); - diff --git a/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch b/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch deleted file mode 100644 index bd804e173909..000000000000 --- a/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch +++ /dev/null @@ -1,83 +0,0 @@ -https://bugs.gentoo.org/727008 ---- a/adl.h -+++ b/adl.h -@@ -4,10 +4,10 @@ - - #include <stdbool.h> - --bool adl_active; --bool opt_reorder; --const int opt_targettemp; --const int opt_overheattemp; -+extern bool adl_active; -+extern bool opt_reorder; -+extern const int opt_targettemp; -+extern const int opt_overheattemp; - void init_adl(int nDevs); - float gpu_temp(int gpu); - int gpu_engineclock(int gpu); ---- a/driver-cpu.c -+++ b/driver-cpu.c -@@ -43,6 +43,8 @@ - - BFG_REGISTER_DRIVER(cpu_drv) - -+struct cgpu_info *cpus; -+ - #if defined(__linux) && defined(CPU_ZERO) /* Linux specific policy and affinity management */ - #include <sched.h> - static inline void drop_policy(void) ---- a/driver-opencl.c -+++ b/driver-opencl.c -@@ -795,7 +795,6 @@ char *print_ndevs_and_exit(int *ndevs) - - - struct cgpu_info gpus[MAX_GPUDEVICES]; /* Maximum number apparently possible */ --struct cgpu_info *cpus; - - - /* In dynamic mode, only the first thread of each device will be in use. ---- a/miner.c -+++ b/miner.c -@@ -3762,10 +3762,6 @@ static int statusy; - static int devsummaryYOffset; - static int total_lines; - #endif --#ifdef USE_OPENCL --struct cgpu_info gpus[MAX_GPUDEVICES]; /* Maximum number apparently possible */ --#endif --struct cgpu_info *cpus; - - bool _bfg_console_cancel_disabled; - int _bfg_console_prev_cancelstate; ---- a/sha256_sse2_amd64.c -+++ b/sha256_sse2_amd64.c -@@ -48,7 +48,6 @@ static uint32_t g_sha256_k[]__attribute__((aligned(0x100))) = { - const uint32_t sha256_init_sse2[8]__asm__("sha256_init_sse2")__attribute__((aligned(0x100))) = - {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19}; - --__m128i g_4sha256_k[64]; - __m128i sha256_consts_m128i[64]__asm__("sha256_consts_m128i")__attribute__((aligned(0x1000))); - - bool scanhash_sse2_64(struct thr_info * const thr, struct work * const work, ---- a/sha256_sse2_i386.c -+++ b/sha256_sse2_i386.c -@@ -48,7 +48,6 @@ static uint32_t g_sha256_k[]__attribute__((aligned(0x100))) = { - const uint32_t sha256_32init[8]__attribute__((aligned(0x100))) = - {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19}; - --__m128i g_4sha256_k[64]; - __m128i sha256_consts_m128i[64]__asm__("sha256_consts_m128i")__attribute__((aligned(0x1000))); - - bool scanhash_sse2_32(struct thr_info * const thr, struct work * const work, ---- a/util.h -+++ b/util.h -@@ -217,7 +217,7 @@ void cgsleep_us(int64_t us); - #define cgtimer_time(ts_start) timer_set_now(ts_start) - #define cgsleep_prepare_r(ts_start) cgtimer_time(ts_start) - void cgsleep_ms_r(cgtimer_t *ts_start, int ms); --void (*cgsleep_us_r)(cgtimer_t *ts_start, int64_t us); -+extern void (*cgsleep_us_r)(cgtimer_t *ts_start, int64_t us); - - static inline - int cgtimer_to_ms(cgtimer_t *cgt) diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml deleted file mode 100644 index 37229c5f391f..000000000000 --- a/net-misc/bfgminer/metadata.xml +++ /dev/null @@ -1,49 +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="adl">Enable support for controlling fans and overclocking on AMD cards with AMD Display Library</flag> - <flag name="alchemist">Enable support for mining with AlcheMist</flag> - <flag name="avalon">Enable support for mining with Avalon 1 ASIC modules</flag> - <flag name="avalonmm">Enable support for mining with Avalon 2/3 ASIC modules</flag> - <flag name="bifury">Enable support for mining with Bi*fury USB sticks</flag> - <flag name="bitforce">Enable support for mining with ButterFly Labs BitFORCE ASICs and/or FPGAs</flag> - <flag name="bitmain">Enable support for mining with Bitmain Antminer S* series</flag> - <flag name="bfsb">Enable support for mining on BFSB host Raspberry Pi</flag> - <flag name="bfx">Enable support for mining with BFx2 USB sticks</flag> - <flag name="bigpic">Enable support for mining with Big Picture Mining USB sticks (Red/BlueFury, BF1, etc)</flag> - <flag name="bitfury">Enable support for mining with 55nm Bitfury-based devices</flag> - <flag name="cointerra">Enable support for mining with CoinTerra TerraMiner.</flag> - <flag name="cpumining">Enable support for mining with CPUs</flag> - <flag name="drillbit">Enable support for mining with Drillbit boards</flag> - <flag name="dualminer">Enable support for mining with DualMiner USB sticks</flag> - <flag name="gridseed">Enable support for mining with 5-chip GridSeed orbs</flag> - <flag name="hashbuster">Enable support for mining with HashBuster nano boards</flag> - <flag name="hashbuster2">Enable support for mining with HashBuster micro boards</flag> - <flag name="hashfast">Enable support for mining with HashFast devices</flag> - <flag name="icarus">Enable support for mining with Icarus-compatible devices (including Block Erupter Sapphire ASICs)</flag> - <flag name="jingtian">Enable support for mining on JingTian boards via SPI/GPIO</flag> - <flag name="keccak">Enable support for mining with Keccak miners</flag> - <flag name="klondike">Enable support for mining with Klondike USB miners</flag> - <flag name="libusb">Use libusb</flag> - <flag name="littlefury">Enable support for mining with LittleFury USB sticks</flag> - <flag name="metabank">Enable support for mining on Metabank host Raspberry Pi</flag> - <flag name="minion">Enable support for mining on minion chips via SPI (BlackArrow Prospero)</flag> - <flag name="modminer">Enable support for mining with ModMiner FPGAs</flag> - <flag name="nanofury">Enable support for mining with NanoFury USB sticks</flag> - <flag name="opencl">Enable support for mining with OpenCL-capable devices (GPUs)</flag> - <flag name="proxy">Enable support for virtual proxy device</flag> - <flag name="proxy_getwork">Enable proxy support for getwork protocol (often used with Block Erupter Blades)</flag> - <flag name="proxy_stratum">Enable proxy support for stratum protocol</flag> - <flag name="rockminer">Enable support for mining with RockMiner devices</flag> - <flag name="screen">Provide start-bfgminer.sh script to launch BFGMiner in <pkg>app-misc/screen</pkg></flag> - <flag name="scrypt">Enable support for scrypt mining algorithm</flag> - <flag name="sha256d">Enable support for SHA256d mining algorithm</flag> - <flag name="twinfury">Enable support for mining with Twinfury USB sticks</flag> - <flag name="udev-broad-rules">Enable broader udev rules that may match non-mining devices</flag> - <flag name="x6500">Enable support for mining with X6500 FPGAs</flag> - <flag name="zeusminer">Enable support for mining with ZeusMiner units</flag> - <flag name="ztex">Enable support for mining with Ztex FPGAs</flag> - </use> -</pkgmetadata> diff --git a/net-misc/bgpq4/bgpq4-1.8.ebuild b/net-misc/bgpq4/bgpq4-1.8.ebuild index a59c2865738d..f8e8353f66b3 100644 --- a/net-misc/bgpq4/bgpq4-1.8.ebuild +++ b/net-misc/bgpq4/bgpq4-1.8.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 @@ SRC_URI="https://github.com/bgp/bgpq4/archive/refs/tags/${PV}.tar.gz -> ${P}.tar LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" src_prepare() { default diff --git a/net-misc/bird/bird-2.0.10.ebuild b/net-misc/bird/bird-2.0.10.ebuild index 9e1415507309..68cedb7d4894 100644 --- a/net-misc/bird/bird-2.0.10.ebuild +++ b/net-misc/bird/bird-2.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,8 +25,8 @@ RDEPEND=" ) libssh? ( net-libs/libssh:= )" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex sys-devel/m4 " diff --git a/net-misc/bird/bird-2.0.11.ebuild b/net-misc/bird/bird-2.0.11.ebuild index 05e00dc95fd6..44a995dcc670 100644 --- a/net-misc/bird/bird-2.0.11.ebuild +++ b/net-misc/bird/bird-2.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,8 +25,8 @@ RDEPEND=" ) libssh? ( net-libs/libssh:= )" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex sys-devel/m4 " diff --git a/net-misc/bird/bird-2.0.12-r1.ebuild b/net-misc/bird/bird-2.0.12-r1.ebuild index ced3b211938d..daa657410251 100644 --- a/net-misc/bird/bird-2.0.12-r1.ebuild +++ b/net-misc/bird/bird-2.0.12-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,8 +25,8 @@ RDEPEND=" ) libssh? ( net-libs/libssh:= )" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex sys-devel/m4 " diff --git a/net-misc/bird/bird-2.0.7.ebuild b/net-misc/bird/bird-2.0.7.ebuild index e1b3892ab3f7..397df5ee7aeb 100644 --- a/net-misc/bird/bird-2.0.7.ebuild +++ b/net-misc/bird/bird-2.0.7.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 @@ -14,8 +14,8 @@ IUSE="+client debug" RDEPEND="client? ( sys-libs/ncurses ) client? ( sys-libs/readline )" -DEPEND="sys-devel/flex - sys-devel/bison +DEPEND="app-alternatives/lex + app-alternatives/yacc sys-devel/m4" PATCHES=( 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/blinkperl/metadata.xml b/net-misc/blinkperl/metadata.xml deleted file mode 100644 index 76de869b4002..000000000000 --- a/net-misc/blinkperl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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> -</pkgmetadata> diff --git a/net-misc/bopm/bopm-3.1.3-r7.ebuild b/net-misc/bopm/bopm-3.1.3-r7.ebuild index d959f6b1af9d..f511e3b68eab 100644 --- a/net-misc/bopm/bopm-3.1.3-r7.ebuild +++ b/net-misc/bopm/bopm-3.1.3-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=8 @@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86" RDEPEND="acct-user/opm" BDEPEND=" acct-user/opm - sys-devel/autoconf-archive + dev-build/autoconf-archive " PATCHES=( diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest deleted file mode 100644 index 986b739eabe8..000000000000 --- a/net-misc/buka/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST buka-3.0.1.tar.gz 14697 BLAKE2B 2aabbe6bc78105bb0a1a44378c36ec82fef23df70d7600eaaa055d524bd4d38283644c49043f8c9d77cc52d7b1762f5ea4f2ddf896c0cda85ee677018679c1b6 SHA512 6893f1ad63130c55d2023abc0839e20f02ae4cede2162ec1d6e52d43f6b49cfc734b569776172b38bf2c208c2b41d123cb7bba9398ad689a22ce6703fa47eb22 diff --git a/net-misc/buka/buka-3.0.1.ebuild b/net-misc/buka/buka-3.0.1.ebuild deleted file mode 100644 index 14302f2aa23f..000000000000 --- a/net-misc/buka/buka-3.0.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -COMMIT="45e6b32de708759a4e15181a8e2ad5de55cc78ef" -inherit optfeature - -DESCRIPTION="Download manga from buka.cn" -HOMEPAGE="https://gitlab.com/drylemon/buka" -SRC_URI="https://gitlab.com/drylemon/buka/repository/${PV}/archive.tar.gz?ref=${PV} -> ${P}.tar.gz" -S=${WORKDIR}/${P}-${COMMIT} - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-python/beautifulsoup4 - dev-python/requests - sys-process/parallel - net-misc/curl - dev-util/dialog" - -src_install() { - default - doman "${PN}.1" - dobin "${PN}" "${PN}-parse" -} - -pkg_postinst() { - optfeature "pdf support" media-gfx/imagemagick - optfeature "cbz support" app-arch/zip -} diff --git a/net-misc/buka/metadata.xml b/net-misc/buka/metadata.xml deleted file mode 100644 index ef8bb31dfe9d..000000000000 --- a/net-misc/buka/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>mo@dragona.ca</email> - <name>Mohamad Issawi</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Gentoo Proxy Maintainers</name> - </maintainer> -</pkgmetadata> diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest index c63115a8d408..3d3d9b0ed6ce 100644 --- a/net-misc/cadaver/Manifest +++ b/net-misc/cadaver/Manifest @@ -1 +1,2 @@ DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41 +DIST cadaver-0.24.tar.gz 808069 BLAKE2B 67e2f45a8c78972df9a972b6126e09ffdc8d7067d78bf748ca5c1b987f4138d0f278194c324206df294d77f7e797787edc612942168c6c78adc30f52bb3c996a SHA512 2c0131fd2f591350f6578385eedb353d81d87bae5582b2c8c96555cb51bf31fd15294898206bc7a8307b0e30e7adb1d47535e792cf28c5c1f5c2276bea0141a4 diff --git a/net-misc/cadaver/cadaver-0.24.ebuild b/net-misc/cadaver/cadaver-0.24.ebuild new file mode 100644 index 000000000000..b24b103566e3 --- /dev/null +++ b/net-misc/cadaver/cadaver-0.24.ebuild @@ -0,0 +1,47 @@ +# Copyright 2003-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Command-line WebDAV client" +HOMEPAGE="https://notroj.github.io/cadaver/ https://github.com/notroj/cadaver" +SRC_URI="https://notroj.github.io/cadaver/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" +IUSE="nls" + +BDEPEND="sys-devel/gettext" +DEPEND=">=net-libs/neon-0.27.0:=" +RDEPEND="${DEPEND}" + +DOCS=( BUGS ChangeLog FAQ NEWS README.md THANKS TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.23.2-disable-nls.patch + "${FILESDIR}"/${PN}-0.24-neon-0.33.patch + "${FILESDIR}"/${PN}-0.24-autoconf-2.72.patch + "${FILESDIR}"/${PN}-0.24-link-cflags.patch +) + +src_prepare() { + default + + rm -r lib/expat || die "rm failed" + sed \ + -e "/AC_CONFIG_FILES/s: neon/src/Makefile::" \ + -i configure.ac || die "sed configure.ac failed" + sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed" + cp "${BROOT}"/usr/share/gettext/po/Makefile.in.in po || die "cp failed" + + config_rpath_update . + AT_M4DIR="m4" eautoreconf +} + +src_configure() { + econf \ + $(use_enable nls) +} diff --git a/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch new file mode 100644 index 000000000000..6051c719e36f --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch @@ -0,0 +1,59 @@ +https://github.com/notroj/cadaver/pull/42 + +From 2eab7a8225b6fc0c6fd4773794abe83561f2d733 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 17 Apr 2024 00:48:11 +0100 +Subject: [PATCH] m4: fix quoting in readline.m4 + +Without this, with autoconf-2.72 at least, we get: +``` +$ ./configure +[...] +checking for pkg-config... /usr/sbin/pkg-config +checking pkg-config is at least version 0.9.0... yes +checking for tputs in -lcurses... ./configure: 5319: ac_fn_c_try_link: not found +no +checking for tputs in -lncurses... no +[...] +``` +--- a/m4/readline.m4 ++++ b/m4/readline.m4 +@@ -9,24 +9,21 @@ AC_ARG_ENABLE(readline, + [use_readline=$enableval], + [use_readline=yes]) dnl Defaults to ON (if found) + +-if test "$use_readline" = "yes"; then +- AC_CHECK_LIB(curses, tputs, LIBS="$LIBS -lcurses", +- AC_CHECK_LIB(ncurses, tputs)) +- AC_CHECK_LIB(readline, readline) ++AS_IF([test "$use_readline" = "yes"], [ ++ AC_CHECK_LIB([curses], [tputs], [LIBS="$LIBS -lcurses"], ++ [AC_CHECK_LIB([ncurses], [tputs])]) ++ AC_CHECK_LIB([readline], [readline]) + +- AC_SEARCH_LIBS(add_history, history, +- AC_DEFINE(HAVE_ADD_HISTORY, 1, [Define if you have the add_history function]) ++ AC_SEARCH_LIBS([add_history], [history], ++ AC_DEFINE([HAVE_ADD_HISTORY], [1], [Define if you have the add_history function]) + ) + +- AC_CHECK_HEADERS(history.h readline/history.h readline.h readline/readline.h) ++ AC_CHECK_HEADERS([history.h readline/history.h readline.h readline/readline.h]) + + # Check for rl_completion_matches as in readline 4.2 +- AC_CHECK_FUNCS(rl_completion_matches) +- ++ AC_CHECK_FUNCS([rl_completion_matches]) ++ + msg_readline="enabled" +-else ++], [ + msg_readline="disabled" +-fi +- +-]) +- ++])]) +-- +2.44.0 + diff --git a/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch new file mode 100644 index 000000000000..d2e18eefade4 --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch @@ -0,0 +1,26 @@ +https://github.com/notroj/cadaver/pull/42 + +From e798c0144d3042cf6139d1ab85d84a8416cf5f00 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 17 Apr 2024 00:51:57 +0100 +Subject: [PATCH] Makefile.in: include CFLAGS at link-time + +GCC's documentation recommends this [0] for e.g. LTO. As a trivial silly +example, my -fdiagnostics-color=always was stripped out, so a warning +I got wasn't in colour. + +[0] https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto +--- a/Makefile.in ++++ b/Makefile.in +@@ -56,7 +56,7 @@ all: $(TARGET) + .PHONY: subdirs install clean distclean + + $(TARGET): $(ALLOBJS) subdirs +- $(CC) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) + + .c.o: + $(CC) $(ALL_CFLAGS) -o $@ -c $< +-- +2.44.0 + diff --git a/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch new file mode 100644 index 000000000000..9b6d1a2dceb7 --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch @@ -0,0 +1,15 @@ +Trimmed from diffing upstream d0de5ee5276e83ac1b5ff6bde56084a565bff5fb +to 3c8ecfe9bc8a7fbee58425be69aea89ae3f718e9, which included some +extraneous bits. + +--- a/configure.ac ++++ b/configure.ac +@@ -35,7 +35,7 @@ AS_HELP_STRING([--disable-netrc],[enable .netrc support]),, + + NEON_WITH_LIBS + +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + + dnl Don't enable zlib or ACL support in neon + NEON_WITHOUT_ZLIB 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/Manifest b/net-misc/chrony/Manifest index 74d76950aa23..4c51ea908345 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,2 +1,2 @@ -DIST chrony-4.4.tar.gz 612094 BLAKE2B 470c3d4ab9aa5949df1c10d0ecbd556fba3ce9b05e9dc4a5475795c174fca48a624975df68552f78927a19b72cb6b4f136ed4e5fa04a833dbd8139d0be144e4f SHA512 45e060eb0c5892552f28dc436429e5823409cc93533127af27b64d08ff9c769fdc72694272232114f5ca1884c2bc8b5e842fae7956dc457358e937bcd3dda4d7 -DIST chrony-4.4.tar.gz.asc 833 BLAKE2B 07f863381d37e30435c3796c7ff4ac628dd81b248e76fe1b9ce6dff07f9f2bd9423a013c7d0a09f2bfe251a8e176b04731e1cb60829f1dc83a7321274d3f6992 SHA512 bb795b428567434937cbf3a12c559b549b89abe65010d04eed0fbdcfde35e7266771ea01c2c5581f3e5fae993f1782fff5a62c5ae09259d2b65dab9473d756a3 +DIST chrony-4.5.tar.gz 620287 BLAKE2B e89665e6ff700805b41f89e9349d280579aebab31a30817512a165da939c8f39dc55ef9a17a50e3d7e298015620667638ab119901a71868a9188093606a95d32 SHA512 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5 +DIST chrony-4.5.tar.gz.asc 833 BLAKE2B 7d680a4f5d86335b067b95cb900761615180701cabae5978d6f924063f7a43748534bb2e4f23cd9cd2e6919ed005014db6d396330fbfb5aa6d5f1c46f3c0c3a0 SHA512 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb diff --git a/net-misc/chrony/chrony-4.4.ebuild b/net-misc/chrony/chrony-4.5.ebuild index 356e5cbcd424..8eb587f88c65 100644 --- a/net-misc/chrony/chrony-4.4.ebuild +++ b/net-misc/chrony/chrony-4.5.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 @@ -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 @@ -69,7 +69,7 @@ if [[ ${PV} == 9999 ]] ; then # Needed for doc generation in 9999 REQUIRED_USE+=" html" BDEPEND+=" - sys-devel/bison + app-alternatives/yacc virtual/w3m " else @@ -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 0141d909d34a..75c467aacec7 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-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 @@ -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 @@ -69,7 +69,7 @@ if [[ ${PV} == 9999 ]] ; then # Needed for doc generation in 9999 REQUIRED_USE+=" html" BDEPEND+=" - sys-devel/bison + app-alternatives/yacc virtual/w3m " else @@ -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/clockspeed/clockspeed-0.62-r9.ebuild b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild new file mode 100644 index 000000000000..5607768def91 --- /dev/null +++ b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Simple Network Time Protocol (NTP) client" +HOMEPAGE="https://cr.yp.to/clockspeed.html" + +# this is the trailing part of the name for the latest leapseconds file. +LEAPSECONDS_DATE="20081114" + +SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz + https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE"" + +# http://cr.yp.to/distributors.html +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~mips ~x86" +IUSE="static selinux" +RESTRICT="mirror bindist test" + +DEPEND="sys-apps/groff" +RDEPEND="net-dns/djbdns" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-fix-clang16-build.patch +) + +src_configure() { + echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc || die + use static && append-ldflags -static + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die +} + +src_install() { + dobin clockspeed clockadd clockview sntpclock taiclock taiclockd + dosbin "${FILESDIR}"/ntpclockset + + doman *.1 + dodoc BLURB CHANGES INSTALL README THANKS TODO + + insinto /var/lib/clockspeed + newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat +} diff --git a/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch b/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch new file mode 100644 index 000000000000..66bc89d0c261 --- /dev/null +++ b/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch @@ -0,0 +1,212 @@ +Since clang16 implicit function declarations and implicit integers +result in a compilation error. + +Bug: https://bugs.gentoo.org/882307 +Patch has been sent upstream via mail + +Pascal Jäger <pascal.jaeger@leimstift.de> (2023-10-03) + +--- a/clockspeed.c ++++ b/clockspeed.c +@@ -1,6 +1,7 @@ ++#include <stdio.h> ++#include <sys/stat.h> + #include <sys/types.h> + #include <sys/time.h> +-#include "readwrite.h" + #include "exit.h" + #include "select.h" + #include "scan.h" +@@ -11,11 +12,12 @@ + #include "error.h" + #include "auto_home.h" + #include "timing.h" ++#include "unistd.h" + + #ifndef HASRDTSC + #ifndef HASGETHRTIME + +- Error! Need an unadjusted hardware clock. ++#error Need an unadjusted hardware clock. + + #endif + #endif +--- a/clockview.c ++++ b/clockview.c +@@ -1,3 +1,4 @@ ++#include <sys/time.h> + #include <sys/types.h> + #include <time.h> + #include "substdio.h" +--- a/hier.c ++++ b/hier.c +@@ -1,5 +1,24 @@ + #include "auto_home.h" + ++extern void h(char *home, ++int uid, ++int gid, ++int mode); ++ ++extern void d(char *home, ++char *subdir, ++int uid, ++int gid, ++int mode); ++ ++extern void c( ++char *home, ++char *subdir, ++char *file, ++int uid, ++int gid, ++int mode); ++ + void hier() + { + d("/var/lib","clockspeed",-1,-1,0755); +--- a/install.c ++++ b/install.c +@@ -2,8 +2,9 @@ + #include "strerr.h" + #include "error.h" + #include "open.h" +-#include "readwrite.h" + #include "exit.h" ++#include <sys/stat.h> ++#include <unistd.h> + + extern void hier(); + +--- a/instcheck.c ++++ b/instcheck.c +@@ -2,8 +2,9 @@ + #include <sys/stat.h> + #include "strerr.h" + #include "error.h" +-#include "readwrite.h" + #include "exit.h" ++#include <sys/stat.h> ++#include <unistd.h> + + extern void hier(); + +--- a/leapsecs_read.c ++++ b/leapsecs_read.c +@@ -1,7 +1,9 @@ ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <errno.h> ++#include <unistd.h> + #include "tai.h" + #include "leapsecs.h" + +--- a/sntpclock.c ++++ b/sntpclock.c +@@ -3,12 +3,12 @@ + #include <sys/param.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#include <unistd.h> + #include "strerr.h" + #include "ip.h" + #include "str.h" + #include "byte.h" + #include "substdio.h" +-#include "readwrite.h" + #include "select.h" + #include "scan.h" + #include "leapsecs.h" +@@ -79,7 +79,7 @@ int flagleap; + } + + char outbuf[16]; +-substdio ssout = SUBSTDIO_FDBUF(write,1,outbuf,sizeof outbuf); ++substdio ssout = SUBSTDIO_FDBUF((int(*)())write,1,outbuf,sizeof outbuf); + + #define FATAL "sntpclock: fatal: " + #define WARNING "sntpclock: warning: " +--- a/taiclock.c ++++ b/taiclock.c +@@ -3,17 +3,17 @@ + #include <sys/param.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#include <unistd.h> + #include "strerr.h" + #include "ip.h" + #include "str.h" + #include "byte.h" + #include "substdio.h" +-#include "readwrite.h" + #include "select.h" + #include "taia.h" + + char outbuf[16]; +-substdio ssout = SUBSTDIO_FDBUF(write,1,outbuf,sizeof outbuf); ++substdio ssout = SUBSTDIO_FDBUF((int(*)())write,1,outbuf,sizeof outbuf); + + #define FATAL "taiclock: fatal: " + #define WARNING "taiclock: warning: " + +--- a/auto-str.c ++++ b/auto-str.c +@@ -5,7 +5,7 @@ + char buf1[256]; + substdio ss1 = SUBSTDIO_FDBUF(write,1,buf1,sizeof(buf1)); + +-void puts(s) ++void myputs(s) + char *s; + { + if (substdio_puts(&ss1,s) == -1) _exit(111); +@@ -25,20 +25,20 @@ char **argv; + value = argv[2]; + if (!value) _exit(100); + +- puts("char "); +- puts(name); +- puts("[] = \"\\\n"); ++ myputs("char "); ++ myputs(name); ++ myputs("[] = \"\\\n"); + + while (ch = *value++) { +- puts("\\"); ++ myputs("\\"); + octal[3] = 0; + octal[2] = '0' + (ch & 7); ch >>= 3; + octal[1] = '0' + (ch & 7); ch >>= 3; + octal[0] = '0' + (ch & 7); +- puts(octal); ++ myputs(octal); + } + +- puts("\\\n\";\n"); ++ myputs("\\\n\";\n"); + if (substdio_flush(&ss1) == -1) _exit(111); + _exit(0); + } +--- a/trygethr.c ++++ b/trygethr.c +@@ -1,7 +1,7 @@ + #include <sys/types.h> + #include <sys/time.h> + +-main() ++int main() + { + hrtime_t t; + +--- a/tryrdtsc.c ++++ b/tryrdtsc.c +@@ -1,4 +1,6 @@ +-main() ++#include <unistd.h> ++ ++int main() + { + unsigned long x[2]; + unsigned long y[2]; 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.ebuild b/net-misc/cmst/cmst-2023.03.14-r1.ebuild index da5e9cf339c6..4e7967b8e329 100644 --- a/net-misc/cmst/cmst-2023.03.14.ebuild +++ b/net-misc/cmst/cmst-2023.03.14-r1.ebuild @@ -1,34 +1,42 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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" +S="${WORKDIR}/${PN}-${P}" 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 +IUSE="qt6" + +DEPEND="qt6? ( dev-qt/qtbase:6 ) + !qt6? ( + 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}" +BDEPEND="qt6? ( dev-qt/qttools:6 ) + !qt6? ( dev-qt/linguist-tools:5 ) +" src_configure() { export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}" - eqmake5 DISTRO=gentoo + if use qt6; then + eqmake6 DISTRO=gentoo + else + eqmake5 DISTRO=gentoo + fi } src_install() { diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild index c950b57ae3c2..2403a37670e4 100644 --- a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild +++ b/net-misc/connman-gtk/connman-gtk-1.1.1-r2.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=7 +EAPI=8 inherit autotools gnome2-utils @@ -28,6 +28,10 @@ DEPEND="${CDEOEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-gtk_typecasts.patch +) + src_prepare() { default sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die diff --git a/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch b/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch new file mode 100644 index 000000000000..25f29649404f --- /dev/null +++ b/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch @@ -0,0 +1,11 @@ +--- a/src/status.c ++++ b/src/status.c +@@ -119,7 +119,7 @@ + + gtk_menu_item_set_submenu(item, GTK_WIDGET(submenu)); + gtk_container_add(GTK_CONTAINER(menu), GTK_WIDGET(item)); +- gtk_widget_set_sensitive(item, has_items); ++ gtk_widget_set_sensitive(GTK_WIDGET(item), has_items); + + } + 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-notify/connman-notify-0_pre20191003-r3.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild index da4fd73408b0..79e13a82e929 100644 --- a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild +++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.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=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit desktop python-single-r1 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 a9c654a82144..cb05f3bc5710 100644 --- a/net-misc/croc/Manifest +++ b/net-misc/croc/Manifest @@ -1,4 +1,4 @@ -DIST croc-9.6.2-deps.tar.xz 27304100 BLAKE2B 6eac681bcc60db0b81abad19c3d8d994f2ea88618d90ade0229e9af436334e7bd3e907fa211e3b60a21049550d51c6e325bd9dfccacd4106abab32c7d49d9b66 SHA512 73d979f0d5a939b22304f1dc1976c096b7bee186f060d80aef4f64226a04d9b4f820d39ece9c9c9473791b4436d9e3fdb577f1342453dbbf2c4b765519e5a983 -DIST croc-9.6.2.tar.gz 507769 BLAKE2B df99a7d5d60f753d4d7fd5924bb09be6b21513acbc0c454d2e199fca4ab38eee0b443a091e3b3c64e155cb460e760959d955969231df8a93da2472a6b93703f0 SHA512 a3ad2f6a4bc6a45fa356963bd123ea755caa30c6a3b63e63cc67823ce27d44d62610ff9bfa498f694e356f673c3fcb3cec7ac669bedcde6eaf63111a78538965 -DIST croc-9.6.4-deps.tar.xz 26792064 BLAKE2B 31ead16462c1e10fff9e756c44f4ac7d47dcaa444dcb2fdcdd7f762d1617640a736d4223f74c9dd4f27b62bb3d635fe3035ec0127b3e50a7d8fa83ba26cdce43 SHA512 bc69c6d678888621d93be878a49ad71c04e6b38742d1c1558a1a84d1a63c71c9a901149048e6e4f0385514dbb551e89585e8ed25fc6ec89b9f2437f78f52a1e5 -DIST croc-9.6.4.tar.gz 508495 BLAKE2B 985b3f27fd807e62eda121dcad45e150621ff50cf82fc778cac601fdb16e0aab6bab886326bd80b0cc218608ddddd42a3f537fdfeec3948d1617a4169fefdd0e SHA512 d6eab257ee49d12d07e38b37ae1d60cbf70f627618ea32f2ec74370a09e78cad929de4b7d2bd02e9f300f698d45c8c28f4b4eb337a0be8f29e046fee4bb19b1f +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 +DIST croc-9.6.17-deps.tar.xz 29935608 BLAKE2B 1bdcd2e86f09f3a112faa9f671705a5cabb3f6d9037ba71f0947ee2ce3863d840a8e6847167017c7e02de422900bfbfc8ca285933dd23b95a4232e67c0e30c50 SHA512 0787600d6ca9d46da1e66b27e5f3cc2c88020fa8bb9119c1455209680eb886245f05a7650727759f7624ec59e4b4cec7910f58e83b79d0f87b26375de17b13b2 +DIST croc-9.6.17.tar.gz 514013 BLAKE2B ac0819791329085d91a57a170981d5b42739c098bba7c6ba523d6f02dee06868d9ac45fc4b264a7dff670550d38aa90be10a9be99d07417fb5754529022583d4 SHA512 a9bc1b4325ae8066874f40cad1ff63e8f69cd7d36189f553e6865efb456fed319384710d86ad81cdfebdd3d70cfa82f7ce84d458898d1016ccc652b6b692d120 diff --git a/net-misc/croc/croc-9.6.2.ebuild b/net-misc/croc/croc-9.6.15.ebuild index 160ea8b58614..84a3ce1e3b97 100644 --- a/net-misc/croc/croc-9.6.2.ebuild +++ b/net-misc/croc/croc-9.6.15.ebuild @@ -1,28 +1,25 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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/~sultan/distfiles/net-misc/croc/${P}-deps.tar.xz" +https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz +" LICENSE="Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" RDEPEND=" acct-group/croc acct-user/croc " -PATCHES=( - "${FILESDIR}/${PN}-disable-network-tests-r1.patch" -) - DOCS=( README.md ) src_prepare() { @@ -46,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.4.ebuild b/net-misc/croc/croc-9.6.17.ebuild index a3b14bea8b93..edfe827fbac5 100644 --- a/net-misc/croc/croc-9.6.4.ebuild +++ b/net-misc/croc/croc-9.6.17.ebuild @@ -1,14 +1,15 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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/~sultan/distfiles/net-misc/croc/${P}-deps.tar.xz" +https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz +" LICENSE="Apache-2.0 BSD BSD-2 MIT" SLOT="0" @@ -19,10 +20,6 @@ RDEPEND=" acct-user/croc " -PATCHES=( - "${FILESDIR}/${PN}-disable-network-tests-r1.patch" -) - DOCS=( README.md ) src_prepare() { @@ -46,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/files/croc-disable-network-tests-r1.patch b/net-misc/croc/files/croc-disable-network-tests-r1.patch deleted file mode 100644 index 04540e14b9d4..000000000000 --- a/net-misc/croc/files/croc-disable-network-tests-r1.patch +++ /dev/null @@ -1,32 +0,0 @@ -Disable tests that fail with network-sandbox - ---- a/src/utils/utils_test.go -+++ b/src/utils/utils_test.go -@@ -7,7 +7,6 @@ import ( - "log" - "math/rand" - "os" -- "strings" - "testing" - - "github.com/schollz/croc/v9/src/models" -@@ -189,19 +188,6 @@ func TestHashFile(t *testing.T) { - assert.Equal(t, "e66c561610ad51e2", fmt.Sprintf("%x", hashed)) - } - --func TestPublicIP(t *testing.T) { -- ip, err := PublicIP() -- fmt.Println(ip) -- assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":")) -- assert.Nil(t, err) --} -- --func TestLocalIP(t *testing.T) { -- ip := LocalIP() -- fmt.Println(ip) -- assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":")) --} -- - func TestGetRandomName(t *testing.T) { - name := GetRandomName() - fmt.Println(name) diff --git a/net-misc/croc/metadata.xml b/net-misc/croc/metadata.xml index b14d4f0b4014..c51b4929e88d 100644 --- a/net-misc/croc/metadata.xml +++ b/net-misc/croc/metadata.xml @@ -1,8 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">schollz/croc</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <name>Armas Spann</name> + <email>zappel@simple-co.de</email> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">schollz/croc</remote-id> + <doc>https://schollz.com/tinker/croc6/</doc> + <bugs-to>https://github.com/schollz/croc/issues</bugs-to> + </upstream> </pkgmetadata> diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 0f6e4d3f8566..531b8c06008f 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,4 +1,6 @@ -DIST curl-8.3.0.tar.xz 2641764 BLAKE2B 6875b20e27ed86f9b6ab256210d85e9fb3b39645e8be710b2e6fe29fba40220f870e06bc21e8a92244670fed0a08c7716e4806a267ede49c4ed6d66e03f5fcd4 SHA512 6404b4c74fe1185cb482631ca3a143996cb7298d0d8a76bfafd7696e7729c00559999a069bdba782dee3f3eb273fb678a4438cb27d3deca54022878cdff83a51 -DIST curl-8.3.0.tar.xz.asc 488 BLAKE2B ef5a749e579710d45db9f73da0cbcb58d77a9dfe73be622536496997fa792fe5cbd0331a31f01e21cbdb36c6384dca44baa647c9f3d20effabb5bfc275b1b491 SHA512 b7d45722640ac50181b20a6d663168ec6eec6691c5604ddfe9c7177f07da598cb2de688c631043dc428c311774d781ccd16bd1e2fb4f038be651e3bee383aec4 -DIST curl-8.4.0.tar.xz 2658376 BLAKE2B ea5ebecc3c1aeac3ae8fd0cf7d8ff3298149b9c4c556fb85ed8d9310e3613228eb6fca133b0dfb9268988f93d694779fab8d53510cfa5710c1320bb6638f05eb SHA512 7027dbf3b759b39d6ec9c4da58fadd254e84bb93bff599541b3bc3135bad4c2955c6237d7ddd60973f9f1a6948bc32d7e312985fb50658bc958b9f22fee74f2b -DIST curl-8.4.0.tar.xz.asc 488 BLAKE2B 0fd4ea46a0942b9bc440e91e8f9323bba6d0eb02fbc87c227004c90e5be14cc644446bc235ab67f857b617975cdeada6ce38a647da9e0bd783e57d58f354cdb4 SHA512 b8b7a5b76be816e7b1552354f267f335fdc608cdadbd2c40ab44faf6450c6bbd2853b6de5c2746a1292aad33a8ee1c367380d32bb1a8282540b38c3b985a320e +DIST curl-8.7.1.tar.xz 2707016 BLAKE2B a2a9f48d0b69c0d92fcbbda535ce55082a5243abe3ab2db80d6fa3f32fb2c98b65026d69fc45c94e966398cf9ba8d9c95b6b91f4768b54749ed3275dd21838ef SHA512 5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2 +DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed SHA512 f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37 +DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3 SHA512 9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a +DIST curl-8.8.0.tar.xz.asc 488 BLAKE2B d80c0ff357b344d7ec2b975a92f1eeb7557993b61a69e7adaaeab89c9b5a53ddade5104fe1a0ad260145db9c90fc0aae36dfc22320492db6696f290da9ff675b SHA512 37b501770225dff6b1e7bde1157f556f10ec1c597fcbbb5c8b8c370efb97a3a70f585f2f5c201b96380d68466696474a5f65a07da59b704678d6927567d25359 +DIST curl-8.9.0.tar.xz 2781828 BLAKE2B 3302ce98d937bb398fc1abcc1c403796503099e06919ea3b104c873a6fb6cd79328ea9684f5118f63ebb20bad18b94ebfbe92e87716fc24b91dcc92ff2d304b7 SHA512 922c726cfa3a73954927a32f485248d7a53a3348638a6a01add1bc0a67a7d2ee9cdb7c78b6db84bb7e2fab9d2d5487a96d9071832198b63a86d2caaef85c9310 +DIST curl-8.9.0.tar.xz.asc 488 BLAKE2B 7f35383fd98fe0947be9cb0bfb4737a185f40bb3c3e7ab001cb1bef026dec654a01059e225c0d9774c2c5a57a6ee00a4ccf4be8eb1a2db17fe7b2cdbdd06b2f1 SHA512 44cc7053ac0fddcb5131e7806fcd793d70bd49c5549b2548bbcbe60fdf913f450e45861ff6497b30eb00fd84483302ff9b6c3aea6b66728d6e54dd7ffc388408 diff --git a/net-misc/curl/curl-8.4.0.ebuild b/net-misc/curl/curl-8.7.1-r3.ebuild index 2635b9c9be42..7877669d822a 100644 --- a/net-misc/curl/curl-8.4.0.ebuild +++ b/net-misc/curl/curl-8.7.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 @@ -17,13 +17,13 @@ else 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" + 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+=" +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +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 )" @@ -69,6 +69,7 @@ RDEPEND=" >=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? ( @@ -84,8 +85,8 @@ RDEPEND=" openssl? ( >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) - rustls? ( - net-libs/rustls-ffi:=[${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}] ) @@ -123,11 +124,17 @@ QA_CONFIG_IMPL_DECL_SKIP=( IoctlSocket mach_absolute_time setmode + _fseeki64 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method ) 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() { @@ -253,7 +260,7 @@ multilib_src_configure() { $(use_with idn libidn2) $(use_with kerberos gssapi "${EPREFIX}"/usr) --without-libgsasl - --without-libpsl + $(use_with psl libpsl) --without-msh3 $(use_with nghttp3) $(use_with nghttp3 ngtcp2) diff --git a/net-misc/curl/curl-8.3.0-r2.ebuild b/net-misc/curl/curl-8.7.1-r4.ebuild index 350d4acf5b7c..d9502c6ca227 100644 --- a/net-misc/curl/curl-8.3.0-r2.ebuild +++ b/net-misc/curl/curl-8.7.1-r4.ebuild @@ -1,8 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# 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 @@ -22,10 +26,10 @@ 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 +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +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" -IUSE+=" nghttp3" RESTRICT="!test? ( test )" # Only one default ssl provider can be enabled @@ -44,34 +48,38 @@ REQUIRED_USE=" curl_ssl_mbedtls? ( mbedtls ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) - nghttp3? ( !openssl ) + 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/HTTP3.md -# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml +# - 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[${MULTILIB_USEDEP}] + >=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:=[static-libs?,${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[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) ssl? ( gnutls? ( app-misc/ca-certificates - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle:=[${MULTILIB_USEDEP}] ) mbedtls? ( @@ -79,10 +87,10 @@ RDEPEND=" net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) openssl? ( - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) - rustls? ( - net-libs/rustls-ffi:=[${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}] ) @@ -120,14 +128,18 @@ QA_CONFIG_IMPL_DECL_SKIP=( IoctlSocket mach_absolute_time setmode + _fseeki64 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method ) PATCHES=( "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch - "${FILESDIR}"/${P}-tests-arm-musl.patch - "${FILESDIR}"/${P}-CVE-2023-38545.patch - "${FILESDIR}"/${P}-CVE-2023-38546.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() { @@ -253,7 +265,7 @@ multilib_src_configure() { $(use_with idn libidn2) $(use_with kerberos gssapi "${EPREFIX}"/usr) --without-libgsasl - --without-libpsl + $(use_with psl libpsl) --without-msh3 $(use_with nghttp3) $(use_with nghttp3 ngtcp2) diff --git a/net-misc/curl/curl-8.8.0-r1.ebuild b/net-misc/curl/curl-8.8.0-r1.ebuild new file mode 100644 index 000000000000..1e9f3de2f0f6 --- /dev/null +++ b/net-misc/curl/curl-8.8.0-r1.ebuild @@ -0,0 +1,387 @@ +# 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 debug +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-1.16.0:=[${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-1.1.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-1.2.0[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.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 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix-2.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${P}-install-manpage.patch + "${FILESDIR}"/${P}-mbedtls.patch + "${FILESDIR}"/${P}-multi_wait-timeout.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 + $(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 debug; then + myconf+=( + --enable-debug + ) + fi + + 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 +} + +pkg_postinst() { + if use debug; then + ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose." + ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger." + ewarn "hic sunt dracones; you have been warned." + fi +} diff --git a/net-misc/curl/curl-8.8.0.ebuild b/net-misc/curl/curl-8.8.0.ebuild new file mode 100644 index 000000000000..db51f02670f5 --- /dev/null +++ b/net-misc/curl/curl-8.8.0.ebuild @@ -0,0 +1,372 @@ +# 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-1.16.0:=[${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-1.1.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-1.2.0[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.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 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix-2.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${P}-install-manpage.patch + "${FILESDIR}"/${P}-mbedtls.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 + $(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.9.0.ebuild b/net-misc/curl/curl-8.9.0.ebuild new file mode 100644 index 000000000000..b42cca9c5152 --- /dev/null +++ b/net-misc/curl/curl-8.9.0.ebuild @@ -0,0 +1,368 @@ +# 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 debug +ftp gnutls gopher +hsts +http2 http3 idn +imap kerberos ldap mbedtls +openssl +pop3" +IUSE+=" +psl +progress-meter quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default tls implementation / which quic impl to use +IUSE+=" curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" +RESTRICT="!test? ( test )" + +# Only one default ssl / quic provider can be enabled +# The default provider needs its USE satisfied +REQUIRED_USE=" + quic? ( + ^^ ( + curl_quic_openssl + curl_quic_ngtcp2 + ) + http3 + ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_quic_openssl? ( openssl ) + curl_quic_ngtcp2? ( gnutls ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + http3? ( alt-svc quic ) +" + +# 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. +# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time. +RDEPEND=" + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + http3? ( >=net-libs/nghttp3-1.1.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}] ) + psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) + quic? ( + curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] ) + curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${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.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}] ) + http3? ( 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 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix-2.patch + "${FILESDIR}"/${PN}-respect-cflags-3.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 + $(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 http3 nghttp3) + $(use_with curl_quic_ngtcp2 ngtcp2) + $(use_with curl_quic_openssl openssl-quic) + --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 debug; then + myconf+=( + --enable-debug + ) + fi + + if use test && multilib_is_native_abi && ( use http2 || use http3 ); 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 + +} + +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 +} + +pkg_postinst() { + if use debug; then + ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose." + ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger." + ewarn "hic sunt dracones; you have been warned." + fi +} diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild index 7d87477bc1f1..b42cca9c5152 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-9999.ebuild @@ -1,8 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# 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 @@ -22,16 +26,22 @@ 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+=" +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" +IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 http3 idn +imap kerberos ldap mbedtls +openssl +pop3" +IUSE+=" +psl +progress-meter quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default tls implementation / which quic impl to use +IUSE+=" curl_quic_openssl curl_quic_ngtcp2 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 +# Only one default ssl / quic provider can be enabled +# The default provider needs its USE satisfied REQUIRED_USE=" + quic? ( + ^^ ( + curl_quic_openssl + curl_quic_ngtcp2 + ) + http3 + ) ssl? ( ^^ ( curl_ssl_gnutls @@ -40,13 +50,13 @@ REQUIRED_USE=" curl_ssl_rustls ) ) + curl_quic_openssl? ( openssl ) + curl_quic_ngtcp2? ( gnutls ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) - nghttp3? ( - !openssl - alt-svc ) + http3? ( alt-svc quic ) " # cURL's docs and CI/CD are great resources for confirming supported versions @@ -56,18 +66,20 @@ REQUIRED_USE=" # - 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. - +# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time. RDEPEND=" >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + http3? ( >=net-libs/nghttp3-1.1.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}] ) + quic? ( + curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] ) + curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) @@ -85,7 +97,7 @@ RDEPEND=" >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) rustls? ( - net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] + >=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] ) ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) @@ -99,7 +111,7 @@ BDEPEND=" test? ( sys-apps/diffutils http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) - nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) " @@ -123,10 +135,13 @@ QA_CONFIG_IMPL_DECL_SKIP=( IoctlSocket mach_absolute_time setmode + _fseeki64 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method ) PATCHES=( - "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-prefix-2.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch ) @@ -214,7 +229,6 @@ multilib_src_configure() { $(use_enable ldap) $(use_enable ldap ldaps) --enable-ntlm - --disable-ntlm-wb $(use_enable pop3) --enable-rt --enable-rtsp @@ -253,10 +267,11 @@ multilib_src_configure() { $(use_with idn libidn2) $(use_with kerberos gssapi "${EPREFIX}"/usr) --without-libgsasl - --without-libpsl + $(use_with psl libpsl) --without-msh3 - $(use_with nghttp3) - $(use_with nghttp3 ngtcp2) + $(use_with http3 nghttp3) + $(use_with curl_quic_ngtcp2 ngtcp2) + $(use_with curl_quic_openssl openssl-quic) --without-quiche $(use_with rtmp librtmp) --without-schannel @@ -272,7 +287,13 @@ multilib_src_configure() { --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions ) - if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + if use debug; then + myconf+=( + --enable-debug + ) + fi + + if use test && multilib_is_native_abi && ( use http2 || use http3 ); then myconf+=( --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" ) @@ -292,30 +313,6 @@ multilib_src_configure() { 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() { @@ -361,3 +358,11 @@ multilib_src_install_all() { find "${ED}" -type f -name '*.la' -delete || die rm -rf "${ED}"/etc/ || die } + +pkg_postinst() { + if use debug; then + ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose." + ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger." + ewarn "hic sunt dracones; you have been warned." + fi +} diff --git a/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch b/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch deleted file mode 100644 index 04603a8c01dc..000000000000 --- a/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch +++ /dev/null @@ -1,136 +0,0 @@ -https://bugs.gentoo.org/915195 - -From 1e1f915b73ab0895a68348ad1f96a5283a44ffd7 Mon Sep 17 00:00:00 2001 -From: Jay Satiro <raysatiro@yahoo.com> -Date: Mon, 9 Oct 2023 17:45:07 -0400 -Subject: [PATCH] socks: return error if hostname too long for remote resolve - -Prior to this change the state machine attempted to change the remote -resolve to a local resolve if the hostname was longer than 255 -characters. Unfortunately that did not work as intended and caused a -security issue. - -This patch applies to curl versions 8.2.0 - 8.3.0. Other versions -that are affected take a different patch. Refer to the CVE advisory -for more information. - -Bug: https://curl.se/docs/CVE-2023-38545.html ---- - lib/socks.c | 8 +++---- - tests/data/Makefile.inc | 2 +- - tests/data/test728 | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 69 insertions(+), 5 deletions(-) - create mode 100644 tests/data/test728 - -diff --git a/lib/socks.c b/lib/socks.c -index 25a3578..3d41c93 100644 ---- a/lib/socks.c -+++ b/lib/socks.c -@@ -588,9 +588,9 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, - - /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ - if(!socks5_resolve_local && hostname_len > 255) { -- infof(data, "SOCKS5: server resolving disabled for hostnames of " -- "length > 255 [actual len=%zu]", hostname_len); -- socks5_resolve_local = TRUE; -+ failf(data, "SOCKS5: the destination hostname is too long to be " -+ "resolved remotely by the proxy."); -+ return CURLPX_LONG_HOSTNAME; - } - - if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) -@@ -904,7 +904,7 @@ CONNECT_RESOLVE_REMOTE: - } - else { - socksreq[len++] = 3; -- socksreq[len++] = (char) hostname_len; /* one byte address length */ -+ socksreq[len++] = (unsigned char) hostname_len; /* one byte length */ - memcpy(&socksreq[len], sx->hostname, hostname_len); /* w/o NULL */ - len += hostname_len; - } -diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc -index 8ee1394..3e2094e 100644 ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -100,7 +100,7 @@ test679 test680 test681 test682 test683 test684 test685 test686 \ - \ - test700 test701 test702 test703 test704 test705 test706 test707 test708 \ - test709 test710 test711 test712 test713 test714 test715 test716 test717 \ --test718 test719 test720 test721 \ -+test718 test719 test720 test721 test728 \ - \ - test799 test800 test801 test802 test803 test804 test805 test806 test807 \ - test808 test809 test810 test811 test812 test813 test814 test815 test816 \ -diff --git a/tests/data/test728 b/tests/data/test728 -new file mode 100644 -index 0000000..05bcf28 ---- /dev/null -+++ b/tests/data/test728 -@@ -0,0 +1,64 @@ -+<testcase> -+<info> -+<keywords> -+HTTP -+HTTP GET -+SOCKS5 -+SOCKS5h -+followlocation -+</keywords> -+</info> -+ -+# -+# Server-side -+<reply> -+# The hostname in this redirect is 256 characters and too long (> 255) for -+# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case. -+<data> -+HTTP/1.1 301 Moved Permanently -+Location: http://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ -+Content-Length: 0 -+Connection: close -+ -+</data> -+</reply> -+ -+# -+# Client-side -+<client> -+<features> -+proxy -+</features> -+<server> -+http -+socks5 -+</server> -+ <name> -+SOCKS5h with HTTP redirect to hostname too long -+ </name> -+ <command> -+--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER -+</command> -+</client> -+ -+# -+# Verify data after the test has been "shot" -+<verify> -+<protocol crlf="yes"> -+GET /%TESTNUMBER HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+User-Agent: curl/%VERSION -+Accept: */* -+ -+</protocol> -+<errorcode> -+97 -+</errorcode> -+# the error message is verified because error code CURLE_PROXY (97) may be -+# returned for any number of reasons and we need to make sure it is -+# specifically for the reason below so that we know the check is working. -+<stderr mode="text"> -+curl: (97) SOCKS5: the destination hostname is too long to be resolved remotely by the proxy. -+</stderr> -+</verify> -+</testcase> --- -2.7.4 - diff --git a/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch b/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch deleted file mode 100644 index 615ab26cb2a8..000000000000 --- a/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch +++ /dev/null @@ -1,131 +0,0 @@ -https://bugs.gentoo.org/915195 -https://github.com/curl/curl/commit/61275672b46d9abb3285740467b882e22ed75da8 - -From 61275672b46d9abb3285740467b882e22ed75da8 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Thu, 14 Sep 2023 23:28:32 +0200 -Subject: [PATCH] cookie: remove unnecessary struct fields - -Plus: reduce the hash table size from 256 to 63. It seems unlikely to -make much of a speed difference for most use cases but saves 1.5KB of -data per instance. - -Closes #11862 ---- - lib/cookie.c | 13 +------------ - lib/cookie.h | 13 ++++--------- - lib/easy.c | 4 +--- - 3 files changed, 6 insertions(+), 24 deletions(-) - -diff --git a/lib/cookie.c b/lib/cookie.c -index 4345a84c6fd9d..e39c89a94a960 100644 ---- a/lib/cookie.c -+++ b/lib/cookie.c -@@ -119,7 +119,6 @@ static void freecookie(struct Cookie *co) - free(co->name); - free(co->value); - free(co->maxage); -- free(co->version); - free(co); - } - -@@ -718,11 +717,7 @@ Curl_cookie_add(struct Curl_easy *data, - } - } - else if((nlen == 7) && strncasecompare("version", namep, 7)) { -- strstore(&co->version, valuep, vlen); -- if(!co->version) { -- badcookie = TRUE; -- break; -- } -+ /* just ignore */ - } - else if((nlen == 7) && strncasecompare("max-age", namep, 7)) { - /* -@@ -1160,7 +1155,6 @@ Curl_cookie_add(struct Curl_easy *data, - free(clist->path); - free(clist->spath); - free(clist->expirestr); -- free(clist->version); - free(clist->maxage); - - *clist = *co; /* then store all the new data */ -@@ -1224,9 +1218,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, - c = calloc(1, sizeof(struct CookieInfo)); - if(!c) - return NULL; /* failed to get memory */ -- c->filename = strdup(file?file:"none"); /* copy the name just in case */ -- if(!c->filename) -- goto fail; /* failed to get memory */ - /* - * Initialize the next_expiration time to signal that we don't have enough - * information yet. -@@ -1378,7 +1369,6 @@ static struct Cookie *dup_cookie(struct Cookie *src) - CLONE(name); - CLONE(value); - CLONE(maxage); -- CLONE(version); - d->expires = src->expires; - d->tailmatch = src->tailmatch; - d->secure = src->secure; -@@ -1595,7 +1585,6 @@ void Curl_cookie_cleanup(struct CookieInfo *c) - { - if(c) { - unsigned int i; -- free(c->filename); - for(i = 0; i < COOKIE_HASH_SIZE; i++) - Curl_cookie_freelist(c->cookies[i]); - free(c); /* free the base struct as well */ -diff --git a/lib/cookie.h b/lib/cookie.h -index b3c0063b2cfb2..41e9e7a6914e0 100644 ---- a/lib/cookie.h -+++ b/lib/cookie.h -@@ -36,11 +36,7 @@ struct Cookie { - char *domain; /* domain = <this> */ - curl_off_t expires; /* expires = <this> */ - char *expirestr; /* the plain text version */ -- -- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */ -- char *version; /* Version = <value> */ - char *maxage; /* Max-Age = <value> */ -- - bool tailmatch; /* whether we do tail-matching of the domain name */ - bool secure; /* whether the 'secure' keyword was used */ - bool livecookie; /* updated from a server, not a stored file */ -@@ -56,17 +52,16 @@ struct Cookie { - #define COOKIE_PREFIX__SECURE (1<<0) - #define COOKIE_PREFIX__HOST (1<<1) - --#define COOKIE_HASH_SIZE 256 -+#define COOKIE_HASH_SIZE 63 - - struct CookieInfo { - /* linked list of cookies we know of */ - struct Cookie *cookies[COOKIE_HASH_SIZE]; -- char *filename; /* file we read from/write to */ -- long numcookies; /* number of cookies in the "jar" */ -+ curl_off_t next_expiration; /* the next time at which expiration happens */ -+ int numcookies; /* number of cookies in the "jar" */ -+ int lastct; /* last creation-time used in the jar */ - bool running; /* state info, for cookie adding information */ - bool newsession; /* new session, discard session cookies on load */ -- int lastct; /* last creation-time used in the jar */ -- curl_off_t next_expiration; /* the next time at which expiration happens */ - }; - - /* The maximum sizes we accept for cookies. RFC 6265 section 6.1 says -diff --git a/lib/easy.c b/lib/easy.c -index 16bbd35251d40..03195481f9780 100644 ---- a/lib/easy.c -+++ b/lib/easy.c -@@ -925,9 +925,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) - if(data->cookies) { - /* If cookies are enabled in the parent handle, we enable them - in the clone as well! */ -- outcurl->cookies = Curl_cookie_init(data, -- data->cookies->filename, -- outcurl->cookies, -+ outcurl->cookies = Curl_cookie_init(data, NULL, outcurl->cookies, - data->set.cookiesession); - if(!outcurl->cookies) - goto fail; diff --git a/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch b/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch deleted file mode 100644 index e07c13a04766..000000000000 --- a/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch +++ /dev/null @@ -1,115 +0,0 @@ -https://github.com/curl/curl/issues/11900 -https://github.com/curl/curl/commit/b226bd679a68b8bf94cbb6d58837f00251560e63 -https://github.com/curl/curl/commit/9c7165e96a3a9a2d0b7059c87c699b5ca8cdae93 - -From b226bd679a68b8bf94cbb6d58837f00251560e63 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 25 Sep 2023 13:03:26 +0200 -Subject: [PATCH] configure: sort AC_CHECK_FUNCS - -No functional changes. ---- - configure.ac | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2fc9f2f01783c..a6f9066a133a4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3583,8 +3583,10 @@ AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Se - #include <sys/types.h>]]) - - --AC_CHECK_FUNCS([fnmatch \ -+AC_CHECK_FUNCS([\ -+ arc4random \ - fchmod \ -+ fnmatch \ - fork \ - geteuid \ - getpass_r \ -@@ -3604,7 +3606,6 @@ AC_CHECK_FUNCS([fnmatch \ - snprintf \ - utime \ - utimes \ -- arc4random - ],[ - ],[ - func="$ac_func" - -From 9c7165e96a3a9a2d0b7059c87c699b5ca8cdae93 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 22 Sep 2023 13:58:49 +0000 -Subject: [PATCH] lib: use wrapper for curl_mime_data fseek callback - -fseek uses long offset which does not match with curl_off_t. This leads -to undefined behavior when calling the callback and caused failure on -arm 32 bit. - -Use a wrapper to solve this and use fseeko which uses off_t instead of -long. - -Thanks to the nice people at Libera IRC #musl for helping finding this -out. - -Fixes #11882 -Fixes #11900 -Closes #11918 ---- - configure.ac | 2 ++ - lib/formdata.c | 17 +++++++++++++++-- - 3 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a6f9066a133a4..5fa7c45c47430 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3584,10 +3584,12 @@ AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Se - - - AC_CHECK_FUNCS([\ -+ _fseeki64 \ - arc4random \ - fchmod \ - fnmatch \ - fork \ -+ fseeko \ - geteuid \ - getpass_r \ - getppid \ -diff --git a/lib/formdata.c b/lib/formdata.c -index 8984b63223cc0..f370ce6854b5f 100644 ---- a/lib/formdata.c -+++ b/lib/formdata.c -@@ -789,6 +789,20 @@ static CURLcode setname(curl_mimepart *part, const char *name, size_t len) - return res; - } - -+/* wrap call to fseeko so it matches the calling convetion of callback */ -+static int fseeko_wrapper(void *stream, curl_off_t offset, int whence) -+{ -+#if defined(HAVE_FSEEKO) -+ return fseeko(stream, (off_t)offset, whence); -+#elif defined(HAVE__FSEEKI64) -+ return _fseeki64(stream, (__int64)offset, whence); -+#else -+ if(offset > LONG_MAX) -+ return -1; -+ return fseek(stream, (long)offset, whence); -+#endif -+} -+ - /* - * Curl_getformdata() converts a linked list of "meta data" into a mime - * structure. The input list is in 'post', while the output is stored in -@@ -874,8 +888,7 @@ CURLcode Curl_getformdata(struct Curl_easy *data, - compatibility: use of "-" pseudo file name should be avoided. */ - result = curl_mime_data_cb(part, (curl_off_t) -1, - (curl_read_callback) fread, -- CURLX_FUNCTION_CAST(curl_seek_callback, -- fseek), -+ fseeko_wrapper, - NULL, (void *) stdin); - } - else - 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/curl/files/curl-8.7.1-rustls-fixes.patch b/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch new file mode 100644 index 000000000000..81bcb0734339 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch @@ -0,0 +1,49 @@ +From a866b062b17ab94b16b817ab9969c561364a4d72 Mon Sep 17 00:00:00 2001 +From: Matt Jolly <Matt.Jolly@footclan.ninja> +Date: Mon, 1 Apr 2024 08:36:51 +1000 +Subject: [PATCH] m4: fix rustls builds + +This patch consolidates the following commits to do with rustls +detection using pkg-config: + +- https://github.com/curl/curl/commit/9c4209837094781d5eef69ae6bcad0e86b64bf99 +- https://github.com/curl/curl/commit/5a50cb5a18a141a463148562dab83fa3be1a3b90 +--- + m4/curl-rustls.m4 | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4 +index 7c55230..8082cf9 100644 +--- a/m4/curl-rustls.m4 ++++ b/m4/curl-rustls.m4 +@@ -142,6 +142,11 @@ if test "x$OPT_RUSTLS" != xno; then + LIBS="$SSL_LIBS $LIBS" + USE_RUSTLS="yes" + ssl_msg="rustls" ++ AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled]) ++ AC_SUBST(USE_RUSTLS, [1]) ++ USE_RUSTLS="yes" ++ RUSTLS_ENABLED=1 ++ test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes + else + AC_MSG_ERROR([pkg-config: Could not find rustls]) + fi +@@ -174,5 +179,15 @@ if test "x$OPT_RUSTLS" != xno; then + fi + + test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg" ++ ++ if test X"$OPT_RUSTLS" != Xno && ++ test "$RUSTLS_ENABLED" != "1"; then ++ AC_MSG_NOTICE([OPT_RUSTLS: $OPT_RUSTLS]) ++ AC_MSG_NOTICE([RUSTLS_ENABLED: $RUSTLS_ENABLED]) ++ AC_MSG_ERROR([--with-rustls was given but Rustls could not be detected]) ++ fi + fi + ]) ++ ++ ++RUSTLS_ENABLED +-- +2.44.0 + diff --git a/net-misc/curl/files/curl-8.8.0-install-manpage.patch b/net-misc/curl/files/curl-8.8.0-install-manpage.patch new file mode 100644 index 000000000000..f58ddae1c302 --- /dev/null +++ b/net-misc/curl/files/curl-8.8.0-install-manpage.patch @@ -0,0 +1,22 @@ +https://patch-diff.githubusercontent.com/raw/curl/curl/pull/13741 +From: Daniel Stenberg <daniel@haxx.se> +Date: Wed, 22 May 2024 08:43:43 +0200 +Subject: [PATCH] docs/Makefile.am: make curl-config.1 install + +on "make install" like it should +--- + docs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index 83f5b0c461cc0f..e9ef6284860555 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -28,6 +28,7 @@ if BUILD_DOCS + # if we disable man page building, ignore these + MK_CA_DOCS = mk-ca-bundle.1 + CURLCONF_DOCS = curl-config.1 ++man_MANS = curl-config.1 + endif + + CURLPAGES = curl-config.md mk-ca-bundle.md diff --git a/net-misc/curl/files/curl-8.8.0-mbedtls.patch b/net-misc/curl/files/curl-8.8.0-mbedtls.patch new file mode 100644 index 000000000000..8fa4d6ef7cfe --- /dev/null +++ b/net-misc/curl/files/curl-8.8.0-mbedtls.patch @@ -0,0 +1,42 @@ +https://github.com/curl/curl/pull/13749 +From: Stefan Eissing <stefan@eissing.org> +Date: Wed, 22 May 2024 14:44:56 +0200 +Subject: [PATCH] mbedtls, check version for cipher id + +- mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have + been added in mbedtls 3.2.0. Check for that version. +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + (struct mbed_ssl_backend_data *)connssl->backend; + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + const mbedtls_x509_crt *peercert; +- char cipher_str[64]; +- uint16_t cipher_id; + #ifndef CURL_DISABLE_PROXY + const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)? + data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]: +@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + return CURLE_SSL_CONNECT_ERROR; + } + +- cipher_id = (uint16_t) +- mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); +- mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); +- infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); +- ++#if MBEDTLS_VERSION_NUMBER >= 0x03020000 ++ { ++ char cipher_str[64]; ++ uint16_t cipher_id; ++ cipher_id = (uint16_t) ++ mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); ++ mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); ++ infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); ++ } ++#else ++ infof(data, "mbedTLS: Handshake complete"); ++#endif + ret = mbedtls_ssl_get_verify_result(&backend->ssl); + + if(!conn_config->verifyhost) diff --git a/net-misc/curl/files/curl-8.8.0-multi_wait-timeout.patch b/net-misc/curl/files/curl-8.8.0-multi_wait-timeout.patch new file mode 100644 index 000000000000..38d8c1bd3f20 --- /dev/null +++ b/net-misc/curl/files/curl-8.8.0-multi_wait-timeout.patch @@ -0,0 +1,75 @@ +https://github.com/curl/curl/pull/13825 +From: Stefan Eissing <stefan@eissing.org> +Date: Wed, 29 May 2024 17:13:34 +0200 +Subject: [PATCH] fix multi_wait() timeout handling + +- determine the actual poll timeout *after* all sockets + have been collected. Protocols and connection filters may + install new timeouts during collection. +- add debug logging to test1533 where the mistake was noticed +- refs #13782 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -1366,13 +1366,6 @@ static CURLMcode multi_wait(struct Curl_multi *multi, + if(timeout_ms < 0) + return CURLM_BAD_FUNCTION_ARGUMENT; + +- /* If the internally desired timeout is actually shorter than requested from +- the outside, then use the shorter time! But only if the internal timer +- is actually larger than -1! */ +- (void)multi_timeout(multi, &timeout_internal); +- if((timeout_internal >= 0) && (timeout_internal < (long)timeout_ms)) +- timeout_ms = (int)timeout_internal; +- + memset(ufds, 0, ufds_len * sizeof(struct pollfd)); + memset(&ps, 0, sizeof(ps)); + +@@ -1476,6 +1469,14 @@ static CURLMcode multi_wait(struct Curl_multi *multi, + #endif + #endif + ++ /* We check the internal timeout *AFTER* we collected all sockets to ++ * poll. Collecting the sockets may install new timers by protocols ++ * and connection filters. ++ * Use the shorter one of the internal and the caller requested timeout. */ ++ (void)multi_timeout(multi, &timeout_internal); ++ if((timeout_internal >= 0) && (timeout_internal < (long)timeout_ms)) ++ timeout_ms = (int)timeout_internal; ++ + #if defined(ENABLE_WAKEUP) && defined(USE_WINSOCK) + if(nfds || use_wakeup) { + #else +--- a/tests/libtest/Makefile.inc ++++ b/tests/libtest/Makefile.inc +@@ -487,7 +487,7 @@ lib1551_SOURCES = lib1551.c $(SUPPORTFILES) + lib1552_SOURCES = lib1552.c $(SUPPORTFILES) $(TESTUTIL) + lib1552_LDADD = $(TESTUTIL_LIBS) + +-lib1553_SOURCES = lib1553.c $(SUPPORTFILES) $(TESTUTIL) ++lib1553_SOURCES = lib1553.c $(SUPPORTFILES) $(TSTTRACE) $(TESTUTIL) + lib1553_LDADD = $(TESTUTIL_LIBS) + + lib1554_SOURCES = lib1554.c $(SUPPORTFILES) +--- a/tests/libtest/lib1553.c ++++ b/tests/libtest/lib1553.c +@@ -24,6 +24,7 @@ + #include "test.h" + + #include "testutil.h" ++#include "testtrace.h" + #include "warnless.h" + #include "memdebug.h" + +@@ -74,6 +75,12 @@ CURLcode test(char *URL) + easy_setopt(curls, CURLOPT_XFERINFOFUNCTION, xferinfo); + easy_setopt(curls, CURLOPT_NOPROGRESS, 1L); + ++ libtest_debug_config.nohex = 1; ++ libtest_debug_config.tracetime = 1; ++ test_setopt(curls, CURLOPT_DEBUGDATA, &libtest_debug_config); ++ easy_setopt(curls, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); ++ easy_setopt(curls, CURLOPT_VERBOSE, 1L); ++ + multi_add_handle(multi, curls); + + multi_perform(multi, &still_running); diff --git a/net-misc/curl/files/curl-prefix-2.patch b/net-misc/curl/files/curl-prefix-2.patch new file mode 100644 index 000000000000..0372038e7d59 --- /dev/null +++ b/net-misc/curl/files/curl-prefix-2.patch @@ -0,0 +1,34 @@ +From a3033ee39f2cc43cb17386b23cb304b010c2c96f Mon Sep 17 00:00:00 2001 +From: Matt Jolly <Matt.Jolly@footclan.ninja> +Date: Wed, 22 May 2024 16:18:51 +1000 +Subject: [PATCH] Update prefix patch for 8.8.0 + +--- + curl-config.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/curl-config.in b/curl-config.in +index 085bb1e..c0bc6ce 100644 +--- a/curl-config.in ++++ b/curl-config.in +@@ -145,7 +145,7 @@ while test "$#" -gt 0; do + else + CPPFLAG_CURL_STATICLIB="" + fi +- if test "X@includedir@" = "X/usr/include"; then ++ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then + echo "${CPPFLAG_CURL_STATICLIB}" + else + echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@" +@@ -153,7 +153,7 @@ while test "$#" -gt 0; do + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then ++ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then + CURLLIBDIR="-L@libdir@ " + else + CURLLIBDIR="" +-- +2.45.0 + diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml index 7f3ef922ed92..884608c7c1f5 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>Matt.Jolly@footclan.ninja</email> + <maintainer type="person"> + <email>kangie@gentoo.org</email> <name>Matt Jolly</name> </maintainer> <maintainer type="project"> @@ -15,13 +15,15 @@ <flag name="gnutls">Enable gnutls ssl backend</flag> <flag name="gopher">Enable Gopher protocol support</flag> <flag name="hsts">Enable HTTP Strict Transport Security</flag> - <flag name="http2">Enable HTTP/2.0 support</flag> <flag name="imap">Enable Internet Message Access Protocol support</flag> <flag name="mbedtls">Enable mbedtls ssl backend</flag> - <flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag> + <flag name="nghttp3">Enable HTTP/3 support using <pkg>net-libs/nghttp3</pkg></flag> + <flag name="http3">Enable HTTP/3 support</flag> <flag name="openssl">Enable openssl ssl backend</flag> <flag name="pop3">Enable Post Office Protocol 3 support</flag> <flag name="progress-meter">Enable the progress meter</flag> + <flag name="psl">Enable Public Suffix List (PSL) support. See https://daniel.haxx.se/blog/2024/01/10/psl-in-curl/.</flag> + <flag name="quic">Enable support for QUIC (RFC 9000); a UDP-based protocol intended to replace TCP</flag> <flag name="rtmp">Enable RTMP Streaming Media support</flag> <flag name="rustls">Enable Rustls ssl backend</flag> <flag name="smtp">Enable Simple Mail Transfer Protocol support</flag> diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest deleted file mode 100644 index 39bdb6ec81be..000000000000 --- a/net-misc/dahdi-tools/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694 -DIST dahdi-tools-3.2.0.tar.gz 729392 BLAKE2B 77667a16fd18fa5b6ffd67d9bd267c4ea5e6ff3841938de64704b7e6f1818b23feff196701c62ceb0a56c677614b4c2a4d4d1f4f533020559e8b3b3c12785bf5 SHA512 29df9a768c6db872bd51926dac11178400a03e2e1d0771ae163433ce300af71691f5c7a60f8756c0e6cef8a43f1331944cb4e44393f04a0ff8dee19bc9e7cf16 diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild deleted file mode 100644 index 49903c27e61a..000000000000 --- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 perl-functions udev - -DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -IUSE="ppp" -PATCHES=( - "${FILESDIR}/dahdi-nondigium-blacklist.patch" - "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" - "${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch" - "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" - "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" -) - -DEPEND="dev-libs/newt - net-misc/dahdi - sys-kernel/linux-headers - virtual/libusb:0 - ppp? ( net-dialup/ppp:= )" -RDEPEND="${DEPEND} - dev-lang/perl:= - dev-perl/CGI" -BDEPEND="dev-lang/perl - sys-apps/file" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" - sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." - sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." -} - -src_install() { - local bashcompdir="$(get_bashcompdir)" - local bashcmd bashcmdtarget - - emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install - emake DESTDIR="${ED}" install-config - - dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest - - # install init scripts - newinitd "${FILESDIR}"/dahdi.init2 dahdi - newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf - newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf - - bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || - die "Error parsing dahdi bash completion file for commands") - - rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install." - # Delete *if* the libtool file exists, bug #778380 - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - udev_reload -} diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild deleted file mode 100644 index 4ccf762c64d7..000000000000 --- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 perl-functions udev - -DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="ppp" -PATCHES=( - "${FILESDIR}/dahdi-nondigium-blacklist.patch" - "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" - "${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch" - "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" - "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" -) - -DEPEND="dev-libs/newt - net-misc/dahdi - sys-kernel/linux-headers - virtual/libusb:0 - ppp? ( net-dialup/ppp:= )" -RDEPEND="${DEPEND} - dev-lang/perl:= - dev-perl/CGI" -BDEPEND="dev-lang/perl - sys-apps/file" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" - sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." - sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." -} - -src_install() { - local bashcompdir="$(get_bashcompdir)" - local bashcmd bashcmdtarget - - emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install - emake DESTDIR="${ED}" install-config - - dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest - - # install init scripts - newinitd "${FILESDIR}"/dahdi.init2 dahdi - newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf - newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf - - bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || - die "Error parsing dahdi bash completion file for commands") - - rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install." - # Delete *if* the libtool file exists, bug #778380 - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild deleted file mode 100644 index 773d22263bd4..000000000000 --- a/net-misc/dahdi-tools/dahdi-tools-3.2.0.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 autotools bash-completion-r1 perl-functions udev - -DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="ppp" -PATCHES=( - "${FILESDIR}/dahdi-nondigium-blacklist.patch" - "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" - "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" - "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" - "${FILESDIR}/dahdi-tools-3.2.0-lto.patch" -) - -DEPEND="dev-libs/newt - net-misc/dahdi - sys-kernel/linux-headers - virtual/libusb:1 - ppp? ( net-dialup/ppp:= )" -RDEPEND="${DEPEND} - dev-lang/perl:= - dev-perl/CGI" -BDEPEND="dev-lang/perl - sys-apps/file" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" - sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." - sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." -} - -src_install() { - local bashcompdir="$(get_bashcompdir)" - local bashcmd bashcmdtarget - - emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install - emake DESTDIR="${ED}" install-config - - dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest - - # install init scripts - newinitd "${FILESDIR}"/dahdi.init2 dahdi - newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf - newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf - - bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || - die "Error parsing dahdi bash completion file for commands") - - # Delete *if* the libtool file exists, bug #778380 - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 b/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 deleted file mode 100644 index a46545231911..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 +++ /dev/null @@ -1,40 +0,0 @@ -# Global settings -# Set this to your country code. -DAHDI_ZONE=za -DAHDI_ECHOCAN=oslec # mg2,jpah,kb1,sec,sec2 (there may be more, we recommend oslec) - -# Settings for analog -#Analog signal types, one of: -# ks - KewlStart (recommended, default) -# ls - LoopStart -# gs - GroundStart - -# Signalling to be used on FXO ports -DAHDI_FXO_SIGNALLING=ks - -# Signalling to be used on FXS ports -DAHDI_FXS_SIGNALLING=ks - -# Whether or not to echocan: -DAHDI_FXO_ECHOCAN=yes -DAHDI_FXS_ECHOCAN=yes - -# These settings will be used for BRI cards. -# Known options: B8ZS,AMI,HDB3 -DAHDI_BRI_CODING=AMI - -# Known options: ESF,D4,CCS,CRC4 -DAHDI_BRI_FRAMING=CCS - -# Our experience is that it's not required (still defaults to yes) -DAHDI_BRI_NT_ECHOCAN=yes -DAHDI_BRI_TE_ECHOCAN=yes - -# These settings are for PRI cards. Note that only E1 currently supported. -DAHDI_E1_CPE_ECHOCAN=yes -DAHDI_E1_NET_ECHOCAN=yes - -# PRI will default to CPE mode (remote end provides signalling). -# If you really want to provide signalling set the appropriate spans -# here (eg, set span 1 to NET mode). -#PRI_SPAN_1_NET=yes diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 deleted file mode 100644 index 73ab07b8904f..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 +++ /dev/null @@ -1,271 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Ultimate Linux Solutions CC -# Distributed under the terms of the GNU General Public License v2 - -depend() { - before dahdi -} - -dahdi_load_modules() { - local hwlist loc status mod mod_vname pciid desc - - hwlist=$(/usr/sbin/dahdi_hardware) - - if [ -z "${hwlist}" ]; then - einfo "No digium hardware found." - ebegin "Loading module dahdi_dummy" - /sbin/modprobe dahdi_dummy - eend $? - return - fi - - echo "${hwlist}" | while read loc mod pciid desc; do - status="${mod:${#mod}-1:1}" - mod="${mod%[+-]}" - mod_vname="mod_${mod}" - - einfo "Found $desc at $loc (module: $mod)" - - if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then - ebegin "Loading module $mod" - /sbin/modprobe $mod - eend - - [ $? -eq 0 ] && eval "$mod_vname=loaded" - fi - done -} - -dahdi_module_unload() { - local mod=$1 s - [ -d /sys/module/${mod} ] || return 0 - - for s in $(find /sys/module/${mod}/holders -type l); do - dahdi_module_unload $(basename $s) - done - - ebegin "Removing dahdi module: $mod" - /sbin/rmmod $mod - eend $? -} - -dahdi_gen_fxo_config() { - local port=$1 - - echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}" - [ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" -} - -dahdi_gen_fxs_config() { - local port=$1 - - echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}" - [ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" -} - -dahdi_gen_bri_te_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" - echo "bchan=${basechan}-$(( basechan + 1 ))" - echo "hardhdlc=$(( basechan + 2 ))" - [ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" -} - -dahdi_gen_bri_nt_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" - echo "bchan=${basechan}-$(( basechan + 1 ))" - echo "hardhdlc=$(( basechan + 2 ))" - [ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" -} - -dahdi_gen_e1_cpe_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" - bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" - echo "bchan=${bchans}" - echo "dchan=$(( basechan + 15 ))" - [ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" -} - -dahdi_gen_e1_net_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" - bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" - echo "bchan=${bchans}" - echo "dchan=$(( basechan + 15 ))" - [ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" -} - -dahdi_gen_t1_cpe_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},${port},0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}" - bchans="${basechan}-$(( basechan + 22 ))" - echo "bchan=${bchans}" - echo "dchan=$(( basechan + 23 ))" - [ "${DAHDI_T1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" -} - -dahdi_gen_t1_net_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},0,0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}" - bchans="${basechan}-$(( basechan + 22 ))" - echo "bchan=${bchans}" - echo "dchan=$(( basechan + 23 ))" - [ "${DAHDI_T1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" -} - -dahdi_conf_span() { - local span=$1 - local type=$2 - local desc=$3 - local port=$4 - local basechan=$5 - local vname="PRI_SPAN_${span}_NET" - local cfunc="dahdi_gen_" - - # Analog we need to deal with on a port-by-port basis. - [ "${type}" = "analog" ] && return 0 - - echo "" - echo "# ${desc}" - - case "${type}" in - digital-TE) - cfunc="${cfunc}bri_te" - ;; - digital-NT) - cfunc="${cfunc}bri_nt" - ;; - digital-[TE]1) - cfunc="${cfunc}$(echo "${type##*-}" | tr 'TE' 'te')" - # Use CPE by default. Unfortunately there is no easy - # way to detect CPE vs NET as far as I know and specifying - # in a config that you want NET mode seems the sanest way. - if yesno "${vname}"; then - cfunc="${cfunc}_net" - else - cfunc="${cfunc}_cpe" - fi - ;; - *) - echo "# Don't know how to configure this (type=${type})." - echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC." - return 1 - ;; - esac - - "${cfunc}_config" "${span}" "${port}" "${basechan}" -} - -dahdi_gen_config() { - local type manufacturer devicetype basechan aport atype - local span= - local tfile="$(mktemp)" - local sfile="$(mktemp)" - local plocation="" - local isdnport=0 - - /usr/sbin/dahdi_scan > "${sfile}" - exec 3<"${sfile}" - exec 4>"${tfile}" - - echo "# Automatically dahdi-autoconf generated file ($(date))." >&4 - echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >&4 - - while read LINE <&3; do - case "$LINE" in - \[*\]) - if [ -n "${span}" ]; then - ebegin "Configuring ${manufacturer} ${devicetype} (${name})" - dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4 - eend $? - fi - span="${LINE%?}" - span="${span#?}" - ;; - type=*|manufacturer=*|devicetype=*|basechan=*|name=*) - eval "${LINE%%=*}='${LINE#*=}'" - ;; - location=*) - eval "${LINE%%=*}='${LINE#*=}'" - if [ "${location}" = "${plocation}" ]; then - isdnport=$(( isdnport + 1 )) - else - plocation="${location}" - isdnport=1 - fi - ;; - port=*) - # For analog cards only. - aport="${LINE#*=}"; aport="${aport%,*}" - atype="${LINE#*,}" - if [ "${aport}" -eq "${basechan}" ]; then - echo "" >&4 - echo "# ${manufacturer} ${devicetype} (${name})" >&4 - fi - case "${atype}" in - FXO) - dahdi_gen_fxo_config $aport >&4 - ;; - FXS) - dahdi_gen_fxs_config $aport >&4 - ;; - esac - ;; - esac - done - - if [ -n "${span}" ]; then - ebegin "Configuring ${manufacturer} ${devicetype} (${name})" - dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4 - eend $? - fi - - echo "" >&4 - echo "loadzone = ${DAHDI_ZONE}" >&4 - echo "defaultzone = ${DAHDI_ZONE}" >&4 - echo "## END OF AUTOCONFIGURED FILE ##" >&4 - - exec 3<&- - exec 4<&- - - rm -f "${sfile}" - [ -r /etc/dahdi/system.conf ] && mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck - mv "${tfile}" /etc/dahdi/system.conf -} - -start() { - dahdi_load_modules - - if [ ! -r /dev/dahdi/ctl ]; then - eerror "No DAHDI compatible cards detected." - return 1 - fi - - ebegin "Generating DAHDI Configuration" - dahdi_gen_config - eend $? -} - -stop() { - dahdi_module_unload dahdi -} diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init2 b/net-misc/dahdi-tools/files/dahdi-autoconf.init2 deleted file mode 100644 index 9e3de84bac26..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-autoconf.init2 +++ /dev/null @@ -1,225 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Ultimate Linux Solutions CC -# Distributed under the terms of the GNU General Public License v2 - -depend() { - before dahdi -} - -dahdi_load_modules() { - local hwlist loc status mod mod_vname pciid desc - - hwlist=$(/usr/sbin/dahdi_hardware) - - if [ -z "${hwlist}" ]; then - einfo "No digium hardware found." - ebegin "Loading module dahdi_dummy" - /sbin/modprobe dahdi_dummy - eend $? - return - fi - - echo "${hwlist}" | while read loc mod pciid desc; do - status="${mod:${#mod}-1:1}" - mod="${mod%[+-]}" - mod_vname="mod_${mod}" - - einfo "Found $desc at $loc (module: $mod)" - - if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then - ebegin "Loading module $mod" - /sbin/modprobe $mod - eend - - [ $? -eq 0 ] && eval "$mod_vname=loaded" - fi - done -} - -dahdi_module_unload() { - local mod=$1 s - [ -d /sys/module/${mod} ] || return 0 - - for s in $(find /sys/module/${mod}/holders -type l); do - dahdi_module_unload $(basename $s) - done - - ebegin "Removing dahdi module: $mod" - /sbin/rmmod $mod - eend $? -} - -dahdi_gen_fxo_config() { - local port=$1 - - echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}" - [ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" -} - -dahdi_gen_fxs_config() { - local port=$1 - - echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}" - [ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" -} - -dahdi_gen_bri_te_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" - echo "bchan=${basechan}-$(( basechan + 1 ))" - echo "hardhdlc=$(( basechan + 2 ))" - [ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" -} - -dahdi_gen_bri_nt_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" - echo "bchan=${basechan}-$(( basechan + 1 ))" - echo "hardhdlc=$(( basechan + 2 ))" - [ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" -} - -dahdi_gen_e1_cpe_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" - bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" - echo "bchan=${bchans}" - echo "dchan=$(( basechan + 15 ))" - [ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" -} - -dahdi_gen_e1_net_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" - bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" - echo "bchan=${bchans}" - echo "dchan=$(( basechan + 15 ))" - [ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" -} - -dahdi_conf_span() { - local span=$1 - local type=$2 - local desc=$3 - local port=$4 - local basechan=$5 - local vname="" - - # Analog we need to deal with on a port-by-port basis. - [ "${type}" = "analog" ] && return 0 - - echo -e "\n# ${desc}" - case "${type}" in - digital-TE) - dahdi_gen_bri_te_config "${span}" "${port}" "${basechan}" - ;; - digital-NT) - dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}" - ;; - digital-E1) - # Use CPE by default. Unfortunately there is no easy - # way to detect CPE vs NET as far as I know and specifying - # in a config that you want NET mode seems the sanest way. - vname="PRI_SPAN_${span}_NET" - if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then - dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}" - else - dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}" - fi - ;; - *) - echo "# Don't know how to configure this (type=${type})." - echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC." - ;; - esac -} - -dahdi_gen_config() { - local type manufacturer devicetype basechan aport atype - local span= - local tfile="$(mktemp)" - local sfile="$(mktemp)" - local plocation="" - local isdnport=0 - - /usr/sbin/dahdi_scan > "${sfile}" - exec 3<"${sfile}" - - echo "# Automatically dahdi-autoconf generated file ($(date))." >> "${tfile}" - echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >> "${tfile}" - - while read LINE <&3; do - case "$LINE" in - [[]*[]]) - [ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}" - span="${LINE%?}" - span="${span#?}" - ;; - type=*|manufacturer=*|devicetype=*|basechan=*|name=*) - eval "${LINE%%=*}='${LINE#*=}'" - ;; - location=*) - eval "${LINE%%=*}='${LINE#*=}'" - if [ "${location}" == "${plocation}" ]; then - (( ++isdnport )) - else - plocation="${location}" - isdnport=1 - fi - ;; - port=*) - # For analog cards only. - aport="${LINE#*=}"; aport="${aport%,*}" - atype="${LINE#*,}" - [ "${aport}" -eq "${basechan}" ] && echo -e "\n# ${manufacturer} ${devicetype} (${name})" >> "${tfile}" - case "${atype}" in - FXO) - dahdi_gen_fxo_config $aport >> "${tfile}" - ;; - FXS) - dahdi_gen_fxs_config $aport >> "${tfile}" - ;; - esac - ;; - esac - done - - [ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}" - - echo -e "\nloadzone = ${DAHDI_ZONE}\ndefaultzone = ${DAHDI_ZONE}\n## END OF AUTOCONFIGURED FILE ##" >> "${tfile}" - - exec 3<&- - - rm -f "${sfile}" - mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck - mv "${tfile}" /etc/dahdi/system.conf -} - -start() { - dahdi_load_modules - - if [ ! -r /dev/dahdi/ctl ]; then - eerror "No DAHDI compatible cards detected." - return 1 - fi - - ebegin "Generating DAHDI Configuration" - dahdi_gen_config - eend $? -} - -stop() { - dahdi_module_unload dahdi -} diff --git a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch b/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch deleted file mode 100644 index 3df8f166a56c..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr dahdi-tools-2.8.0.ORIG/blacklist.sample dahdi-tools-2.8.0/blacklist.sample ---- dahdi-tools-2.8.0/blacklist.sample.ORIG 2009-04-02 10:34:32.000000000 +0200 -+++ dahdi-tools-2.8.0/blacklist.sample 2010-05-24 20:46:05.000000000 +0200 -@@ -14,6 +14,8 @@ - blacklist wcb4xxp - blacklist wcaxx - blacklist wcte43x -+blacklist wcopenpci -+blacklist zaphfc - - # Some mISDN drivers may try to attach to cards supported by DAHDI. If you - # have a card which is *not* supported by DAHDI but supported by one of the diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch deleted file mode 100644 index 37d1402c404f..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/./dahdi-tools-3.1.0/xpp/hexfile.h.o b/./dahdi-tools-3.1.0/xpp/hexfile.h -index 33ff50d..3d03f98 100644 ---- a/xpp/hexfile.h -+++ b/xpp/hexfile.h -@@ -70,7 +70,9 @@ struct hexdata { - }; - - --__BEGIN_DECLS -+#ifdef __cpluplus -+extern "C" { -+#endif - - typedef void (*parse_hexfile_report_func_t)(int level, const char *msg, ...) - #ifdef __GNUC__ -@@ -86,6 +88,9 @@ int dump_hexfile2(struct hexdata *hexdata, const char *outfile, uint8_t maxwidth - void dump_binary(struct hexdata *hexdata, const char *outfile); - void gen_hexline(const uint8_t *data, uint16_t addr, size_t len, FILE *output); - int bsd_checksum(struct hexdata *hexdata); --__END_DECLS -+ -+#ifdef __cpluplus -+} -+#endif - - #endif diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch deleted file mode 100644 index b222a85d8cb9..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/configure.ac 2020-03-28 22:28:35.614340050 +0200 -+++ b/configure.ac 2020-03-28 22:28:55.084181570 +0200 -@@ -161,6 +161,7 @@ - # Checks for header files. - AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h]) - AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) -+AC_CHECK_HEADERS([execinfo.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_INLINE ---- a/xpp/xtalk/debug.c 2020-03-28 22:41:43.507810560 +0200 -+++ b/xpp/xtalk/debug.c 2020-03-28 22:41:10.538087608 +0200 -@@ -27,8 +27,10 @@ - #include <stdarg.h> - #include <syslog.h> --#include <execinfo.h> - #include <xtalk/debug.h> - #include <autoconfig.h> -+#ifdef HAVE_EXECINFO_H -+#include <execinfo.h> -+#endif - - int verbose = LOG_INFO; - int debug_mask; -@@ -61,6 +63,7 @@ - /* from glibc info(1) */ - void print_backtrace(FILE *fp) - { -+#ifdef HAVE_EXECINFO_H - void *array[10]; - size_t size; - char **strings; -@@ -71,4 +74,7 @@ - for (i = 0; i < size; i++) - fprintf(fp, "%s\n", strings[i]); - free(strings); -+#else -+ fprintf(fp, "backtrace information only available if execinfo.h is available.\n"); -+#endif - } diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch deleted file mode 100644 index 3ca5bd2aa09b..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c -index fdb34f1..8fb3687 100644 ---- a/xpp/mpptalk.c -+++ b/xpp/mpptalk.c -@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) { - MEMBER(MPP, TWS_PORT_GET_REPLY); - MEMBER(MPP, TWS_PWR_GET); - MEMBER(MPP, TWS_PWR_GET_REPLY); --} PACKED members; -+} PACKED; - - /* - * Statuses -diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c -index 49e47d5..251a502 100644 ---- a/xpp/xtalk/xtalk_raw.c -+++ b/xpp/xtalk/xtalk_raw.c -@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK, - - union XTALK_PDATA(XTALK) { - MEMBER(XTALK, ACK); --} PACKED members; -+} PACKED; - - const struct xtalk_protocol xtalk_raw_proto = { - .name = "XTALK-RAW", -diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c -index 18a5cad..ffa79d2 100644 ---- a/xpp/xtalk/xtalk_sync.c -+++ b/xpp/xtalk/xtalk_sync.c -@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) { - MEMBER(XTALK, ACK); - MEMBER(XTALK, PROTO_GET); - MEMBER(XTALK, PROTO_GET_REPLY); --} PACKED members; -+} PACKED; - - const struct xtalk_protocol xtalk_sync_proto = { - .name = "XTALK-SYNC", diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch deleted file mode 100644 index 9575966435e7..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- dahdi-tools-3.1.0/Makefile.am.o 2020-01-09 12:23:37.943059915 +0200 -+++ dahdi-tools-3.1.0/Makefile.am 2020-01-09 12:23:58.863036654 +0200 -@@ -1,7 +1,7 @@ - ACLOCAL_AMFLAGS = -I m4 - - LEGACY_MAKE = \ -- $(MAKE) -f $(srcdir)/Makefile.legacy \ -+ +$(MAKE) -f $(srcdir)/Makefile.legacy \ - top_srcdir=$(top_srcdir) \ - srcdir=$(srcdir) - -@@ -131,7 +131,6 @@ - install -m644 init.conf.sample $(DESTDIR)$(dahdiconfdir)/init.conf - install -m644 blacklist.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi-blacklist.conf - install -m644 modprobe.conf.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi.conf -- $(LEGACY_MAKE) config - - dahdiconfdir = @sysconfdir@/dahdi - dahdiconf_DATA = \ diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch deleted file mode 100644 index 75f6c1a93eee..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch +++ /dev/null @@ -1,61 +0,0 @@ -From bc45d96413902e0ded093908bc3a02410d799e24 Mon Sep 17 00:00:00 2001 -From: Jaco Kroon <jaco@uls.co.za> -Date: Thu, 11 May 2023 17:28:02 +0200 -Subject: [PATCH] Fix compilation with LTO. - ---- - xpp/echo_loader.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xpp/echo_loader.c b/xpp/echo_loader.c -index 827f6ef..adfb1f4 100644 ---- a/xpp/echo_loader.c -+++ b/xpp/echo_loader.c -@@ -409,7 +409,7 @@ UINT32 Oct6100UserGetTime(tPOCT6100_GET_TIME f_pTime) - struct timeval tv; - unsigned long long total_usecs; - unsigned int mask = ~0; -- -+ - gettimeofday(&tv, 0); - total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) + - (((unsigned long long)(tv.tv_usec))); -@@ -564,7 +564,7 @@ UINT32 Oct6100UserDriverReadBurstApi(tPOCT6100_READ_BURST_PARAMS f_pBurstParams) - return cOCT6100_ERR_OK; - } - --inline int get_ver(struct astribank *astribank) -+static inline int get_ver(struct astribank *astribank) - { - return spi_send(astribank, 0, 0, 1, 1); - } -@@ -647,7 +647,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe - /* General parameters */ - OpenChip.fEnableChannelRecording = TRUE; - -- /* Chip ID.*/ -+ /* Chip ID.*/ - OpenChip.ulUserChipId = 1; - - /* Set the max number of accesses to 1024 to speed things up */ -@@ -775,7 +775,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe - ChannelOpen.VqeConfig.fRinDcOffsetRemoval = TRUE; - ChannelOpen.VqeConfig.fSinDcOffsetRemoval = TRUE; - -- ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; -+ ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; - /* cOCT6100_COMFORT_NOISE_NORMAL - cOCT6100_COMFORT_NOISE_EXTENDED, - cOCT6100_COMFORT_NOISE_OFF, -@@ -824,7 +824,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe - ChannelOpen.VqeConfig.fRinDcOffsetRemoval = TRUE; - ChannelOpen.VqeConfig.fSinDcOffsetRemoval = TRUE; - -- ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; -+ ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; - /* cOCT6100_COMFORT_NOISE_NORMAL - cOCT6100_COMFORT_NOISE_EXTENDED, - cOCT6100_COMFORT_NOISE_OFF, --- -2.39.3 - diff --git a/net-misc/dahdi-tools/files/dahdi.init2 b/net-misc/dahdi-tools/files/dahdi.init2 deleted file mode 100644 index d3abf3c4e61e..000000000000 --- a/net-misc/dahdi-tools/files/dahdi.init2 +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -checkconfig() { - if [ ! -f /etc/dahdi/system.conf ]; then - eerror "/etc/dahdi/system.conf not found. Nothing to do." - return 1 - fi - - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting DAHDI" - /usr/sbin/dahdi_cfg - eend $? - - if [ $? -eq 0 -a -r /etc/fxotune.conf ]; then - ebegin "Loading DAHDI fxotune.conf" - /usr/sbin/fxotune -s - eend $? - fi -} - -stop() { - ebegin "Stopping DAHDI" - /usr/sbin/dahdi_cfg -s - eend -} diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml deleted file mode 100644 index 41312228e19d..000000000000 --- a/net-misc/dahdi-tools/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>jaco@uls.co.za</email> - <name>Jaco Kroon</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="ppp">Enables PPP/DAHDIRAS support</flag> - </use> - <upstream> - <remote-id type="github">asterisk/dahdi-tools</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest deleted file mode 100644 index 856dd7fb9c7e..000000000000 --- a/net-misc/dahdi/Manifest +++ /dev/null @@ -1,25 +0,0 @@ -DIST dahdi-fw-a4a-a0017.tar.gz 181429 BLAKE2B fb1285eb7d06c8bca5c91b421c408c7f494c05e4ccb89eb0703457059efef78f248a471e0d5ca03fdca97882531eb3b7e0c52e3231b7ef7a90b58c33882772db SHA512 e42cb83e05edb359949acd888a743c665d228cd3b9424fc8f3b60676d6799f4455e65cc269d1e2ac0e3bb5613607dad4fb37c433067832fb68b15bfddf6f4a2a -DIST dahdi-fw-a4b-d001e.tar.gz 239591 BLAKE2B f09c2ee17c9d14b95d5bc90de84cdb57a49c33d44e21c66b8ea29908d9ac58b979a0d0eb3cae80efc5e96de19226a850b2ca36aa2b462af66e02043bc8c3def1 SHA512 ab72cf6d469e44f3a8b9dda5e7acae9ae435b6f12b1491079155b8df4c9cf83aed48ccbda4acb4a9943dd6228846f5b82998a0bf575d454ac3b81b72c585d58c -DIST dahdi-fw-a8a-1d0017.tar.gz 181958 BLAKE2B f7955ba62a94a1edd0c859e71c4f820ab789e098e2fd2c48e3fb453fee6ca5b056fe4144f83bd926f61e8f48fa223b84ce6912bf4a384ee9068fbe63538c1047 SHA512 2f80d24170f0efdebc318f238abb04664dfa97e3ca47a330b5a5e1d695c8ba5c535ad1302bf338667912b46cd5b4bbb76ab5bdbe6e736edd4f0e9239d818d05d -DIST dahdi-fw-a8b-1f001e.tar.gz 236508 BLAKE2B 830cc01cc14eca0367e92e5d6dc10b019e42072da5a69b18095c52633d7dcddade920fd2cf2c43f101effc2319c43a803f433faad244e096fc9854d3d652da7a SHA512 68041e5cb53d8ff6beb9f667abca5a5a1c752357c224f5c7cfcb81732bd417671cf6dc03b5c5bafd6a0864f6c5451165c0f26908b0f40ed3408961f448f2a9a4 -DIST dahdi-fw-hx8-2.06.tar.gz 29252 BLAKE2B f3c635108032ff06b51a140f2f665a6a41638eb027d88c33822da9d47fe907eecfaab937ce6199f0d9eeeafbd36919366e039b0bc1a1be605c339055a8b6843b SHA512 d113d2bd10d5a851087e04fadb3427ec07634960d47e2292320f0d195c65075fb24ab173e0985c257eaf8e46f595f29af034fb380382cdbff7bfbc7381dff4ae -DIST dahdi-fw-oct6114-032-1.05.01.tar.gz 165866 BLAKE2B 527d49f66924e91b6689cf905f365804be02707476d425e563db763bb158431f0e8bccc8ed38cbe3f4ec91747e53769ab5526cb3949218fc3b8041839796fcbc SHA512 ec47a7aac6a6abc73fe0c7ec3b31eebc868c516aeb1bb584f145f36c28abec21afa12dcec554bceb914c058c83255e32fb8d967ef4d8a5d0161b6053af464a24 -DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 BLAKE2B 9b21e9a5a9bf85ac18db67b14a457676d32958e1a2316fbf33fb802c1393ef2759a3637a80eafb77e2c496002c76f49705ac9eb2d427b8e079503a31bf930893 SHA512 6dcc6a3413c6c0561b08c4949a746cbebc58b8a068481f568007fdc663cfc6ef90417fbd81398055a781367e7db57f0a694745cddcd3c697a4f857be15981549 -DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 BLAKE2B 8621538d16e028eb2de64fa61c7475874525a302af5603f07a8a948a3c2cc1bd776feeeaf51c4d0c2edc4577156addc27905ecb06c9db6f43400258905cad6bf SHA512 17e83aa57ea8e9d3353027184adb48f664b177a528006d67112a53127fcb19c1011d4f44c2980ab77d27b3bf7f7a74d44f15aaf115e05fa3df8e16d3c30fc267 -DIST dahdi-fw-oct6114-256-1.05.01.tar.gz 171685 BLAKE2B 2f831da3043c6c73a4a38085d1c2b685acae94d92deba776e47a4d292f1ae65e5686ec3e8c73f0672ea8f390404717662f106b084083af4a8635447cd2f539fe SHA512 e447fe8d24963892339d895450cf7a04da3bdcf1de22630dea68119dbd9da84878478adf8ce0e5ef859e6d677c2a051aa6272de4e0692f5ce0e8b5d0fba4096b -DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 BLAKE2B b16a2c77dc0222851af25a11e64e40f2648ec870444373ad2310b8b5157b2a2d5a4a4bf2850551758080e87f43371ff55a11f5f381bd08b060f5062f0faa7587 SHA512 88a986d22ead41a3dabc320e13f7a3e6e6ab9e2752aca2cc940ad9c1ec570d4f01e82c46d0ec1b6dc1a87a1df7e94cfb8aa638b44b4fe2254af8962f1fdbac86 -DIST dahdi-fw-te133-7a001e.tar.gz 242987 BLAKE2B f6e5fedc742061b0ee26b33c20cb16a7a5efd68de827963dbb5fe3ddeed5bb491643e20818d39c8d0876ab3971c339ce43f03e97af3aff2286b70e020d2e05a4 SHA512 acd273bcf9b8e009b986e2c9f068121fad8b9cf8f500b79fd5456225ec4ef81d22f32960246a1e9b49ca7f47efb2f7d346c8727fe3b7b80c700d2dc609784acc -DIST dahdi-fw-te134-780017.tar.gz 185478 BLAKE2B c301362e7433f9c3c9991ae50c0536ad4315fe966dced38fd2be7a9c3b01ce4829d4ecb8ef9756f4ad05b507bb4b6739a861264eb6975512ce8aa5b89b1ca14c SHA512 b6f93ff060512b15bb8462805d8f8a435e56a83be362770d2c3b39b876d2171c5e1e6c1bc42c893eaa382ccd2f19534536612618c4ef4ff8c25976cf3719d4fb -DIST dahdi-fw-te435-13001e.tar.gz 238504 BLAKE2B c348a1e0d187ac4008254c78680dcd2b2ccce3f1af92bced190936c8ace88973e7d6854ed6de0480869ccd687d398958193ad90a648c8fe90464c3d1b5ddf974 SHA512 1cd5c191db62f87f87c9f6913bcbc3ed9f3d77a51578cd0bc5fdb9d17e128bcaf66d04c5a9e6417e9d7543fc8f18b6f635f0e8c1cb1bc19b11bc8ddffaa6be08 -DIST dahdi-fw-te436-10017.tar.gz 210601 BLAKE2B 8aceaa093b457a374db89599779315458a91af3d6f58e74a35ee08d3c91a556b64f78244a9e3e05d9bc8b200be2b3be83d159eb85681f3afb20329f16b2f2445 SHA512 56e8a26a737ac45e137324b635e5f489fe05a5939324af038f881b64ddabf486eb3830ff0ada1561ffedb3d6bc8338b11f4dccbc9b2ca9e00cd2bcc85abf83c0 -DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43dd21170fc16669de064e92615e5b049cf5cdf49f9c9d03d9e795172eafad83cd3b0636fb1491df5612358757a2e9d5 SHA512 3189df3dd680353d5520773ac8ea7fe638ea05e3c656379c1a245bd3ab8a6ae0c8a1c22c2068be9c758996e5993b0d19376b159b4e868ebc3d817dcce3b9aec7 -DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3 -DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047 -DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 -DIST dahdi-linux-3.2.0.tar.gz 1617958 BLAKE2B 1a35ba69719e7cebf7cf471f901a3280e1558b8e8e4f615fcc974a08a83f62e71ee653b47f3a09e85e96a0447e4516996ef254497746492fe50eebef5515e217 SHA512 cb4b06d5a83aae7ce54049137d989fa6275367debc77a1df64cc36ba1bda08a058ea92f01bb873bcd83c3c7d58ff4c5da42c67bbbe8a02b8f4f0e12348c4a072 -DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157 -DIST gentoo-dahdi-patches-3.2.0.tar.bz2 6947 BLAKE2B 8e4d2245d966a14c6eec7045c74788decc52c5dec562e7d09670766f169e6890a7fae2bf245ab198276780210564e891fe5d16b6e0d44ff5be876f218c23f2fb SHA512 c47a092d17abb0070cebfae540363a01bb8a9927e05524c3d50e76d69249115b3caf83d436469153b7a519e6c6952baab14d6bf898a440373f90d02359fbb4ae -DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de -DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762 -DIST gentoo-dahdi-sources-3.2.0.tar.bz2 87595 BLAKE2B 18a2f007581ac653e0a1a50c77b36b0b2065e1dfd5c32ffe754cbb66b7aaf6df52dc4f856f8a9e0440f6ecf193c56e7506db24ab2b0ede43d9a1185ef84e0036 SHA512 4f13597914427f2e6cea08c6dce9e9bedf5d35a62c8d5dc545e8fb1268ffeb5dece84a27c2a50a8d55a7b8eda1d4fe2bfe18465b0492b45a3684170c5a600072 -DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild deleted file mode 100644 index 5dc1b0089be5..000000000000 --- a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-mod linux-info toolchain-funcs - -MY_P="${P/dahdi/dahdi-linux}" -JNET=1.0.14 -GENTOO=3.1.0-r3 -S="${WORKDIR}/${MY_P}" - -JNET_DRIVERS="cwain qozap ztgsm" - -DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz - https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz - https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2 - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -IUSE="flash oslec" - -PATCHES=( "${WORKDIR}/dahdi-patchset" ) - -CONFIG_CHECK="MODULES PCI ~CRC_CCITT" - -pkg_pretend() { - use oslec && CONFIG_CHECK+=" ECHO" - check_extra_config -} - -src_unpack() { - unpack ${A} - # Copy the firmware tarballs over, the makefile will try and download them otherwise - for file in ${A} ; do - [[ "${file}" = dahdi-fw* ]] || continue - cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || - die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" - done - # But without the .bin's it'll still fall over and die, so copy those too. - mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || - die "Error moving firmware files into the right folders." - - for drv in ${JNET_DRIVERS}; do - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.c from jnet to DAHDI." - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.h from jnet to DAHDI." - done -} - -src_prepare() { - if use flash; then - sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || - die "Failed to define FXSFLASH" - sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ - include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" - fi - if use oslec; then - sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ - drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." - fi - default -} - -src_compile() { - unset ARCH - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" all -} - -src_install() { - einfo "Installing kernel module" - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" install - - # Remove the blank "version" files (these files are all empty, and root owned). - find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" - - # If the kernel sources have a System.map, and there a suitable depmod - # available (seemingly when we're not cross-compiling), then the kernel - # sources depmod kicks in. Remove the files caused by that. - find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" -} diff --git a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild deleted file mode 100644 index 05ae21da55a6..000000000000 --- a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-mod toolchain-funcs - -MY_P="${P/dahdi/dahdi-linux}" -JNET=1.0.14 -GENTOO_PATCHVERSION=3.1.0-r4 -GENTOO_SOURCEVERSION=3.1.0-r4 -S="${WORKDIR}/${MY_P}" - -JNET_DRIVERS="cwain qozap ztgsm" - -DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz - https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz - https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2 - https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2 - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="flash oslec" - -PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" ) - -CONFIG_CHECK="MODULES PCI ~CRC_CCITT" - -pkg_setup() { - use oslec && CONFIG_CHECK+=" ECHO" - linux-mod_pkg_setup -} - -src_unpack() { - local file drv - - unpack ${A} - # Copy the firmware tarballs over, the makefile will try and download them otherwise - for file in ${A} ; do - [[ "${file}" = dahdi-fw* ]] || continue - cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || - die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" - done - # But without the .bin's it'll still fall over and die, so copy those too. - mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || - die "Error moving firmware files into the right folders." - - for drv in ${JNET_DRIVERS}; do - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.c from jnet to DAHDI." - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.h from jnet to DAHDI." - done - - # Find the stuff from gentoo-sources (ie, modules that has been removed by - # upstream and we're re-adding). - DAHDI_GENTOO_MODULES="" - for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do - [[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/" - [[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o" - mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed." - done -} - -src_prepare() { - if use flash; then - sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || - die "Failed to define FXSFLASH" - sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ - include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" - fi - if use oslec; then - sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ - drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." - fi - default -} - -src_compile() { - unset ARCH - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" all -} - -src_install() { - einfo "Installing kernel module" - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \ - LDFLAGS="$(raw-ldflags)" install - - # Remove the blank "version" files (these files are all empty, and root owned). - find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" - - # If the kernel sources have a System.map, and there a suitable depmod - # available (seemingly when we're not cross-compiling), then the kernel - # sources depmod kicks in. Remove the files caused by that. - find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" -} diff --git a/net-misc/dahdi/dahdi-3.2.0.ebuild b/net-misc/dahdi/dahdi-3.2.0.ebuild deleted file mode 100644 index 8b59341edcee..000000000000 --- a/net-misc/dahdi/dahdi-3.2.0.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic linux-mod toolchain-funcs - -MY_P="${P/dahdi/dahdi-linux}" -JNET=1.0.14 -GENTOO_PATCHVERSION=3.2.0 -GENTOO_SOURCEVERSION=3.2.0 -S="${WORKDIR}/${MY_P}" - -JNET_DRIVERS="cwain qozap ztgsm" - -DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz - https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz - https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2 - https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2 - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="flash oslec" - -PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" ) - -CONFIG_CHECK="MODULES PCI ~CRC_CCITT" - -pkg_setup() { - use oslec && CONFIG_CHECK+=" ECHO" - linux-mod_pkg_setup -} - -src_unpack() { - local file drv - - unpack ${A} - # Copy the firmware tarballs over, the makefile will try and download them otherwise - for file in ${A} ; do - [[ "${file}" = dahdi-fw* ]] || continue - cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || - die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" - done - # But without the .bin's it'll still fall over and die, so copy those too. - mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || - die "Error moving firmware files into the right folders." - - for drv in ${JNET_DRIVERS}; do - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.c from jnet to DAHDI." - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.h from jnet to DAHDI." - done - - # Find the stuff from gentoo-sources (ie, modules that has been removed by - # upstream and we're re-adding). - DAHDI_GENTOO_MODULES="" - for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do - [[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/" - [[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o" - mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed." - done -} - -src_prepare() { - if use flash; then - sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || - die "Failed to define FXSFLASH" - sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ - include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" - fi - if use oslec; then - sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ - drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." - fi - default -} - -src_compile() { - unset ARCH - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" all -} - -src_install() { - einfo "Installing kernel module" - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \ - LDFLAGS="$(raw-ldflags)" install - - # Remove the blank "version" files (these files are all empty, and root owned). - find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" - - # If the kernel sources have a System.map, and there a suitable depmod - # available (seemingly when we're not cross-compiling), then the kernel - # sources depmod kicks in. Remove the files caused by that. - find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" -} diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml deleted file mode 100644 index 2bd89c9cbc5a..000000000000 --- a/net-misc/dahdi/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>jaco@uls.co.za</email> - <name>Jaco Kroon</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="flash">Support (short) flash on FXS</flag> - <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag> - </use> - <upstream> - <remote-id type="github">asterisk/dahdi-linux</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 565f763ef590..47b71db74f8f 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -1 +1,2 @@ DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154 +DIST dhcp-4.4.3-patches.tar.xz 15276 BLAKE2B 4750833f986eccdc60b63de55f0b0633039806d75e1bbb79ea6974990399f2ec33836fd22ec3a0981aaeffc3fcfd914deff96d139f4ea3c2ad1b9010ec737d06 SHA512 c8071f48e4074a7a83e74706868a782c7dc4bcb6df4b9035411e419a95bf90de66ece2b2aacc8f8f3ca517287599cb178704402ff276a4620c941733ce03c57b diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r6.ebuild index 48fb12a0f5d6..82f6478828a7 100644 --- a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r6.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=7 +EAPI=8 inherit systemd toolchain-funcs flag-o-matic tmpfiles @@ -13,8 +13,12 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" HOMEPAGE="https://www.isc.org/dhcp" -SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz - ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" +SRC_URI=" + https://downloads.isc.org/isc/dhcp/${MY_P}.tar.gz + https://downloads.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/dhcp-4.4.3-patches.tar.xz +" +S="${WORKDIR}/${MY_P}" LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" @@ -23,8 +27,8 @@ IUSE="+client ipv6 ldap selinux +server ssl vim-syntax" BDEPEND=" acct-group/dhcp - acct-user/dhcp" - + acct-user/dhcp +" DEPEND=" sys-libs/zlib:= client? ( @@ -41,44 +45,46 @@ RDEPEND=" ${BDEPEND} ${DEPEND} selinux? ( sec-policy/selinux-dhcp ) - vim-syntax? ( app-vim/dhcpd-syntax )" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - # handle local bind hell - cd "${S}"/bind - unpack ./bind.tar.gz -} + vim-syntax? ( app-vim/dhcpd-syntax ) +" PATCHES=( # Gentoo patches - these will probably never be accepted upstream # Fix some permission issues - "${FILESDIR}/${PN}-4.4.3-fix-perms.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-fix-perms.patch" # Enable dhclient to equery NTP servers - "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch" - "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-ntp.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-resolvconf.patch" # Enable dhclient to get extra configuration from stdin - "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-stdin-conf.patch" # bug #265531 - "${FILESDIR}/${PN}-4.4.3-nogateway.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-nogateway.patch" # bug #296921 - "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-quieter-ping.patch" # bug #437108 - "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-always-accept-4.patch" # bug #480636 - "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-iproute2-path.patch" # bug #471142 - "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-bindtodevice-inet6.patch" # bug #559832 - "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-ldap-ipv6-client-id.patch" + # bug #908986 + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-infiniband.patch" # Possible upstream candidates + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-configure-clang16.patch" ) +src_unpack() { + unpack ${A} + # handle local bind hell + cd "${S}"/bind || die + unpack ./bind.tar.gz +} + src_prepare() { default @@ -133,7 +139,7 @@ src_prepare() { binddir=${binddir} GMAKE=${MAKE:-gmake} EOF - eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch + eapply -p2 "${WORKDIR}"/dhcp-4.4.3-patches/${PN}-4.4.3-bind-disable.patch # Only use the relevant subdirs now that ISC #removed the lib/export structure in bind. sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \ @@ -173,9 +179,7 @@ src_configure() { append-flags -fno-strict-aliasing # bug #720806, bug #801592 - if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then - append-libs -latomic - fi + append-atomic-flags local myeconfargs=( --enable-paranoia @@ -205,11 +209,14 @@ src_compile() { emake -C bind/bind-*/lib install # then build standard dhcp code emake AR="$(tc-getAR)" + emake -C keama AR="$(tc-getAR)" } src_install() { default + emake -C keama DESTDIR="${D}" install + dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} docinto html dodoc doc/References.html diff --git a/net-misc/dhcp/files/dhcpd.conf2 b/net-misc/dhcp/files/dhcpd.conf2 index 5cd2eeca3f71..ac173f8a3576 100644 --- a/net-misc/dhcp/files/dhcpd.conf2 +++ b/net-misc/dhcp/files/dhcpd.conf2 @@ -16,7 +16,9 @@ # All file paths below are relative to the chroot. # You can specify a different chroot directory but MAKE SURE it's empty. -# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf +# Specify a configuration file - the default is based on the service name, +# so dhcpd would use /etc/dhcp/dhcpd.conf and dhcpd.foo would use +# /etc/dhcp/dhcpd.foo.conf # DHCPD_CONF="/etc/dhcp/dhcpd.conf" # Configure which interface or interfaces to for dhcpd to listen on. diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5 index 66b29cd3bb00..8e05625e6345 100644 --- a/net-misc/dhcp/files/dhcpd.init5 +++ b/net-misc/dhcp/files/dhcpd.init5 @@ -1,8 +1,11 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +description="ISC DHCP server" + extra_commands="configtest" +description_configtest="Test the syntax of the configuration file" : ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf} diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild index b29581f35d00..52148a4f3933 100644 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/NetworkConfiguration/dhcpcd-ui/releases/download/v${ LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug gtk libnotify ncurses qt5" # Qt handles notifications separately, no need for libnotify there diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 1cc1689a8ca7..f2059325c3bb 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,4 +1,3 @@ -DIST dhcpcd-10.0.3.tar.xz 268872 BLAKE2B c063fbb44b4a6928ffd84c109c1ed8ae0345c81b732fc75ce1c1aebc51c190fa512de9822c1c6865794db126f4ad2aceef97c4da28d6922cca082b1aeedb4760 SHA512 f4437e9aa094ab38f077c455b012f46cc84a39f97a19eae896a0954f24f2064e91407dc7f7be7fae00faf3455a8e50695e94c406f476f88a61b980169a778560 -DIST dhcpcd-10.0.4.tar.xz 269212 BLAKE2B 770ee398eccff20cd4a37f89b841f8d580d9a42b456d93673ab3bf6ddf1ed0e49feda47ea8c1206a8a8582bccde80f45c3efbf2e1d0e493b06f04e2c6df876af SHA512 8af26c4a42ce63e9cae72de68774807b8739aabd19cc2a0260148f3baa25c587bf34a5a0b80239b54d8ab9b79661744e61b0e316d2c510c4da65615268d3e8cf -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-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee diff --git a/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild deleted file mode 100644 index a320e843768a..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.4.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.3.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild index f311304756fa..96731da4de1c 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.6-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 @@ -34,6 +34,22 @@ RDEPEND=" ) " +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 + "${FILESDIR}"/${PN}-10.0.6-crash.patch +) + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild index 437899bb6d47..492b2eca8327 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.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? ( @@ -34,8 +37,25 @@ RDEPEND=" ) " +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 + # These may exist on some glibc versions, but the checks fail due to + # -Werror / undefined reference no matter what. bug #924825 + arc4random + arc4random_uniform +) + PATCHES=( - "${FILESDIR}"/10.0.5 + "${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() { diff --git a/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild index a320e843768a..6a9034364ee6 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.8.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 @@ -15,7 +15,7 @@ else 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" + 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" @@ -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? ( @@ -34,6 +37,25 @@ RDEPEND=" ) " +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 + # These may exist on some glibc versions, but the checks fail due to + # -Werror / undefined reference no matter what. bug #924825 + arc4random + arc4random_uniform +) + +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/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index a320e843768a..56307d8d8f09 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? ( @@ -34,6 +37,25 @@ RDEPEND=" ) " +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 + # These may exist on some glibc versions, but the checks fail due to + # -Werror / undefined reference no matter what. bug #924825 + arc4random + arc4random_uniform +) + +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-crash.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch new file mode 100644 index 000000000000..5b61e3ca37ef --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch @@ -0,0 +1,46 @@ +https://github.com/NetworkConfiguration/dhcpcd/issues/179 +https://github.com/NetworkConfiguration/dhcpcd/issues/283 +https://bugzilla.redhat.com/2262996 +https://github.com/NetworkConfiguration/dhcpcd/commit/727c78f503d456875e2a3cee7609288b537d9d25 + +From 727c78f503d456875e2a3cee7609288b537d9d25 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com> +Date: Fri, 16 Feb 2024 17:15:35 +0100 +Subject: [PATCH] Move dhcp(v4) packet size check earlier (#295) + +dhcp_handlebootp handled zero sized packets correctly, but +dhcp_redirect_dhcp did not have such protection. Move size check before +both of them. Size when called from dhcp_packet is checked by +is_packet_udp_bootp call. Only dhcp_recvmsg needs earlier checking to be +added. + +Fixes #283 +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -3532,12 +3532,6 @@ dhcp_handlebootp(struct interface *ifp, struct bootp *bootp, size_t len, + { + size_t v; + +- if (len < offsetof(struct bootp, vend)) { +- logerrx("%s: truncated packet (%zu) from %s", +- ifp->name, len, inet_ntoa(*from)); +- return; +- } +- + /* Unlikely, but appeases sanitizers. */ + if (len > FRAMELEN_MAX) { + logerrx("%s: packet exceeded frame length (%zu) from %s", +@@ -3670,6 +3664,13 @@ dhcp_recvmsg(struct dhcpcd_ctx *ctx, struct msghdr *msg) + logerr(__func__); + return; + } ++ ++ if (iov->iov_len < offsetof(struct bootp, vend)) { ++ logerrx("%s: truncated packet (%zu) from %s", ++ ifp->name, iov->iov_len, inet_ntoa(from->sin_addr)); ++ return; ++ } ++ + state = D_CSTATE(ifp); + if (state == NULL) { + /* Try re-directing it to another interface. */ 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/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch new file mode 100644 index 000000000000..6457368f1150 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/920652#c2 +https://github.com/NetworkConfiguration/dhcpcd/commit/8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 + +From 8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Sun, 24 Dec 2023 12:07:25 +0000 +Subject: [PATCH] DHCP: DECLINE address on ARP defend failure + +Also, drop the lease. +This should get us a new address from the DHCP server when we +re-enter DISCOVER to avoid looping on the same address and fail +again. +--- + src/dhcp.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/dhcp.c b/src/dhcp.c +index 014ce6cf..a58e1db2 100644 +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -1944,7 +1944,11 @@ dhcp_expire(void *arg) + static void + dhcp_decline(struct interface *ifp) + { ++ struct dhcp_state *state = D_STATE(ifp); + ++ // Set the expired state so we send over BPF as this could be ++ // an address defence failure. ++ state->added |= STATE_EXPIRED; + send_message(ifp, DHCP_DECLINE, NULL); + } + #endif +@@ -2098,8 +2102,12 @@ static void + dhcp_arp_defend_failed(struct arp_state *astate) + { + struct interface *ifp = astate->iface; ++ struct dhcp_state *state = D_STATE(ifp); + ++ if (!(ifp->options->options & (DHCPCD_INFORM | DHCPCD_STATIC))) ++ dhcp_decline(ifp); + dhcp_drop(ifp, "EXPIRED"); ++ dhcp_unlink(ifp->ctx, state->leasefile); + dhcp_start1(ifp); + } + #endif + diff --git a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild index b6fa854d515d..fb3201a46045 100644 --- a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild +++ b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild @@ -33,7 +33,9 @@ src_configure() { # Uses removed 'register' keyword append-cxxflags -std=c++14 - econf $(use_enable resolvconf) + econf \ + --cache-file="${S}"/config.cache \ + $(use_enable resolvconf) } src_compile() { diff --git a/net-misc/downloader-cli/Manifest b/net-misc/downloader-cli/Manifest index 68d573893923..c8987c2f78c8 100644 --- a/net-misc/downloader-cli/Manifest +++ b/net-misc/downloader-cli/Manifest @@ -1,2 +1 @@ -DIST downloader_cli-0.3.3.tar.gz 10881 BLAKE2B 489e49d679be3570ee348ec73091cc3458953d4b37c552a9a417af2421e9c032624214300418ff8c93decda6bad7622e6208a08dc216f40d1195f849dc11d0d3 SHA512 4210cc3c09f4c9d07c3ea7335b6ea356393f539ef26e3a231b3278359e853165b8145c1f6186b657e2cee02b515748f7ffc87966cc30e082b0d2b282b9557c72 DIST downloader_cli-0.3.4.tar.gz 14479 BLAKE2B d45ec6399b6ccd76141a85440faeac040b11565c1d7db6316c23026008238e11601346ff433ec2f18516fef2f34f2e87d94460b64bfe875569c6da236e4ba63e SHA512 ace252bc6129b463c644ef7c34d07cd37759030fc4b4b853e049a2377226cdc73a6661f4e8ca7721b7af11f9daf548c81f25f73fde405e633091d614a05ed4f6 diff --git a/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild b/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild deleted file mode 100644 index 12f30759df62..000000000000 --- a/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Simple downloader with an customizable progressbar" -HOMEPAGE=" - https://github.com/deepjyoti30/downloader-cli/ - https://pypi.org/project/downloader-cli/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]" diff --git a/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild b/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild index d380311907f1..75b02a2b00c8 100644 --- a/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild +++ b/net-misc/downloader-cli/downloader-cli-0.3.4.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 @@ -9,13 +9,20 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi DESCRIPTION="Simple downloader with an customizable progressbar" -HOMEPAGE=" - https://github.com/deepjyoti30/downloader-cli/ - https://pypi.org/project/downloader-cli/ -" +HOMEPAGE="https://github.com/deepjyoti30/downloader-cli/ + https://pypi.org/project/downloader-cli/" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + dev-python/urllib3[${PYTHON_USEDEP}] +" + +EPYTEST_DESELECT=( + tests/test_download.py::test__preprocess_conn + tests/test_download.py::test_file_integrity +) -RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]" +distutils_enable_tests pytest diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index c762d488c638..f3d702c62cb0 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -1,2 +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.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.85.ebuild b/net-misc/dropbear/dropbear-2024.85.ebuild new file mode 100644 index 000000000000..257cdc04ca87 --- /dev/null +++ b/net-misc/dropbear/dropbear-2024.85.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc +inherit pam python-any-r1 savedconfig verify-sig + +DESCRIPTION="Small SSH 2 client/server designed for small memory environments" +HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html" +SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 + https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( + https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc + https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc + )" + +LICENSE="MIT GPL-2" # (init script is GPL-2 #426056) +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib" +RESTRICT="!test? ( test )" + +LIB_DEPEND=" + virtual/libcrypt[static-libs(+)] + zlib? ( sys-libs/zlib[static-libs(+)] ) +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( + >=dev-libs/libtomcrypt-1.18.2-r2[libtommath] + >=dev-libs/libtommath-1.2.0 + ${LIB_DEPEND//\[static-libs(+)]} + ) + pam? ( sys-libs/pam ) +" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )" +BDEPEND=" + test? ( + sys-libs/nss_wrapper + $(python_gen_any_dep ' + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/iniconfig[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pluggy[${PYTHON_USEDEP}] + dev-python/py[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + ') + ) + verify-sig? ( sec-keys/openpgp-keys-dropbear ) +" + +REQUIRED_USE="pam? ( !static )" + +PATCHES=( + "${FILESDIR}"/${PN}-2024.84-dbscp.patch + "${FILESDIR}"/${PN}-2022.82-tests.patch + "${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch + "${FILESDIR}"/${PN}-2024.84-fix-channels-tests.patch + "${FILESDIR}"/${PN}-2024.84-test-bg-sleep.patch +) + +set_options() { + progs=( + dropbear dbclient dropbearkey + $(usev !minimal "dropbearconvert scp") + ) + makeopts=( + MULTI=$(usex multicall 1 0) + ) +} + +python_check_deps() { + python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup + + if use static ; then + ewarn "Using bundled copies of libtommath and libtomcrypt" + fi +} + +src_prepare() { + default + sed \ + -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ + -e '/DROPBEAR_X11FWD/s:0:1:' \ + src/default_options.h > localoptions.h || die + sed \ + -e '/pam_start/s:sshd:dropbear:' \ + -i src/svr-authpam.c || die + restore_config localoptions.h + + # remove tests that fail + rm test/test_aslr.py || die + + # dropbearconver is not build with USE minimal + if use minimal; then + rm test/test_dropbearconvert.py || die + fi +} + +src_configure() { + # Notes: + # 1) We use bundled libtom* when static build is enabled because + # libtomcrypt lacks it and we don't particularly want to add it. + # 2) We disable the hardening flags as our compiler already enables them + # by default as is appropriate for the target. + local myeconfargs=( + --disable-harden + + # bug #836900 + $(use_enable !elibc_musl lastlog) + $(use_enable !elibc_musl wtmp) + + $(use_enable static bundled-libtom) + $(use_enable zlib) + $(use_enable pam) + $(use_enable !bsdpty openpty) + $(use_enable shadow) + $(use_enable static) + $(use_enable syslog) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + set_options + emake "${makeopts[@]}" PROGRAMS="${progs[*]}" + + # need symlinks for tests + if use multicall && use test; then + local x + for x in "${progs[@]}" ; do + ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" + done + fi +} + +src_install() { + set_options + emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install + doman manpages/*.8 + newinitd "${FILESDIR}"/dropbear.init.d dropbear + newconfd "${FILESDIR}"/dropbear.conf.d dropbear + dodoc CHANGES README.md SMALL.md MULTI.md + + # The multi install target does not install the links right. + if use multicall ; then + pushd "${ED}"/usr/bin &> /dev/null || die + local x + for x in "${progs[@]}" ; do + ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" + done + rm -f dropbear + dodir /usr/sbin + dosym -r /usr/bin/dropbearmulti /usr/sbin/dropbear + popd &> /dev/null || die + fi + save_config localoptions.h + + if ! use minimal ; then + mv "${ED}"/usr/bin/{,db}scp || die + fi + + if use pam; then + pamd_mimic system-remote-login dropbear auth account password session + fi +} diff --git a/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch b/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch new file mode 100644 index 000000000000..52095e1427de --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch @@ -0,0 +1,20 @@ +--- a/src/dbmulti.c ++++ b/src/dbmulti.c +@@ -60,7 +60,7 @@ + } + #endif + #ifdef DBMULTI_scp +- if (strcmp(progname, "scp") == 0) { ++ if ((strcmp(progname, "scp") == 0) || (strcmp(progname, "dbscp") == 0)) { + return scp_main(argc, argv); + } + #endif +@@ -81,7 +81,7 @@ + "'dropbearconvert' - the key converter\n" + #endif + #ifdef DBMULTI_scp +- "'scp' - secure copy\n" ++ "'dbscp' - secure copy\n" + #endif + , + DROPBEAR_VERSION); diff --git a/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch new file mode 100644 index 000000000000..0db292da8332 --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch @@ -0,0 +1,36 @@ +dbclient obeys $HOME, but dropbear (the server) resolves HOME using getpwnam. +Use sys-libs/nss_wrapper to fake it during tests. + +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -4,7 +4,15 @@ SHELL=bash + + all: test + ++uid:=$(shell id -u) ++gid:=$(shell id -g) + test: fakekey ++ mkdir -p ~/.ssh ++ ../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear ++ ../dropbearkey -y -f ~/.ssh/id_dropbear | grep ^ecdsa > ~/.ssh/authorized_keys ++ echo "$(LOGNAME)::$(uid):$(gid):$(USER):$(HOME):/bin/bash" >> ~/passwd ++ echo "$(LOGNAME)::$(gid):" >> ~/group ++ chmod 0700 ~ ~/.ssh ~/.ssh/authorized_keys ~/passwd ~/group + pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) + + one: fakekey +--- a/test/test_dropbear.py ++++ b/test/test_dropbear.py +@@ -27,7 +27,11 @@ def dropbear(request): + ] + print("subprocess args: ", args) + +- p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True) ++ env = os.environ ++ env['LD_PRELOAD'] = 'libnss_wrapper.so' ++ env['NSS_WRAPPER_PASSWD'] = env['HOME'] + '/passwd' ++ env['NSS_WRAPPER_GROUP'] = env['HOME'] + '/group' ++ p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True, env=env) + # Wait until it has started listening + for l in p.stderr: + if "Not backgrounding" in l: diff --git a/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch new file mode 100644 index 000000000000..84314f5fd7fa --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch @@ -0,0 +1,13 @@ +Force tests to be non-interactive + +--- a/test/test_dropbear.py ++++ b/test/test_dropbear.py +@@ -23,7 +23,7 @@ + args = opt.dropbear.split() + [ + "-p", LOCALADDR + ":" + opt.port, # bind locally only + "-r", opt.hostkey, +- "-F", "-E", ++ "-F", "-E", "-s", + ] + print("subprocess args: ", args) + diff --git a/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch b/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch new file mode 100644 index 000000000000..a078eb2e68b6 --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch @@ -0,0 +1,14 @@ +One test passes when run with ebuild ... test, but fails when run by portage. +Mark it as xfail. + +--- a/test/test_channels.py ++++ b/test/test_channels.py +@@ -45,7 +45,7 @@ + r.check_returncode() + assert r.stdout.decode() == dat + +-@pytest.mark.parametrize("fd", [1, 2]) ++@pytest.mark.parametrize("fd", [1, pytest.param(2, marks=pytest.mark.xfail(reason="Fails sometimes"))]) + def test_bg_sleep(request, fd, dropbear): + # https://lists.ucc.asn.au/pipermail/dropbear/2006q1/000362.html + # Rob Landley "Is this a bug?" 24 Mar 2006 diff --git a/net-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml index 4491864b760d..80473cbd3d8f 100644 --- a/net-misc/dropbear/metadata.xml +++ b/net-misc/dropbear/metadata.xml @@ -27,5 +27,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:matt_johnston:dropbear_ssh_server</remote-id> + <remote-id type="github">mkj/dropbear</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest index bf534b1fdbb6..6805cc564f55 100644 --- a/net-misc/dropbox-cli/Manifest +++ b/net-misc/dropbox-cli/Manifest @@ -1 +1,2 @@ DIST dropbox-cli-2023.py.xz 14308 BLAKE2B e0e1f28c911e5744f26bc3854e1283884f7daa57c247f0a13cd5f571124edca1f11e61ea487bccae294b34c4ce30884758662f95d0438efd1e0e3e64ead6a819 SHA512 c11928de24c6ab10c142eedfa244a903795b37bb75e7e805dbf28fe5b18f524db210eb432bf43eb3c99d67b0caca51c85bbe533b3d7d877cfdc7595925483294 +DIST dropbox-cli-2024.01.22.py.xz 14316 BLAKE2B c2bc33a6d1f74103a3685340747c8d9c974f75e0deec4cd97690333b7697730aa61beef1b315f1375a29d02c6bdf2609464b8ff41cffe7b7ec6efd5978762207 SHA512 272ad65476c8ebd55154feb848e1027b891c91252ca3fa3f50c7db84a7c71697843ae999716a671f697b891721b5c536927c2e63fd2c2afd298a37770aebf123 diff --git a/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild b/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild new file mode 100644 index 000000000000..d28cac9b0dd3 --- /dev/null +++ b/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit python-r1 bash-completion-r1 + +DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox" +HOMEPAGE="https://www.dropbox.com/" +# https://linux.dropbox.com/packages/dropbox.py +# https://www.dropbox.com/download?dl=packages/dropbox.py +# https://raw.githubusercontent.com/dropbox/nautilus-dropbox/master/dropbox.in +SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz" +S=${WORKDIR} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+gpg" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="net-misc/dropbox + ${PYTHON_DEPS} + gpg? ( app-crypt/gpgme[python] ) + dev-python/pygobject:3[${PYTHON_USEDEP}]" + +src_install() { + newbin ${P}.py ${PN} + python_replicate_script "${D}"/usr/bin/${PN} + newbashcomp "${FILESDIR}"/${PN}-19-completion ${PN} +} diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index 97b1190d72af..9989e6e576a0 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,5 +1,5 @@ DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712 -DIST dropbox-lnx.x86-186.4.6207.tar.gz 112963615 BLAKE2B 4fc315f224c3d198ccbc4c489f28263643be99832d0319b22c760fe7fa95e6525283870544e5a1496ce982bbcc5daffed91ba93ff15717e37eba7ecd721b45b8 SHA512 4508781d4e8a33c455b2617cccae777f0837fd0cf131b6ed0f0128f7855f99998c135a36f84abe7ea6a6641e069d0c930c31fe40d45cf50742b7cfd1f64fee83 -DIST dropbox-lnx.x86-187.4.5691.tar.gz 113372020 BLAKE2B 48733ca8db7c3394de67db9b7a62f48287f79d1ca9dca6a566be6cd2d138a777598e01a286b42b9de0855e4b6c8ce323beb25aefdca0d5ae23b1766e9f68fa7c SHA512 d7e18e19784c59299eec42b07c37ce7727e683d79d63c42f659239586366f4e1492ff52b9a77e4e3b3bd264004e97e3a23a0440632b9a2a903ac1082855916a1 -DIST dropbox-lnx.x86_64-186.4.6207.tar.gz 114657435 BLAKE2B 43c7eb102367143c01cdd0e1e83fdb7d5f19fff43923001aa123cf3cc90a67d9f606bda504ecde11a3dbe7c9eb31b835780738b77e207c2cf1a18a54015bd4f7 SHA512 851b902fae583e8154b77a3c2fd1b212a146e5a11aef71ab5c3231bba4d38964244f1edde4637840dfe4bdd2c4776c592c31c9e54a0d98346933784322a773fb -DIST dropbox-lnx.x86_64-187.4.5691.tar.gz 115019595 BLAKE2B 6368557a5370fc54f8ac36c365f79693ad91b2d0ce6094be7c7c7e6ec29af4c1d386947de4892b18c583caf6bc15c2c9e8b818cbcfaf3238b7f966e419525c2f SHA512 de7461dc7fe51c9f968dec06733d800842454ed2af3c9959ddadd8019d694d60b88e175982d03034030d0047f70923c304a3e0a389e58354ed4e56b8c9da6234 +DIST dropbox-lnx.x86-202.4.5551.tar.gz 113668681 BLAKE2B 2590c89af767803b77ff7bd57e4978c90a90be6f6394f7058393045fa4f3c68ae97ab365a460eccf38ab1e0b0a58b0e33aa482348a0bdf040dbe71d0bf683eeb SHA512 d5176c6c4b8f178fced661ef6df73fb767c3e7ff7f111df4829ab258d218586e128acb4187de6d840a0faca5a8766ea97b77c4d5c915fbd944be458ff07b8765 +DIST dropbox-lnx.x86-203.4.4857.tar.gz 113474071 BLAKE2B 109111bca49d7c59d9f7c28b9c012953b8cb01a116cdfe757b0c37b9a168e12ed61501cf313c5b5264fbbafa1528d5e2c884de51c3e3a18318dfd195b14ff7d1 SHA512 54945ecb11094d1a73a96f0469415eee8c2b936a22f8a9410ea5cac75e5eda4b3db72def487eef6f113e6bac7eb656403587fbaab4503bb331032648225660a3 +DIST dropbox-lnx.x86_64-202.4.5551.tar.gz 116236652 BLAKE2B f8a7c45ed45ce70580cb0c2f23e83c06098b8792e4a47b01f8ea9d2b1674b6d6470450edc25d58917630106b9f3ba49c20e87829b2f594d9e3a458d2586276fe SHA512 2d33f9f6d7a8b59f381ed43033c7638a54ae0a84f68845127505f6eb7ef00fbae490d7ba8d4f5e31790a39348612db665591e2785870acf816d60ca6d20097c3 +DIST dropbox-lnx.x86_64-203.4.4857.tar.gz 116080942 BLAKE2B 44b039a1478bc48a01c2a6c81250417c753dacbac0c7b393e2bf5b1ed1fdcb06855432c6f48bdc3d734d036f5f6e769eee6fdc9ac1685d003db711c9a6646112 SHA512 372ebe6a621f9df7143a4f685d9a6c305d3b124813b13514dd56a409ec473240115000bbedad624efc40c36660811e4a347f0847a9c9a1e0e526f20559f3390d diff --git a/net-misc/dropbox/dropbox-186.4.6207.ebuild b/net-misc/dropbox/dropbox-202.4.5551.ebuild index b0b4cee9bbeb..e90baaad900e 100644 --- a/net-misc/dropbox/dropbox-186.4.6207.ebuild +++ b/net-misc/dropbox/dropbox-202.4.5551.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=7 +EAPI=8 inherit desktop pax-utils systemd xdg diff --git a/net-misc/dropbox/dropbox-187.4.5691.ebuild b/net-misc/dropbox/dropbox-203.4.4857.ebuild index e1949fb60f88..7d9715a71882 100644 --- a/net-misc/dropbox/dropbox-187.4.5691.ebuild +++ b/net-misc/dropbox/dropbox-203.4.4857.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=7 +EAPI=8 inherit desktop pax-utils systemd xdg diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest deleted file mode 100644 index b1cf22dd457d..000000000000 --- a/net-misc/econnman/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST econnman-1.1_p20160305.tar.xz 240428 BLAKE2B 6417b30fd110416f6339b4dfad9edaff2888e9fb9562451ffb13661664c1e51d45f513a192f7850f8030caab13ebd914a138ff6cd596ed09c7210940c98ce748 SHA512 c50155a286e8a8d20deb4d5bf30ce91cc97e7323bc6dd209a16c767c3a1d6f30aab0d3b60c3a14df091d086fc10c2584d7bf56c59c95af684af3d2af7eff726c diff --git a/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild b/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild deleted file mode 100644 index 8b5bc55fe2dc..000000000000 --- a/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools python-single-r1 - -DESCRIPTION="ConnMan User Interface written with EFL & python" -HOMEPAGE="https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/" -SRC_URI="https://dev.gentoo.org/~juippis/distfiles/${P}.tar.xz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - dev-libs/efl[X,connman] - $(python_gen_cond_dep ' - dev-python/python-efl[${PYTHON_USEDEP}] - ')" - -src_prepare() { - default - python_fix_shebang econnman-bin.in - eautoreconf -} - -src_install() { - default - rm -r "${ED}"/var/ || die -} diff --git a/net-misc/electron-cash/electron-cash-4.2.11.ebuild b/net-misc/electron-cash/electron-cash-4.2.11.ebuild index 8028eb404b26..8ca0f0b82471 100644 --- a/net-misc/electron-cash/electron-cash-4.2.11.ebuild +++ b/net-misc/electron-cash/electron-cash-4.2.11.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="ncurses?" @@ -32,6 +33,8 @@ REQUIRED_USE=" vkb? ( qt5 ) " +BDEPEND="${DISTUTILS_DEPS}" + RDEPEND=" dev-python/dnspython[${PYTHON_USEDEP}] dev-python/ecdsa[${PYTHON_USEDEP}] @@ -65,7 +68,9 @@ src_prepare() { eapply "${FILESDIR}/3.3.6-no-user-root.patch" # Prevent icon from being installed in the wrong location - sed -i '/icons/d' setup.py || die + sed -e '/icons/d' \ + -e "s:\\(os.path.join(\\)share_dir:\\1'share':" \ + -i setup.py || die if use qt5; then pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die @@ -142,10 +147,6 @@ src_install() { distutils-r1_src_install } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { xdg_icon_cache_update xdg_desktop_database_update diff --git a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild index 64c650229a76..bc67b230cfc0 100644 --- a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild +++ b/net-misc/electrum-ltc/electrum-ltc-4.2.2.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 @@ -24,7 +24,7 @@ RDEPEND=" dev-libs/libsecp256k1 dev-python/scrypt[${PYTHON_USEDEP}] >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] - =dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}] + =dev-python/aiorpcx-0.22*[${PYTHON_USEDEP}] >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] dev-python/bitstring[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 37e638aaaf9c..dabbb482a982 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1 +1 @@ -DIST electrum-4.4.6.gh.tar.gz 5637532 BLAKE2B c6b7667c7699f9eb11013c446e203ac4205df1d78e2fb8d44309bd6340c85bd9b4f6aef364f9bf9da4f262b58c74a7830c290c0659cd388b4a50863926dffa67 SHA512 e643a7119a8746d0f9ae02888bcdcf5ab4216ea19483113cf270b2cf23c8c615f0013a2aaf2c5f488655bf52cd190ab76761fa54f4b851039bc7add0c05ad320 +DIST electrum-4.5.5.gh.tar.gz 4927614 BLAKE2B 9b0bdf4f79ed15279bd8485b9d7fd1d911a5cdc6c3a2deb5e72dad7cd232c87d3f41f10ab572ab3969c9d1ddc65742d1983369a43946ab7f321d49975a50b41a SHA512 28121665cad7bc540600562d4d3e72e20108785c096647fdcc9eb8c26616a04730f53ba53b19f6a332eadc8e20a5524b33dab3719421aeb2b51a0531f9e8ef11 diff --git a/net-misc/electrum/electrum-4.4.6.ebuild b/net-misc/electrum/electrum-4.5.5.ebuild index 78458a0ccfd1..404378f8879a 100644 --- a/net-misc/electrum/electrum-4.4.6.ebuild +++ b/net-misc/electrum/electrum-4.5.5.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 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="ncurses?" inherit distutils-r1 xdg-utils @@ -28,12 +28,12 @@ REQUIRED_USE="|| ( cli ncurses qt5 )" RDEPEND=" ${PYTHON_DEPS} <dev-libs/libsecp256k1-0.4 - >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] - =dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}] - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - dev-python/bitstring[${PYTHON_USEDEP}] + >=dev-python/aiohttp-socks-0.8.4[${PYTHON_USEDEP}] + =dev-python/aiorpcx-0.23*[${PYTHON_USEDEP}] + >=dev-python/attrs-20.1.0[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] >=dev-python/dnspython-2[${PYTHON_USEDEP}] + dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] dev-python/pyperclip[${PYTHON_USEDEP}] dev-python/PySocks[${PYTHON_USEDEP}] @@ -57,6 +57,11 @@ BDEPEND=" distutils_enable_tests pytest +EPYTEST_IGNORE=( + # test for qml/PyQt6 GUI that doesn't work anyway + tests/test_qml_types.py +) + src_prepare() { # use backwards-compatible cryptodome API sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die 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/ena-driver/Manifest b/net-misc/ena-driver/Manifest index 005748ccc618..47b0f42e7e45 100644 --- a/net-misc/ena-driver/Manifest +++ b/net-misc/ena-driver/Manifest @@ -1,3 +1,3 @@ -DIST ena-driver-2.10.0-linux.tar.gz 1215248 BLAKE2B 625be1635ef5bd8094d277f196187126bf7cf2900002eca2dc5d292befd38ed0577fc0978ef699654584e01f9e03e3ef6055aecaada61401d5fe819fc3f48934 SHA512 0a4b40a7989bed2435124da854a47c4bad8ae079058d49b4140a8fb581fc58481be912907df2ec33e4d788eaf61eb92521aced0113cc19a1bb545e01d64bb533 -DIST ena-driver-2.8.9-linux.tar.gz 1205931 BLAKE2B 9ea92eadb53b38b717a26652f386609d279616e153836ad7b2d88ccf4f7647b7db98ce9029fc117a79389b002bf4c427e689f3ed52f572fab5d8ba02a9f0c1aa SHA512 be3f647ed54326b8d585e9c5e85b002fbdced5ef037940ed21d3cbaebbcd36745d1baccfd9e35bd32e297d6f1d25aa2a0af30d9fee372df81bd7eb2a49d7a0f8 -DIST ena-driver-2.9.1-linux.tar.gz 1209574 BLAKE2B 4d7d577882d2a4e97a43efb1ccc1dfec5b978685367f010bb07685f812f3d95b262229be480e4b92c7855466ee48ff6da81bfe4f48af4f48bb5bb7f9f813eafa SHA512 df312a0b034247266eb7ecb8ae9900b991a9a5fcace1f06e00b28502ec43e90b3979c62bbfecc4ab224ec564fe57a5ea0c4fa44c5af1393224bdc30e283051df +DIST ena-driver-2.11.1-linux.tar.gz 1441591 BLAKE2B 39db9d21efd0d7f810304a1be0be13dd0c944419a9e5aee5a60c3dee310f990af9787cb297e36e718aa3f62ff3a7e9ce4e8302a19efcc3b151438869827b540d SHA512 f27c556a902ee276022ddafec7cda70790280587f470968f233e3de09a7dac3b49f43a2b7dba1018489c9ff5f0f554201fe63b82533c6a627b7f533c2b4910c5 +DIST ena-driver-2.12.2-linux.tar.gz 1444018 BLAKE2B 54223073bb096e8b6d29dc7bc8c971f5b99dd8803d5ece5e631120a9b2b8d180742cb74d5986dc163e3de53f223161dedc61102def498ea6274f117ae9508055 SHA512 93cb93c78aa409a1f9c3d542e1271dda9630641ceb32ecd2f69b69b380cf9625e1bc89721726ffcd3f64ff538df87e276748c5c7ac1f625a171624ffff776b6a +DIST ena-driver-2.12.3-linux.tar.gz 1444176 BLAKE2B 8dedd042d912082d60c29aa121b09e9d18ae7294257e217ac17970ea34ef0b7871d4ab87995f5cf59512174288e35d2c6bdd6aab3cd04c972e077364f8a4e9da SHA512 e1afaa3826e0b89c0cd07293ee300f14e452018e06ea7ac2048e4015c1d7115d3f1f112bd3897c6cd177314d6ebb63fd3111d1b45c76f9bc818dcf30d3ecf1cc diff --git a/net-misc/ena-driver/ena-driver-2.9.1.ebuild b/net-misc/ena-driver/ena-driver-2.11.1.ebuild index eb8ed9525827..098c3b683de7 100644 --- a/net-misc/ena-driver/ena-driver-2.9.1.ebuild +++ b/net-misc/ena-driver/ena-driver-2.11.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 diff --git a/net-misc/ena-driver/ena-driver-2.10.0.ebuild b/net-misc/ena-driver/ena-driver-2.12.2.ebuild index eb8ed9525827..3d3ab17ac267 100644 --- a/net-misc/ena-driver/ena-driver-2.10.0.ebuild +++ b/net-misc/ena-driver/ena-driver-2.12.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 @@ -8,6 +8,7 @@ inherit linux-mod-r1 DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz" +S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" LICENSE="GPL-2" SLOT="0" @@ -15,8 +16,6 @@ KEYWORDS="~amd64 ~arm64" BDEPEND="app-arch/unzip" -S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" - CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" DOCS=( README.rst diff --git a/net-misc/ena-driver/ena-driver-2.8.9.ebuild b/net-misc/ena-driver/ena-driver-2.12.3.ebuild index e7f73db785b4..3d3ab17ac267 100644 --- a/net-misc/ena-driver/ena-driver-2.8.9.ebuild +++ b/net-misc/ena-driver/ena-driver-2.12.3.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 @@ -8,6 +8,7 @@ inherit linux-mod-r1 DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz" +S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" LICENSE="GPL-2" SLOT="0" @@ -15,12 +16,11 @@ KEYWORDS="~amd64 ~arm64" BDEPEND="app-arch/unzip" -S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" - CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" DOCS=( README.rst RELEASENOTES.md + ENA_Linux_Best_Practices.rst ) src_compile() { diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest index b4852cf947ee..2560fb8bb15c 100644 --- a/net-misc/etherdfs/Manifest +++ b/net-misc/etherdfs/Manifest @@ -1,2 +1,2 @@ -DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439 +DIST etherdfs-tsr-0.8.3.zip 13139 BLAKE2B 5907974d9c4c2f97f737ead66ab5a3f0934d5086a07cfdc2483e7ef236d993d784a3686811bdf615f85a6112647e9d538de463d6453536e13c04a5ae7c082393 SHA512 489d61f13a1233ce94ce8ce4b0ad7400cceab3fd4b864efff94fe142f0703b6d76713a66ebd941b979af2d515192ed196ba1b33ae283647b5181dfbed27a8d97 DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e diff --git a/net-misc/etherdfs/etherdfs-20180203-r4.ebuild b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild index 9a85cc57a896..9329f40b7423 100644 --- a/net-misc/etherdfs/etherdfs-20180203-r4.ebuild +++ b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild @@ -1,10 +1,10 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MY_PN="ethersrv-linux" -MY_PV_TSR="0.8.2" +MY_PV_TSR="0.8.3" MY_P="${MY_PN}-${PV}" inherit systemd toolchain-funcs @@ -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 -> ${P}.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/etherdfs/metadata.xml b/net-misc/etherdfs/metadata.xml index d9337e277c43..24fb39b58029 100644 --- a/net-misc/etherdfs/metadata.xml +++ b/net-misc/etherdfs/metadata.xml @@ -11,7 +11,7 @@ to a local drive letter, using raw ethernet frames to communicate. </longdescription> <use> - <flag name="tsr">Build the TSR program for DOS, which acts as a client.</flag> + <flag name="tsr">Install the precompiled TSR program for DOS, which acts as a client.</flag> </use> <upstream> <remote-id type="sourceforge">etherdfs</remote-id> 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/eventd/metadata.xml b/net-misc/eventd/metadata.xml index 8f637f01963e..d6a2d2e180c9 100644 --- a/net-misc/eventd/metadata.xml +++ b/net-misc/eventd/metadata.xml @@ -8,7 +8,6 @@ (Note: not required for local notifications via <pkg>net-misc/eventd</pkg>)</flag> <flag name="notification">Enable plugin to display on-screen notifications</flag> <flag name="purple">Enable plugin for IM notifications via libpurple</flag> - <flag name="speech">Enable plugin for Text-To-Speech support</flag> <flag name="webhook">Enable plugin to send payloads to webhook handlers</flag> <flag name="websocket">Enable support for WebSocket protocol</flag> </use> 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 6190d97c3e83..09d543e4268e 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,5 +1,6 @@ -DIST freerdp-2.10.0.tar.gz 7321489 BLAKE2B 92b4b45670a5ed3b41713d1e036d41a9ef5714ddf9273a4b88fadf5c8435a467a53144f42bd969a44e641995a7f94b6c7b43b85f0ede738b1a1213e3bada9788 SHA512 a5749e3140d74c66d51869b405852bdaa776ca7d82e50a1e3ed19ccf56ed91a4ad9c3ce2c8ee6ff0abbb29d915c2e7278a1fcea04d73fd5ba4014f6590484477 -DIST freerdp-2.11.0.tar.gz 7325731 BLAKE2B 7cf2805065b870d959461a41b2b5cc7a5d00121078c0a5f51db0f2d83c4a5eb64aba75d0c1e184edf3546b4df87150b30f81ad88b301366ccaeaec59120085ca SHA512 97ce19f392e2b197830e22f12870e787fce85a7d9342cd7b7043c1efc45f5773410901b27de11bf1b70ca36dd6d7d102b3dd34eace813892a72d44dc290a8703 -DIST freerdp-2.11.1.tar.gz 7325835 BLAKE2B 2b6e62cd46627c60c3e815216711d3c5c9839d232aa5cb8653d92870bb46d93c40f2f44e0abf7ef6e5f44d92239541ae44d37366f343a1992fdbc8f09452fba0 SHA512 efd9d44bdc15047322600046fdcd17e37f14c84d75badc77e8ea53da6e065f33725be2f3c03e02031867124b62b32ad9deeabf8cc8f79321e7a866f552e63f2d -DIST freerdp-2.11.2.tar.gz 7326213 BLAKE2B 5d044d660df1e5115ffde13389be79e852711161ad1969017a9ba662e5f278fc98b86efbc59a24c3ea32a137c24ed308ef5c9eb89db1c24f37f1b8b41bfd3c45 SHA512 2e0e74cba22ed0b33fd6453dd76f6a1ffb3107d1868276faf3eea25bd58d3d869c2ce7c6c467896ecc94ca71c0582beb029a0d44f50df38cc26661f85d0822fb -DIST freerdp-3.0.0-beta3.tar.gz 8950651 BLAKE2B f5171d76da635bd05b4a267383ffb150b4c214820b79624b1988d297e44a4bfd3d7b34fbc4ac88f79d973e6eb4372700fe53910078eaf36ea7fc553cc6ed6e4f SHA512 a9e61c30254ba5e894c70b981fae4d6311d20546d4352e5a584361b3b7232f6cc075bf7d7c1e9e5a52c820c36a185120f095306ec36ff72489f7dce0cb7e0fbb +DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd +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.6.3.tar.gz 10199503 BLAKE2B ff4c76a7f2d808db09d22b6cf79caaa1f1aff58c25d37d853d4244cf4b8d0f522cb3ad384c6284544a08e2092277e7b4ee8a6f9fa61bb24319d7c5d08aebfdc7 SHA512 e92b839bdaaed99f05c3ab883a864fb3a18a01b5e173317b1cf8210ad16cbf25f2133b8893dec9f9d3a92b0a2fbcb0230f549e1632ade0394b5c8ea0f7331e1e +DIST freerdp-3.6.3.tar.gz.asc 228 BLAKE2B 4ea04f0d662afef34d61f06d36f3bd6f872f2a7cd8095df581f489306d88a761921a0a93325bdd4c5a627a1c47c612652697b9dc3338ebe0ea952a65b0783cc7 SHA512 6568362c2ad1032925e7dfcd04977c56a58e661b8eacc79d6d2ad77bb9e56d3dff3f13d004d50a88827aa9ccbd2f56c1019a53e18bf35856dbec81acba1dc142 diff --git a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch deleted file mode 100644 index 586ae641b58e..000000000000 --- a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/901003 -https://github.com/FreeRDP/FreeRDP/issues/8686 -https://github.com/FreeRDP/FreeRDP/commit/7f55c97d60453738323e0ecafe6d357019528227 - -From 7f55c97d60453738323e0ecafe6d357019528227 Mon Sep 17 00:00:00 2001 -From: akallabeth <akallabeth@posteo.net> -Date: Tue, 14 Feb 2023 07:48:54 +0100 -Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API - ---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP - } - } - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100) - if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED) - mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED; -+#endif - - return TRUE; - } ---- a/libfreerdp/codec/h264_ffmpeg.c -+++ b/libfreerdp/codec/h264_ffmpeg.c -@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264) - goto EXCEPTION; - } - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100) - if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED) - { - sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED; - } -+#endif - - #ifdef WITH_VAAPI - diff --git a/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch new file mode 100644 index 000000000000..8d45331bd95b --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch @@ -0,0 +1,329 @@ +https://github.com/FreeRDP/FreeRDP/issues/9616 + +From 8b349f4f2b5d14e28a6a73e9c2b9860d7f275bc4 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Thu, 7 Dec 2023 15:54:38 -0500 +Subject: [PATCH] Revert "[codec] encode messages considering endianness" + +This reverts commit e3ef8a02ddf079bcf6dfa58888db69a709ce50c9. +--- + libfreerdp/codec/nsc_encode.c | 76 +++++++++++++---------------------- + libfreerdp/codec/rfx_encode.c | 74 +++++++++++++--------------------- + 2 files changed, 58 insertions(+), 92 deletions(-) + +diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c +index 477318cc1..fd9626a6d 100644 +--- a/libfreerdp/codec/nsc_encode.c ++++ b/libfreerdp/codec/nsc_encode.c +@@ -119,8 +119,6 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI + UINT16 rw; + BYTE ccl; + const BYTE* src; +- const UINT32* src_32; +- const UINT16* src_16; + BYTE* yplane = NULL; + BYTE* coplane = NULL; + BYTE* cgplane = NULL; +@@ -142,85 +140,69 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI + coplane = context->priv->PlaneBuffers[1] + y * rw; + cgplane = context->priv->PlaneBuffers[2] + y * rw; + aplane = context->priv->PlaneBuffers[3] + y * context->width; +- src_32 = (UINT32*)src; +- src_16 = (UINT16*)src; + + for (x = 0; x < context->width; x++) + { + switch (context->format) + { + case PIXEL_FORMAT_BGRX32: +- b_val = (INT16)(*src_32 & 0xFF); +- g_val = (INT16)((*src_32 >> 8) & 0xFF); +- r_val = (INT16)((*src_32 >> 16) & 0xFF); ++ b_val = *src++; ++ g_val = *src++; ++ r_val = *src++; ++ src++; + a_val = 0xFF; +- src_32++; + break; + + case PIXEL_FORMAT_BGRA32: +- b_val = (INT16)(*src_32 & 0xFF); +- g_val = (INT16)((*src_32 >> 8) & 0xFF); +- r_val = (INT16)((*src_32 >> 16) & 0xFF); +- a_val = (INT16)((*src_32 >> 24) & 0xFF); +- src_32++; ++ b_val = *src++; ++ g_val = *src++; ++ r_val = *src++; ++ a_val = *src++; + break; + + case PIXEL_FORMAT_RGBX32: +- r_val = (INT16)(*src_32 & 0xFF); +- g_val = (INT16)((*src_32 >> 8) & 0xFF); +- b_val = (INT16)((*src_32 >> 16) & 0xFF); ++ r_val = *src++; ++ g_val = *src++; ++ b_val = *src++; ++ src++; + a_val = 0xFF; +- src_32++; + break; + + case PIXEL_FORMAT_RGBA32: +- r_val = (INT16)(*src_32 & 0xFF); +- g_val = (INT16)((*src_32 >> 8) & 0xFF); +- b_val = (INT16)((*src_32 >> 16) & 0xFF); +- a_val = (INT16)((*src_32 >> 24) & 0xFF); +- src_32++; ++ r_val = *src++; ++ g_val = *src++; ++ b_val = *src++; ++ a_val = *src++; + break; + + case PIXEL_FORMAT_BGR24: +-#ifdef __LITTLE_ENDIAN__ + b_val = *src++; + g_val = *src++; + r_val = *src++; +-#else +- r_val = *src++; +- g_val = *src++; +- b_val = *src++; +-#endif + a_val = 0xFF; + break; + + case PIXEL_FORMAT_RGB24: +-#ifdef __LITTLE_ENDIAN__ + r_val = *src++; + g_val = *src++; + b_val = *src++; +-#else +- b_val = *src++; +- g_val = *src++; +- r_val = *src++; +-#endif + a_val = 0xFF; + break; + + case PIXEL_FORMAT_BGR16: +- b_val = (INT16)((*src_16) & 0x1F); +- g_val = (INT16)((*src_16 >> 5) & 0x3F); +- r_val = (INT16)((*src_16 >> 11) & 0x1F); ++ b_val = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); ++ g_val = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); ++ r_val = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); + a_val = 0xFF; +- src_16++; ++ src += 2; + break; + + case PIXEL_FORMAT_RGB16: +- r_val = (INT16)((*src_16) & 0x1F); +- g_val = (INT16)((*src_16 >> 5) & 0x3F); +- b_val = (INT16)((*src_16 >> 11) & 0x1F); ++ r_val = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); ++ g_val = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); ++ b_val = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); + a_val = 0xFF; +- src_16++; ++ src += 2; + break; + + case PIXEL_FORMAT_A4: +@@ -228,17 +210,17 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI + int shift; + BYTE idx; + shift = (7 - (x % 8)); +- idx = (BYTE)(((*src_32 & 0xFF) >> shift) & 1); +- idx |= (BYTE)(((((*src_32 >> 8) & 0xFF) >> shift) & 1) << 1); +- idx |= (BYTE)(((((*src_32 >> 16) & 0xFF) >> shift) & 1) << 2); +- idx |= (BYTE)(((((*src_32 >> 24) & 0xFF) >> shift) & 1) << 3); ++ idx = ((*src) >> shift) & 1; ++ idx |= (((*(src + 1)) >> shift) & 1) << 1; ++ idx |= (((*(src + 2)) >> shift) & 1) << 2; ++ idx |= (((*(src + 3)) >> shift) & 1) << 3; + idx *= 3; + r_val = (INT16)context->palette[idx]; + g_val = (INT16)context->palette[idx + 1]; + b_val = (INT16)context->palette[idx + 2]; + + if (shift == 0) +- src_32++; ++ src += 4; + } + + a_val = 0xFF; +diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c +index 355f74340..b4f393605 100644 +--- a/libfreerdp/codec/rfx_encode.c ++++ b/libfreerdp/codec/rfx_encode.c +@@ -49,8 +49,6 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + int x_exceed; + int y_exceed; + const BYTE* src; +- const UINT32* src_32; +- const UINT16* src_16; + INT16 r, g, b; + INT16 *r_last, *g_last, *b_last; + x_exceed = 64 - width; +@@ -59,8 +57,6 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + for (y = 0; y < height; y++) + { + src = rgb_data + y * rowstride; +- src_32 = (UINT32*)src; +- src_16 = (UINT16*)src; + + switch (pixel_format) + { +@@ -68,10 +64,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_BGRA32: + for (x = 0; x < width; x++) + { +- *b_buf++ = (INT16)(*src_32 & 0xFF); +- *g_buf++ = (INT16)((*src_32 >> 8) & 0xFF); +- *r_buf++ = (INT16)((*src_32 >> 16) & 0xFF); +- src_32++; ++ *b_buf++ = (INT16)(*src++); ++ *g_buf++ = (INT16)(*src++); ++ *r_buf++ = (INT16)(*src++); ++ src++; + } + + break; +@@ -80,10 +76,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_ABGR32: + for (x = 0; x < width; x++) + { +- *b_buf++ = (INT16)((*src_32 >> 8) & 0xFF); +- *g_buf++ = (INT16)((*src_32 >> 16) & 0xFF); +- *r_buf++ = (INT16)((*src_32 >> 24) & 0xFF); +- src_32++; ++ src++; ++ *b_buf++ = (INT16)(*src++); ++ *g_buf++ = (INT16)(*src++); ++ *r_buf++ = (INT16)(*src++); + } + + break; +@@ -92,10 +88,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_RGBA32: + for (x = 0; x < width; x++) + { +- *r_buf++ = (INT16)(*src_32 & 0xFF); +- *g_buf++ = (INT16)((*src_32 >> 8) & 0xFF); +- *b_buf++ = (INT16)((*src_32 >> 16) & 0xFF); +- src_32++; ++ *r_buf++ = (INT16)(*src++); ++ *g_buf++ = (INT16)(*src++); ++ *b_buf++ = (INT16)(*src++); ++ src++; + } + + break; +@@ -104,10 +100,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_ARGB32: + for (x = 0; x < width; x++) + { +- *r_buf++ = (INT16)((*src_32 >> 8) & 0xFF); +- *g_buf++ = (INT16)((*src_32 >> 16) & 0xFF); +- *b_buf++ = (INT16)((*src_32 >> 24) & 0xFF); +- src_32++; ++ src++; ++ *r_buf++ = (INT16)(*src++); ++ *g_buf++ = (INT16)(*src++); ++ *b_buf++ = (INT16)(*src++); + } + + break; +@@ -115,15 +111,9 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_BGR24: + for (x = 0; x < width; x++) + { +-#ifdef __LITTLE_ENDIAN__ + *b_buf++ = (INT16)(*src++); + *g_buf++ = (INT16)(*src++); + *r_buf++ = (INT16)(*src++); +-#else +- *r_buf++ = (INT16)(*src++); +- *g_buf++ = (INT16)(*src++); +- *b_buf++ = (INT16)(*src++); +-#endif + } + + break; +@@ -131,15 +121,9 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_RGB24: + for (x = 0; x < width; x++) + { +-#ifdef __LITTLE_ENDIAN__ + *r_buf++ = (INT16)(*src++); + *g_buf++ = (INT16)(*src++); + *b_buf++ = (INT16)(*src++); +-#else +- *b_buf++ = (INT16)(*src++); +- *g_buf++ = (INT16)(*src++); +- *r_buf++ = (INT16)(*src++); +-#endif + } + + break; +@@ -147,10 +131,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_BGR16: + for (x = 0; x < width; x++) + { +- *b_buf++ = (INT16)((*src_16) & 0x1F); +- *g_buf++ = (INT16)((*src_16 >> 5) & 0x3F); +- *r_buf++ = (INT16)((*src_16 >> 11) & 0x1F); +- src_16++; ++ *b_buf++ = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); ++ *g_buf++ = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); ++ *r_buf++ = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); ++ src += 2; + } + + break; +@@ -158,10 +142,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_RGB16: + for (x = 0; x < width; x++) + { +- *r_buf++ = (INT16)((*src_16 & 0x1F)); +- *g_buf++ = (INT16)((*src_16 >> 5) & 0x3F); +- *b_buf++ = (INT16)((*src_16 >> 11) & 0x1F); +- src_16++; ++ *r_buf++ = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); ++ *g_buf++ = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); ++ *b_buf++ = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); ++ src += 2; + } + + break; +@@ -175,17 +159,17 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + int shift; + BYTE idx; + shift = (7 - (x % 8)); +- idx = (BYTE)(((*src_32 & 0xFF) >> shift) & 1); +- idx |= (BYTE)(((((*src_32 >> 8) & 0xFF) >> shift) & 1) << 1); +- idx |= (BYTE)(((((*src_32 >> 16) & 0xFF) >> shift) & 1) << 2); +- idx |= (BYTE)(((((*src_32 >> 24) & 0xFF) >> shift) & 1) << 3); ++ idx = ((*src) >> shift) & 1; ++ idx |= (((*(src + 1)) >> shift) & 1) << 1; ++ idx |= (((*(src + 2)) >> shift) & 1) << 2; ++ idx |= (((*(src + 3)) >> shift) & 1) << 3; + idx *= 3; + *r_buf++ = (INT16)palette[idx]; + *g_buf++ = (INT16)palette[idx + 1]; + *b_buf++ = (INT16)palette[idx + 2]; + + if (shift == 0) +- src_32++; ++ src += 4; + } + + break; +-- +2.43.0 + diff --git a/net-misc/freerdp/files/freerdp-2.11.2-clang.patch b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch new file mode 100644 index 000000000000..b05492a3effd --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch @@ -0,0 +1,29 @@ +https://github.com/FreeRDP/FreeRDP/pull/9373 +https://bugs.gentoo.org/916515 + +From 88dd68153c834e1d5f59beb59496bfd1bf9697a8 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Mon, 11 Sep 2023 00:31:54 +0000 +Subject: [PATCH] Fixes clang error error: incompatible function pointer types + assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const + void *)' [-Wincompatible-function-pointer-types] | obj->fnObjectNew = + uwac_event_clone; | ^ ~~~~~~~~~~~~~~~~ + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> +--- + client/Wayland/wlfreerdp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c +index 5be10aae2c1b..ef3539383f55 100644 +--- a/client/Wayland/wlfreerdp.c ++++ b/client/Wayland/wlfreerdp.c +@@ -598,7 +598,7 @@ static void wlf_client_free(freerdp* instance, rdpContext* context) + DeleteCriticalSection(&wlf->critical); + } + +-static void* uwac_event_clone(const void* val) ++static void* uwac_event_clone(void* val) + { + UwacEvent* copy; + const UwacEvent* ev = (const UwacEvent*)val; diff --git a/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch new file mode 100644 index 000000000000..34720aef4b5b --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch @@ -0,0 +1,23 @@ +From d2b6771c748e54e659d5f1243a92e499c3beaa36 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Wed, 22 May 2024 17:04:43 -0400 +Subject: [PATCH] X11: fix pointer/integer type mismatch + +Fixed on master in 2da280b8a1748052b70b3f5a1ef0d8e932c33adc. +--- + client/X11/xf_graphics.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c +index 5aa1fd48b5a3..fe81e0ed91cb 100644 +--- a/client/X11/xf_graphics.c ++++ b/client/X11/xf_graphics.c +@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) + + #endif + fail: +- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1); ++ WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL); + return rc; + } + diff --git a/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch new file mode 100644 index 000000000000..549c813f774b --- /dev/null +++ b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch @@ -0,0 +1,279 @@ +https://github.com/FreeRDP/FreeRDP/pull/9992 +https://bugs.gentoo.org/921252 + +From 0242240ba7a61945607b835f378ff077e4582780 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:05:30 +0100 +Subject: [PATCH 1/8] [winpr,clipboard] fix incompatible WCHAR pointer + +--- + winpr/libwinpr/clipboard/synthetic_file.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c +index 14219806c76e..e748f8bea399 100644 +--- a/winpr/libwinpr/clipboard/synthetic_file.c ++++ b/winpr/libwinpr/clipboard/synthetic_file.c +@@ -276,7 +276,13 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l + const WCHAR* remote_name, wArrayList* files) + { + BOOL result = FALSE; +- const WCHAR* wildcard = "/\0*\0\0\0"; ++ union ++ { ++ const char* c; ++ const WCHAR* w; ++ } wildcard; ++ const char buffer[4] = "/\0*\0\0\0"; ++ wildcard.c = buffer; + const size_t wildcardLen = 3; + + WINPR_ASSERT(clipboard); +@@ -290,7 +296,7 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l + return FALSE; + + _wcsncat(namebuf, local_name, len); +- _wcsncat(namebuf, wildcard, wildcardLen); ++ _wcsncat(namebuf, wildcard.w, wildcardLen); + + result = do_add_directory_contents_to_list(clipboard, local_name, remote_name, namebuf, files); + + +From b1f60a1d117da2a6775dc12ab7e9b62c95615550 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:07:17 +0100 +Subject: [PATCH 2/8] [winpr,smartcard] fix incompatible PCSC_SCardListReaders + pointer + +--- + winpr/libwinpr/smartcard/smartcard_pcsc.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c +index fb04d5684aa0..c94b4caafe1e 100644 +--- a/winpr/libwinpr/smartcard/smartcard_pcsc.c ++++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c +@@ -992,8 +992,14 @@ static LONG WINAPI PCSC_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGrou + return SCARD_E_NO_MEMORY; + } + +- status = +- PCSC_SCardListReaders_Internal(hContext, mszGroupsA, (LPSTR*)&mszReadersA, pcchReaders); ++ union ++ { ++ LPSTR* ppc; ++ LPSTR pc; ++ } cnv; ++ cnv.ppc = &mszReadersA; ++ ++ status = PCSC_SCardListReaders_Internal(hContext, mszGroupsA, cnv.pc, pcchReaders); + if (status == SCARD_S_SUCCESS) + { + size_t size = 0; + +From 48eaca08048918260d4dca05e9522118657e8210 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:10:39 +0100 +Subject: [PATCH 3/8] [core,license] fix incompatible WCHAR pointer + +--- + libfreerdp/core/license.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c +index 99d4fa25fc84..e6c622a6b087 100644 +--- a/libfreerdp/core/license.c ++++ b/libfreerdp/core/license.c +@@ -2802,18 +2802,25 @@ BOOL license_server_send_request(rdpLicense* license) + return license_set_state(license, LICENSE_STATE_REQUEST); + } + +-static BOOL license_set_string(const char* what, const char* value, WCHAR** dst, UINT32* dstLen) ++static BOOL license_set_string(const char* what, const char* value, BYTE** bdst, UINT32* dstLen) + { + WINPR_ASSERT(what); + WINPR_ASSERT(value); +- WINPR_ASSERT(dst); ++ WINPR_ASSERT(bdst); + WINPR_ASSERT(dstLen); + ++ union ++ { ++ WCHAR** w; ++ BYTE** b; ++ } cnv; ++ cnv.b = bdst; ++ + size_t len = 0; +- *dst = (BYTE*)ConvertUtf8ToWCharAlloc(value, &len); +- if (!*dst || (len > UINT32_MAX / sizeof(WCHAR))) ++ *cnv.w = ConvertUtf8ToWCharAlloc(value, &len); ++ if (!*cnv.w || (len > UINT32_MAX / sizeof(WCHAR))) + { +- WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *dst, ++ WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *cnv.w, + len); + return FALSE; + } + +From 0717b4de1549390a3404af823bd36db66772abd2 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:10:59 +0100 +Subject: [PATCH 4/8] [winpr,crt] fix incompatible WCHAR pointer + +--- + winpr/libwinpr/crt/test/TestUnicodeConversion.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +index a5c4c75e8f71..187a068aedaa 100644 +--- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c ++++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +@@ -24,10 +24,12 @@ typedef struct + // TODO: The unit tests do not check for valid code points, so always end the test + // strings with a simple ASCII symbol for now. + static const testcase_t unit_testcases[] = { +- { "foo", 3, "f\x00o\x00o\x00\x00\x00", 3 }, +- { "foo", 4, "f\x00o\x00o\x00\x00\x00", 4 }, ++ { "foo", 3, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 3 }, ++ { "foo", 4, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 4 }, + { "✊🎅ęʥ꣸𑗊a", 19, +- "\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00\x00", 9 } ++ (const WCHAR*)"\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00" ++ "\x00", ++ 9 } + }; + + static void create_prefix(char* prefix, size_t prefixlen, size_t buffersize, SSIZE_T rc, + +From cab7b59fccabc0f09d659bd499c03dab7e911ffa Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:13:40 +0100 +Subject: [PATCH 5/8] [codec,rfx] explicitly cast return + +cast to avoid compilation issues with incompatible-pointer-types +--- + libfreerdp/codec/rfx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c +index c83cfd5c1ac3..66ed1e04aea2 100644 +--- a/libfreerdp/codec/rfx.c ++++ b/libfreerdp/codec/rfx.c +@@ -1368,7 +1368,7 @@ const RFX_TILE** rfx_message_get_tiles(const RFX_MESSAGE* message, UINT16* numTi + WINPR_ASSERT(message); + if (numTiles) + *numTiles = message->numTiles; +- return message->tiles; ++ return (const RFX_TILE**)message->tiles; + } + + UINT16 rfx_message_get_tile_count(const RFX_MESSAGE* message) + +From 86966912502a3667c111d35dc9ba577a8b209a6d Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:17:29 +0100 +Subject: [PATCH 6/8] [client,common] fix incompatible-pointer-types + +use a union to cast to expected types. +--- + client/common/file.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/client/common/file.c b/client/common/file.c +index feb37967fc5a..39b08f18c916 100644 +--- a/client/common/file.c ++++ b/client/common/file.c +@@ -2299,9 +2299,15 @@ BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSett + if (~file->RedirectLocation) + { + size_t count = 0; +- char** str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count); +- const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, str); +- free(str); ++ union ++ { ++ void* pv; ++ char** str; ++ const char** cstr; ++ } cnv; ++ cnv.str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count); ++ const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, cnv.cstr); ++ free(cnv.pv); + if (!rc) + return FALSE; + } + +From dfdb8a849ef78a6e5d1530489ad7f899c62c9c22 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:18:09 +0100 +Subject: [PATCH 7/8] [channels,drive] fix wrong function usage + +_wcslen is for WCHAR, wcslen for wchar_t +--- + channels/drive/client/drive_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c +index 0fdc2e08ff50..04f8d837fa6b 100644 +--- a/channels/drive/client/drive_main.c ++++ b/channels/drive/client/drive_main.c +@@ -511,7 +511,7 @@ static UINT drive_process_irp_query_volume_information(DRIVE_DEVICE* drive, IRP* + /* http://msdn.microsoft.com/en-us/library/cc232101.aspx */ + const WCHAR* diskType = + InitializeConstWCharFromUtf8("FAT32", LabelBuffer, ARRAYSIZE(LabelBuffer)); +- const size_t diskTypeLen = (wcslen(diskType) + 1) * sizeof(WCHAR); ++ const size_t diskTypeLen = (_wcslen(diskType) + 1) * sizeof(WCHAR); + const size_t length = 12ul + diskTypeLen; + Stream_Write_UINT32(output, length); /* Length */ + + +From 00ec91dc16724f7aad8866b4f988baad4c1216a8 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:25:00 +0100 +Subject: [PATCH 8/8] [server,shadow] cast incompatible pointer + +the context pointer to WTSOpenServerA is intentional, cast to LPSTR to +match definition +--- + server/shadow/shadow_client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c +index 0fd52363eb6d..f2a5f63cb188 100644 +--- a/server/shadow/shadow_client.c ++++ b/server/shadow/shadow_client.c +@@ -252,7 +252,7 @@ static BOOL shadow_client_context_new(freerdp_peer* peer, rdpContext* context) + goto fail; + + region16_init(&(client->invalidRegion)); +- client->vcm = WTSOpenServerA(peer->context); ++ client->vcm = WTSOpenServerA((LPSTR)peer->context); + + if (!client->vcm || client->vcm == INVALID_HANDLE_VALUE) + goto fail; +From 00f4c9612a924f1b87a7dcdd2a5728d9e9616ee6 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 19:57:02 +0100 +Subject: [PATCH] [winpr,clipboard] fix WCHAR buffer size + +--- + winpr/libwinpr/clipboard/synthetic_file.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c +index e748f8bea399..ce70e1efc26e 100644 +--- a/winpr/libwinpr/clipboard/synthetic_file.c ++++ b/winpr/libwinpr/clipboard/synthetic_file.c +@@ -281,9 +281,9 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l + const char* c; + const WCHAR* w; + } wildcard; +- const char buffer[4] = "/\0*\0\0\0"; ++ const char buffer[6] = "/\0*\0\0\0"; + wildcard.c = buffer; +- const size_t wildcardLen = 3; ++ const size_t wildcardLen = ARRAYSIZE(buffer) / sizeof(WCHAR); + + WINPR_ASSERT(clipboard); + WINPR_ASSERT(local_name); diff --git a/net-misc/freerdp/files/freerdp-3.6.3-backports.patch b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch new file mode 100644 index 000000000000..473b27cbab02 --- /dev/null +++ b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch @@ -0,0 +1,224 @@ +https://bugs.gentoo.org/936406 +https://github.com/FreeRDP/FreeRDP/pull/10410 + +From 776083234b61224f8e3412c31be406b11509b7db Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Tue, 23 Jul 2024 09:14:04 +0200 +Subject: [PATCH 1/2] [warnings] fix unused-but-set-variable + +--- + channels/parallel/client/parallel_main.c | 4 ++++ + channels/printer/client/printer_main.c | 2 ++ + channels/serial/client/serial_main.c | 4 ++++ + channels/tsmf/client/tsmf_media.c | 2 +- + channels/urbdrc/client/data_transfer.c | 3 +-- + libfreerdp/core/gateway/tsg.c | 3 +-- + libfreerdp/core/heartbeat.c | 3 +-- + libfreerdp/gdi/gfx.c | 7 ++----- + winpr/libwinpr/ncrypt/ncrypt_pkcs11.c | 3 --- + 9 files changed, 16 insertions(+), 15 deletions(-) + +diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c +index ce574b87b084..4be078693870 100644 +--- a/channels/parallel/client/parallel_main.c ++++ b/channels/parallel/client/parallel_main.c +@@ -160,6 +160,8 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) + return ERROR_INVALID_DATA; + Stream_Read_UINT32(irp->input, Length); + Stream_Read_UINT64(irp->input, Offset); ++ (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message ++ * ignored */ + buffer = (BYTE*)calloc(Length, sizeof(BYTE)); + + if (!buffer) +@@ -220,6 +222,8 @@ static UINT parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp) + + Stream_Read_UINT32(irp->input, Length); + Stream_Read_UINT64(irp->input, Offset); ++ (void)Offset; /* [MS-RDPESP] 3.2.5.1.5 Processing a Server Write Request Message ++ * ignore offset */ + if (!Stream_SafeSeek(irp->input, 20)) /* Padding */ + return ERROR_INVALID_DATA; + const void* ptr = Stream_ConstPointer(irp->input); +diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c +index 8d11f9b5ccd3..c458c0fdcfca 100644 +--- a/channels/printer/client/printer_main.c ++++ b/channels/printer/client/printer_main.c +@@ -515,6 +515,8 @@ static UINT printer_process_irp_write(PRINTER_DEVICE* printer_dev, IRP* irp) + return ERROR_INVALID_DATA; + Stream_Read_UINT32(irp->input, Length); + Stream_Read_UINT64(irp->input, Offset); ++ (void)Offset; /* [MS-RDPEPC] 2.2.2.9 Server Printer Write Request (DR_PRN_WRITE_REQ) ++ * reserved for future use, ignore */ + Stream_Seek(irp->input, 20); /* Padding */ + const void* ptr = Stream_ConstPointer(irp->input); + if (!Stream_SafeSeek(irp->input, Length)) +diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c +index 22f799a16ba6..c98a27ea9040 100644 +--- a/channels/serial/client/serial_main.c ++++ b/channels/serial/client/serial_main.c +@@ -241,6 +241,8 @@ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) + + Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */ + Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */ ++ (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message ++ * ignored */ + Stream_Seek(irp->input, 20); /* Padding (20 bytes) */ + buffer = (BYTE*)calloc(Length, sizeof(BYTE)); + +@@ -301,6 +303,8 @@ static UINT serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp) + + Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */ + Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */ ++ (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message ++ * ignored */ + if (!Stream_SafeSeek(irp->input, 20)) /* Padding (20 bytes) */ + return ERROR_INVALID_DATA; + +diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c +index 5f47090ae37b..b20db415944d 100644 +--- a/channels/tsmf/client/tsmf_media.c ++++ b/channels/tsmf/client/tsmf_media.c +@@ -1161,7 +1161,7 @@ BOOL tsmf_stream_flush(TSMF_STREAM* stream) + stream->presentation->audio_end_time = 0; + } + +- return TRUE; ++ return ret; + } + + void _tsmf_presentation_free(void* obj) +diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c +index 56f3267ccc35..5f9a6e0e479e 100644 +--- a/channels/urbdrc/client/data_transfer.c ++++ b/channels/urbdrc/client/data_transfer.c +@@ -1038,7 +1038,6 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_ + BYTE bmRequestType = 0; + UINT16 Value = 0; + UINT16 Index = 0; +- UINT16 Padding = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; + const BOOL noAck = (RequestField & 0x80000000U) != 0; +@@ -1061,7 +1060,7 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_ + Stream_Read_UINT8(s, Request); /** Request */ + Stream_Read_UINT16(s, Value); /** value */ + Stream_Read_UINT16(s, Index); /** index */ +- Stream_Read_UINT16(s, Padding); /** Padding */ ++ Stream_Seek_UINT16(s); /** Padding */ + Stream_Read_UINT32(s, OutputBufferSize); + if (OutputBufferSize > UINT32_MAX - 36) + return ERROR_INVALID_DATA; +diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c +index fdd01089810a..60ccdc5a63c6 100644 +--- a/libfreerdp/core/gateway/tsg.c ++++ b/libfreerdp/core/gateway/tsg.c +@@ -693,14 +693,13 @@ static BOOL tsg_ndr_read_packet_response(wLog* log, wStream* s, UINT32* index, + UINT32 MaxSizeValue = 0; + UINT32 MaxOffsetValue = 0; + UINT32 idleTimeout = 0; +- UINT32 reserved = 0; + + WINPR_ASSERT(response); + + if (!Stream_CheckAndLogRequiredLengthOfSizeWLog(log, s, 2, sizeof(UINT32))) + return FALSE; + Stream_Read_UINT32(s, response->flags); /* Flags (4 bytes) */ +- Stream_Read_UINT32(s, reserved); /* Reserved (4 bytes) */ ++ Stream_Seek_UINT32(s); /* Reserved (4 bytes) */ + + if (response->flags != TSG_PACKET_TYPE_QUARREQUEST) + { +diff --git a/libfreerdp/core/heartbeat.c b/libfreerdp/core/heartbeat.c +index 1fb608962f0a..6a77bd562ceb 100644 +--- a/libfreerdp/core/heartbeat.c ++++ b/libfreerdp/core/heartbeat.c +@@ -25,7 +25,6 @@ + + state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s) + { +- BYTE reserved = 0; + BYTE period = 0; + BYTE count1 = 0; + BYTE count2 = 0; +@@ -38,7 +37,7 @@ state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s) + if (!Stream_CheckAndLogRequiredLength(AUTODETECT_TAG, s, 4)) + return STATE_RUN_FAILED; + +- Stream_Read_UINT8(s, reserved); /* reserved (1 byte) */ ++ Stream_Seek_UINT8(s); /* reserved (1 byte) */ + Stream_Read_UINT8(s, period); /* period (1 byte) */ + Stream_Read_UINT8(s, count1); /* count1 (1 byte) */ + Stream_Read_UINT8(s, count2); /* count2 (1 byte) */ +diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c +index c9016a995e6b..59c7a377f8db 100644 +--- a/libfreerdp/gdi/gfx.c ++++ b/libfreerdp/gdi/gfx.c +@@ -1855,14 +1855,11 @@ BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx, + pcRdpgfxUnmapWindowForSurface unmap, + pcRdpgfxUpdateSurfaceArea update) + { +- rdpContext* context = NULL; +- const rdpSettings* settings = NULL; +- + if (!gdi || !gfx || !gdi->context || !gdi->context->settings) + return FALSE; + +- context = gdi->context; +- settings = gdi->context->settings; ++ rdpContext* context = gdi->context; ++ rdpSettings* settings = context->settings; + + gdi->gfx = gfx; + gfx->custom = (void*)gdi; +diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c +index 5f0a80262a30..74ee99ec3a2c 100644 +--- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c ++++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c +@@ -356,7 +356,6 @@ static void log_(const char* tag, const char* msg, CK_RV rv, CK_ULONG index, CK_ + static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKeysState* state) + { + CK_OBJECT_HANDLE slotObjects[MAX_KEYS_PER_SLOT] = { 0 }; +- const char* step = NULL; + + WINPR_ASSERT(provider); + +@@ -418,7 +417,6 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe + { + // TODO: shall it be fatal ? + loge(TAG, "unable to initiate search", rv, i, state->slots[i]); +- step = "C_FindObjectsInit"; + goto cleanup_FindObjectsInit; + } + +@@ -428,7 +426,6 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe + if (rv != CKR_OK) + { + loge(TAG, "unable to findObjects", rv, i, state->slots[i]); +- step = "C_FindObjects"; + goto cleanup_FindObjects; + } + + +From f22974a95a6b2d647174f4195f2ba4789105afaa Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Tue, 23 Jul 2024 09:15:00 +0200 +Subject: [PATCH 2/2] [winpr,utils] include current source dir + +--- + winpr/libwinpr/utils/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/winpr/libwinpr/utils/CMakeLists.txt b/winpr/libwinpr/utils/CMakeLists.txt +index 2c5efb3295a5..6bf40e77b1a6 100644 +--- a/winpr/libwinpr/utils/CMakeLists.txt ++++ b/winpr/libwinpr/utils/CMakeLists.txt +@@ -18,7 +18,7 @@ + include(CheckFunctionExists) + include(CMakeDependentOption) + +-set(CMAKE_INCLUDE_CURRENT_DIR ON) ++winpr_include_directory_add(${CMAKE_CURRENT_SOURCE_DIR}) + + option(WITH_LODEPNG "build WinPR with PNG support" OFF) + if (WITH_LODEPNG) diff --git a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild deleted file mode 100644 index ca7d9504ea65..000000000000 --- a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2011-2023 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 jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - 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 - x11-libs/libXrandr - ) - 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=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -PATCHES=( - "${FILESDIR}"/${P}-ffmpeg-6.patch -) - -src_configure() { - # bug #881695 - filter-lto - - local mycmakeargs=( - -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_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_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.0-r1.ebuild b/net-misc/freerdp/freerdp-2.11.0-r1.ebuild deleted file mode 100644 index 2a906f8c6a0d..000000000000 --- a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2011-2023 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 )" - -RDEPEND=" - 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 - 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=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -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.1.ebuild b/net-misc/freerdp/freerdp-2.11.1.ebuild deleted file mode 100644 index c02216b06c7b..000000000000 --- a/net-misc/freerdp/freerdp-2.11.1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2011-2023 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 )" - -RDEPEND=" - 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 - 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=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -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.2.ebuild b/net-misc/freerdp/freerdp-2.11.2.ebuild deleted file mode 100644 index 2a906f8c6a0d..000000000000 --- a/net-misc/freerdp/freerdp-2.11.2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2011-2023 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 )" - -RDEPEND=" - 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 - 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=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -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.5-r10.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild new file mode 100644 index 000000000000..6c9b29344718 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild @@ -0,0 +1,168 @@ +# 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="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 + 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..399900dc6899 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.7.ebuild @@ -0,0 +1,176 @@ +# 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" + "${FILESDIR}/freerdp-2.11.7-type-mismatch.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 + + # https://bugs.gentoo.org/927731 + append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) + + 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 2a906f8c6a0d..b17a66b5c459 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2023 Gentoo Authors +# Copyright 2011-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,21 +12,31 @@ 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" 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" +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 )" -RDEPEND=" +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 ) @@ -52,7 +62,7 @@ RDEPEND=" gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr + X? ( x11-libs/libXrandr ) ) icu? ( dev-libs/icu:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) @@ -72,66 +82,94 @@ RDEPEND=" ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) " -DEPEND=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) " -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) +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 + # https://bugs.gentoo.org/927731 + append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) + local mycmakeargs=( -Wno-dev - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) -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_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=$(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) + -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=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) + 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-3.0.0_beta3.ebuild b/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild deleted file mode 100644 index f5fc7c8b622a..000000000000 --- a/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 2011-2023 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="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - 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= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - 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 - 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= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -src_configure() { - # bug #881695 - filter-lto - - local mycmakeargs=( - -Wno-dev - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_AAD=$(usex aad ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CLIENT_SDL=$(usex sdl ON 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_JPEG=$(usex jpeg ON OFF) - -DWITH_KRB5=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_OSS=OFF - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_PKCS11=$(usex smartcard ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_UNICODE_BUILTIN=$(usex icu OFF ON) - -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) - -DWITH_WEBVIEW=OFF - ) - cmake_src_configure -} - -src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) - cmake_src_test -} diff --git a/net-misc/freerdp/freerdp-3.4.0-r12.ebuild b/net-misc/freerdp/freerdp-3.4.0-r12.ebuild new file mode 100644 index 000000000000..eff1b1ea29b2 --- /dev/null +++ b/net-misc/freerdp/freerdp-3.4.0-r12.ebuild @@ -0,0 +1,188 @@ +# 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="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] ) + smartcard? ( dev-libs/opensc ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-3.4.0-incompatible-pointer.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 + + # 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-3.6.3.ebuild b/net-misc/freerdp/freerdp-3.6.3.ebuild new file mode 100644 index 000000000000..2603e73e7407 --- /dev/null +++ b/net-misc/freerdp/freerdp-3.6.3.ebuild @@ -0,0 +1,186 @@ +# 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? ( 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] ) + smartcard? ( app-crypt/p11-kit ) +" + +PATCHES=( + "${FILESDIR}/freerdp-3.6.3-backports.patch" +) + +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 ba1f26353110..51aab209a2db 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2023 Gentoo Authors +# Copyright 2011-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,21 +12,30 @@ 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" HOMEPAGE="https://www.freerdp.com/" LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" +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 )" -RDEPEND=" +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 ) @@ -54,7 +63,7 @@ RDEPEND=" gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr + X? ( x11-libs/libXrandr ) ) icu? ( dev-libs/icu:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) @@ -62,7 +71,7 @@ RDEPEND=" openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-libs/libpulse ) sdl? ( - media-libs/libsdl2 + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] media-libs/sdl2-ttf ) server? ( @@ -76,76 +85,98 @@ RDEPEND=" xinerama? ( x11-libs/libXinerama ) ) ) - smartcard? ( - dev-libs/pkcs11-helper - sys-apps/pcsc-lite - ) + smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) " -DEPEND=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) " -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:2[client] ) + server? ( !net-misc/freerdp:2[server] ) + smartcard? ( app-crypt/p11-kit ) " +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=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_AAD=$(usex aad ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) + + # 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_SDL=$(usex sdl ON 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_FUSE=$(usex fuse ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_KRB5=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON 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=$(usex smartcard ON OFF) - -DWITH_PKCS11=$(usex smartcard ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_UNICODE_BUILTIN=$(usex icu OFF ON) - -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) + -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=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) + 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/metadata.xml b/net-misc/freerdp/metadata.xml index 0fc989abd6dc..ff51b9ab1df0 100644 --- a/net-misc/freerdp/metadata.xml +++ b/net-misc/freerdp/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="aad">Enable login via Azure AD</flag> + <flag name="client">Build client binaries</flag> <flag name="fuse">Clipboard with FUSE file copy support</flag> <flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag> <flag name="server">Build server binaries</flag> diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest index d91332d2ffe3..ed66d088a7ac 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -1,2 +1,2 @@ -DIST frr-9.0.1.tar.gz 10334150 BLAKE2B c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b SHA512 fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9 -DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25 +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.0.ebuild b/net-misc/frr/frr-9.0.2.ebuild index 73df8c4dd6f6..87227382bd64 100644 --- a/net-misc/frr/frr-9.0.ebuild +++ b/net-misc/frr/frr-9.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,7 @@ COMMON_DEPEND=" " BDEPEND=" ~dev-util/clippy-${PV} - sys-devel/flex + app-alternatives/lex app-alternatives/yacc doc? ( dev-python/sphinx ) " @@ -49,7 +49,6 @@ DEPEND=" RDEPEND=" ${COMMON_DEPEND} $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') - !net-misc/quagga " PATCHES=( diff --git a/net-misc/frr/frr-9.0.1.ebuild b/net-misc/frr/frr-9.1.ebuild index 3e71c240c475..71a6eb44675c 100644 --- a/net-misc/frr/frr-9.0.1.ebuild +++ b/net-misc/frr/frr-9.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools pam python-single-r1 systemd DESCRIPTION="The FRRouting Protocol Suite" @@ -12,9 +12,9 @@ SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz" # FRR tarballs have weird format. S="${WORKDIR}/frr-${P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -36,8 +36,7 @@ COMMON_DEPEND=" snmp? ( net-analyzer/net-snmp:= ) " BDEPEND=" - ~dev-util/clippy-${PV} - sys-devel/flex + app-alternatives/lex app-alternatives/yacc doc? ( dev-python/sphinx ) " @@ -49,7 +48,6 @@ DEPEND=" RDEPEND=" ${COMMON_DEPEND} $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') - !net-misc/quagga " PATCHES=( @@ -66,18 +64,15 @@ src_prepare() { src_configure() { local myconf=( - --disable-static --with-pkg-extra-version="-gentoo" --enable-configfile-mask=0640 --enable-logfile-mask=0640 - --prefix="${EPREFIX}"/usr --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 - --with-clippy="${BROOT}"/usr/bin/clippy --enable-user=frr --enable-group=frr --enable-vty-group=frr @@ -104,6 +99,11 @@ src_compile() { 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 @@ -112,28 +112,17 @@ src_install() { use doc && dodoc -r doc/user/_build/html # Create configuration directory with correct permissions - keepdir /etc/frr - fowners frr:frr /etc/frr - fperms 775 /etc/frr - # Create logs directory with the correct permissions - keepdir /var/log/frr - fowners frr:frr /var/log/frr - fperms 775 /var/log/frr + diropts -ofrr -gfrr -m0775 + keepdir /var/log/frr /etc/frr # Install the default configuration files insinto /etc/frr - doins tools/etc/frr/vtysh.conf - doins tools/etc/frr/frr.conf - doins tools/etc/frr/daemons + doins tools/etc/frr/{vtysh.conf,frr.conf,daemons} # Fix permissions/owners. - fowners frr:frr /etc/frr/vtysh.conf - fowners frr:frr /etc/frr/frr.conf - fowners frr:frr /etc/frr/daemons - fperms 640 /etc/frr/vtysh.conf - fperms 640 /etc/frr/frr.conf - fperms 640 /etc/frr/daemons + 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 diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml index 872896f7668c..9cd33eb40e66 100644 --- a/net-misc/frr/metadata.xml +++ b/net-misc/frr/metadata.xml @@ -5,10 +5,6 @@ <name>Alarig Le Lay</name> <email>alarig@swordarmor.fr</email> </maintainer> - <maintainer type="person"> - <email>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> - </maintainer> <maintainer type="person" proxied="yes"> <email>jaco@uls.co.za</email> <name>Jaco Kroon</name> diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index 2a6057d69bc5..679dbae9c060 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,3 +1,4 @@ -DIST gallery-dl-1.26.1.gh.tar.gz 604212 BLAKE2B 980e7b8b3c8ec966bb77db7c4312398490add75580e557f4654ca3aeb62ab287599f85dc401ed5bfae4dc6124e5a87b9254904b442b3a0cc2b10acdf5ce6695a SHA512 60d32ac82df5dd837399b778c118d8f944b7f35c5dfbbe8168841f0ff76471016b6049b617fef4825b3e21b37237c58bbc9f44be3e4e7ddb9bdf97cba11154bb -DIST gallery-dl-1.26.2.gh.tar.gz 607389 BLAKE2B 9bacfa4ba4019dbd8abd87ad868b1f6d2c56eab165633a07ba99c569962f26df6d82c96ef12c0c033792ece2084e4f5b7a2121483d51d765b828d4997780edc1 SHA512 08f0caa07f1e3fddf003658e9261e711b2a5fc0049447f36794c441f37ba01b74cc091f90378d5a649196ceba487d5dff541dbfcd86ca8c1b0551a972dc1f848 -DIST gallery-dl-1.26.3.gh.tar.gz 621229 BLAKE2B d85be6e8f3e21d5f8e18bcf70fb51f46d5672d48115bf88fb5fa3316b6e8cddca8c8c6f540f3b1529e6607d746aba98097aa95f692e98effa4e51ba4578d16aa SHA512 43891d40de26527b7195c064fda6c8303461c5e4107b0482ca535f06b8fe923513acc212bd75b4d8d82fa12e19ef214e1ee395ced1525eceda7a433d3d05fef3 +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 +DIST gallery-dl-1.27.0.gh.tar.gz 682957 BLAKE2B 7a376c22d970533ac3668d9893fed74551100463d7d24c93940971238c568b70c644cd78df1edb506c9a5ef0d7154d3566f61fb9bcc047c47f0868900936b5d5 SHA512 129df83eafecf3ce680318ff9360fd99feb2136e236f377eb7921406e3f4ea93bb2479265dcec18cae77b83f013223612c0cae7ffd7ac2e122e0395de7beb92a +DIST gallery-dl-1.27.1.gh.tar.gz 686087 BLAKE2B c80f37d314671637f435957abf9d79d01d421e48c89e90a3290e6fbf6e32f89d4b7495deeaf2ce0528750b65d4b404108fe78bc42f0e39dda4bcfd4267aa9dff SHA512 d3243bd23e7a743d98b9745d78b653546a49a97dd8468b60014fa6ba74071de8057c8b479dc3d74854b4c194034b027fe15bc530a60dea34dcc6221b105c285c diff --git a/net-misc/gallery-dl/gallery-dl-1.26.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.2.ebuild deleted file mode 100644 index b3da2a9c870f..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.26.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -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" -# Tests require network access. -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" - -distutils_enable_tests setup.py - -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 new file mode 100644 index 000000000000..74f78f4c094c --- /dev/null +++ b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild @@ -0,0 +1,55 @@ +# 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 + https://github.com/mikf/${PN}/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch + -> ${P}-5227bb6.patch + " + + KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=" + >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] +" + +PATCHES=( "${DISTDIR}/${P}-5227bb6.patch" ) + +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.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.0.ebuild index e83e798733f1..64a17799c780 100644 --- a/net-misc/gallery-dl/gallery-dl-1.26.1.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.27.0.ebuild @@ -1,37 +1,46 @@ -# Copyright 1999-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) 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" +HOMEPAGE="https://github.com/mikf/gallery-dl/" -if [[ ${PV} == 9999 ]]; then +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" + 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" -# Tests require network access. -PROPERTIES="test_network" -RESTRICT="test" -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" +RDEPEND=" + >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] +" + +distutils_enable_tests unittest -distutils_enable_tests setup.py +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 + emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man } pkg_postinst() { diff --git a/net-misc/gallery-dl/gallery-dl-1.26.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.1.ebuild index b3da2a9c870f..fea34fbde450 100644 --- a/net-misc/gallery-dl/gallery-dl-1.26.3.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.27.1.ebuild @@ -1,37 +1,46 @@ -# Copyright 1999-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) 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" +HOMEPAGE="https://github.com/mikf/gallery-dl/" -if [[ ${PV} == 9999 ]]; then +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" + 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" -# Tests require network access. -PROPERTIES="test_network" -RESTRICT="test" -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" +RDEPEND=" + >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] +" + +distutils_enable_tests unittest -distutils_enable_tests setup.py +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 + emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man } pkg_postinst() { diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild index b3da2a9c870f..fea34fbde450 100644 --- a/net-misc/gallery-dl/gallery-dl-9999.ebuild +++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild @@ -1,37 +1,46 @@ -# Copyright 1999-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) 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" +HOMEPAGE="https://github.com/mikf/gallery-dl/" -if [[ ${PV} == 9999 ]]; then +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" + 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" -# Tests require network access. -PROPERTIES="test_network" -RESTRICT="test" -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" +RDEPEND=" + >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] +" + +distutils_enable_tests unittest -distutils_enable_tests setup.py +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 + emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man } pkg_postinst() { 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..c677d93e4526 --- /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 "$(cargo_target_dir)"/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/gensio/Manifest b/net-misc/gensio/Manifest new file mode 100644 index 000000000000..4d862c8842cf --- /dev/null +++ b/net-misc/gensio/Manifest @@ -0,0 +1 @@ +DIST gensio-2.8.5.tar.gz 1550476 BLAKE2B 4a000101a31ce0e1b9ee47e786a3a552b5b2e5863de67491bcfea0a61e55132220b5a62c6e40bb17aeae66ea57b651611e776b1446c6b1c3ac74452238295d95 SHA512 820bceca89085f830d0bdf05147ffa591f63a635311757d0af22a5a0284065e9b50e3bb4bea64bba1114c563e448d11e7f425c311b8f577d7f0f2d17944c9549 diff --git a/net-misc/gensio/files/gensio-2.8.5-install-dir.patch b/net-misc/gensio/files/gensio-2.8.5-install-dir.patch new file mode 100644 index 000000000000..ddea0cb55402 --- /dev/null +++ b/net-misc/gensio/files/gensio-2.8.5-install-dir.patch @@ -0,0 +1,16 @@ +--- gensio-2.8.5.orig/lib/Makefile.am 2024-06-18 21:45:20.427838306 -0700 ++++ gensio-2.8.5/lib/Makefile.am 2024-06-18 21:46:09.360860952 -0700 +@@ -385,6 +385,7 @@ + endif + + install-exec-hook: ++ @(install -d $(DESTDIR)$(gensiolibexecdir)) + @(cd $(DESTDIR)$(gensiolibexecdir) && $(RM) -f $(gensiolibexec_LTLIBRARIES)) + @(cd $(DESTDIR)$(gensiolibexecdir) && $(RM) -f $(xgensio_libs)) + +@@ -392,4 +393,5 @@ + # libtool will not remove the .so or .dll files since the .la file is + # no longer there. We have to do that by hand. + uninstall-hook: ++ @(install -d $(DESTDIR)$(gensiolibexecdir)) + @(cd $(DESTDIR)$(gensiolibexecdir) && $(RM) -f $(xgensio_solibs)) diff --git a/net-misc/gensio/gensio-2.8.5.ebuild b/net-misc/gensio/gensio-2.8.5.ebuild new file mode 100644 index 000000000000..738d126edafe --- /dev/null +++ b/net-misc/gensio/gensio-2.8.5.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools +DESCRIPTION="General Stream I/O" +HOMEPAGE="https://sourceforge.net/projects/ser2net" +SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug tcpd" + +DEPEND=" + tcpd? ( sys-apps/tcp-wrappers ) +" +RDEPEND="${DEPEND}" + +# Test suite requires a kernel module +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-2.8.5-install-dir.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --with-file-stdio \ + --without-link-ssl-with-main \ + --with-uucp-locking \ + --with-flock-locking \ + --without-broken-pselect \ + --with-pthreads \ + --without-glib \ + --without-cplusplus \ + --without-python \ + --without-go \ + --without-swig \ + --without-all-gensios \ + --without-moduleinstall \ + --with-net=yes \ + --with-udp=yes \ + --with-sctp=no \ + --with-stdio=yes \ + --with-pty=yes \ + --with-serialdev=yes \ + --with-telnet=yes \ + --without-tcl \ + --without-openipmi \ + --without-ipmisol \ + --without-mdns \ + --without-dnssd \ + --without-alsa \ + --without-winsound \ + --without-portaudio \ + --without-certauth \ + --without-udev \ + --without-ssl \ + --enable-doc \ + --disable-internal-trace \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable debug) +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-misc/gensio/metadata.xml b/net-misc/gensio/metadata.xml new file mode 100644 index 000000000000..846d0822488b --- /dev/null +++ b/net-misc/gensio/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>perfinion@gentoo.org</email> + <name>Jason Zaman</name> + </maintainer> + + <longdescription> + A library to abstract stream I/O like serial port, TCP, telnet, UDP, SSL, IPMI SOL, etc. + </longdescription> + + <upstream> + <remote-id type="sourceforge">ser2net</remote-id> + <remote-id type="github">cminyard/gensio</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index 2906a9477455..2a432023cafd 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -1,2 +1,6 @@ -DIST geoipupdate-4.9.0-deps.tar.xz 2894004 BLAKE2B 2995d4f2f8632d232b156294cca8bd76f40373c948df9ca5b4813bf630923168063eb094de52582af5221950343b998afb50c97bfe9077cf952951b00e5b3349 SHA512 c83c05cd5063199b21b8eb621a80da8679ddac2881da53b6914a7cb1419a1a6ef8cabd62562722d61b7e5d05d93f430a707d4e082e126514bfad27537f4e3ff7 +DIST geoipupdate-4.9.0-deps.tar.xz 911156 BLAKE2B 136df3a0e94ab0934b48e8860b152edacffae093d26bdbe9593c24f540ce0d6cff215e4cf4ea158bd8dc9a9f3157d5634fea4d66315c5dbc537b42041d0625e6 SHA512 88579ba0e804d7dd9f6cab24d2ac01186f39c47f1ae79d395a77b0725d25e8675928ce34532506f164157cbce4fb2e947efbd2e66c23ed18d61bc67be74ce74d DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c +DIST geoipupdate-6.0.0-deps.tar.xz 864256 BLAKE2B 6f9a7adf4bfef6c38a06b3f5e8b49362218dd8b698eec29921ac1d587094c49b26bc307924327600cb06327aae7171a6865cc79134eddee9e08004a82dfcbb84 SHA512 678ecb798b9b736a82d3e2b64c426e966408bbf3858a32e84dd142f0392444248c34c78dec07a5f8c0f04752c965c5cfb1602d96a541462e40a4c84039c71237 +DIST geoipupdate-6.0.0.tar.gz 46523 BLAKE2B ff14026acf39797f69b7cde527c826b78740a65ac4e0914cdffc6276473e3f4367e87e962dfa4634114b7f5b02c33a4a8e675518f4de85238a2342cb367c9f25 SHA512 2b2a6573b6af30ad1ad4c8ed3b97df41bba96212a0e6d90e4a92bd0615f02c9e989168ad56a651d8f35a7d2534e223de5a6f8a34d587f3c8a7a8e19f3b913ca4 +DIST geoipupdate-6.1.0-deps.tar.xz 866588 BLAKE2B aabda8132d0f8866e3450b5c2f07dccc7b1555cac0a987fea48ffe3f07a8c66c72bb41ca1478d47f03cb61bd29a6183bd0621126222decc4e29b8525c3ba991e SHA512 4a03b35258dc77659471299fe119da1e435b1360df08b0b8a19f6374e3880c1c6153fcdb5146f74900ebf540c2c66a3007228f05b702f526ed9e75e01f51f98d +DIST geoipupdate-6.1.0.tar.gz 47557 BLAKE2B ef33058f8504c06dc2c2a350421866cd88a6b87624874cf6bd29d99c77637c3b99468a6ba615d71310e0c5d49d6ee2820d9a3841c1127437fa602864a014d77d SHA512 b20a3101fb055ed71fe999fe924b71f6d0eb76da8bc4444f7281a3deceac1ee7d1854f3d672b93edabf152cc69551933dd951419ab484259d47f56b243e568eb diff --git a/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch b/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch new file mode 100644 index 000000000000..aa48a97ef155 --- /dev/null +++ b/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch @@ -0,0 +1,26 @@ +From 250049909d1f9ed3c8ab06e07fcb10487942953a Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Wed, 13 Dec 2023 18:59:31 +0200 +Subject: [PATCH] Use go-md2man instead of perl script with pandoc + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/Makefile ++++ b/Makefile +@@ -53,10 +53,11 @@ $(BUILDDIR)/GeoIP.conf.md: $(BUILDDIR) doc/GeoIP.conf.md + $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdate.md + sed -e 's|CONFFILE|$(CONFFILE)|g' -e 's|DATADIR|$(DATADIR)|g' -e 's|$$|$(MAYBE_CR)|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md + +-$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md $(BUILDDIR)/geoipupdate.md +- dev-bin/make-man-pages.pl "$(BUILDDIR)" ++$(BUILDDIR)/GeoIP.conf.5: %.5 : %.md ++ go-md2man -in $< -out $@ + +-$(BUILDDIR)/geoipupdate.1: $(BUILDDIR)/GeoIP.conf.5 ++$(BUILDDIR)/geoipupdate.1: %.1: %.md ++ go-md2man -in $< -out $@ + + clean: + rm -rf $(BUILDDIR)/GeoIP.conf \ +-- +2.43.0 + diff --git a/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild new file mode 100644 index 000000000000..eeedc3970bee --- /dev/null +++ b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" +HOMEPAGE="https://github.com/maxmind/geoipupdate" +SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="BSD MIT Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" + +BDEPEND="dev-go/go-md2man" + +DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) + +PATCHES=( + "${FILESDIR}/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch" +) + +src_compile() { + # Do not let these leak from outside into the package + unset GOBIN GOPATH GOCODE + + # the horror, the horror ... but it's all automagic + export CONFFILE=/etc/GeoIP.conf + export DATADIR=/usr/share/GeoIP + export VERSION=${PV} + + default +} + +src_install() { + dobin build/geoipupdate + + keepdir /usr/share/GeoIP + + insinto /etc + doins build/GeoIP.conf + + doman build/GeoIP.conf.5 build/geoipupdate.1 + + einstalldocs +} diff --git a/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild new file mode 100644 index 000000000000..e614b260fb7e --- /dev/null +++ b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" +HOMEPAGE="https://github.com/maxmind/geoipupdate" +SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="ISC BSD BSD-2 MIT Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm ppc64 ~s390 x86" + +DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) + +src_compile() { + # Do not let these leak from outside into the package + unset GOBIN GOPATH GOCODE + + # requires pandoc but the information is still in the distributed md files + sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die + #sed -i -e 's/go build/go build -x/' Makefile || die + + # the horror, the horror ... but it's all automagic + export CONFFILE=/etc/GeoIP.conf + export DATADIR=/usr/share/GeoIP + export VERSION=${PV} + + default +} + +src_install() { + dobin build/geoipupdate + + keepdir /usr/share/GeoIP + + insinto /etc + doins build/GeoIP.conf + + einstalldocs +} 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/econnman/metadata.xml b/net-misc/geoipyupdate/metadata.xml index a1fbf3c0c993..c6418674131d 100644 --- a/net-misc/econnman/metadata.xml +++ b/net-misc/geoipyupdate/metadata.xml @@ -2,7 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>juippis@gentoo.org</email> - <name>Joonas Niilola</name> + <email>mjo@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/net-misc/geomyidae/metadata.xml b/net-misc/geomyidae/metadata.xml index a3862b8ec2fc..115e9d64a669 100644 --- a/net-misc/geomyidae/metadata.xml +++ b/net-misc/geomyidae/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"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index 96b7358aac52..44e5c5374c0d 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1 +1,3 @@ DIST gerbera-1.12.1.tar.gz 4368573 BLAKE2B 870b1296b89d51086048c5c5a52109f336facbf0bce02313487cb5c80ca4bb9a5590f64683f5ac92a3c3026ef9c3e22275a38fdc52fd8cbe887ec6f3c7b38ab9 SHA512 54f4b9fe38f4890d1cac16d433bd70cb2892f3659fffcd5f52814d2f9377c4a8eb68deb3a13053531609727f7ae6cb5ee12bbf652bc41dd1eabd83e6f8dcc1f2 +DIST gerbera-2.1.0.tar.gz 5828980 BLAKE2B d611b9db723e52d417c64ce6ff8bfd77009ad7b7c2454b8f722810aacfde76b892894e8a70cf4e25474f970b13353eb770d4663f91ac59ac87cea858928005fb SHA512 5069ffb470dc10c5b7e6f95e9d61794e00d8a4473835860e7bca63ff1c34f2b8544b3a7fed8373a20e6bbddb2bc016ecb39a8321e930813e65e444b653e5a24f +DIST gerbera-2.2.0.tar.gz 6138157 BLAKE2B eab6008696cf353c50468a686509ed82381375e7b5e5a5a1b38bfcad6e275ca69885df7a8df7ebdf5bb407f7e7ec9401c27e09fbca55ec61ef15c415439b7148 SHA512 6e11d3e40c9a95d278ce4c6f0c914a27fed250e9202bb81c0f539d06622738bfa5b2156ca6bd061872e276858eb203f626c997ddc00810f9d816f4ff9198c97e diff --git a/net-misc/gerbera/gerbera-2.1.0.ebuild b/net-misc/gerbera/gerbera-2.1.0.ebuild new file mode 100644 index 000000000000..b3c80239e4c7 --- /dev/null +++ b/net-misc/gerbera/gerbera-2.1.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake linux-info + +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P}" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" + +RDEPEND=" + acct-user/gerbera + dev-db/sqlite + dev-libs/libebml:= + dev-libs/libfmt:= + dev-libs/pugixml + dev-libs/spdlog:= + net-libs/libupnp:=[ipv6(+),reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2:= ) + ffmpeg? ( media-video/ffmpeg:= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + javascript? ( dev-lang/duktape:= ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska:= ) + mysql? ( dev-db/mysql-connector-c:= ) + taglib? ( media-libs/taglib ) +" + +DEPEND="${RDEPEND}" + +CONFIG_CHECK="~INOTIFY_USER" + +src_configure() { + local mycmakeargs=( + -DWITH_AVCODEC=$(usex ffmpeg) + -DWITH_CURL=$(usex curl) + -DWITH_DEBUG=$(usex debug) + -DWITH_EXIF=$(usex exif) + -DWITH_EXIV2=$(usex exiv2) + -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) + -DWITH_INOTIFY=1 + -DWITH_JS=$(usex javascript) + -DWITH_LASTFM=NO + -DWITH_MAGIC=$(usex magic) + -DWITH_MATROSKA=$(usex matroska) + -DWITH_MYSQL=$(usex mysql) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TAGLIB=$(usex taglib) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} + newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} + + insinto /etc/${PN} + newins "${FILESDIR}"/${PN}-1.3.0.config config.xml + fperms 0640 /etc/${PN}/config.xml + fowners root:gerbera /etc/${PN}/config.xml +} + +pkg_postinst() { + if use mysql; then + elog "Gerbera has been built with MySQL support and needs" + elog "to be configured before being started. By default" + elog "SQLite will be used." + fi +} diff --git a/net-misc/gerbera/gerbera-2.2.0.ebuild b/net-misc/gerbera/gerbera-2.2.0.ebuild new file mode 100644 index 000000000000..ea5940db0a95 --- /dev/null +++ b/net-misc/gerbera/gerbera-2.2.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake linux-info + +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P}" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" + +RDEPEND=" + acct-user/gerbera + dev-db/sqlite + dev-libs/libebml:= + dev-libs/libfmt:= + dev-libs/pugixml + dev-libs/spdlog:= + net-libs/libupnp:=[ipv6(+),reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2:= ) + ffmpeg? ( media-video/ffmpeg:= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + javascript? ( dev-lang/duktape:= ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska:= ) + mysql? ( dev-db/mysql-connector-c:= ) + taglib? ( media-libs/taglib ) +" + +DEPEND="${RDEPEND}" + +CONFIG_CHECK="~INOTIFY_USER" + +src_configure() { + local mycmakeargs=( + -DWITH_AVCODEC=$(usex ffmpeg) + -DWITH_CURL=$(usex curl) + -DWITH_DEBUG=$(usex debug) + -DWITH_EXIF=$(usex exif) + -DWITH_EXIV2=$(usex exiv2) + -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) + -DWITH_INOTIFY=ON + -DWITH_JS=$(usex javascript) + -DWITH_LASTFM=OFF + -DWITH_MAGIC=$(usex magic) + -DWITH_MATROSKA=$(usex matroska) + -DWITH_MYSQL=$(usex mysql) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TAGLIB=$(usex taglib) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} + newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} + + insinto /etc/${PN} + newins "${FILESDIR}"/${PN}-1.3.0.config config.xml + fperms 0640 /etc/${PN}/config.xml + fowners root:gerbera /etc/${PN}/config.xml +} + +pkg_postinst() { + if use mysql; then + elog "Gerbera has been built with MySQL support and needs" + elog "to be configured before being started. By default" + elog "SQLite will be used." + fi +} diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 2691f65a7c4f..ea5940db0a95 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake linux-info +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" inherit git-r3 else SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -DESCRIPTION="UPnP Media Server" -HOMEPAGE="https://gerbera.io" - LICENSE="GPL-2" SLOT="0" IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" @@ -28,7 +28,7 @@ RDEPEND=" dev-libs/libfmt:= dev-libs/pugixml dev-libs/spdlog:= - >=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] + net-libs/libupnp:=[ipv6(+),reuseaddr,-blocking-tcp] sys-apps/util-linux sys-libs/zlib virtual/libiconv @@ -40,7 +40,7 @@ RDEPEND=" javascript? ( dev-lang/duktape:= ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska:= ) - mysql? ( dev-db/mysql-connector-c ) + mysql? ( dev-db/mysql-connector-c:= ) taglib? ( media-libs/taglib ) " @@ -56,9 +56,9 @@ src_configure() { -DWITH_EXIF=$(usex exif) -DWITH_EXIV2=$(usex exiv2) -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) - -DWITH_INOTIFY=1 + -DWITH_INOTIFY=ON -DWITH_JS=$(usex javascript) - -DWITH_LASTFM=NO + -DWITH_LASTFM=OFF -DWITH_MAGIC=$(usex magic) -DWITH_MATROSKA=$(usex matroska) -DWITH_MYSQL=$(usex mysql) diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest index 98e1e21d1893..d5d5f9a9762a 100644 --- a/net-misc/gnome-connections/Manifest +++ b/net-misc/gnome-connections/Manifest @@ -1,2 +1,2 @@ -DIST gnome-connections-44.1.tar.xz 3999000 BLAKE2B 62f811a5cf530d3b38b576217d004d982f051a12bd3e525499d7fa4466538a1c8a2d4713f15cb0862d753f06a1f624f8fa87b80498ecbb461e7e7a545cb8c4d5 SHA512 34878e51ae67b222f8c5a00524bf2f3f24b9bc989ceccd707028ecdec612d81d3dc5e187e000f6e870e1cf816a66342cb8e9e9aaf7a6296950e1efa5b8a0d47e DIST gnome-connections-45.0.tar.xz 4009108 BLAKE2B 10f3f98df6fd6a090c226192229c3eeba7d707c1a109eaaf3a6427b9eadd375a136da9f089b904b66d9e94f27b9b6f982f1c0392ac9eb00936f46450b48bfbf6 SHA512 a2c5f8cd3076fc370cdd34f909bd02d07b9391a606133a46d17a5fd92644ee971c7dddb09674d660a462b9f0d99e83ef2b595095173274e54bbdc0f8411fffe4 +DIST gnome-connections-46.0.tar.xz 4036956 BLAKE2B f7f797353c57d615761b3048d5b2f50f21a6dd3245de9ab201317da10116f807cb9b301aec660165206ec61de42b4328debf5190e5d97e4c9e550af6edefe45a SHA512 7c57d2aa581abc6862f2509ed530d089019465ec2a54bc26e9736cf79d4d839a0fc62bb2ac931aa395cd576326a1d7b7c181e741cb943f836904d92ad41871cd diff --git a/net-misc/gnome-connections/gnome-connections-45.0.ebuild b/net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild index b6330f5a7f91..de42f7e3e3c6 100644 --- a/net-misc/gnome-connections/gnome-connections-45.0.ebuild +++ b/net-misc/gnome-connections/gnome-connections-45.0-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 @@ -24,7 +24,7 @@ DEPEND=" >=dev-libs/libxml2-2.7.8 app-crypt/libsecret[vala] - >=net-misc/freerdp-2.0.0:0= + >=net-misc/freerdp-2.0.0:2= " RDEPEND="${DEPEND}" BDEPEND=" diff --git a/net-misc/gnome-connections/gnome-connections-44.1.ebuild b/net-misc/gnome-connections/gnome-connections-46.0.ebuild index 325726aeadc2..ced38e9ea418 100644 --- a/net-misc/gnome-connections/gnome-connections-44.1.ebuild +++ b/net-misc/gnome-connections/gnome-connections-46.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 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/connections" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~loong" IUSE="test" RESTRICT="!test? ( test )" @@ -18,12 +18,13 @@ DEPEND=" dev-libs/gobject-introspection >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] + >=sys-fs/fuse-3.9.1 >=net-libs/gtk-vnc-0.4.4[pulseaudio,vala] >=gui-libs/libhandy-1.6.0:1[vala] >=dev-libs/libxml2-2.7.8 app-crypt/libsecret[vala] - >=net-misc/freerdp-2.0.0:0= + >=net-misc/freerdp-2.0.0:= " RDEPEND="${DEPEND}" BDEPEND=" diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest index fbb24933da9c..c4c90d690a54 100644 --- a/net-misc/gnome-remote-desktop/Manifest +++ b/net-misc/gnome-remote-desktop/Manifest @@ -1,3 +1,2 @@ -DIST gnome-remote-desktop-44.2.tar.xz 199876 BLAKE2B a959e6ca1f72660138640c4f6edfd5ee8bb4185d27d55456fcdee2eaa38e09ac5a76b0bfbf6395c9725f2cb4fa857f3064379d9824810657ea9c046738803411 SHA512 2e310cd926e0ed6fd28406a56e4d4ba239b9817b035231f66b648a98e08a5c7a7d810a2b786292aa39a7c67ca17af3de92dce4a6031a4f72166d667b8f498bd0 -DIST gnome-remote-desktop-45.0.tar.xz 212232 BLAKE2B 381429a7ddc6d7aa299754d42481577046ee2e89e4199bb307d4e13c58bef329ec0a56640ab84d9c1ef97eb04d72720fa061d43294e85925b17374c09bf05e60 SHA512 257548da2dffe1ed403708dba955fee5a1cd3219e82dd9db8914da603de89a28bfd7b60bcb5667fb47f6de1e590c68ea53d7df689b49d62a216a418d5b72c0d6 DIST gnome-remote-desktop-45.1.tar.xz 213504 BLAKE2B 78dd348cf15b677f52ca327ac824b2bd5276d53e7b6578bef0634e00e81993c1a1802ee861a31527af03351e6640cc9fcdc5f86fd44f20ec56138837dd9f05b6 SHA512 4572fefa03ee433783c822cf0405bd17b645f3aa08e8d88c04165859fd30643d612e5d7516a64ded8c1a0d2007026d6df877930b5ea127d7e1e939c1bb60f379 +DIST gnome-remote-desktop-46.3.tar.xz 273304 BLAKE2B dd959c0fabf183afd0be39da84f344589d5f5a6defaa298141bba4aeb3a39b253c962095efe35e425c106ae7126ddf2b3c8bba79b43054e26d0e0ff61c8e5ce5 SHA512 4e12ef3156eae8a1770646dd10235f0950ca34bd60bd8358958fe98696c2eb3af9ed9a2ad37239de9b4f25e0991bb7248a1d0f89e4b67c34430d5980064d4319 diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.ebuild deleted file mode 100644 index 595e4cdbee2a..000000000000 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.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 gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Remote desktop daemon for GNOME using pipewire" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="aac doc +rdp systemd +vnc" -REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )" -RESTRICT="test" # Tests run xvfb-run directly - -DEPEND=" - x11-libs/cairo - x11-libs/libdrm - >=media-libs/libepoxy-1.4 - >=dev-libs/glib-2.68:2 - x11-libs/libnotify - app-crypt/libsecret - >=media-video/pipewire-0.3.49:= - app-crypt/tpm2-tss:= - rdp? ( - >=media-libs/nv-codec-headers-11.1.5.0 - >=net-misc/freerdp-2.10.0:=[server] - >=sys-fs/fuse-3.9.1:3 - >=x11-libs/libxkbcommon-1.0.0 - - aac? ( - media-libs/fdk-aac:= - ) - ) - vnc? ( - net-libs/libvncserver - ) -" -RDEPEND="${DEPEND} - x11-wm/mutter[screencast] -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - virtual/pkgconfig - doc? ( - app-text/asciidoc - ) -" - -src_configure() { - local emesonargs=( - $(meson_use doc man) - $(meson_use aac fdk_aac) - $(meson_use rdp) - $(meson_use vnc) - $(meson_use systemd) - -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild index d7c4a7f43cf6..61bc7a28c45c 100644 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1.ebuild +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-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 @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="aac doc +rdp systemd +vnc" REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )" RESTRICT="test" # Tests run xvfb-run directly @@ -27,7 +27,7 @@ DEPEND=" app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 - >=net-misc/freerdp-2.10.0:=[server] + >=net-misc/freerdp-2.10.0:2=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-46.3.ebuild index d7c4a7f43cf6..3a7d27f8cee9 100644 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-46.3.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,30 +10,28 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" -IUSE="aac doc +rdp systemd +vnc" -REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )" +KEYWORDS="~amd64 ~arm64" +IUSE="doc +rdp systemd +vnc" +REQUIRED_USE="|| ( rdp vnc )" RESTRICT="test" # Tests run xvfb-run directly DEPEND=" x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 - >=dev-libs/glib-2.68:2 - >=dev-libs/libei-1.0.901 + >=dev-libs/glib-2.75:2 + >=dev-libs/libei-1.2.0 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 - >=net-misc/freerdp-2.10.0:=[server] + >=net-misc/freerdp-3.1.0:=[server] >=sys-fs/fuse-3.9.1:3 + >=sys-auth/polkit-122 >=x11-libs/libxkbcommon-1.0.0 - - aac? ( - media-libs/fdk-aac:= - ) + media-libs/fdk-aac:= ) vnc? ( net-libs/libvncserver @@ -55,7 +53,6 @@ BDEPEND=" src_configure() { local emesonargs=( $(meson_use doc man) - $(meson_use aac fdk_aac) $(meson_use rdp) $(meson_use vnc) $(meson_use systemd) diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 3b2dece1b459..bfd542211181 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,2 +1,2 @@ -DIST gns3-gui-2.2.42.tar.gz 5048413 BLAKE2B 19c4f1977797af0a3c2bbed926cc8f9361840658dbdc25ad9a2972bec21749c84d5cdc477079f01b8c354e21e9663b27bcbc09f974c914c188f98ec151b7bd67 SHA512 19940857308da3810047cec9285c34b0011e4dc44a1316bf2fe5042e0f255546e8e3d2d4788a1f70baedb498a295223916633f4950ef9dbfa19b8e72c7545176 -DIST gns3-gui-2.2.43.tar.gz 5055465 BLAKE2B 21e21d1b1e77151d385d210270dc909e3ed938c2220360e038820d9e30a1ca126122ccfe0f582e392143aeac364274bc96dbed1a3ea23cd29e0d9dbc858af5a5 SHA512 167961caa13e7bc7abea3753c69e883e864e5fbf543f12117a0653f203ef92d46214f083c715c1fad3ab4a52504fa714a2901d0caa4c0048e26cae9fa7ee5a31 +DIST gns3-gui-2.2.47.tar.gz 5064818 BLAKE2B 8d8fea47e6ed0256e8e22659a8eed24dc18183b44d4ca3c1a863b0c8f5e45471b5ffc82c267ad18f4e97f5587f0a615586364ed26a340e409f11b74375916c3f SHA512 e9637d0789c7ee656a8fd366be150e70d9045240fff962b30b9beff5b11dd22a3ede9565c18b02f934ad610bf05687fce7a7dbd6c8f5cea6cf22db2c1871781e +DIST gns3-gui-2.2.48.1.tar.gz 5065473 BLAKE2B 4536997b9bdfad93544582f1c8ef57953b4a83ca0300bdfdc2ebc6dc70db66a779cb924bbae71589ac0971107bcd70ecb9f095346cceef026761d546c7fce7ce SHA512 74c4b9b79a1bda42e7f4bea4439c30ef53f5d3a792295a9395e6a27c5bb7a9bdee9278aafc19f1c283621cff2f79844f0b97ac1ecde48bf7bf897f97fa798479 diff --git a/net-misc/gns3-gui/gns3-gui-2.2.43.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.47.ebuild index 0dfa014133d2..7779fe5303e9 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.43.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.47.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_11 ) +PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 virtualx xdg @@ -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/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.31.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.22.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-2.1.1[${PYTHON_USEDEP}] + >=dev-python/truststore-0.9.1[${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-gui/gns3-gui-2.2.42.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.48.1.ebuild index 5834bf62b463..031b643becd8 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.48.1.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_11 ) +PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 virtualx xdg @@ -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/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.22.0[${PYTHON_USEDEP}] + >=dev-python/psutil-6.0.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-2.7.1[${PYTHON_USEDEP}] + >=dev-python/truststore-0.9.1[${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 1d056bc4280b..8a93eb8b3ca5 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,2 +1,2 @@ -DIST gns3-server-2.2.42.tar.gz 10735078 BLAKE2B 424f73fcb7377a518873b4880b77b6e057d8293fb96073eca59224b0e5e5c1e50114f30c564b861e91769380d9d15b3c2c28a8f4cec3358282902af09eeccd30 SHA512 9982fabcdd587b090833b9137124a0accb2990cee91ca5d19d8ee691f807d547670a38b2168d0f71465088a3971eac73e101cc284922732b5132ac47b84d84f6 -DIST gns3-server-2.2.43.tar.gz 10734029 BLAKE2B c417557823c94bb62a08ab2401e7d6a6e46ea83961cfee87f5b134139f7f0237ff5c214661a2abd30d62a8806c1ea556db9fa9d7ff1e608cfa84142409315832 SHA512 3b086f6c14b4258f4f0eb72e9839c6499530b6f0866ba6adc72a8fd301c99919bf4fc36b7d64e61035d81f193faee8b161c304f1a445a2cab5ca9c42739796f4 +DIST gns3-server-2.2.47.tar.gz 10850105 BLAKE2B c83cdf6495ddc4997347ff41416a684b6c6a516eefa6d1811e8855a4954edbace53aefb817ddce8cb08526c798b02fad11b5bb3b70a076be97a4a1ab92dd48b7 SHA512 1634e813feaaef9b7d44256a34c58fc1e339fce2d57dc41d7ff8ba86c2ed3999f19063754d5bc928d99319f3d2e8949a72ebbe087f82a8dc56dfbd6ba06f8bd4 +DIST gns3-server-2.2.48.1.tar.gz 10851841 BLAKE2B 021ace62b3d3ef379014948df1808ecfecd9f8a15a6f225a0219433e74ee811ec67b8caeb507ca7b99244f34e9ff4f9f95d4f80a7b472413ae064a86347821f2 SHA512 f367d812393d90895243fb29b580989fe2927e796492427c5d962a67e97d5e11d5e3fb861d5cdf196f6d7e7f70f6db083f8fc0d2c359bf0535e7b86cecbb0ab3 diff --git a/net-misc/gns3-server/gns3-server-2.2.43.ebuild b/net-misc/gns3-server/gns3-server-2.2.47.ebuild index c76329a46375..59b7d69fdc36 100644 --- a/net-misc/gns3-server/gns3-server-2.2.43.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.47.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_11 ) +PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature systemd @@ -14,22 +14,24 @@ SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" RDEPEND=" acct-group/gns3 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.5[${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/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] + >=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.4[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.22.0[${PYTHON_USEDEP}] + >=dev-python/platformdirs-2.4.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.31.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-2.1.1[${PYTHON_USEDEP}] + >=dev-python/truststore-0.9.1[${PYTHON_USEDEP}] net-misc/ubridge sys-apps/busybox[static] " @@ -53,9 +55,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/gns3-server/gns3-server-2.2.42.ebuild b/net-misc/gns3-server/gns3-server-2.2.48.1.ebuild index de2185845ca4..f4f3abba999d 100644 --- a/net-misc/gns3-server/gns3-server-2.2.42.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.48.1.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_11 ) +PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature systemd @@ -14,22 +14,24 @@ SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" RDEPEND=" acct-group/gns3 acct-user/gns3 app-emulation/dynamips - >=dev-python/aiofiles-23.1.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}] + >=dev-python/aiofiles-24.1.0[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.9.5[${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/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] + >=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.4[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.22.0[${PYTHON_USEDEP}] + >=dev-python/platformdirs-2.4.0[${PYTHON_USEDEP}] + >=dev-python/psutil-6.0.0[${PYTHON_USEDEP}] >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-2.7.1[${PYTHON_USEDEP}] + >=dev-python/truststore-0.9.1[${PYTHON_USEDEP}] net-misc/ubridge sys-apps/busybox[static] " @@ -53,9 +55,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/gsasl/Manifest b/net-misc/gsasl/Manifest index 4c9c9d7ecf73..2db805085bc1 100644 --- a/net-misc/gsasl/Manifest +++ b/net-misc/gsasl/Manifest @@ -1,2 +1,3 @@ DIST gsasl-2.0.1.tar.gz 3279632 BLAKE2B a25d121a5043455ed827a6bdc776c10d467a49b4dc6b73d2f4b08fecbf1ca5f423ffdcfd39e0d2bf71f724ed8302ffd8acda4fda3ef10ceadece60509ac73500 SHA512 01c6f6bd9f986c942a25b89fee0052aef8c10bf914ead29983abdf0cc8fcaa7223fd9d9eeafb4be07e4bc318f087f6f6258facaaeb7f83bca8de512406812be5 DIST gsasl-2.2.0.tar.gz 3290469 BLAKE2B ca57765f299939a6f9457aac3d51132f7b5a0e2f0788523349083a65e5de0b780573000c378e0fff844cf9f882239e7ff6e0b520ae66a60f3e928c16d6f74857 SHA512 0ae318a8616fe675e9718a3f04f33731034f9a7ba03d83ccb1a72954ded54ced35dc7c7e173fdcb6fa0f0813f8891c6cbcedf8bf70b37d00b8ec512eb9f07f5f +DIST gsasl-2.2.1.tar.gz 3344807 BLAKE2B 3bb1f7dee8510c19215dc8fdc5efd8e53318ab967b4d4af9e48474857a112b0e08872016a5c5bcbd6b1b340f29fbd77623efc6c41a1f87fb734623e2f173e1bf SHA512 161b8a315862a79807ba067c5ae840175b0d8ec14806aceafc3f92d571713b94d1b8c1a5b188c47bf94a79b9a1f133065f96b087baa5e7f360ae7fb8336381ab diff --git a/net-misc/gsasl/gsasl-2.2.0.ebuild b/net-misc/gsasl/gsasl-2.2.0.ebuild index ff825515aa75..17ade65eed5d 100644 --- a/net-misc/gsasl/gsasl-2.2.0.ebuild +++ b/net-misc/gsasl/gsasl-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=8 @@ -13,7 +13,7 @@ LICENSE="GPL-3" SLOT="0" # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see # if it's a stable release or not! -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" REQUIRED_USE="|| ( client server )" diff --git a/net-misc/gsasl/gsasl-2.2.1.ebuild b/net-misc/gsasl/gsasl-2.2.1.ebuild new file mode 100644 index 000000000000..35e903c6643b --- /dev/null +++ b/net-misc/gsasl/gsasl-2.2.1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="The GNU SASL client, server, and library" +HOMEPAGE="https://www.gnu.org/software/gsasl/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see +# if it's a stable release or not! +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" +REQUIRED_USE="|| ( client server )" + +DEPEND=" + !net-libs/libgsasl + sys-libs/readline:= + gcrypt? ( dev-libs/libgcrypt:= ) + gnutls? ( net-libs/gnutls:= ) + idn? ( net-dns/libidn:= ) + kerberos? ( >=net-libs/libgssglue-0.5-r1 ) + nls? ( >=sys-devel/gettext-0.18.1 ) + ntlm? ( >=net-libs/libntlm-0.3.5 ) +" +RDEPEND="${DEPEND}" + +QA_CONFIG_IMPL_DECL_SKIP=( + # gnulib FPs + unreachable + MIN + alignof + static_assert +) + +src_prepare() { + default + + sed -i \ + -e '/gl_WARN_ADD(\[-Werror/d' \ + -e 's/ -Werror//' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + local krb5_impl="--with-gssapi-impl=no" + + # See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/ + if use kerberos; then + krb5_impl="--with-gssapi-impl=gssglue" + fi + + local myeconfargs=( + --disable-gcc-warnings + --disable-valgrind-tests + --disable-rpath + + --with-packager="Gentoo Linux" + --with-packager-bug-reports="https://bugs.gentoo.org" + --with-packager-version="r${PR}" + + $(use_enable client) + $(use_enable server) + + $(use_enable kerberos gssapi) + ${krb5_impl} + $(use_enable kerberos gs2) + + $(use_with gcrypt libgcrypt) + $(use_with gnutls) + $(use_enable nls) + $(use_with idn stringprep) + $(use_enable ntlm) + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if ! use static-libs; then + rm -f "${ED}"/usr/lib*/lib*.la || die + fi + + doman doc/gsasl.1 doc/man/*.3 +} + +pkg_postinst() { + ewarn "For USE=kerberos, ${PN} now uses libgssglue to allow choosing" + ewarn "the Kerberos implementation at runtime." + elog "See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/" + elog "for more details." +} 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/htail/htail-1.5.ebuild b/net-misc/htail/htail-1.5.ebuild index 3125e0a4d3ad..cb7f47746b65 100644 --- a/net-misc/htail/htail-1.5.ebuild +++ b/net-misc/htail/htail-1.5.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=bdepend +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi @@ -14,3 +14,4 @@ HOMEPAGE="https://github.com/vpelletier/htail" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" +BDEPEND="${DISTUTILS_DEPS}" 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..da77417ac708 --- /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/httpstat/Manifest b/net-misc/httpstat/Manifest index 6c21f9db0e5c..24e6d33804cc 100644 --- a/net-misc/httpstat/Manifest +++ b/net-misc/httpstat/Manifest @@ -1,2 +1 @@ DIST httpstat-1.3.1.gh.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46 -DIST httpstat-1.3.1.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46 diff --git a/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch b/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch index 0fcb6523e6e1..37985a3241a0 100644 --- a/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch +++ b/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch @@ -8,24 +8,24 @@ @@ -19,8 +19,7 @@ function title() { http_url="google.com" https_url="https://http2.akamai.com" - + -for pybin in python python3; do -#for pybin in python; do -+for pybin in python; do ++for pybin in ${EPYTHON}; do echo echo "# Test in $pybin" - + @@ -40,9 +39,9 @@ for pybin in python python3; do main_silent $https_url assert_exit 0 - + - title "comma decimal language (ru_RU)" - LC_ALL=ru_RU main_silent $http_url - assert_exit 0 + #title "comma decimal language (ru_RU)" + #LC_ALL=ru_RU main_silent $http_url + #assert_exit 0 - + title "HTTPSTAT_DEBUG" HTTPSTAT_DEBUG=true main $http_url | grep -q 'HTTPSTAT_DEBUG=true' - + diff --git a/net-misc/httpstat/httpstat-1.3.1-r1.ebuild b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild index cdd345b94cba..7c8ead845af8 100644 --- a/net-misc/httpstat/httpstat-1.3.1-r1.ebuild +++ b/net-misc/httpstat/httpstat-1.3.1-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 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity" @@ -24,5 +24,5 @@ PROPERTIES="test_network" PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch ) python_test() { - ./httpstat_test.sh || die + ./httpstat_test.sh || die "Tests failed with ${EPYTHON}" } diff --git a/net-misc/httpstat/httpstat-1.3.1.ebuild b/net-misc/httpstat/httpstat-1.3.1.ebuild deleted file mode 100644 index 381ef2db3345..000000000000 --- a/net-misc/httpstat/httpstat-1.3.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} pypy3 ) -inherit distutils-r1 - -DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity" -HOMEPAGE="https://github.com/reorx/httpstat" -SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="net-misc/curl:*" - -# Requires access to google.com and http2.akamai.com -RESTRICT="test" -PROPERTIES="test_network" - -PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch ) - -python_test() { - ./httpstat_test.sh || die -} 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/hurl/hurl-4.1.0.ebuild b/net-misc/hurl/hurl-4.1.0.ebuild index f2d88a3a70e6..856d7cca73a5 100644 --- a/net-misc/hurl/hurl-4.1.0.ebuild +++ b/net-misc/hurl/hurl-4.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Autogenerated by pycargoebuild 0.10 @@ -195,7 +195,7 @@ QA_FLAGS_IGNORED=( QA_PRESTRIPPED="${QA_FLAGS_IGNORED[*]}" src_install() { - dobin target/release/hurl{,fmt} + dobin "$(cargo_target_dir)"/hurl{,fmt} doman docs/manual/hurl{,fmt}.1 dodoc CHANGELOG.md README.md LICENSE 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/icingadb/Manifest b/net-misc/icingadb/Manifest index dde44ce3907b..35796cc25395 100644 --- a/net-misc/icingadb/Manifest +++ b/net-misc/icingadb/Manifest @@ -2,3 +2,5 @@ DIST icingadb-1.1.0-deps.tar.xz 9188036 BLAKE2B d816220d66d354f348c7eb9874d2edd6 DIST icingadb-1.1.0.tar.gz 3865617 BLAKE2B e71b577f799ff6c069f86810b35731411eedbfb15c5e741aac987f9fdb852e342bbece3b3995af7fe1f957988314e71af8d92cbda118a6bf8d91639cfe8734e2 SHA512 a7659004802acabe9f3fdc2b843e37928b0b8835428d1f12a730fc3842bb7550f380e6abc8b253bd00fe5b5df6710573fef847f657a61b10f4cf617fb03b4ea0 DIST icingadb-1.1.1-deps.tar.xz 9308260 BLAKE2B 95d9e87bc48661af9eeee5b14beea50fcee5ad5fdf846e207795e676b3a0f8a7b95f9410ef3ab97e490be275928f8d21e8b4c54d15fd9b4c0c4036504c4d885c SHA512 d43819ac8979e4396def929bc2cc0777683b5afb2d80d3c95c83a46b5ef2e9463b93e338c1ba1fafee780e4dc7ded53d0044d15258565a01acd178fde85c39ca DIST icingadb-1.1.1.tar.gz 3868785 BLAKE2B 9f07cfca9acbe170189f28c42d71433c1d1faba55f6a25348b3a5cb76675f72df5e2c8c0f2c984830766a6239db4e1098da9e5daddb5dbd3c24b42c8058161b6 SHA512 25dab9cb93d786b6bccb3e305cf9f36d7910e8919a87148805fee61378c072107838741a2066eddcbadde9f1d345d79e9d12c46b87789ac79b272fb4d01d3ab4 +DIST icingadb-1.2.0-deps.tar.xz 9714708 BLAKE2B e79ab63b8bec42ee61cb402db37dbb346f9521aa4188667e3bfe98ea5c3a44f8bada4e228c2f8e06c73d522fa3a97aa11eb23bb7e54500b53c4191f4a458f6a1 SHA512 83c3aed34923c23ea723220e637e54788435ef53837a454ebad00ce0e714c7c33a1e57adaef5702b5e2ebe541659286cb9889e4680986c0bd786b9aa48d87291 +DIST icingadb-1.2.0.tar.gz 3345811 BLAKE2B 7cf985e1209ee1bab9f0ee63745fd367ed15000d9807cf776e0301691c11d1dfb63c88e39dfa522ab1ab3daf0ee0165993e82747b32fb8db1ec6fab3857c0c70 SHA512 ab5e01b4ef606c765970e4f32b26d79f956c2363e9ce4213e037413ecbde5cbc85c57cd8c7ae730524c1c103306dd6f78cce47fd758cb58384f1ad0bc963b920 diff --git a/net-misc/icingadb/files/icingadb.service b/net-misc/icingadb/files/icingadb.service new file mode 100644 index 000000000000..c55d36764788 --- /dev/null +++ b/net-misc/icingadb/files/icingadb.service @@ -0,0 +1,13 @@ +[Unit] +Description=Icinga DB +Documentation=https://icinga.com/docs/icingadb/latest/ +After=network-online.target redis.service mariadb.service postgresql.service + +[Service] +Type=notify +ExecStart=@EPREFIX@/usr/sbin/icingadb --config /etc/icingadb/config.yml +User=icinga +Group=icinga + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/icingadb/icingadb-1.1.1.ebuild b/net-misc/icingadb/icingadb-1.1.1.ebuild index 1482f551186c..af07c9d8355a 100644 --- a/net-misc/icingadb/icingadb-1.1.1.ebuild +++ b/net-misc/icingadb/icingadb-1.1.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 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/Icinga/icingadb/archive/refs/tags/v${PV}.tar.gz -> $ LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm64" RDEPEND=" acct-user/icinga diff --git a/net-misc/icingadb/icingadb-1.2.0.ebuild b/net-misc/icingadb/icingadb-1.2.0.ebuild new file mode 100644 index 000000000000..b29d48bda9dc --- /dev/null +++ b/net-misc/icingadb/icingadb-1.2.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module systemd + +DESCRIPTION="Icinga configuration and state database supporting multiple environments" +HOMEPAGE="https://icinga.com/docs/icinga-db/" +SRC_URI=" + https://github.com/Icinga/icingadb/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~sbraz/distfiles/${P}-deps.tar.xz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RDEPEND=" + acct-user/icinga + acct-group/icinga +" + +DOCS=( config.example.yml doc README.md schema ) + +src_prepare() { + default + sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}/icingadb.service" > "${T}/icingadb.service" || die +} + +src_compile() { + local cmd + for cmd in icingadb icingadb-migrate; do + pushd "cmd/${cmd}" || die + ego build + popd || die + done +} + +src_install() { + local cmd + for cmd in icingadb icingadb-migrate; do + dobin "cmd/${cmd}/${cmd}" + done + einstalldocs + + newinitd "${FILESDIR}/icingadb.initd" "${PN}" + systemd_dounit "${T}/icingadb.service" + + keepdir /etc/icingadb + keepdir /var/log/icingadb + + fperms 0750 /etc/icingadb /var/log/icingadb + fowners icinga:icinga /etc/icingadb /var/log/icingadb +} diff --git a/net-misc/inetutils/Manifest b/net-misc/inetutils/Manifest index 81c1302e7a72..9294329b8da4 100644 --- a/net-misc/inetutils/Manifest +++ b/net-misc/inetutils/Manifest @@ -1 +1 @@ -DIST inetutils-2.4.tar.xz 1558308 BLAKE2B 1f7a33f313b736b305f62587c727ba843659621fbd89610dea81a0acf0e74aca8d3005cca2e3451fe30517880678023d4949bf1b1276bb660b80802e97c06bc8 SHA512 e7e6a5d7e2e02f07a2a6cfc09694e3c0a4e4a8ef8a435eed41902eba13caeed329ae6d6ba94b0de8f789e307f04656d12c48c1c0217b69d162bc5efb0ff6adee +DIST inetutils-2.5.tar.xz 1670424 BLAKE2B 80ab4f4287328ceb75c33b8794ec21209ea95206a205ea60fbd8f1d7e7fa01eec228ea50d61c8bb37a88cd3144b58ecfecd0af440ba85d43d5ea19565d88a6d4 SHA512 dc11ad6eeb5ea2c85edddbfc77630b5b09e4e1ac643629edf13b0ac0828c13cdb0885275153c072ae13a798427c96bc461037822ad646f7210369192c35bb04c diff --git a/net-misc/inetutils/inetutils-2.4.ebuild b/net-misc/inetutils/inetutils-2.5.ebuild index e7e723de8d59..adc14e092684 100644 --- a/net-misc/inetutils/inetutils-2.4.ebuild +++ b/net-misc/inetutils/inetutils-2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,7 +46,7 @@ RDEPEND="${DEPEND} traceroute? ( !net-analyzer/traceroute ) " -QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert alignof ) +QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert alignof unreachable ) src_configure() { local myconf=( diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index b4708ff13b08..6bfe5652d14d 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -1,4 +1,3 @@ DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea -DIST iperf-3.13.tar.gz 648754 BLAKE2B 8b08ae0e67ed066c7dabd115b757fefff03196aa2d732b6d88e20cf82ea3a5431b9be753fcc7b331932a5e59dc3e24ff4b929a7a1af5b500704cdd5094bf6859 SHA512 067147edffa1d7482a9fc5d54638091f8bc099b9c45d9a471f4e33730463548fb2350749620f2ca3ff509cd7a9c4f63bf01f84cab36718edd8784ce7a15ca368 -DIST iperf-3.14.tar.gz 650626 BLAKE2B 3809689964721ec2f58d29985c1767bc12473f9b659fd8bd430adb00558ceda2519276dbc0df5cb9634ef96d3d98708b8413a712cdb372bd34a28a330049349f SHA512 a90fbaddd73e5b721a84cee71cefb63391c13f64107f5785e954e7c44e9a8c5072e402b6fe45434966d3cc58ac97227c608ca9719161fc23459c5e5efcf8232b DIST iperf-3.15.tar.gz 649330 BLAKE2B f086d506d1de8e8b333a7ad46a94279aa5b42800ded7cc6724c3400e479a6523b336c74b5956d07117a178b5f89934553535824a05daafcdb2eb8d31754680e1 SHA512 988bc558f40a16c3d94df3956705712829c1c529efd577db16213783846c84bc3edbad19a4d7890b7aba08fbc4e1c6807105df29931e9b45981066b609d87aa2 +DIST iperf-3.16.tar.gz 664751 BLAKE2B 4ca930b58c54d5ae5b0c8b14aca2556224ff2c7b943d32e65486dc2a7e1abd2d26b229e9f759358c326be8754e88a203e11a3ab0f029daa982375a880c3f1cbd SHA512 9ba97e03f17f3b939343b07ed3d508fbf57489e2b984b77a3dc3ada535f981350e56495154bdd108a83b3c507ccbed599b2b7b25de0d1778912d2c01b4ad4e7c 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/iperf/iperf-3.14.ebuild b/net-misc/iperf/iperf-3.14.ebuild deleted file mode 100644 index a136b4ecd132..000000000000 --- a/net-misc/iperf/iperf-3.14.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd - -DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" -HOMEPAGE="https://github.com/esnet/iperf" -SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${P/_/} - -LICENSE="BSD" -SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="sctp" - -DEPEND=" - >=dev-libs/cJSON-1.7.15 - dev-libs/openssl:= - sctp? ( net-misc/lksctp-tools ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( README.md RELNOTES.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch - "${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch -) - -src_prepare() { - default - - # Drop bundled cjson - rm src/cjson.{c,h} || die - - eautoreconf -} - -src_configure() { - econf $(use_with sctp) -} - -src_install() { - default - - newconfd "${FILESDIR}"/iperf.confd iperf3 - newinitd "${FILESDIR}"/iperf3.initd iperf3 - systemd_dounit contrib/iperf3.service - - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-misc/iperf/iperf-3.13.ebuild b/net-misc/iperf/iperf-3.16.ebuild index a136b4ecd132..4edfb6439687 100644 --- a/net-misc/iperf/iperf-3.13.ebuild +++ b/net-misc/iperf/iperf-3.16.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="A TCP, UDP, and SCTP network bandwidth measurement tool" HOMEPAGE="https://github.com/esnet/iperf" -SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz" S="${WORKDIR}"/${P/_/} LICENSE="BSD" diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index eeedf8998123..2863ec7dbc8d 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,3 +1,4 @@ DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9 DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f +DIST iputils-20240117.tar.xz 445684 BLAKE2B 635943e12010aef8c1291b407bfbe284e0179391fca76197b77037ae1ffc219fa1d8e36abcea5fb7fff10d55ab40eed7c081e5d92b29f0916a4b4dd806945491 SHA512 c45822c5641f194dc07cba919c13a4b7a79d050bb53957a894ebb6ccc1f71bac1f26489e13d18ef1ce235982f5fa1824e677f95037a0f5cce6bcb94be4c2e2de DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee diff --git a/net-misc/iputils/iputils-20211215.ebuild b/net-misc/iputils/iputils-20211215.ebuild index 9adbec78252c..eae62b94c80d 100644 --- a/net-misc/iputils/iputils-20211215.ebuild +++ b/net-misc/iputils/iputils-20211215.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 # For released versions, we precompile the man/html pages and store @@ -19,8 +19,7 @@ if [[ ${PV} == "99999999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi diff --git a/net-misc/iputils/iputils-20240117.ebuild b/net-misc/iputils/iputils-20240117.ebuild new file mode 100644 index 000000000000..30d11a82c612 --- /dev/null +++ b/net-misc/iputils/iputils-20240117.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="de fr ja pt_BR tr uk zh_CN" + +inherit fcaps meson plocale systemd toolchain-funcs + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/iputils/iputils.git" + inherit git-r3 +else + SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" + +# We install ping unconditionally so BSD is listed by itself +# See LICENSE on each release, it summaries per-component +LICENSE=" + BSD + arping? ( GPL-2+ ) + clockdiff? ( BSD ) + tracepath? ( GPL-2+ ) +" +SLOT="0" +IUSE="+arping caps clockdiff doc idn nls test tracepath" +RESTRICT="!test? ( test )" + +RDEPEND=" + caps? ( sys-libs/libcap ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-ns-stylesheets + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig + test? ( sys-apps/iproute2 ) + nls? ( sys-devel/gettext ) +" + +src_prepare() { + default + + plocale_get_locales > po/LINGUAS || die +} + +src_configure() { + local emesonargs=( + -DUSE_CAP=$(usex caps true false) + -DUSE_IDN=$(usex idn true false) + -DBUILD_ARPING=$(usex arping true false) + -DBUILD_CLOCKDIFF=$(usex clockdiff true false) + -DBUILD_PING=true + -DBUILD_TRACEPATH=$(usex tracepath true false) + -DNO_SETCAP_OR_SUID=true + -Dsystemdunitdir=$(systemd_get_systemunitdir) + -DUSE_GETTEXT=$(usex nls true false) + $(meson_use !test SKIP_TESTS) + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true + ) + + meson_src_configure +} + +src_compile() { + tc-export CC + + meson_src_compile +} + +src_test() { + if [[ ${EUID} != 0 ]] ; then + einfo "Tests require root privileges. Skipping ..." + return + fi + + meson_src_test +} + +src_install() { + meson_src_install + + FILECAPS=( cap_net_raw usr/bin/ping ) + use arping && FILECAPS+=( usr/bin/arping ) + use clockdiff && FILECAPS+=( usr/bin/clockdiff ) + + dosym ping /usr/bin/ping4 + dosym ping /usr/bin/ping6 + + if use tracepath ; then + dosym tracepath /usr/bin/tracepath4 + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath4.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 + fi + + if use doc ; then + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die + fi +} + +pkg_preinst() { + local version_with_tftpd="<${CATEGORY}/${PN}-20211215" + if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then + HAD_TFTPD_VERSION=1 + fi +} + +pkg_postinst() { + fcaps_pkg_postinst + + if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then + ewarn "This upstream version (>= 20211215) drops two tools:" + ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)" + ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)" + ewarn "Please install one of the listed alternatives if needed!" + fi +} diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index f1fd401dbdc4..9ea33b7d9ce9 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/iputils/iputils.git" inherit git-r3 else - SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi diff --git a/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch b/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch new file mode 100644 index 000000000000..542c9fdd1fc2 --- /dev/null +++ b/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch @@ -0,0 +1,37 @@ +From 96fdd331c21421a313b6b97cb62e0c775ddc061c Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 10 Jan 2023 12:36:30 +0100 +Subject: [PATCH 2/2] <utils.h>: Add timeout_init prototype + +So that it can be called from the main function. This avoids a +compilation error with future compilers. +--- + include/utils.h | 1 + + src/utils.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/utils.h b/include/utils.h +index 754ddff..cd98b29 100644 +--- a/include/utils.h ++++ b/include/utils.h +@@ -28,6 +28,7 @@ char *create_string(const char *fmt, ...); + int split_host_from_query(struct s_whois_query *wq); + int make_connect(const char *, int); + int add_text_to_buffer(char **, const char *); ++void timeout_init(void); + + + #endif +diff --git a/src/utils.c b/src/utils.c +index ab01c2c..f82bd1c 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -348,7 +348,7 @@ split_host_from_query(struct s_whois_query *wq) + * file. + */ + void +-timeout_init() ++timeout_init(void) + { + int iret; + char *ret = "75", *ret2; diff --git a/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch b/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch new file mode 100644 index 000000000000..fca5dd4cdd38 --- /dev/null +++ b/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch @@ -0,0 +1,44 @@ +From c7c344302d81a36b20d3d26a3d13367c8ed2c80d Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 10 Jan 2023 12:31:03 +0100 +Subject: [PATCH 1/2] configure.in: C99 compatibility fix + +Avoid implicit declarations of inet_pton, exit. Include <arpa/inet.h> +for the glibc declaration. Return from main instead of calling exit. +This avoids compilation errors with future compilers. +--- + configure.in | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index f1cdd10..678fe7d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,7 +119,7 @@ AC_CHECK_LIB(inet6, main, + AC_CHECK_FUNCS(memcpy strtol) + AC_CHECK_FUNCS(strcasecmp strncasecmp getopt_long) + AC_HEADER_STDC([]) +-AC_CHECK_HEADERS(sys/types.h sys/socket.h netinet/in.h netdb.h sys/time.h sys/stat.h sys/fcntl.h malloc.h locale.h stdint.h inttypes.h idna.h) ++AC_CHECK_HEADERS(sys/types.h sys/socket.h netinet/in.h netdb.h sys/time.h sys/stat.h sys/fcntl.h malloc.h locale.h stdint.h inttypes.h idna.h arpa/inet.h) + AC_HEADER_TIME + + +@@ -139,13 +139,16 @@ AC_TRY_RUN( + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif ++#ifdef HAVE_ARPA_INET_H ++#include <arpa/inet.h> ++#endif + int main() + { + struct in6_addr addr6; + if (inet_pton(AF_INET6, "::1", &addr6) < 1) +- exit(1); ++ return 1; + else +- exit(0); ++ return 0; + } + ], [ + AC_MSG_RESULT(yes) diff --git a/net-misc/jwhois/jwhois-4.0-r2.ebuild b/net-misc/jwhois/jwhois-4.0-r2.ebuild new file mode 100644 index 000000000000..ecfef500523f --- /dev/null +++ b/net-misc/jwhois/jwhois-4.0-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Advanced Internet Whois client capable of recursive queries" +HOMEPAGE="https://github.com/jonasob/jwhois/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="idn nls" + +RDEPEND="idn? ( net-dns/libidn )" +DEPEND="${RDEPEND}" + +PATCHES=( + # bug 208875 + "${FILESDIR}"/${P}-connect-logic.patch + "${FILESDIR}"/${P}-avoid-implicit-declarations.patch + "${FILESDIR}"/${P}-add-timeout_init-prototype.patch +) + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var/cache \ + --without-cache \ + $(use_enable nls) \ + $(use_with idn libidn) + eautoreconf +} + +src_compile(){ + emake AR="$(tc-getAR)" +} diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml index 05e015a7ce25..e8a24cb81ff8 100644 --- a/net-misc/jwhois/metadata.xml +++ b/net-misc/jwhois/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="savannah">jwhois</remote-id> + <remote-id type="github">jonasob/jwhois</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index 72422573e8de..89efbe84e4bf 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -1,3 +1,4 @@ -DIST kafka_2.13-3.4.1.tgz 106613091 BLAKE2B c75bc59291f2030e34bad8d5401a65603b1ef9f570784c382874807741ee97ed4812a114f8a0dbcfbc9d3abe278f103a4dfca53d5a1a0be6f7ebc1d9c00c8565 SHA512 875308e9b0a3597ea4a1088788f4040f257c3b825730572b038ede0fee3bc5336559f7ef0ab4d78b9512ac71385f84698180a2026ca81f1221ef65811bed6bce -DIST kafka_2.13-3.5.1.tgz 106748875 BLAKE2B daba54058f8b26dcf622bcf09df3c1abc79886bca0ae1f4221ad593021c329640689408803bac9e62b419e332633f7643354b5168a30c0360f178642c11ae112 SHA512 b6ceb010a5fe1791843cbc53d34d35993e97e03f9518344b4b5bdf7146d0a4e866cd2d4760cab319d8b3323a5bf53037a78fed88c9384381aea2cd0366877763 -DIST kafka_2.13-3.6.0.tgz 113257079 BLAKE2B db5f0bafbbaef256d03a80e27adbcaffc8463cd5fffcba937cdfc418c4ab931770d87424eeff96cdc41e79217954c0885e26bab72e68b9d9c3f905a1991e7865 SHA512 98d20f475bccc11eb3cf05362112c788eea7bfc88abddba66cfcfb48880d3bb97918a90d44eb7c1720527bebca93dd231002b5159876f6ee8b7fcd91cc1b0644 +DIST kafka_2.13-3.5.2.tgz 110420856 BLAKE2B fd59e7fcb22a944f6fdee4ecda7d418f3818c42b23a0b8a02ef629781ed8a34c95e4ad75560f9e3fb9bbc32933f7960f086c39d2294c336b8ab520c887aa8a22 SHA512 229ccc5e3e6b3b9845f59f6e829d70711c5a5a2293f32b6bcabc37350666f874bc7d8f08130f712a1b32915205c10f2847f04908c20d5f7fdb4b62d058c9defe +DIST kafka_2.13-3.6.1.tgz 113466638 BLAKE2B 1142459c2810cf4df8785afc9fab57440357000a97b23cfec8b6c59d886706d4fd13120388e9473917106c1cb237f65671bb1258de1343ef7818b3b97617f0b4 SHA512 1f063cd67463dd3bb5a5e06e7a1c2278db84bfc836a634fac7c9a005de66a42ac00b32f5e9bbdd22086605f73659efd4ce5bd1185196b02a743be0898daac55d +DIST kafka_2.13-3.7.0.tgz 119028138 BLAKE2B 5d366f5d9456668f4914da30fa32f7104816ec721379f88c5e77946f01256e02a7a6465e6865cb957af5bdf6a77e3ae16cf9e715f3b13ce00e1debd0ce34d4f3 SHA512 b8679283a2d8dab86e7c636b2c688fe9d9e64ac437241f65ef7a1733f4d26a2bd415eefa04f09f1911373bcd2a5dbc3838c76347f68656425c09202cd290ce91 +DIST kafka_2.13-3.7.1.tgz 120235344 BLAKE2B ae78e77b52eae9099f700a7644120b307cb2e8f84fb76b313b4fe208988d7010856a36253eb3ce4196a3bb8ac1c791e9d83969913f67553dea702f4b55675446 SHA512 78e985235d245ba9e2951a82e723a62b8aba8b74a2c8376f7271906af715a36de9142c446096f13fd4bff3a4c10f1d080eb924e91e2256ec2db779906fd6737d diff --git a/net-misc/kafka-bin/kafka-bin-3.5.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.5.2.ebuild index 62f5d3c5f537..750555119b44 100644 --- a/net-misc/kafka-bin/kafka-bin-3.5.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.5.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 diff --git a/net-misc/kafka-bin/kafka-bin-3.4.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild index 62f5d3c5f537..62f5d3c5f537 100644 --- a/net-misc/kafka-bin/kafka-bin-3.4.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild diff --git a/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.7.0.ebuild index 62f5d3c5f537..750555119b44 100644 --- a/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.7.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 diff --git a/net-misc/kafka-bin/kafka-bin-3.7.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.7.1.ebuild new file mode 100644 index 000000000000..750555119b44 --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-3.7.1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A high-throughput distributed messaging system" +HOMEPAGE="https://kafka.apache.org/" + +# pick recommended scala version +SCALA_VERSION=2.13 +MY_PN="kafka" +MY_P="${MY_PN}_${SCALA_VERSION}-${PV}" +SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz" + +RESTRICT="mirror" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="internal-zookeeper connect" + +COMMON_DEPEND="acct-group/kafka + acct-user/kafka + virtual/jre:=" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR="/opt/${MY_PN}" + +src_prepare() { + sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die + sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die + sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.properties" || die + eapply_user +} + +src_install() { + insinto /etc/kafka + doins config/zookeeper.properties config/server.properties + if use "internal-zookeeper"; then + keepdir /var/lib/kafka/zookeeper + newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper" + + ewarn "Zookeeper owner has been changed to kafka:kafka" + ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper" + ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper" + ewarn "to keep the previous behavior." + ewarn "All logs files have been move to /var/log/kafka/" + fi + + if use "connect"; then + doins config/connect-distributed.properties config/connect-standalone.properties + newinitd "${FILESDIR}/${MY_PN}-connect-distributed.init.d" "${MY_PN}-connect-distributed" + fi + + keepdir /var/lib/kafka + fowners -R kafka:kafka /var/lib/kafka + + keepdir /var/log/kafka + fowners -R kafka:kafka /var/log/kafka + + newinitd "${FILESDIR}/${MY_PN}.init.d.5" "${MY_PN}" + + dodir "${INSTALL_DIR}" + cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die + keepdir "${INSTALL_DIR}/logs" + fowners -R kafka:kafka "${INSTALL_DIR}" +} diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index a29210d24713..313b52da604e 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,3 +1,2 @@ -DIST kea-2.0.2.tar.gz 9796557 BLAKE2B a859c4cc3f6686db2dcf640738b421499a816700d134ee9322290051c3a192bab482be4a4bdb2630113594a3af1cafe2b95abce4a463815a6404fe87fac227ad SHA512 edb7de227898fb7bd76dd8b503d02e07b4ba512b907b53399a5c45bd216820b342f00c1834858848ce8ff94aa3c228ceead0e2946cbcb1f75a03ca579630be83 -DIST kea-2.2.0.tar.gz 9999074 BLAKE2B 10b4bca1a135c6d146490f8c4c7bd4d56c1c03e2b4cc88a6888fcad5d1a5c2ee2d2c0215cb345b53a2a4262dbd02516d75d5778835d45384a7d69a062b8696b9 SHA512 82cd44efea8c968ef097de242e1ca59e0183c80df25050017fd45538d35da64a9a0d2f4a5249ad3bd3d30b1f8895c360d301518bc22e60dfddd966fe020dc773 DIST kea-2.4.0.tar.gz 10462721 BLAKE2B 07a4424c01872142b85446ee881afbdc9d8b3a0bc7879226463dd0ba20eba6d3d6db3dfd5fff88cd54af05c4f58183032c7df90d24a969a7ae63200822b6f35f SHA512 b0bdb6b6af88e322145ffeb742a818d6e225846ff981ecc4925d311870db94e0c5a4eb0e1140f146624f64b636c9b24148b5efbc32e62a19b99bba0810b54654 +DIST kea-2.4.1.tar.gz 10487415 BLAKE2B 21037d28f812ebbc65ae34f5151a209e9c74f6aa005e96ed7cbbf6e4250e6c40eecf5d257b852bf01663a0982b5401008dd6a51a16d861b30a83549f827538b6 SHA512 b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224 diff --git a/net-misc/kea/files/ax_gtest.m4 b/net-misc/kea/files/ax_gtest.m4 index acd887c2d3ab..7f7d0bb7aa65 100644 --- a/net-misc/kea/files/ax_gtest.m4 +++ b/net-misc/kea/files/ax_gtest.m4 @@ -1,56 +1,13 @@ AC_DEFUN([AX_ISC_GTEST], [ -AC_ARG_WITH([lcov], - [AS_HELP_STRING([--with-lcov[[=PROGRAM]]], - [enable gtest and coverage target using the specified lcov])], - [lcov="$withval"], - [lcov="no"]) - USE_LCOV="no" -if test "$lcov" != "no"; then - # force gtest if not set - if test "$enable_gtest" = "no"; then -# AC_MSG_ERROR("lcov needs gtest for test coverage report") - AC_MSG_NOTICE([gtest support is now enabled, because used by coverage tests]) - enable_gtest="yes" - fi - if test "$lcov" != "yes"; then - LCOV=$lcov - else - AC_PATH_PROG([LCOV], [lcov]) - fi - if test -x "${LCOV}"; then - USE_LCOV="yes" - else - AC_MSG_ERROR([Cannot find lcov.]) - fi - # is genhtml always in the same directory? - GENHTML=`echo "$LCOV" | ${SED} s/lcov$/genhtml/` - if test ! -x $GENHTML; then - AC_MSG_ERROR([genhtml not found, needed for lcov]) - fi - # GCC specific? - CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage" - LIBS=" $LIBS -lgcov" - AC_SUBST(CPPFLAGS) - AC_SUBST(LIBS) - AC_SUBST(LCOV) - AC_SUBST(GENHTML) -fi AC_SUBST(USE_LCOV) -# -# Check availability of gtest, which will be used for unit tests. -# -DISTCHECK_GTEST_CONFIGURE_FLAG= - -AS_IF([test "x$enable_gtest" = "xyes"], [ - DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest" - PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])]) - GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest` - GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest` - GTEST_VERSION=`${PKG_CONFIG} --modversion gtest` -]) +DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest" +PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])]) +GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest` +GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest` +GTEST_VERSION=`${PKG_CONFIG} --modversion gtest` AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no") AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes") diff --git a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch b/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch deleted file mode 100644 index fec0fcc30f4b..000000000000 --- a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc -+++ kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc -@@ -9,6 +9,7 @@ - #include <asiolink/io_service.h> - #include <dhcpsrv/dhcpsrv_log.h> - #include <dhcpsrv/timer_mgr.h> -+#include <map> - #include <exceptions/exceptions.h> - - #include <functional> diff --git a/net-misc/kea/files/kea-1.9.10-gtest.patch b/net-misc/kea/files/kea-1.9.10-gtest.patch deleted file mode 100644 index f3e8cd7af4cc..000000000000 --- a/net-misc/kea/files/kea-1.9.10-gtest.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- a/m4macros/ax_gtest.m4 -+++ b/m4macros/ax_gtest.m4 -@@ -1,17 +1,8 @@ - AC_DEFUN([AX_ISC_GTEST], [ - --enable_gtest="no" --GTEST_INCLUDES= -- --AC_ARG_WITH([gtest-source], -- [AS_HELP_STRING([--with-gtest-source=PATH], -- [location of the Googletest source])], -- [enable_gtest="yes" ; GTEST_SOURCE="$withval"]) -- --AC_ARG_WITH([gtest], -- [AS_HELP_STRING([--with-gtest=PATH], -- [specify a path to gtest header files (PATH/include) and library (PATH/lib)])], -- [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"]) -+AC_ARG_ENABLE([gtest], -+ [AS_HELP_STRING([--enable-gtest], -+ [enable testing via Googletest [default=no]])]) - - AC_ARG_WITH([lcov], - [AS_HELP_STRING([--with-lcov=PROGRAM], -@@ -55,111 +46,22 @@ - # - # Check availability of gtest, which will be used for unit tests. - # --GTEST_LDFLAGS= --GTEST_LDADD= - DISTCHECK_GTEST_CONFIGURE_FLAG= --GTEST_VERSION="unknown" -- --if test "x$enable_gtest" = "xyes" ; then -- -- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path" -- -- if test -n "$with_gtest_source" ; then - -- if test "x$GTEST_SOURCE" = "xyes" ; then -+AS_IF([test "x$enable_gtest" = "xyes"], [ -+ DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest" -+ PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])]) -+ GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest` -+ GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest` -+ GTEST_VERSION=`${PKG_CONFIG} --modversion gtest` -+]) - -- AC_MSG_CHECKING([for gtest source]) -- # If not specified, try some common paths. -- GTEST_SOURCE= -- for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do -- if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then -- GTEST_SOURCE=$d -- AC_MSG_RESULT([$GTEST_SOURCE]) -- break -- fi -- done -- if test -z $GTEST_SOURCE ; then -- AC_MSG_ERROR([no gtest source but it was selected]) -- fi -- else -- if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then -- GTEST_SOURCE=$GTEST_SOURCE/googletest -- fi -- if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then -- have_gtest_source=yes -- else -- AC_MSG_ERROR([no gtest source at $GTEST_SOURCE]) -- fi -- fi -- have_gtest_source=yes -- -- GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a" -- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE" -- GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include" -- GTEST_VERSION="`basename $GTEST_SOURCE`" -- --# Versions starting from 1.8.0 are put in the googletest directory. If the basename --# returns googletest string, we need to cut it off and try baseline again. -- if test "$GTEST_VERSION" = "googletest"; then -- GTEST_VERSION=${GTEST_SOURCE%"/googletest"} -- GTEST_VERSION=`basename $GTEST_VERSION` -- fi -- GTEST_VERSION="${GTEST_VERSION#googletest-release-}" -- GTEST_VERSION="${GTEST_VERSION#gtest-}" -- fi -- -- if test "$gtest_path" != "no" ; then -- if test "$gtest_path" != "yes"; then -- GTEST_PATHS=$gtest_path -- if test -x "${gtest_path}/bin/gtest-config" ; then -- GTEST_CONFIG="${gtest_path}/bin/gtest-config" -- fi -- else -- AC_PATH_PROG([GTEST_CONFIG], [gtest-config]) -- fi -- if test -x "${GTEST_CONFIG}" ; then : -- # using cppflags instead of cxxflags -- GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags` -- GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` -- GTEST_LDADD=`${GTEST_CONFIG} --libs` -- GTEST_VERSION=`${GTEST_CONFIG} --version` -- GTEST_FOUND="true" -- else -- AC_MSG_WARN([Unable to locate Google Test gtest-config.]) -- if test -z "${GTEST_PATHS}" ; then -- GTEST_PATHS="/usr /usr/local" -- fi -- GTEST_FOUND="false" -- fi -- if test "${GTEST_FOUND}" != "true"; then -- GTEST_FOUND="false" -- for dir in $GTEST_PATHS; do -- if test -f "$dir/include/gtest/gtest.h"; then -- if test -f "$dir/lib/libgtest.a" || \ -- test -f "$dir/lib/libgtest.so"; then -- GTEST_INCLUDES="-I$dir/include" -- GTEST_LDFLAGS="-L$dir/lib" -- GTEST_LDADD="-lgtest" -- GTEST_FOUND="true" -- break -- else -- AC_MSG_WARN([Found Google Test include but not the library in $dir.]) -- fi -- fi -- done -- fi -- if test "${GTEST_FOUND}" != "true"; then -- AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS]) -- fi -- -- fi --fi - AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no") - AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes") - AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG) - AC_SUBST(GTEST_INCLUDES) - AC_SUBST(GTEST_LDFLAGS) --AC_SUBST(GTEST_LDADD) -+AC_SUBST([GTEST_LDADD], [$GTEST_LIBS]) - AC_SUBST(GTEST_SOURCE) - - ])dnl AX_ISC_GTEST diff --git a/net-misc/kea/kea-2.0.2.ebuild b/net-misc/kea/kea-2.0.2.ebuild deleted file mode 100644 index aca4fe99e606..000000000000 --- a/net-misc/kea/kea-2.0.2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="${PV//_p/-P}" -MY_PV="${MY_PV/_/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="https://www.isc.org/kea/" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit autotools fcaps python-single-r1 systemd tmpfiles - -if [[ ${PV} = 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/isc-projects/kea.git" -else - SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz - ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz" - # Odd minor version = development release - if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~arm64 ~x86" - fi -fi - -LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -IUSE="mysql +openssl postgres +samples shell test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/boost:= - dev-libs/log4cplus - mysql? ( dev-db/mysql-connector-c ) - !openssl? ( dev-libs/botan:2= ) - openssl? ( dev-libs/openssl:0= ) - postgres? ( dev-db/postgresql:* ) - shell? ( ${PYTHON_DEPS} ) -" -DEPEND="${COMMON_DEPEND} - test? ( dev-cpp/gtest ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/dhcp - acct-user/dhcp" -BDEPEND="virtual/pkgconfig" - -REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch - "${FILESDIR}"/${PN}-1.9.10-gtest.patch -) - -pkg_setup() { - use shell && python-single-r1_pkg_setup -} - -src_prepare() { - default - # 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" \ - configure.ac || die - - sed -i \ - -e '/mkdir -p $(DESTDIR)${runstatedir}\/${PACKAGE_NAME}/d' \ - Makefile.am || die "Fixing Makefile.am failed" - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-install-configurations - --disable-static - --enable-generate-messages - --enable-perfdhcp - --localstatedir="${EPREFIX}/var" - --runstatedir="${EPREFIX}/run" - --without-werror - $(use_enable test gtest) - $(use_enable shell) - $(use_with mysql) - $(use_with openssl) - $(use_with postgres pgsql) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} - newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} - - if use samples; then - diropts -m 0750 -o root -g dhcp - dodir /etc/kea - insopts -m 0640 -o root -g dhcp - insinto /etc/kea - doins "${FILESDIR}"/${PN}-ctrl-agent.conf - doins "${FILESDIR}"/${PN}-ddns-server.conf - doins "${FILESDIR}"/${PN}-dhcp4.conf - doins "${FILESDIR}"/${PN}-dhcp6.conf - fi - - systemd_dounit "${FILESDIR}"/${PN}-ctrl-agent.service - systemd_dounit "${FILESDIR}"/${PN}-ddns-server.service - systemd_dounit "${FILESDIR}"/${PN}-dhcp4-server.service - systemd_dounit "${FILESDIR}"/${PN}-dhcp6-server.service - - newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf - - keepdir /var/lib/${PN} /var/log/${PN} - find "${ED}" -type f -name "*.la" -delete || die -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf - fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6} -} diff --git a/net-misc/kea/kea-2.4.0.ebuild b/net-misc/kea/kea-2.4.0-r1.ebuild index bf1c596ab6ba..72c97487d6f6 100644 --- a/net-misc/kea/kea-2.4.0.ebuild +++ b/net-misc/kea/kea-2.4.0-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 @@ -12,7 +12,7 @@ HOMEPAGE="https://www.isc.org/kea/" PYTHON_COMPAT=( python3_{8..12} ) -inherit autotools fcaps python-single-r1 systemd tmpfiles +inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles if [[ ${PV} = 9999* ]] ; then inherit git-r3 @@ -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 \ @@ -86,6 +90,13 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/861617 + # + # I would truly love to submit an upstream bug but their self-hosted gitlab + # won't let me sign up. -- Eli + filter-lto + local myeconfargs=( --disable-install-configurations --disable-rpath @@ -98,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) @@ -108,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/kea/kea-2.2.0.ebuild b/net-misc/kea/kea-2.4.1.ebuild index 65ef75d7f344..72c97487d6f6 100644 --- a/net-misc/kea/kea-2.2.0.ebuild +++ b/net-misc/kea/kea-2.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 @@ -10,9 +10,9 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="https://www.isc.org/kea/" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{8..12} ) -inherit autotools fcaps python-single-r1 systemd tmpfiles +inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles if [[ ${PV} = 9999* ]] ; then inherit git-r3 @@ -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 \ @@ -86,6 +90,13 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/861617 + # + # I would truly love to submit an upstream bug but their self-hosted gitlab + # won't let me sign up. -- Eli + filter-lto + local myeconfargs=( --disable-install-configurations --disable-rpath @@ -98,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) @@ -108,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/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index bf1c596ab6ba..72c97487d6f6 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-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 @@ -12,7 +12,7 @@ HOMEPAGE="https://www.isc.org/kea/" PYTHON_COMPAT=( python3_{8..12} ) -inherit autotools fcaps python-single-r1 systemd tmpfiles +inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles if [[ ${PV} = 9999* ]] ; then inherit git-r3 @@ -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 \ @@ -86,6 +90,13 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/861617 + # + # I would truly love to submit an upstream bug but their self-hosted gitlab + # won't let me sign up. -- Eli + filter-lto + local myeconfargs=( --disable-install-configurations --disable-rpath @@ -98,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) @@ -108,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 03bb2c05724a..b142bd4c8cf0 100644 --- a/net-misc/kio-zeroconf/Manifest +++ b/net-misc/kio-zeroconf/Manifest @@ -1,2 +1,2 @@ -DIST kio-zeroconf-23.04.3.tar.xz 44116 BLAKE2B 9cd9bdac2dda044485c1e665c875e85181ce540a251f28c3f7011c658523298072a96042ea30632422619054228aa9aa3ea4142a59fdddb918d64fd20cb10432 SHA512 83c401b0d5cc32088990635e805c9881bd234b5919eab973f26021841df0d3e06595c68d2b9a37dcbaa4158349a2540650b7897ef5209d7de54fa5913627df8a -DIST kio-zeroconf-23.08.3.tar.xz 44372 BLAKE2B fb1d1657e864ce197f80d70e2112593a44d0a7503a1d5294117c31def0d9fbcbb24c51f7aa40bda10474d5f757365588052d47bb29ec1b477752d01bec46c422 SHA512 6e0393384565ff538c7f53ca4d537829d82b372f0a23d97d89ea78ffdcbb1e099ee278bb1f0234e5690f97dcc4b365b0369df909cb88479c9216051b609479e5 +DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6 +DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild deleted file mode 100644 index b5993cb40e3e..000000000000 --- a/net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdnssd-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.08.3.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild index b5993cb40e3e..3300b2034c62 100644 --- a/net-misc/kio-zeroconf/kio-zeroconf-23.08.3.ebuild +++ b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.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 @@ -12,7 +12,7 @@ DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discover LICENSE="GPL-2+" SLOT="5" KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="" +IUSE="kf6compat" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -22,4 +22,17 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + kf6compat? ( net-misc/kio-zeroconf:6 ) +" + +src_install() { + ecm_src_install + + if use kf6compat; then + rm "${D}"/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml \ + "${D}"/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml \ + "${D}"/usr/share/remoteview/zeroconf.desktop || die + rm -r "${D}"/usr/share/locale || die + fi +} diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild new file mode 100644 index 000000000000..ca28c0731856 --- /dev/null +++ b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.3.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdnssd-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" diff --git a/net-misc/kio-zeroconf/metadata.xml b/net-misc/kio-zeroconf/metadata.xml index d925f2439758..8697c2472ca5 100644 --- a/net-misc/kio-zeroconf/metadata.xml +++ b/net-misc/kio-zeroconf/metadata.xml @@ -7,5 +7,9 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">network/kio-zeroconf</remote-id> </upstream> + <use> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> + </use> </pkgmetadata> diff --git a/net-misc/l7-filter-userspace/metadata.xml b/net-misc/l7-filter-userspace/metadata.xml index 767af8e63201..66ba86cf29ef 100644 --- a/net-misc/l7-filter-userspace/metadata.xml +++ b/net-misc/l7-filter-userspace/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>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">l7-filter</remote-id> </upstream> 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/l7-protocols/metadata.xml b/net-misc/l7-protocols/metadata.xml index 1acb44ce3bc1..8b46d38acce1 100644 --- a/net-misc/l7-protocols/metadata.xml +++ b/net-misc/l7-protocols/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>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> These are patterns (protocol definitions) for the Linux layer 7 packet classifier (l7-filter). To use them, you need the l7-filter userspace version diff --git a/net-misc/lambdamoo/files/lambdamoo-1.8.1-C99-configure.patch b/net-misc/lambdamoo/files/lambdamoo-1.8.1-C99-configure.patch new file mode 100644 index 000000000000..972bf918db06 --- /dev/null +++ b/net-misc/lambdamoo/files/lambdamoo-1.8.1-C99-configure.patch @@ -0,0 +1,111 @@ +Original minimal fix for bug https://bugs.gentoo.org/927734 +with it lambdaroo starts compiling +diff -ur MOO-1.8.1.orig/configure.in MOO-1.8.1/configure.in +--- a/configure.in 2024-04-01 07:02:38.948009581 +0000 ++++ b/configure.in 2024-04-01 07:04:19.706417934 +0000 +@@ -260,7 +260,8 @@ + SAVECC="$CC" + CC="$CC $opt" + AC_TEST_PROGRAM([ +-int main(int argc, char *argv) { void *ptr; exit(0); } ++#include <stdlib.h> ++int main(int argc, char **argv) { void *ptr; exit(0); } + ], + [have_ansi=1 + break], +diff -ur MOO-1.8.1.orig/config.h.in MOO-1.8.1/config.h.in +--- a/config.h.in 2024-04-01 07:11:20.263972630 +0000 ++++ b/config.h.in 2024-04-01 07:13:06.909341833 +0000 +@@ -253,6 +253,7 @@ + */ + + #include <limits.h> ++#include <string.h> + + #if INT_MAX == 2147483647 + typedef int int32; +fix for old name of configure.in +--- a/Makefile.in 2024-05-09 05:39:45.019672388 -0000 ++++ b/Makefile.in 2024-05-09 05:40:41.162384171 -0000 +@@ -69,7 +69,7 @@ + + DISTFILES = $(SRCS) Makefile.in restart restart.sh \ + Minimal.db README.Minimal \ +- ChangeLog.txt README configure.in configure config.h.in \ ++ ChangeLog.txt README configure.ac configure config.h.in \ + MOOCodeSequences.txt AddingNewMOOTypes.txt pgperf aclocal.m4 + + COBJS = $(CSRCS:.c=.o) +@@ -94,7 +94,7 @@ + restart: + touch restart + +-configure: configure.in ++configure: configure.ac + # autoconf + @echo "Not running autoconf; you must do this by hand." + touch configure +QA fixes from Sam, modified for configure.in, as they are applied +before renaming +https://github.com/gentoo/gentoo/pull/36033#issuecomment-2101077890 +diff --git a/configure.in b/configure.in +index 685bdfe..24cfe64 100644 +--- a/configure.in ++++ b/configure.in +@@ -381,8 +381,10 @@ dnl *************************************************************************** + echo "checking whether or not fstat() can tell how much data is in a FIFO" + AC_TEST_PROGRAM([#include <sys/types.h> + #include <sys/stat.h> ++#include <stdlib.h> + #include <fcntl.h> +-main() ++#include <unistd.h> ++int main() + { + #ifdef NeXT + /* The NeXT claims to have FIFOs, but using them panics the kernel... */ +@@ -407,13 +409,15 @@ AC_TEST_PROGRAM([#include <sys/types.h> + #include <sys/time.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <stdlib.h> ++#include <unistd.h> + #ifndef FD_ZERO + #define NFDBITS (sizeof(fd_set)*8) + #define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) + #define FD_SET(n, p) ((p)->fds_bits[0] |= (1L<<((n)%NFDBITS))) + #define FD_ISSET(n, p) ((p)->fds_bits[0] & (1L<<((n)%NFDBITS))) + #endif /* FD_ZERO */ +-main() ++int main() + { + #ifdef NeXT + /* The NeXT claims to have FIFOs, but using them panics the kernel... */ +@@ -443,7 +447,9 @@ AC_TEST_PROGRAM([#include <sys/types.h> + #include <poll.h> + #include <sys/stat.h> + #include <fcntl.h> +-main() ++#include <stdlib.h> ++#include <unistd.h> ++int main() + { + int rfd, wfd, result; struct pollfd fds[1]; + unlink("/tmp/conftest-fifo"); +@@ -461,11 +467,14 @@ main() + dnl *************************************************************************** + echo checking whether POSIX-style non-blocking I/O works + AC_TEST_PROGRAM([#include <sys/types.h> ++#include <sys/stat.h> + #include <errno.h> + #include <fcntl.h> + #include <signal.h> +-handler(int sig) { } +-main () ++#include <stdlib.h> ++#include <unistd.h> ++void handler(int sig) { return; } ++int main () + { /* Testing a POSIX feature, so assume FIFOs */ + #ifdef NeXT + /* The NeXT claims to have FIFOs, but using them panics the kernel... */ diff --git a/net-misc/lambdamoo/files/lambdamoo-1.8.1-respect-cflags.patch b/net-misc/lambdamoo/files/lambdamoo-1.8.1-respect-cflags.patch new file mode 100644 index 000000000000..2ebfdadb59c9 --- /dev/null +++ b/net-misc/lambdamoo/files/lambdamoo-1.8.1-respect-cflags.patch @@ -0,0 +1,24 @@ +was sed -i Makefile.in -e '/ -o /s|$(CFLAGS)|& $(LDFLAGS)|g' +--- a/Makefile.in 2024-05-09 05:12:18.249018601 -0000 ++++ b/Makefile.in 2024-05-09 05:12:20.497004963 -0000 +@@ -79,16 +79,16 @@ + OBJS = $(COBJS) $(YOBJS) + + moo: $(OBJS) +- $(CC) $(CFLAGS) $(OBJS) $(LIBRARIES) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBRARIES) -o $@ + + pure_moo: moo +- purify $(CC) $(CFLAGS) $(OBJS) $(LIBRARIES) -o $@ ++ purify $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBRARIES) -o $@ + + client_bsd: client_bsd.o +- $(CC) $(CFLAGS) client_bsd.o $(LIBRARIES) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) client_bsd.o $(LIBRARIES) -o $@ + + client_sysv: client_sysv.o +- $(CC) $(CFLAGS) client_sysv.o $(LIBRARIES) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) client_sysv.o $(LIBRARIES) -o $@ + + # This rule gets around some "make"s' desire to `derive' it from `restart.sh'. + restart: diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r4.ebuild index b95483d47d8d..4587428b7bc3 100644 --- a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild +++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r4.ebuild @@ -1,31 +1,28 @@ -# Copyright 1999-2022 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 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" +S=${WORKDIR}/MOO-${PV} LICENSE="LambdaMOO GPL-2" SLOT="0" -KEYWORDS="~sparc ~x86" -IUSE="" - -DEPEND="sys-devel/bison" -RDEPEND="" +KEYWORDS="~amd64 ~x86" -S=${WORKDIR}/MOO-${PV} +DEPEND="app-alternatives/yacc" +PATCHES=( + "${FILESDIR}/${PV}-enable-outbound.patch" + "${FILESDIR}/${P}-C99-configure.patch" + "${FILESDIR}/${P}-respect-cflags.patch" +) src_prepare() { default - - eapply "${FILESDIR}"/${PV}-enable-outbound.patch - sed -i Makefile.in \ - -e '/ -o /s|$(CFLAGS)|& $(LDFLAGS)|g' \ - || die "sed Makefile.in" eautoreconf } diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest index deed140279eb..1eaa8b55b645 100644 --- a/net-misc/libteam/Manifest +++ b/net-misc/libteam/Manifest @@ -1,2 +1,3 @@ DIST libteam-1.23.tar.gz 173445 BLAKE2B 143e43cb092ac9aab8b152101c4c91c995436a6b02cf85fb710fa095a0bbd46fe70666149cfa9d86135b5496dd0287296e55d68f511aa5965c1d4f22f61ded57 SHA512 f78ceca4606b93e75fafdd97aa3cc44153fc42d31209f216c3da9c71abf38a2e4a690c71b8631ae09e02d7285d6bbd8292983fdc69eb921b0537a75558bc89f5 DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e +DIST libteam-1.32.tar.gz 177184 BLAKE2B dd3e988d52a373c3c006e749ffee35b12f7b26f0cd154479769b4426d97a23509a52d0b50430ef4220bce4ef6ee73c827b3eeb3fe28537f40f65c45fcacb18b6 SHA512 38a0926f22733000dedb5669e8ba29bd9bce61b00dbdc713220eee520e10ce6eb979b02408f785463cd7b61ff3e57a78b43ed6baffb305e63a0fab0883493507 diff --git a/net-misc/libteam/libteam-1.32.ebuild b/net-misc/libteam/libteam-1.32.ebuild new file mode 100644 index 000000000000..23c3186d0a44 --- /dev/null +++ b/net-misc/libteam/libteam-1.32.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/jpirko/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Library and tools set for controlling team network device" +HOMEPAGE="https://libteam.org" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="dbus debug examples static-libs +syslog zmq" + +DEPEND=">=dev-libs/jansson-2.4:= + dev-libs/libdaemon + >=dev-libs/libnl-3.2.19[utils] + dbus? ( sys-apps/dbus ) + zmq? ( >=net-libs/zeromq-3.2.0 ) + " + +RDEPEND="${DEPEND} + syslog? ( virtual/logger )" + +CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE" +ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel! +Only >=3.3.0 kernel version support in team mode" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable syslog logging) \ + $(use_enable dbus) \ + $(use_enable zmq) +} + +src_install() { + default + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die + + insinto /etc/dbus-1/system.d + doins teamd/dbus/teamd.conf + + if use examples; then + docinto examples + dodoc teamd/example_configs/* + fi +} diff --git a/net-misc/libteam/libteam-9999.ebuild b/net-misc/libteam/libteam-9999.ebuild index a5a895f1bca1..23c3186d0a44 100644 --- a/net-misc/libteam/libteam-9999.ebuild +++ b/net-misc/libteam/libteam-9999.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools linux-info if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pirko/${PN}.git" + EGIT_REPO_URI="https://github.com/jpirko/${PN}.git" inherit git-r3 else SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi DESCRIPTION="Library and tools set for controlling team network device" -HOMEPAGE="http://libteam.org" +HOMEPAGE="https://libteam.org" LICENSE="LGPL-2.1+" SLOT="0" @@ -34,8 +34,6 @@ CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~N ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel! Only >=3.3.0 kernel version support in team mode" -DOCS=( README ) - src_prepare() { default eautoreconf @@ -52,6 +50,8 @@ src_configure() { src_install() { default + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die + insinto /etc/dbus-1/system.d doins teamd/dbus/teamd.conf diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest index 99d89fba1a94..6875deba8c2e 100644 --- a/net-misc/linuxptp/Manifest +++ b/net-misc/linuxptp/Manifest @@ -1 +1,2 @@ DIST linuxptp-4.1.tgz 252373 BLAKE2B 9dc6bb69c98a8b452250554b5e06b39d445b81a3e0c7ce2beaa7bd1d2cb969928496827bd3d3e32136c9fe55f1103ab312441c2a4cdee035c7d6b7526f0c1327 SHA512 144c03677f2c61c58d05c5c5dbb771b7aac3860507d9ba814f67f6da024c3cb2019f9e8cf39b983d39a6feddd1b24a1f40a678b4ff7af8aa564ee813e322dfae +DIST linuxptp-4.2.tgz 253861 BLAKE2B 83489edb1cb48a7f245e3224705332980a32aed14e166c3fd0d8111f4008ae42a293397a588a546e421fae634057829dcbcd94794ce539ecb166e5cf69ff6554 SHA512 479e512efd0573602379a9e1d8ef5c0ec9e033944cee5aed11c68cea5e8a3f7d4b6f2d11f6d6d4718282010da52c2c8629d675d9b388cc0c3d574845a913cdbb diff --git a/net-misc/linuxptp/files/linuxptp-4.2-user_cpp.patch b/net-misc/linuxptp/files/linuxptp-4.2-user_cpp.patch new file mode 100644 index 000000000000..f999ed0189b6 --- /dev/null +++ b/net-misc/linuxptp/files/linuxptp-4.2-user_cpp.patch @@ -0,0 +1,11 @@ +--- a/incdefs.sh ++++ b/incdefs.sh +@@ -27,7 +27,7 @@ + printf " -D_GNU_SOURCE" + + # Get list of directories searched for header files. +- dirs=$(${CC} -E -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /") ++ dirs=$(echo "" | ${CPP} -Wp,-v - 2>&1 >/dev/null | grep ^" /") + + # Look for clock_adjtime(). + for d in $dirs; do 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 new file mode 100644 index 000000000000..8665d7add0d6 --- /dev/null +++ b/net-misc/linuxptp/linuxptp-4.2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info systemd toolchain-funcs + +DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" +HOMEPAGE="https://linuxptp.nwtime.org/" +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" + +DEPEND="elibc_musl? ( sys-libs/queue-standalone )" + +CONFIG_CHECK="~NETWORK_PHY_TIMESTAMPING ~PPS ~PTP_1588_CLOCK" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2-user_cpp.patch +) + +pkg_setup() { + linux-info_pkg_setup +} + +src_compile() { + # parse needed additional CFLAGS + export MY_FLAGS=$(CPP="$(tc-getCPP)" ./incdefs.sh) + export EXTRA_CFLAGS="${CFLAGS} ${MY_FLAGS}" + emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man +} + +src_install() { + emake \ + prefix="${D}"/usr \ + mandir="${D}"/usr/share/man \ + infodir="${D}"/usr/share/info \ + libdir="${D}"/usr/$(get_libdir) \ + install + + systemd_newunit "${FILESDIR}"/phc2sysAT.service phc2sys@.service + systemd_newunit "${FILESDIR}"/ptp4lAT.service ptp4l@.service + systemd_dounit "${FILESDIR}"/timemaster.service + + dodoc README.org + dodoc -r configs +} diff --git a/net-misc/linuxptp/metadata.xml b/net-misc/linuxptp/metadata.xml index 4b4b63f6299a..b5563b8f7c01 100644 --- a/net-misc/linuxptp/metadata.xml +++ b/net-misc/linuxptp/metadata.xml @@ -2,14 +2,11 @@ <!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 type="person"> <email>tomjbe@gentoo.org</email> <name>Thomas Beierlein</name> </maintainer> <upstream> <remote-id type="sourceforge">linuxptp</remote-id> + <remote-id type="cpe">cpe:/a:linuxptp_project:linuxptp</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest index 8d58693add2d..96161893a88d 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -1,2 +1 @@ -DIST lldpd-1.0.16.tar.gz 1967182 BLAKE2B 3a359ec6539087ab1ffa5e1f83b90cc375b047b6e404df21067621bac9c9e5bab4b04209e9111d72fc2486046fb1d4b6744c093342c908f9a6475cd0b5a33328 SHA512 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1 -DIST lldpd-1.0.17.tar.gz 1983689 BLAKE2B e74a1cdd965b26e9bad509fefb66bddfd74028a7d5122e561aed51eeb1b42c26497ce07169218133e4b99f12f4e0951065280c4ea8e47d54ecb6a8e697104106 SHA512 8f6d6ea6a32cc0f238158a2d1f08224224bca250cf61f80e4d8b633c0471e4ff9a17a7a7d7f313f10d557a256c7419f54cbb3b78903b7bba3619f9c5b6c114c8 +DIST lldpd-1.0.18.tar.gz 1988691 BLAKE2B 37ee156013ab9ceaee06d10025fe0b76e26ebafef7a8254866347db8e6b316805a49d0f9f2ba330bb5f863336e95983214c9c9fb453e2290e9be0c47808504c7 SHA512 c8734221767cd879c98ea3ee6fa80e1dce2f8470a97b0f757cfe7ef8fe2adaf878fdedcda896cf65e1af980634f2ab312588658fb85f89c6d5b6cc9d2da52045 diff --git a/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch b/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch deleted file mode 100644 index bd03399e1b36..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/900286 -https://github.com/lldpd/lldpd/commit/01aee0f3601c60e570aeb9040c036c83d053cc5a - -From 01aee0f3601c60e570aeb9040c036c83d053cc5a Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Thu, 8 Dec 2022 13:01:07 +0100 -Subject: [PATCH] m4/progname.m4: Include <stdio.h> for printf in - lldp_CHECK___PROGNAME - -Otherwise the checks always fails with a compiler that does not -support implict function declarations. ---- a/m4/progname.m4 -+++ b/m4/progname.m4 -@@ -4,7 +4,7 @@ - AC_DEFUN([lldp_CHECK___PROGNAME],[ - AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [ - AC_LINK_IFELSE([AC_LANG_PROGRAM( -- [[]], -+ [[#include<stdio.h>]], - [[ extern char *__progname; printf("%s", __progname); ]])], - [ lldp_cv_check___progname="yes" ], - [ lldp_cv_check___progname="no" ]) - diff --git a/net-misc/lldpd/lldpd-1.0.16-r2.ebuild b/net-misc/lldpd/lldpd-1.0.16-r2.ebuild deleted file mode 100644 index 76245a3ea31e..000000000000 --- a/net-misc/lldpd/lldpd-1.0.16-r2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd bash-completion-r1 autotools tmpfiles - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://lldpd.github.io/" -SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/4.9.1" -KEYWORDS="~amd64 ~x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline valgrind xml" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/lldpd - acct-user/lldpd - dev-libs/libbsd - >=dev-libs/libevent-2.1.11:= - sys-libs/readline:0= - seccomp? ( sys-libs/libseccomp:= ) - snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) - xml? ( dev-libs/libxml2:= ) -" -DEPEND="${RDEPEND} - test? ( dev-libs/check ) - valgrind? ( dev-util/valgrind ) -" -BDEPEND="virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot,doc] ) - !graph? ( app-doc/doxygen ) - ) -" - -REQUIRED_USE=" - graph? ( doc ) - test? ( snmp sanitizers ) -" - -# tests need root -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.16-configure-clang16.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) - - econf \ - --without-embedded-libevent \ - --with-privsep-user=${PN} \ - --with-privsep-group=${PN} \ - --with-privsep-chroot=/run/${PN} \ - --with-lldpd-ctl-socket=/run/${PN}.socket \ - --with-lldpd-pid-file=/run/${PN}.pid \ - $(use_enable cdp) \ - $(use_enable doc doxygen-doc) \ - $(use_enable doc doxygen-man) \ - $(use_enable doc doxygen-pdf) \ - $(use_enable doc doxygen-html) \ - $(use_enable dot1) \ - $(use_enable dot3) \ - $(use_enable edp) \ - $(use_enable fdp) \ - $(use_enable graph doxygen-dot) \ - $(use_enable lldpmed) \ - $(use_enable old-kernel oldies) \ - $(use_enable sonmp) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - $(use_enable sanitizers) \ - $(use_with seccomp) \ - $(use_with snmp) \ - $(use_with xml) -} - -src_compile() { - emake - use doc && emake doxygen-doc -} - -src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -delete || die - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.16.ebuild b/net-misc/lldpd/lldpd-1.0.16.ebuild deleted file mode 100644 index 894e65e80572..000000000000 --- a/net-misc/lldpd/lldpd-1.0.16.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd bash-completion-r1 autotools tmpfiles - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://lldpd.github.io/" -SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/4.9.1" -KEYWORDS="amd64 x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/lldpd - acct-user/lldpd - dev-libs/libbsd - >=dev-libs/libevent-2.1.11:= - sys-libs/readline:0= - seccomp? ( sys-libs/libseccomp:= ) - snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) - xml? ( dev-libs/libxml2:= ) -" -DEPEND="${RDEPEND} - test? ( dev-libs/check ) -" -BDEPEND="virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot,doc] ) - !graph? ( app-doc/doxygen ) - ) -" - -REQUIRED_USE=" - graph? ( doc ) - test? ( snmp sanitizers ) -" - -# tests need root -RESTRICT+=" test" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - --without-embedded-libevent \ - --with-privsep-user=${PN} \ - --with-privsep-group=${PN} \ - --with-privsep-chroot=/run/${PN} \ - --with-lldpd-ctl-socket=/run/${PN}.socket \ - --with-lldpd-pid-file=/run/${PN}.pid \ - $(use_enable cdp) \ - $(use_enable doc doxygen-man) \ - $(use_enable doc doxygen-pdf) \ - $(use_enable doc doxygen-html) \ - $(use_enable dot1) \ - $(use_enable dot3) \ - $(use_enable edp) \ - $(use_enable fdp) \ - $(use_enable graph doxygen-dot) \ - $(use_enable lldpmed) \ - $(use_enable old-kernel oldies) \ - $(use_enable sonmp) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - $(use_enable sanitizers) \ - $(use_with seccomp) \ - $(use_with snmp) \ - $(use_with xml) -} - -src_compile() { - emake - use doc && emake doxygen-doc -} - -src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -delete || die - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.17.ebuild b/net-misc/lldpd/lldpd-1.0.18.ebuild index bd0f6ba2ac4e..92848bf22b45 100644 --- a/net-misc/lldpd/lldpd-1.0.17.ebuild +++ b/net-misc/lldpd/lldpd-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 @@ -28,12 +28,12 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-libs/check ) - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND="virtual/pkgconfig doc? ( - graph? ( app-doc/doxygen[dot,doc] ) - !graph? ( app-doc/doxygen ) + graph? ( app-text/doxygen[dot,doc] ) + !graph? ( app-text/doxygen ) ) " @@ -55,6 +55,7 @@ src_configure() { export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) econf \ + --cache-file="${S}"/config.cache \ --without-embedded-libevent \ --with-privsep-user=${PN} \ --with-privsep-group=${PN} \ diff --git a/net-misc/mcproxy/mcproxy-1.1.1-r2.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r2.ebuild index 18b13e778d5f..aa97d1c68cee 100644 --- a/net-misc/mcproxy/mcproxy-1.1.1-r2.ebuild +++ b/net-misc/mcproxy/mcproxy-1.1.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 @@ -17,7 +17,7 @@ IUSE="doc" DEPEND=" dev-qt/qtcore:5 - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " PATCHES=( diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 39221eead1c1..f18e2282e35d 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -1,5 +1 @@ -DIST memcached-1.6.18.tar.gz 1081928 BLAKE2B edfaf02cdd3b13930d473fbc4475484602b70bca323f28636b1770780be34fdb325c70d0b0ba7f8d92233aab4dac8a5537be84276489be6a803e1d93d1dc34ab SHA512 85e5a5e7c901b02158ea20cc58f2e7e6ba4806c40a0105185140b31fa40f3ce0fc704f6f17ea4a425a9ff543f9d30092aadbb202ea4ca46476c151e65eac97e6 -DIST memcached-1.6.19.tar.gz 2599941 BLAKE2B a66eef916b1d540558cf6487363b95a4228784d921bc0987da803c8d3897ad2ef22ef9949d95251b92b98390d900d4ca26a88862cbf33b8e5d624f3f32cb00d2 SHA512 60d93065e0ef2b17e9da5370a497a4fbfc64c0af70e14fdfdab60c0c94c0b19e30da31d615e19565474c278141a4cb401c65fd79bd70947dd96a9fee81824a74 -DIST memcached-1.6.20.tar.gz 2615902 BLAKE2B 3baa0b2c72619104f43dce6e19b4ae7f54da8342dbdebc06bdd03b5c63bc0133bed71800d8b890d7eb6745a19799fdfd2f1d9f1636bc109ad8827f828639f304 SHA512 518784e7ea1f919e3cd67afe394c9435b18f63b612e528d12f554a806ee479139db08ee8ab8e176ee0e88cee6e732cf311fbe6942fc0ca5b1a2286638e1cfcb9 -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.27.tar.gz 1189608 BLAKE2B 056f9555dda758ebb46f62c7eb65712107b1e50b4e4e9696ad4962abdd584df0e0d398590b0e6bfabad33ca18f2a7596d9410d8b35fe069bce6f812ecedd3c35 SHA512 d9de26887339d456e1cace60bf5b2cc2a78231a52ec6f6f36ed7d3ad373eaf231419601be46e80963a3a0254638d03198141647f81fa530b85dbdc4a6071c4cd diff --git a/net-misc/memcached/files/memcached-1.2.2-fbsd.patch b/net-misc/memcached/files/memcached-1.2.2-fbsd.patch deleted file mode 100644 index 76f237698cf7..000000000000 --- a/net-misc/memcached/files/memcached-1.2.2-fbsd.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: memcached-1.2.2/memcached.h -=================================================================== ---- memcached-1.2.2.orig/memcached.h -+++ memcached-1.2.2/memcached.h -@@ -4,6 +4,7 @@ - #include "config.h" - #include <sys/types.h> - #include <sys/time.h> -+#include <sys/socket.h> - #include <netinet/in.h> - #include <event.h> - diff --git a/net-misc/memcached/files/memcached-1.4.4-as-needed.patch b/net-misc/memcached/files/memcached-1.4.4-as-needed.patch deleted file mode 100644 index f6e5cde11057..000000000000 --- a/net-misc/memcached/files/memcached-1.4.4-as-needed.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nuar memcached-1.4.4.orig/configure.ac memcached-1.4.4/configure.ac ---- memcached-1.4.4.orig/configure.ac 2009-11-24 16:40:29.000000000 -0800 -+++ memcached-1.4.4/configure.ac 2009-11-27 15:20:38.000000000 -0800 -@@ -115,6 +115,14 @@ - AC_SUBST(ENABLE_SASL) - AC_SUBST(PROFILER_LDFLAGS) - -+dnl Check whether the user's system supports pthread before adding -pthread to CFLAGS -+dnl otherwise we won't get -l{threads} in LIBS -+dnl AFAIK -pthread should be added to LDFLAGS on BSD systems -+AC_SEARCH_LIBS(pthread_create, [pthread pthreads thread threads] ) -+if test "x$ac_cv_search_pthread_create" == "xno"; then -+ AC_MSG_ERROR([Can't enable threads without the POSIX thread library.]) -+fi -+ - AC_ARG_ENABLE(coverage, - [AS_HELP_STRING([--disable-coverage],[Disable code coverage])]) - -@@ -376,12 +384,6 @@ - - AC_C_HTONLL - --dnl Check whether the user's system supports pthread --AC_SEARCH_LIBS(pthread_create, pthread) --if test "x$ac_cv_search_pthread_create" = "xno"; then -- AC_MSG_ERROR([Can't enable threads without the POSIX thread library.]) --fi -- - AC_CHECK_FUNCS(mlockall) - AC_CHECK_FUNCS(getpagesizes) - AC_CHECK_FUNCS(memcntl) diff --git a/net-misc/memcached/memcached-1.6.18.ebuild b/net-misc/memcached/memcached-1.6.18.ebuild deleted file mode 100644 index 0ed1ae622894..000000000000 --- a/net-misc/memcached/memcached-1.6.18.ebuild +++ /dev/null @@ -1,106 +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.2.2-fbsd.patch" - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" -) - -src_prepare() { - default - - sed -i -e 's,-Werror,,g' configure.ac || die - 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 \ - $(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.19.ebuild b/net-misc/memcached/memcached-1.6.19.ebuild deleted file mode 100644 index 0ed1ae622894..000000000000 --- a/net-misc/memcached/memcached-1.6.19.ebuild +++ /dev/null @@ -1,106 +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.2.2-fbsd.patch" - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" -) - -src_prepare() { - default - - sed -i -e 's,-Werror,,g' configure.ac || die - 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 \ - $(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.20.ebuild b/net-misc/memcached/memcached-1.6.20.ebuild deleted file mode 100644 index 0987a83cff6b..000000000000 --- a/net-misc/memcached/memcached-1.6.20.ebuild +++ /dev/null @@ -1,106 +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.2.2-fbsd.patch" - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" -) - -src_prepare() { - default - - sed -i -e 's,-Werror,,g' configure.ac || die - 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 \ - $(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.21.ebuild b/net-misc/memcached/memcached-1.6.21.ebuild deleted file mode 100644 index 0987a83cff6b..000000000000 --- a/net-misc/memcached/memcached-1.6.21.ebuild +++ /dev/null @@ -1,106 +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.2.2-fbsd.patch" - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" -) - -src_prepare() { - default - - sed -i -e 's,-Werror,,g' configure.ac || die - 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 \ - $(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.21-r1.ebuild b/net-misc/memcached/memcached-1.6.27.ebuild index 53e00ffd929c..774569713225 100644 --- a/net-misc/memcached/memcached-1.6.21-r1.ebuild +++ b/net-misc/memcached/memcached-1.6.27.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 @@ -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 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/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild index 637035595df9..d1ce400fc92d 100644 --- a/net-misc/mico/mico-2.3.13-r14.ebuild +++ b/net-misc/mico/mico-2.3.13-r14.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" @@ -31,7 +31,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - >=sys-devel/flex-2.5.2 + app-alternatives/lex >=sys-devel/bison-1.22 " 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/mikutter/Manifest b/net-misc/mikutter/Manifest index 1f8b11a219f9..021510194bfe 100644 --- a/net-misc/mikutter/Manifest +++ b/net-misc/mikutter/Manifest @@ -1,2 +1,4 @@ +DIST 1585-use-own-blowfish-impl.patch 41698 BLAKE2B c7e62ee5e9d362e7bc103468f4be9a9e49715de63905ca1b2022f01af1bc7f143b46f69f4f73b34bc4f6ba8589ccd138822876c35b7061f0458ee4206aaf6941 SHA512 cddab2449c16b64bc12d272b9302eba01d3e80dfa1d9ade9b125d46508bdc49eb1b4990b25f43c915f76d3e3d4b669a9d5a6b09fbfb6e845690b39d336f120a0 DIST mikutter-5.0.4.tar.gz 2378972 BLAKE2B 58101e91a8d8aeaf71e2bc58a421d0543f864c66c5ea313734ca242bce8115c70a036f6db109670cdb76cbd698d6d0569872c16eeb9eed15d1fd951aabccb35a SHA512 30e8b24af56e38fabeb454d4ea3f6a20b11e7836527f68e61f26f164fed0c2028b29db20c21397b2203fe23fceaef2e92a481d734692da3869dfcedcae2a58e0 +DIST mikutter-5.0.5.tar.gz 2379037 BLAKE2B 455109764e76b19298a0408c51a109f0c3b3b5b2f1b1ffcb59cee6d3fc449c754d8420ea37df2a005d36f3ab4447bbf7f6a7affe934852d07594cbe430cbffed SHA512 8b7d178400b0d7cb674297f9109832e1a19563d35e985636a42028df2414973819ef49b39f80e1a51cf1964634062656dc2071ba8d934083ce327e0a9f3adf28 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4 diff --git a/net-misc/mikutter/mikutter-5.0.5.ebuild b/net-misc/mikutter/mikutter-5.0.5.ebuild new file mode 100644 index 000000000000..65013295fed7 --- /dev/null +++ b/net-misc/mikutter/mikutter-5.0.5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby31 ruby32" + +inherit desktop ruby-ng + +PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" +BLOWFISH_PATCH_NAME="1585-use-own-blowfish-impl.patch" +BLOWFISH_PATCH_URI="https://dev.mikutter.hachune.net/attachments/download/813/${BLOWFISH_PATCH_NAME}" + +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git" + inherit git-r3 + SRC_URI=" ${BLOWFISH_PATCH_URI}" + EGIT_CHECKOUT_DIR="${WORKDIR}/all" +else + SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz + ${BLOWFISH_PATCH_URI}" + KEYWORDS="~amd64 ~riscv" +fi + +DESCRIPTION="Simple, powerful and moeful twitter client" +HOMEPAGE="https://mikutter.hachune.net/" + +# Apache license for the blowfish patch +# https://dev.mikutter.hachune.net/issues/1585 +LICENSE="Apache-2.0 MIT" +SLOT="0" +IUSE="+libnotify" + +PATCHES=( + "${DISTDIR}/${BLOWFISH_PATCH_NAME}" +) + +DEPEND="" +RDEPEND=" + libnotify? ( x11-libs/libnotify ) + media-sound/alsa-utils" + +ruby_add_rdepend "=dev-ruby/addressable-2.8* + >=dev-ruby/delayer-1.2.1 + !>=dev-ruby/delayer-2.0 + >=dev-ruby/delayer-deferred-2.2.0 + !>=dev-ruby/delayer-deferred-3.0 + >=dev-ruby/diva-2.0.1 + !>=dev-ruby/diva-3.0 + dev-ruby/httpclient + dev-ruby/json:2 + >=dev-ruby/memoist-0.16.2 + !>=dev-ruby/memoist-0.17 + dev-ruby/moneta + dev-ruby/nokogiri + >=dev-ruby/oauth-0.5.8 + >=dev-ruby/pluggaloid-1.7.0 + !>=dev-ruby/pluggaloid-2.0 + =dev-ruby/prime-0.1.2* + dev-ruby/rcairo + >=dev-ruby/ruby-gettext-3.4 + !>=dev-ruby/ruby-gettext-3.5 + dev-ruby/ruby-gtk3 + >=dev-ruby/typed-array-0.1.2 + !>=dev-ruby/typed-array-0.2 + virtual/ruby-ssl" + +all_ruby_unpack() { + if [ "${PV}" = "9999" ];then + git-3_src_unpack + else + default + fi +} + +all_ruby_install() { + local ruby + + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if use ruby_targets_${ruby}; then + break + fi + done + + exeinto /usr/share/mikutter + doexe mikutter.rb + insinto /usr/share/mikutter + doins -r core plugin + sed -e "s/ruby19/${ruby}/" "${FILESDIR}"/mikutter \ + | newbin - mikutter + dodoc README + make_desktop_entry mikutter Mikutter \ + /usr/share/mikutter/core/skin/data/icon.png +} diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild index 0d3a72a482ca..65013295fed7 100644 --- a/net-misc/mikutter/mikutter-9999.ebuild +++ b/net-misc/mikutter/mikutter-9999.ebuild @@ -1,33 +1,40 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby31" +USE_RUBY="ruby31 ruby32" inherit desktop ruby-ng PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" +BLOWFISH_PATCH_NAME="1585-use-own-blowfish-impl.patch" +BLOWFISH_PATCH_URI="https://dev.mikutter.hachune.net/attachments/download/813/${BLOWFISH_PATCH_NAME}" if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git - https://github.com/toshia/twitter_api_keys.git" + EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git" inherit git-r3 - SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" + SRC_URI=" ${BLOWFISH_PATCH_URI}" EGIT_CHECKOUT_DIR="${WORKDIR}/all" else SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz - https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" + ${BLOWFISH_PATCH_URI}" KEYWORDS="~amd64 ~riscv" fi DESCRIPTION="Simple, powerful and moeful twitter client" HOMEPAGE="https://mikutter.hachune.net/" -LICENSE="MIT" +# Apache license for the blowfish patch +# https://dev.mikutter.hachune.net/issues/1585 +LICENSE="Apache-2.0 MIT" SLOT="0" IUSE="+libnotify" +PATCHES=( + "${DISTDIR}/${BLOWFISH_PATCH_NAME}" +) + DEPEND="" RDEPEND=" libnotify? ( x11-libs/libnotify ) @@ -56,7 +63,6 @@ ruby_add_rdepend "=dev-ruby/addressable-2.8* dev-ruby/ruby-gtk3 >=dev-ruby/typed-array-0.1.2 !>=dev-ruby/typed-array-0.2 - dev-ruby/twitter-text virtual/ruby-ssl" all_ruby_unpack() { @@ -85,39 +91,4 @@ all_ruby_install() { dodoc README make_desktop_entry mikutter Mikutter \ /usr/share/mikutter/core/skin/data/icon.png - - insinto /usr/share/mikutter/plugin/twitter_api_keys - newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in -} - -pkg_postinst() { - echo - elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running" - elog " emerge --config =${PF}" -} - -pkg_config() { - local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin - local CK CS - - echo - einfon "Please input your Consumer Key for Twitter: " - read -r CK - - echo - einfon "Please input your Consumer Secret for Twitter: " - read -r CS - - if [ -z "${CK}" -o -z "${CS}" ]; then - eerror "Consumer Key or Consumer Secret is missing." - return - fi - - sed -e "/consumer_key = /s!''!'${CK}'!" \ - -e "/consumer_secret = /s!''!'${CS}'!" \ - ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \ - ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb - - echo - einfo "Consuker Key/Consumer secret is set." } diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index a52bbc3e8d9b..b3038b1cf9c6 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -1,6 +1,6 @@ -DIST miniupnpd-2.3.1.tar.gz 258050 BLAKE2B c11e3ecb3f1c6b97dfa1acfbc5f844f0bbdaea65fc91be9aec41e9e152900c6998c0fc132ad4faa07cf0cd7c8e433610a8a34ecab7c409f96a9990b6c17ff1ea SHA512 2b854bb75aad7f5b2ad28eeacb3afc2102edecffe50b293bc798b5ae66a9f3eb80df2e27fa14b9f5f232f78831308a5c0d6c7464697dde1770d60a75d98155f7 -DIST miniupnpd-2.3.1.tar.gz.sig 543 BLAKE2B 7211174bf1fa2244fafa1df63c3f872a8c557845840fa83f7cdc6264f6692fa5b4919d8c086e78253451497d55fca22300894a8d0e0bde58dbf8baaa6d8e4a26 SHA512 c661f8e028f0a3d96cc943dacd85414570473cd6805c2215531d14f355da2cee3695083807c91218eabbb9d40efed3c8f1c0178cff9461bf92202b4a948088c7 -DIST miniupnpd-2.3.2.tar.gz 259686 BLAKE2B fe451773be25fd7f5941f89b35a4c94f0bebd5ece93d3b3c526c3c0e1c436773a2c403eb407cde397565ef4ec8f50441a64890bb89a56a9006a6c4556e707cef SHA512 f0956b8f2e52fc9257f6512d780d17c920f6635afaeee604056f3b2afccbfda3f5e65d95d16f1d883bd9e7f4e372856cae620fabcf79c7c87e3f56bbcc089acc -DIST miniupnpd-2.3.2.tar.gz.sig 543 BLAKE2B 8c571eb454f6f31757b699c8a06e0b5ade575e058356aad7cdf727caf8f7a6563e98dde31d242cb1fadf136cf2c7bebbc32483c154f2538c1414f04299f40e38 SHA512 2a90aef1c1ca6210ddf5e29d75b0b0dc5daca949732b54a9bcd8230ecd8a4c3d5175b6561a68e180caa70547bcbd533994cad08c21630dd294190d0843cb2f8f -DIST miniupnpd-2.3.3.tar.gz 260079 BLAKE2B 4b32e05bc7002bc7edc946f01b1984f3d184e0e9949a9685ffa5351ece9dacc09dc48567cc6f68972343a1921f4ceb5c541d4b557c4991f311289a511c492efa SHA512 98915e3c1410d6753a58133596bad012fea205f36ae4991c2cf4b358d1e905e029287cfcf1aa97283c2e3c1cb8c20655bff35d49a37ae8756739e33c4ae3e7ef -DIST miniupnpd-2.3.3.tar.gz.sig 543 BLAKE2B 33b6166ba64a7a7c1b019c84d8a623d2905f32b41ea6b7cfd96c180e3d8738af264b5f073a9503c037f4609f15cb73f039701368eba63764de9edc79159961f6 SHA512 f2b167fec659e2f366ac180e8245c35e2907f5fb6be31fb62aad072e8a67868b995dd9400b4f41ebdfe2dcb46df583e5a1d6260f93c9b3eb25ba46bc7f6106dd +DIST miniupnpd-2.3.5.tar.gz 261952 BLAKE2B 022ddbc495a2dbb500ab54a3c0569a16acf3726927eac42dc316b7251dd21e705be62e3d0bb2e159ff7a5a72078bae2c04bd279d0a97fe2bf378dc8c039089d8 SHA512 bbb82f1b94a68c1bbf65a2e188b39305ec265cb89d9c0f3ab2d3c72eee43ee33c7d6280161344a8d51828cba2e62e2e5f9a54b0c0089503dbed5cd3a154ff0ff +DIST miniupnpd-2.3.5.tar.gz.sig 543 BLAKE2B 17394e1da7d95c89771dd7578e4f1e2ce407c04b142f44fe4f110beff908797991553a7275c3ba28df03b09877963d16092cb718d4c75d96211db07226bcb176 SHA512 ef21f493da56b9f3fe99003ee299c08b13ddcf433d7136222817ff2e1c775bf7c28cbb47ef3ab60c662380e585c2be0ca4c38e261697de410f5a751c1f4fe2da +DIST miniupnpd-2.3.6.tar.gz 263018 BLAKE2B 9e3d6bfdbe71a09a15bf11c1a718b1388db991de52a2ec742aaec70128e4ac5147f441ccfa50e7077f09682ac724040343c4e351b4cc8c3d9e8efe04773651ec SHA512 41ed8d0afcfdba70ab5ec44a33ad4643b226bea2da972fc432035fd3ff3a790227a71c32ca47574558e36eb491b0f6ab7710d3ef0af5ac6a359d899dcb36893c +DIST miniupnpd-2.3.6.tar.gz.sig 543 BLAKE2B 5c5c3566a9dfd16d95ca70fa006f7ce7097aebfe76940c03c22047064d5dae92aed73062f2455f08b61a99a747f9615e72c06e178628d948532b987b40fb262f SHA512 312a9db9cbd74912294a7cc2d4ccc69634806fc58702083fda56e11ad1fd978e92ad71f217cadf5f4482e8e655df07e6d7cc52ae494b8167140ae4db74cd352d +DIST miniupnpd-2.3.7.tar.gz 265329 BLAKE2B 9d7cbe04644c6811950328f402e4666fc8d51cf022a3ec40e4cc76c0f8a1c89b6703fe4ebe8d5eca7f6cef20acad7efbc47503dad4391d1519a6774ae6b26afd SHA512 7409bd6777c2a572ea501d47be604d9b09c09b1451c0f4150acd2313e3a5b4f7f3567559324a6c634c11a2b7c0ff56886a85217d1b056d5402916d0a8a3408e8 +DIST miniupnpd-2.3.7.tar.gz.sig 543 BLAKE2B 957b5dad44b020004a38b6f4748ca251deaadfc8ade28332eb12484e4bac408f5afdb38fe9974f18bc17a28dd33aae91a287838c7c15984bc5df7f69a82f9c6f SHA512 b8edd3f69b61e63560fb902f43e0a1730c80908637978782a1141fe8ac910b24f578ee3980127f4726c44e44222491a83670adea36a19984b3ffd726b12fe0dc diff --git a/net-misc/miniupnpd/miniupnpd-2.3.1.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.5.ebuild index b28bd1d20603..ef90208e7b6d 100644 --- a/net-misc/miniupnpd/miniupnpd-2.3.1.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.5.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 diff --git a/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.6.ebuild index b28bd1d20603..ef90208e7b6d 100644 --- a/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.6.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 diff --git a/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.7.ebuild index b28bd1d20603..ef90208e7b6d 100644 --- a/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.7.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 diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index f1b9afdba657..a64693282393 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -1 +1,2 @@ DIST mobile-broadband-provider-info-20230416.tar.xz 85884 BLAKE2B 51416cbd7e208eca14a5ddf023cad4a76495773794fed7955cfb346950614b1b6d6f9df7d24525c769c2742381eb9d8780575fe9d0bc0de333b17be3d53400d1 SHA512 fd6be1387284b31fa300fe59244a5d2d65c9851037f78b540d8d907c9bedd1ec24a8d23bf66403a30995ddb4791b7cb746952d9438c08c846906f6825c44dd9b +DIST mobile-broadband-provider-info-20240407.tar.xz 44744 BLAKE2B a385f4758e36e767f6670b403e6e72ea5e33274632e1ff973631e00d460b1fabe11d0869b57cd07c0cc838db730164454d2a9c24d7fe627de372e4fd1465d21b SHA512 988d6a2b455580d16dd60f19f0057f440e5f9e57ea84723440c515039b23e1d76d77f18c0316ea5ca43eb2ed291c44c290c83b1e965df09ed75176c8df9728cd diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20240407.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20240407.ebuild new file mode 100644 index 000000000000..ae968324a124 --- /dev/null +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20240407.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-libs/libxslt + test? ( dev-libs/libxml2 ) +" + +DOCS=( README ) diff --git a/net-misc/modemmanager/modemmanager-1.18.12.ebuild b/net-misc/modemmanager/modemmanager-1.18.12.ebuild index cd49618244b2..fd1fb8540485 100644 --- a/net-misc/modemmanager/modemmanager-1.18.12.ebuild +++ b/net-misc/modemmanager/modemmanager-1.18.12.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 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala DESCRIPTION="Modem and mobile broadband management libraries" @@ -39,7 +39,7 @@ RDEPEND="${DEPEND} BDEPEND=" dev-util/gdbus-codegen dev-util/glib-utils - >=dev-util/gtk-doc-am-1 + >=dev-build/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( diff --git a/net-misc/modemmanager/modemmanager-1.20.6.ebuild b/net-misc/modemmanager/modemmanager-1.20.6.ebuild index f306012e1aa1..7673a36cdfef 100644 --- a/net-misc/modemmanager/modemmanager-1.20.6.ebuild +++ b/net-misc/modemmanager/modemmanager-1.20.6.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 @@ SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/ LICENSE="GPL-2+" SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="elogind gtk-doc +introspection +mbim policykit +qmi +qrtr selinux systemd test +udev vala" REQUIRED_USE=" diff --git a/net-misc/monmotha/Manifest b/net-misc/monmotha/Manifest deleted file mode 100644 index 44c8b1906d66..000000000000 --- a/net-misc/monmotha/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rc.firewall-2.3.8 56204 BLAKE2B d699d5eb2c7efdfe258a2f38e2ffc1bb1e568c260c90a77a0fd1d27fbbe5b08ecefcc99d798fd210133ff8f7943fddacfc06a754044434e7525cd6449a92dc46 SHA512 ccdd3427a274204c697a64a8936d4311cb34fbb66738c6afc4c242baad01407d1a36adac7a73b24b432943cd7cec05c9c1d9b2d4845b8b132bd61378c0c2e098 diff --git a/net-misc/monmotha/files/monmotha.rc6 b/net-misc/monmotha/files/monmotha.rc6 deleted file mode 100644 index 9bd0eeb8e2b1..000000000000 --- a/net-misc/monmotha/files/monmotha.rc6 +++ /dev/null @@ -1,40 +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 the MonMotha Firewall" - /etc/monmotha/monmotha > /var/log/monmotha.log - eend $? -} - -stop() { - ebegin "Stopping the MonMotha Firewall" - - # RESET ALL IPTABLES STUFF - - /sbin/iptables -P INPUT ACCEPT - /sbin/iptables -P FORWARD ACCEPT - /sbin/iptables -P OUTPUT ACCEPT - - /sbin/iptables -t nat -P PREROUTING ACCEPT - /sbin/iptables -t nat -P POSTROUTING ACCEPT - /sbin/iptables -t nat -P OUTPUT ACCEPT - - /sbin/iptables -t mangle -P PREROUTING ACCEPT - /sbin/iptables -t mangle -P OUTPUT ACCEPT - - /sbin/iptables -F - /sbin/iptables -t nat -F - /sbin/iptables -t mangle -F - - /sbin/iptables -X - /sbin/iptables -t nat -X - /sbin/iptables -t mangle -X - - eend $? -} diff --git a/net-misc/monmotha/metadata.xml b/net-misc/monmotha/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/net-misc/monmotha/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild b/net-misc/monmotha/monmotha-2.3.8-r1.ebuild deleted file mode 100644 index 00c63fadd917..000000000000 --- a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="MonMotha IPTables-based firewall script" -HOMEPAGE="http://monmotha.mplug.org/firewall/" -LICENSE="GPL-2" - -KEYWORDS="~amd64 x86" -IUSE="" -SLOT="0" -RDEPEND=">=net-firewall/iptables-1.2.5" - -MY_PVP=(${PV//[-\._]/ }) - -S=${WORKDIR} - -SRC_URI="http://monmotha.mplug.org/~monmotha/firewall/firewall/${MY_PVP[0]}.${MY_PVP[1]}/rc.firewall-${PV}" - -src_unpack() { - cp "${DISTDIR}"/${A} "${S}"/ -} - -src_install() { - newinitd "${FILESDIR}/monmotha.rc6" monmotha - exeinto /etc/monmotha - newexe "${S}/rc.firewall-${PV}" monmotha -} - -pkg_postinst() { - einfo "Don't forget to add the 'monmotha' startup script to your default" - einfo "runlevel by typing the following command:" - einfo "" - einfo " rc-update add monmotha default" - einfo "" - einfo "You need to edit /etc/monmotha/monmotha before using" - einfo "it. Enter the right vars in the file, start the script" - einfo "by typing: '/etc/init.d/monmotha start' and it should work." - einfo "" - einfo "Don't forget to change the path to iptables!!!" - einfo "" - einfo "Note: If You are stopping the firewall, all iptables rulesets" - einfo "will be flushed!!!" - einfo "" -} diff --git a/net-misc/moonlight/metadata.xml b/net-misc/moonlight/metadata.xml index 7b6d9ea7ef4f..69364f1304dd 100644 --- a/net-misc/moonlight/metadata.xml +++ b/net-misc/moonlight/metadata.xml @@ -13,7 +13,6 @@ <flag name="embedded">Optimize UI for fullscreen non-desktop usage</flag> <flag name="glslow">Prefer direct KMS/DRM rendering over EGL/GLES rendering for better performance on some weaker GPUs</flag> <flag name="libdrm">Enable video rendering via <pkg>x11-libs/libdrm</pkg></flag> - <flag name="mmal">Enable accelerated video rendering on the Raspberry Pi</flag> <flag name="soundio">Enable sound output via <pkg>media-libs/libsoundio</pkg> instead of <pkg>media-libs/libsdl2</pkg></flag> </use> </pkgmetadata> diff --git a/net-misc/moonlight/moonlight-5.0.1.ebuild b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild index 8b57b5053b13..33e79bb06086 100644 --- a/net-misc/moonlight/moonlight-5.0.1.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 @@ -19,7 +19,7 @@ DESCRIPTION="NVIDIA GameStream (and Sunshine) client" HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt" LICENSE="GPL-3" SLOT="0" -IUSE="cuda +libdrm embedded glslow mmal soundio +vaapi vdpau wayland X" +IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X" RDEPEND=" dev-libs/openssl:= @@ -31,14 +31,17 @@ 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?,mmal?] + media-video/ffmpeg:=[cuda?,libdrm?] libdrm? ( x11-libs/libdrm ) soundio? ( media-libs/libsoundio:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) - vdpau? ( x11-libs/libvdpau ) + vdpau? ( + x11-libs/libvdpau + media-libs/libsdl2[X] + ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 ) " @@ -63,7 +66,7 @@ src_configure() { eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ $(usex cuda "" disable-cuda) \ $(usex libdrm "" disable-libdrm) \ - $(usex mmal "" disable-mmal) \ + --disable-mmal \ $(usex vaapi "" disable-libva) \ $(usex vdpau "" disable-libvdpau) \ $(usex wayland "" disable-wayland) \ diff --git a/net-misc/moonlight/moonlight-9999.ebuild b/net-misc/moonlight/moonlight-9999.ebuild index 8b57b5053b13..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 @@ -19,7 +19,7 @@ DESCRIPTION="NVIDIA GameStream (and Sunshine) client" HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt" LICENSE="GPL-3" SLOT="0" -IUSE="cuda +libdrm embedded glslow mmal soundio +vaapi vdpau wayland X" +IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X" RDEPEND=" dev-libs/openssl:= @@ -31,14 +31,17 @@ 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?,mmal?] + media-video/ffmpeg:=[cuda?,libdrm?] libdrm? ( x11-libs/libdrm ) soundio? ( media-libs/libsoundio:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) - vdpau? ( x11-libs/libvdpau ) + vdpau? ( + x11-libs/libvdpau + media-libs/libsdl2[X] + ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 ) " @@ -63,7 +66,7 @@ src_configure() { eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ $(usex cuda "" disable-cuda) \ $(usex libdrm "" disable-libdrm) \ - $(usex mmal "" disable-mmal) \ + --disable-mmal \ $(usex vaapi "" disable-libva) \ $(usex vdpau "" disable-libvdpau) \ $(usex wayland "" disable-wayland) \ diff --git a/net-misc/mptcpd/mptcpd-0.12.ebuild b/net-misc/mptcpd/mptcpd-0.12.ebuild index 919e6df2371e..2e3281cc8262 100644 --- a/net-misc/mptcpd/mptcpd-0.12.ebuild +++ b/net-misc/mptcpd/mptcpd-0.12.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 @@ -22,7 +22,7 @@ DEPEND=" " BDEPEND=" doc? ( - app-doc/doxygen + app-text/doxygen virtual/pandoc ) virtual/pkgconfig diff --git a/net-misc/mptcpd/mptcpd-9999.ebuild b/net-misc/mptcpd/mptcpd-9999.ebuild index 919e6df2371e..2e3281cc8262 100644 --- a/net-misc/mptcpd/mptcpd-9999.ebuild +++ b/net-misc/mptcpd/mptcpd-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 @@ -22,7 +22,7 @@ DEPEND=" " BDEPEND=" doc? ( - app-doc/doxygen + app-text/doxygen virtual/pandoc ) virtual/pkgconfig diff --git a/net-misc/mrouted/mrouted-4.2.ebuild b/net-misc/mrouted/mrouted-4.2.ebuild index 8f9f6aa61285..06524f6c9e2a 100644 --- a/net-misc/mrouted/mrouted-4.2.ebuild +++ b/net-misc/mrouted/mrouted-4.2.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 @@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86" IUSE="rsrr" BDEPEND=" - || ( dev-util/yacc sys-devel/bison ) + || ( dev-util/yacc app-alternatives/yacc ) virtual/pkgconfig " 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/ndisc6/Manifest b/net-misc/ndisc6/Manifest index af64682c14f8..2af7f0260b23 100644 --- a/net-misc/ndisc6/Manifest +++ b/net-misc/ndisc6/Manifest @@ -1,2 +1,2 @@ -DIST ndisc6-1.0.6.tar.bz2 262008 BLAKE2B b451f8a6f74fe0d30546152e9711055cb2d9fd1433a83f0fdcc57eba4f9eaf41705b03fcfcc14666906f90f3a450c2ef6e3d66faca5019106664dd96dd6d70cf SHA512 e9ce26d139c5cdcaac7a507c247ace5ba1d6bc95a92fbdb693788e463183965390a8228133a8bbbf07ba19eeae64c7a12ce13eb031c1a0c0c47b086d42c527ae DIST ndisc6-1.0.7.tar.bz2 262144 BLAKE2B 6eeb4d8b78e189f1c2db26312b67d8a9ed4343fad0c9db08bfc8e7d4514f50b1b11c6ee5f784cc0480979758a0fae840e87b61bbbdf4c372fe58117cb8dfdab4 SHA512 cd3da7efc050b9f71a0d41336367c21936b37a2a040b58f01ccd5657a4cbd791b974bcd32e0725b325d9322974b0e721af9a6d9ef4693506e437c29a15d81526 +DIST ndisc6-1.0.8.tar.bz2 262355 BLAKE2B f2be7c6027358698ed271670e319fd4c3e89af742c540ddf8b8a430857506fb500ec0d3bbb977e15470c4d7a4a9d5640a09a235d9f9fdf1d5f509490ed30687e SHA512 74a8b0058f9171f1098513891fc1ed890ec43f89195eb501af0e38a67f6e849e44ff7158acf8a6d2eb87c49a00daabf0c3a550e724c1c1afecc2437a35621cc0 diff --git a/net-misc/ndisc6/files/rdnssd.rc-1 b/net-misc/ndisc6/files/rdnssd.rc-1 deleted file mode 100644 index 83aef06a0416..000000000000 --- a/net-misc/ndisc6/files/rdnssd.rc-1 +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - before net - use logger -} - -start() { - ebegin "Starting rdnssd" - start-stop-daemon --start --quiet --exec /usr/sbin/rdnssd -- ${RDNSSD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping rdnssd" - start-stop-daemon --stop --quiet --pidfile /var/lib/run/rdnssd.pid - if [ -x /sbin/resolvconf ]; then - /sbin/resolvconf -f -d rdnssd || true - fi - eend $? -} diff --git a/net-misc/ndisc6/files/resolvconf-1 b/net-misc/ndisc6/files/resolvconf-1 deleted file mode 100644 index c08aa6a3df19..000000000000 --- a/net-misc/ndisc6/files/resolvconf-1 +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -x /sbin/resolvconf ]; then - exec /sbin/resolvconf -a rdnssd </var/lib/run/rdnssd/resolv.conf -else - exec "`dirname "$0"`"/merge-hook -fi diff --git a/net-misc/ndisc6/ndisc6-1.0.6.ebuild b/net-misc/ndisc6/ndisc6-1.0.8.ebuild index ca2f9f669509..4718530be728 100644 --- a/net-misc/ndisc6/ndisc6-1.0.6.ebuild +++ b/net-misc/ndisc6/ndisc6-1.0.8.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 @@ -9,25 +9,30 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~x64-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~x64-macos" IUSE="debug" -BDEPEND="dev-lang/perl - sys-devel/gettext" +BDEPEND=" + dev-lang/perl + sys-devel/gettext +" src_configure() { - econf $(use_enable debug assert) + local args=( + --localstatedir="${EPREFIX}"/var + $(use_enable debug assert) + ) + econf "${args[@]}" } src_install() { emake DESTDIR="${D}" install + rm -r "${ED}/var" || die - newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd + newinitd "${FILESDIR}"/rdnssd.rc-2 rdnssd newconfd "${FILESDIR}"/rdnssd.conf rdnssd exeinto /etc/rdnssd - newexe "${FILESDIR}"/resolvconf-1 resolvconf + newexe "${FILESDIR}"/resolvconf-2 resolvconf dodoc AUTHORS ChangeLog NEWS README - - keepdir /var/lib/run/rdnssd } diff --git a/net-misc/ndppd/ndppd-0.2.5.ebuild b/net-misc/ndppd/ndppd-0.2.5-r1.ebuild index 8edc69925c53..a29806e1fa68 100644 --- a/net-misc/ndppd/ndppd-0.2.5.ebuild +++ b/net-misc/ndppd/ndppd-0.2.5-r1.ebuild @@ -1,19 +1,19 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Proxies NDP messages between interfaces" HOMEPAGE="https://github.com/DanielAdolfsson/ndppd" SRC_URI="https://github.com/DanielAdolfsson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="" src_install() { - emake PREFIX=/usr DESTDIR="${D}" install + dosbin ${PN} + doman ${PN}.{1,conf.5} insinto /etc newins ndppd.conf-dist ndppd.conf newinitd "${FILESDIR}"/ndppd.initd ndppd diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest index ed93deb0fd10..c078d92f5977 100644 --- a/net-misc/nemesis/Manifest +++ b/net-misc/nemesis/Manifest @@ -1 +1,2 @@ DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b +DIST nemesis-1.8.tar.gz 94428 BLAKE2B 6e0935aa23fcb11778d395a8d4318d9d9361afcbd0a2d9eea8ab4f78542e940eda51dd3a00d03c5d3c6c27158346e27a4b997e4bc4194cf82262c87655bd4fb4 SHA512 9f7876f1163c33ddfa0aa9531ef1b366e018d343eede6cf56260d8aa329486f98e9b6fceca5cc08f5293fd693a64dce8c9bfb29fc466abfbafb4dd7dffdb43c2 diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml index 6c436d20234d..a2716185e579 100644 --- a/net-misc/nemesis/metadata.xml +++ b/net-misc/nemesis/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> <upstream> <remote-id type="sourceforge">nemesis</remote-id> + <remote-id type="github">libnet/nemesis</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/nemesis/nemesis-1.8.ebuild b/net-misc/nemesis/nemesis-1.8.ebuild new file mode 100644 index 000000000000..34fb4277a9dd --- /dev/null +++ b/net-misc/nemesis/nemesis-1.8.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux" +HOMEPAGE="https://github.com/libnet/nemesis" +SRC_URI="https://github.com/libnet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 sparc x86" + +RDEPEND=" + net-libs/libnet:1.1 +" +DEPEND="${RDEPEND}" + +DOCS=( ChangeLog.md docs/CONTRIBUTING.md docs/CREDITS README.md ) + +src_prepare() { + default + eautoreconf +} diff --git a/net-misc/netdate/netdate-1.2-r1.ebuild b/net-misc/netdate/netdate-1.2-r2.ebuild index 8af8c8914d72..acfba2862f1c 100644 --- a/net-misc/netdate/netdate-1.2-r1.ebuild +++ b/net-misc/netdate/netdate-1.2-r2.ebuild @@ -1,20 +1,25 @@ -# 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 -DESCRIPTION="utility to synchronize the time with ntp-servers" +inherit toolchain-funcs + +DESCRIPTION="Utility to set date and time by ARPA Internet RFC 868" HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/" SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2" +S="${WORKDIR}/${PN}" LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 arm ~mips ~s390 sparc x86" -S="${WORKDIR}/${PN}" - DOCS=( README ) +src_compile(){ + emake CC="$(tc-getCC)" +} + src_install() { dobin "${PN}" doman "${PN}.8" 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/Manifest b/net-misc/netifrc/Manifest index 8c1bd2bdd95b..a773790b0ce4 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -1,3 +1,2 @@ -DIST netifrc-0.7.5.tar.gz 86884 BLAKE2B 6ca9b8034fe69767910814021df783710cf6b6a4edb5a877142e6be67b57556fee2e9e3fefb8d22c03b1460ce45bf7e490a1a0862dd6ce7b9beb247c942341b0 SHA512 a043df2850362da5f6d8620c4c76ca0644e97c64c0223bfe50e31d20fd8a3e5cf8afa1234d99946631868eab77a8816d24f8cb05b3e4cf4bec101478d162e8a4 -DIST netifrc-0.7.6.tar.gz 86771 BLAKE2B 814e97630a84a2f9531aa81754f3ea20a561f19d055e4a6652a1374925c4ff99996e7279e161a817e3c50059b2c40b7b1a7602bad3dbcb68836882e4fe5ad754 SHA512 ec8d44254106a38b16c500002ef33a5064db40db565cef7b7499d38c7636f2b9c01305329d77ac6298621f3b55a1401345c108374a691ae41129b8fe9d5a7e35 DIST netifrc-0.7.7.tar.bz2 75823 BLAKE2B e2d99ac347e9a449b39981b1aa1585ff83d05af1bafe09f7e2e25954360df1e76f53ce4a5c8e08777ba45baf697a307697576835df4c4b4ae010ab84dbe8bb2b SHA512 995f89beece9e7ff0b558b466c06a476f22d3161f31622a232c382d81e74399aeb0a39cb4a95080829120c527a1a93757425671e2ca3639d8637e5e905ad3e80 +DIST netifrc-0.7.8.tar.bz2 76239 BLAKE2B 501a2bcfaa2753187425cba31f01b2a644ae4d01da76e4bd3722b815b1fa743905728fd66ac9d56c915dba767723bd5df2c417706c8a0150628e61b6e0b86ffb SHA512 d483453058d3e8c3cb22e8eedea69e12ac5fe94449d35a2cd842d7e32603174a470a8a4e883ebf24a0f09374dbf1f4c0c0db5094ae2d2191bcc1c9c8356170ad diff --git a/net-misc/netifrc/netifrc-0.7.5.ebuild b/net-misc/netifrc/netifrc-0.7.5.ebuild deleted file mode 100644 index 5f51fbe7ef3f..000000000000 --- a/net-misc/netifrc/netifrc-0.7.5.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd udev - -DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Netifrc" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" - #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="BSD-2 GPL-2" -SLOT="0" -IUSE="+dhcp" - -RDEPEND="sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 - dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - einfo "Producing ChangeLog from Git history" - GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog - fi - - default -} - -src_compile() { - MAKE_ARGS=( - PREFIX="${EPREFIX}" - UPREFIX="${EPREFIX}/usr" - UDEVDIR="${EPREFIX}$(get_udevdir)" - LIBEXECDIR="${EPREFIX}/lib/${PN}" - PF="${PF}" - ) - - emake "${MAKE_ARGS[@]}" all -} - -src_install() { - emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install - dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO - - # Install the service file - local LIBEXECDIR="${EPREFIX}/lib/${PN}" - sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die - systemd_newunit "${T}/net_at.service" 'net@.service' - - local UNIT_DIR="$(systemd_get_systemunitdir)" - UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}" - dosym net@.service "${UNIT_DIR}/net@lo.service" -} - -pkg_postinst() { - udev_reload - if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then - elog "The network configuration scripts will use dhcp by" - elog "default to set up your interfaces." - elog "If you need to set up something more complete, see" - elog "${EROOT}/usr/share/doc/${P}/README" - fi -} diff --git a/net-misc/netifrc/netifrc-0.7.6.ebuild b/net-misc/netifrc/netifrc-0.7.6.ebuild deleted file mode 100644 index 71acc5378ef6..000000000000 --- a/net-misc/netifrc/netifrc-0.7.6.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd udev - -DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Netifrc" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI=" - https://anongit.gentoo.org/git/proj/netifrc.git - https://github.com/gentoo/${PN} - " - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="BSD-2 GPL-2" -SLOT="0" -IUSE="+dhcp" - -RDEPEND=" - sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 - dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) ) -" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" - -src_prepare() { - if [[ ${PV} == 9999 ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - einfo "Producing ChangeLog from Git history" - GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog - fi - - default -} - -src_compile() { - MAKE_ARGS=( - PREFIX="${EPREFIX}" - UPREFIX="${EPREFIX}/usr" - UDEVDIR="${EPREFIX}$(get_udevdir)" - LIBEXECDIR="${EPREFIX}/lib/${PN}" - PF="${PF}" - ) - - emake "${MAKE_ARGS[@]}" all -} - -src_install() { - emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install - dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO - - # Install the service file - local LIBEXECDIR="${EPREFIX}/lib/${PN}" - sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die - systemd_newunit "${T}/net_at.service" 'net@.service' - - local UNIT_DIR="$(systemd_get_systemunitdir)" - UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}" - dosym net@.service "${UNIT_DIR}/net@lo.service" -} - -pkg_postinst() { - udev_reload - if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then - elog "The network configuration scripts will use dhcp by" - elog "default to set up your interfaces." - elog "If you need to set up something more complete, see" - elog "${EROOT}/usr/share/doc/${P}/README" - fi -} diff --git a/net-misc/netifrc/netifrc-0.7.7.ebuild b/net-misc/netifrc/netifrc-0.7.7.ebuild index a05e5bb7a079..0b8e92d0269e 100644 --- a/net-misc/netifrc/netifrc-0.7.7.ebuild +++ b/net-misc/netifrc/netifrc-0.7.7.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/netifrc/netifrc-0.7.6-r1.ebuild b/net-misc/netifrc/netifrc-0.7.8-r1.ebuild index 54f749377303..e9de2c1ba825 100644 --- a/net-misc/netifrc/netifrc-0.7.6-r1.ebuild +++ b/net-misc/netifrc/netifrc-0.7.8-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 @@ -15,8 +15,8 @@ if [[ ${PV} == 9999 ]]; then " inherit git-r3 else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + 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" fi LICENSE="BSD-2 GPL-2" @@ -25,7 +25,10 @@ IUSE="+dhcp" RDEPEND=" sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 + || ( + >=sys-apps/openrc-0.15 + sys-apps/openrc-navi + ) dhcp? ( || ( net-misc/dhcpcd diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild index 54f749377303..82325c45cc79 100644 --- a/net-misc/netifrc/netifrc-9999.ebuild +++ b/net-misc/netifrc/netifrc-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 @@ IUSE="+dhcp" RDEPEND=" sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 + || ( + >=sys-apps/openrc-0.15 + sys-apps/openrc-navi + ) dhcp? ( || ( net-misc/dhcpcd diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild index 1832ecd0e9ab..17f40824b2df 100644 --- a/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild +++ b/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}"/netkit-ntalk-${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" DEPEND=">=sys-libs/ncurses-5.2:=" BDEPEND="virtual/pkgconfig" diff --git a/net-misc/netopeer2/metadata.xml b/net-misc/netopeer2/metadata.xml index 36ad10f456f3..301e4a528e6e 100644 --- a/net-misc/netopeer2/metadata.xml +++ b/net-misc/netopeer2/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>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">CESNET/netopeer2</remote-id> </upstream> diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index bdec73d02cda..6ce894826054 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,4 +1,2 @@ -DIST NetworkManager-1.42.6.tar.xz 6749088 BLAKE2B 9d583c163908ee4fe145cdbdaa657cbc682d9f6270efc7d7525acd86912a0da50f2ccf14810fdfe2998c6ce701dcabc2b5b39fa58ff9d3fe4f5630205b15f4c8 SHA512 606a996043d8fbc7972329b94bc9854557950f665790381611eddfc632850b31584a4ba2d773fa9d12127db4c37ea2076c657521b78cedb012144df6f41d3748 -DIST NetworkManager-1.44.0.tar.xz 6868528 BLAKE2B f916620e74c0d5b8581b8c1eeb8f58c1cbac2d6c18bc72a25679cf5d36975df6c37b130f97e8d2078d9ab7aeeb4371ed6f9e830c5e6dce19feb41f26277be734 SHA512 7ebece465dfd108d66adb1c941ab22bdca8bb0ce7869baa421e4aef65e89a23bf63f3713e809e1e7b6c5226813ad9d56d8af339c711507a33aa6728afd334405 -DIST NetworkManager-1.44.2.tar.xz 6863972 BLAKE2B 2bb5ac06018d45d55623d742fba49c3b485116091992ad56a4680ce00946c96bd0c1b3b5d34f2c36c6347ff51182e00158351c0c6989cdc7db4a49b52564a1b7 SHA512 2f3721ebdfa14470c8bb22362c4f598a277c6cea77a34101a6cc9ef32b44382bd408d55e4c58561c324864bfb814b6efb563fbbd593a16c191524cde8ee758f5 -DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aaed174a43fae127c8a139431093a3ae9802542c40cf69faabd1d057563438b48f0a0b0d4c7fc188c13e9320d127e0034f181 SHA512 34fe7780ac1780efa156429166344548058a9079ad61238a33d89a57e52ab79765ebfaf39bd9c246d0b74549ca7156e9df1a472920485cbe23ed81de4f8cf243 +DIST NetworkManager-1.46.0.tar.xz 7033296 BLAKE2B db190876105d83c8d2ef7e827fa653ab14f9687ab18392600e04d20020d1dc797d3857c9fb05111fcafd18fe477b93947566100ea7113758703842cded71ed40 SHA512 27f234ad5b715ad0ae9d6adcdc91a4499b76fe78d3a5644aced8976588f0e82f2d03daec47589f1313b9802207c784ade67e921d4d2fa3c813cbf727558ad407 +DIST NetworkManager-1.48.4.tar.xz 6080980 BLAKE2B b5d216e064043e688ce8fc582e4bfae859a3e746fce2bc13f43a871a6886270c75b77cb1c73f4b9c89e89619683a8cdce698cfe1bd249bd68108f02b982dea04 SHA512 73c9399d528b78fe1393ad2015f641d9dcfe8a1134b65a65e051aa08eece6574f44a340d140d1de525000b365370bc2615da0e682b16c2da28dc597961e6410d diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r3 b/net-misc/networkmanager/files/init.d.NetworkManager-r3 new file mode 100644 index 000000000000..b2d240fc76ad --- /dev/null +++ b/net-misc/networkmanager/files/init.d.NetworkManager-r3 @@ -0,0 +1,62 @@ +#!/sbin/openrc-run +# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org> +# Copyright 2013-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="NetworkManager daemon. The service is marked as started only \ +when a network connection is established." + +depend() { + need dbus + use elogind + provide net +} + +start_pre() { + checkpath -q -d -m 0755 /run/NetworkManager +} + +start() { + # If we are re-called by a dispatcher event, we want to mark the service + # as started without starting the daemon again + yesno "${IN_BACKGROUND}" && return 0 + + [ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1" + + ebegin "Starting NetworkManager" + start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \ + --exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid + local _retval=$? + eend "${_retval}" + if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then + einfo "Marking NetworkManager as inactive. It will automatically be marked" + einfo "as started after a network connection has been established." + mark_service_inactive + fi + return "${_retval}" +} + +stop() { + # If we are re-called by a dispatcher event, we want to mark the service + # as inactive without stopping the daemon + if yesno "${IN_BACKGROUND}"; then + mark_service_inactive "${SVCNAME}" + return 0 + fi + + ebegin "Stopping NetworkManager" + local pidfile=/run/NetworkManager/NetworkManager.pid + if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then + # Try stopping the pid file used by <0.9.7 + pidfile=/var/run/NetworkManager.pid + start-stop-daemon --stop --quiet --pidfile "${pidfile}" + ret=$? + [ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}" + eend ${ret} + else + start-stop-daemon --stop --quiet --pidfile "${pidfile}" + eend $? + fi +} + +# vim: set ft=gentoo-init-d ts=4 : diff --git a/net-misc/networkmanager/files/networkmanager-1.48.4-fix-libsystemdless-build.patch b/net-misc/networkmanager/files/networkmanager-1.48.4-fix-libsystemdless-build.patch new file mode 100644 index 000000000000..046d73adcb3e --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-1.48.4-fix-libsystemdless-build.patch @@ -0,0 +1,62 @@ +https://bugs.gentoo.org/936223 +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1559 +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966 + +From 70d1c34b94baadc3305745cf159ea55f312beacc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 7 Jun 2024 14:03:15 -0700 +Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid + function + +When building on musl systems ( with out systemd ), and using LLD linker +from LLVM project we fail to link with undefined symbols. + +This symbol is in sd_id128.c but its disabled, so let disable the functions +which need this function. + +| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific +| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202) +| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a +| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation) + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) { + return 0; + } + ++#if 0 + int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + sd_id128_t machine_id; + int r; +@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); + return 0; + } ++#endif + + int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) { + _cleanup_free_ char *p = NULL, *x = NULL; +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) { + return 0; + } + ++#if 0 + int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + int r; + +@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + + return 0; + } +- ++#endif + int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) { + int r; + +-- +GitLab + diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml index cc9b634fb71d..b052b568a851 100644 --- a/net-misc/networkmanager/metadata.xml +++ b/net-misc/networkmanager/metadata.xml @@ -14,7 +14,6 @@ <flag name="iptables">Use <pkg>net-firewall/iptables</pkg> for connection sharing</flag> <flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of <pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag> <flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag> - <flag name="lto">Build using Link Time Optimizations (LTO)</flag> <flag name="modemmanager">Enable support for mobile broadband devices using <pkg>net-misc/modemmanager</pkg></flag> <flag name="nftables">Use <pkg>net-firewall/nftables</pkg> for connection sharing</flag> <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag> diff --git a/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild b/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild deleted file mode 100644 index 09782cd3d2a0..000000000000 --- a/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild +++ /dev/null @@ -1,400 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME_ORG_MODULE="NetworkManager" -PYTHON_COMPAT=( python3_{9..11} ) - -inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" -# bug #904840 -# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1607 -SRC_URI+=" https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5df19f5b26c5921a401e63fb329e844a02d6b1f2.patch -> ${PN}-ppp-2.5.0.patch" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - connection-sharing? ( || ( iptables nftables ) ) - gtk-doc? ( introspection ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - ^^ ( gnutls nss ) - ?? ( elogind systemd ) - ?? ( dhclient dhcpcd ) - ?? ( syslog systemd ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" - -COMMON_DEPEND=" - sys-apps/util-linux[${MULTILIB_USEDEP}] - elogind? ( >=sys-auth/elogind-219 ) - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - net-libs/libndp - systemd? ( >=sys-apps/systemd-209:0= ) - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - selinux? ( - sec-policy/selinux-networkmanager - sys-libs/libselinux - ) - audit? ( sys-process/audit ) - teamd? ( - >=dev-libs/jansson-2.7:= - >=net-misc/libteam-1.9 - ) - policykit? ( >=sys-auth/polkit-0.106 ) - nss? ( - dev-libs/nspr[${MULTILIB_USEDEP}] - >=dev-libs/nss-3.11[${MULTILIB_USEDEP}] - ) - gnutls? ( - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] - ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) - modemmanager? ( - net-misc/mobile-broadband-provider-info - >=net-misc/modemmanager-0.7.991:0= - ) - bluetooth? ( >=net-wireless/bluez-5:= ) - ofono? ( net-misc/ofono ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) - ovs? ( >=dev-libs/jansson-2.7:= ) - resolvconf? ( virtual/resolvconf ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - iptables? ( net-firewall/iptables ) - nftables? ( net-firewall/nftables ) - ) - psl? ( net-libs/libpsl ) - concheck? ( net-misc/curl ) - tools? ( - >=dev-libs/newt-0.52.15 - libedit? ( dev-libs/libedit ) - !libedit? ( sys-libs/readline:= ) - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.18 - net-libs/libndp[${MULTILIB_USEDEP}] - ppp? ( elibc_musl? ( net-libs/ppp-defs ) ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - gtk-doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.1.2 - ) - >=sys-devel/gettext-0.17 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - >=dev-libs/jansson-2.7 - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -PATCHES=( - "${DISTDIR}"/${PN}-ppp-2.5.0.patch -) - -python_check_deps() { - if use introspection; then - python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return - fi - if use test; then - python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - - if use introspection || use test; then - python-any-r1_pkg_setup - fi - - # bug 809695 - if tc-is-clang && use lto; then - eerror "Clang does not support -flto-partition" - die "Please use gcc or turn off USE=lto flag when building with clang" - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - default - use vala && vala_setup - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -meson_nm_program() { - usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no" -} - -meson_nm_native_program() { - multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no" -} - -multilib_src_configure() { - local emesonargs=( - --localstatedir="${EPREFIX}/var" - - -Dsystemdsystemunitdir=$(systemd_get_systemunitdir) - -Dsystem_ca_path=/etc/ssl/certs - -Dudev_dir=$(get_udevdir) - -Ddbus_conf_dir=/usr/share/dbus-1/system.d - -Dkernel_firmware_dir=/lib/firmware - -Diptables=/sbin/iptables - -Dnft=/sbin/nft - -Ddnsmasq=/usr/sbin/dnsmasq - - -Ddist_version=${PVR} - $(meson_native_use_bool policykit polkit) - $(meson_native_use_bool policykit config_auth_polkit_default) - -Dmodify_system=true - -Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1 - $(meson_native_use_bool selinux) - $(meson_native_use_bool systemd systemd_journal) - -Dhostname_persist=gentoo - -Dlibaudit=$(multilib_native_usex audit) - - $(meson_native_use_bool wext) - $(meson_native_use_bool wifi) - $(meson_native_use_bool iwd) - $(meson_native_use_bool ppp) - -Dpppd=/usr/sbin/pppd - $(meson_native_use_bool modemmanager modem_manager) - $(meson_native_use_bool ofono) - $(meson_native_use_bool concheck) - $(meson_native_use_bool teamd teamdctl) - $(meson_native_use_bool ovs) - $(meson_native_use_bool tools nmcli) - $(meson_native_use_bool tools nmtui) - $(meson_native_use_bool tools nm_cloud_setup) - $(meson_native_use_bool bluetooth bluez5_dun) - -Debpf=true - - -Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default) - -Dconfig_plugins_default=keyfile - -Difcfg_rh=false - -Difupdown=false - - $(meson_nm_native_program resolvconf "" /sbin/resolvconf) - -Dnetconfig=no - -Dconfig_dns_rc_manager_default=auto - - $(meson_nm_program dhclient "" /sbin/dhclient) - -Ddhcpcanon=no - $(meson_nm_program dhcpcd "" /sbin/dhcpcd) - - $(meson_native_use_bool introspection) - $(meson_native_use_bool vala vapi) - $(meson_native_use_bool gtk-doc docs) - -Dtests=$(multilib_native_usex test) - $(meson_native_true firewalld_zone) - -Dmore_asserts=0 - $(meson_use debug more_logging) - -Dvalgrind=no - -Dvalgrind_suppressions= - -Dld_gc=false - $(meson_native_use_bool psl libpsl) - -Dqt=false - - $(meson_use lto b_lto) - ) - - if multilib_is_native_abi && use systemd; then - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=systemd ) - emesonargs+=( -Dsuspend_resume=systemd ) - elif multilib_is_native_abi && use elogind; then - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=elogind ) - emesonargs+=( -Dsuspend_resume=elogind ) - else - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=no ) - emesonargs+=( -Dsuspend_resume=auto ) - fi - - if multilib_is_native_abi && use syslog; then - emesonargs+=( -Dconfig_logging_backend_default=syslog ) - elif multilib_is_native_abi && use systemd; then - emesonargs+=( -Dconfig_logging_backend_default=journal ) - else - emesonargs+=( -Dconfig_logging_backend_default=default ) - fi - - if multilib_is_native_abi && use dhclient; then - emesonargs+=( -Dconfig_dhcp_default=dhclient ) - elif multilib_is_native_abi && use dhcpcd; then - emesonargs+=( -Dconfig_dhcp_default=dhcpcd ) - else - emesonargs+=( -Dconfig_dhcp_default=internal ) - fi - - if use nss; then - emesonargs+=( -Dcrypto=nss ) - else - emesonargs+=( -Dcrypto=gnutls ) - fi - - if use tools ; then - emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) ) - else - emesonargs+=( -Dreadline=none ) - fi - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - meson_src_configure -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx meson_src_test - fi -} - -multilib_src_install() { - meson_src_install - if ! multilib_is_native_abi; then - rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die - fi -} - -multilib_src_install_all() { - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules - - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die - [device] - wifi.backend=iwd - EOF - fi - - mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die - rmdir "${ED}"/usr/share/doc/NetworkManager || die - - # Empty - rmdir "${ED}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - udev_reload - - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild index 47c2023fc20f..32c5c1fee3e8 100644 --- a/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-1.46.0-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 GNOME_ORG_MODULE="NetworkManager" PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx +inherit gnome.org linux-info meson-multilib flag-o-matic python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" +IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -21,6 +21,7 @@ REQUIRED_USE=" connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) + test? ( tools ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) @@ -29,7 +30,7 @@ REQUIRED_USE=" ?? ( syslog systemd ) " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" COMMON_DEPEND=" sys-apps/util-linux[${MULTILIB_USEDEP}] @@ -38,7 +39,7 @@ COMMON_DEPEND=" sys-apps/dbus[${MULTILIB_USEDEP}] net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.42:2[${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager @@ -143,12 +144,6 @@ pkg_setup() { if use introspection || use test; then python-any-r1_pkg_setup fi - - # bug 809695 - if tc-is-clang && use lto; then - eerror "Clang does not support -flto-partition" - die "Please use gcc or turn off USE=lto flag when building with clang" - fi } src_prepare() { @@ -173,7 +168,10 @@ meson_nm_native_program() { } multilib_src_configure() { - filter-lto + # Workaround for LLD 17 (bug #915819) + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + # Build system requires -flto-partition=none support for LTO + tc-is-clang && filter-lto local emesonargs=( --localstatedir="${EPREFIX}/var" @@ -211,7 +209,8 @@ multilib_src_configure() { $(meson_native_use_bool tools nmtui) $(meson_native_use_bool tools nm_cloud_setup) $(meson_native_use_bool bluetooth bluez5_dun) - -Debpf=true + # ebpf is problematic in at least v1.46.0, bug #926943 + -Debpf=false -Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default) -Dconfig_plugins_default=keyfile @@ -239,8 +238,6 @@ multilib_src_configure() { -Dld_gc=false $(meson_native_use_bool psl libpsl) -Dqt=false - - $(meson_use lto b_lto) ) if multilib_is_native_abi && use systemd; then diff --git a/net-misc/networkmanager/networkmanager-1.44.2.ebuild b/net-misc/networkmanager/networkmanager-1.48.4.ebuild index 47c2023fc20f..110098ab67bb 100644 --- a/net-misc/networkmanager/networkmanager-1.44.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.48.4.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GNOME_ORG_MODULE="NetworkManager" PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx +inherit gnome.org linux-info meson-multilib flag-o-matic python-any-r1 \ + readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" @@ -13,7 +14,9 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -21,6 +24,7 @@ REQUIRED_USE=" connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) + test? ( tools ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) @@ -29,8 +33,6 @@ REQUIRED_USE=" ?? ( syslog systemd ) " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" - COMMON_DEPEND=" sys-apps/util-linux[${MULTILIB_USEDEP}] elogind? ( >=sys-auth/elogind-219 ) @@ -38,7 +40,7 @@ COMMON_DEPEND=" sys-apps/dbus[${MULTILIB_USEDEP}] net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.42:2[${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager @@ -120,6 +122,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/networkmanager-1.48.4-fix-libsystemdless-build.patch +) + python_check_deps() { if use introspection; then python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return @@ -143,12 +149,6 @@ pkg_setup() { if use introspection || use test; then python-any-r1_pkg_setup fi - - # bug 809695 - if tc-is-clang && use lto; then - eerror "Clang does not support -flto-partition" - die "Please use gcc or turn off USE=lto flag when building with clang" - fi } src_prepare() { @@ -173,7 +173,10 @@ meson_nm_native_program() { } multilib_src_configure() { - filter-lto + # Workaround for LLD 17 (bug #915819) + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + # Build system requires -flto-partition=none support for LTO + tc-is-clang && filter-lto local emesonargs=( --localstatedir="${EPREFIX}/var" @@ -211,7 +214,8 @@ multilib_src_configure() { $(meson_native_use_bool tools nmtui) $(meson_native_use_bool tools nm_cloud_setup) $(meson_native_use_bool bluetooth bluez5_dun) - -Debpf=true + # ebpf is problematic in at least v1.46.0, bug #926943 + -Debpf=false -Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default) -Dconfig_plugins_default=keyfile @@ -239,8 +243,6 @@ multilib_src_configure() { -Dld_gc=false $(meson_native_use_bool psl libpsl) -Dqt=false - - $(meson_use lto b_lto) ) if multilib_is_native_abi && use systemd; then @@ -313,7 +315,7 @@ multilib_src_install() { multilib_src_install_all() { ! use systemd && readme.gentoo_create_doc - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager + newinitd "${FILESDIR}/init.d.NetworkManager-r3" NetworkManager newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index cbc33b1cfb50..5813ac63d181 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,5 +1,3 @@ -DIST nextcloud-client-3.10.0.tar.gz 13529232 BLAKE2B 3c3f2e823df35d365ae73afa4d59e9afd44bac5873de336b340712c03a18b38bf33f1af8b9dec52f8628034feeb720a3e48e6d435f64f170a57c17f2bfca7d56 SHA512 f4cfa4884e445cf30b4b47077ba4db31f70f1388e235d994886e6aa9e4b0a80426159336d476d057abf422d4201ea608cf54f4e9b04189198f48214315a67330 -DIST nextcloud-client-3.10.1.tar.gz 13519993 BLAKE2B a23afcfe35c3f7a8a01656cf67ea681a7eac40989939b5bf1991eb7334993fddab6c501636292b8526c02b872af8cfed97568e2d263a3dbf3f78985caac3a1ce SHA512 866fcae59a6afc39bd874892f1ca6fc2afcfa2e0166d431829462afbf8d6f7b25a46700737515fe98c3a002c3a34bd9de42cbecdf80134661544c1e590708b43 -DIST nextcloud-client-3.8.2.tar.gz 15605319 BLAKE2B babd45d0a38d5206afd9c2b69e7ea580aeb90df2606932cbfc28f688b20bb026e566ca8a30112975ae38c8d9807339433c8b972230c6a8122cb93ffadd2eecab SHA512 231e074fd3dcc8f69d62616ff4aeec5e748891bf93fc783861008a4e04a12066e77e1449d94f599e5edfa9861bad684403aef80e909e095c16170d8607626a9d -DIST nextcloud-client-3.9.1.tar.gz 15733029 BLAKE2B e7e792b2ea7985c02627661b4686bf568dfe8cfe722babbf5507293daec57b754566d259d3fd4bc0b224e1dc34ae0afa4c757e75910c4d6d4ded692f0d7c2b02 SHA512 b3c77243efed3b70a59c157ae6f45ebf8eb8c4926e23bd78b364e93cbc2612ec220db60ef6bd55e288a2eb5a454fea87fd348116057b052a15b5c6c69f0654d2 +DIST nextcloud-client-3.11.1.tar.gz 13598448 BLAKE2B b1e9070c55972facd72c65b571128f55c041f2fa1d38f7d22ed0f3ebca2b4ad9faef56d5699a48a70f062d13385c39123185b50ebba3d035d4e5af1320ce1844 SHA512 fc8700f36e3a2e8f07d219f9e7065a97e46d162d8c4f9a576e322dc45470e8b95321a1e176c4739a4fa212a69ff2782049096b32dcfe656a9e9cbedb8c7ed50e +DIST nextcloud-client-3.13.2.tar.gz 13782506 BLAKE2B 867ae6ac056bc818d544d22b3a08c8876c093ca75746217822e3111c9de1e8a6b90ba9e0954e0b8c952082ea39f6f732c8914e267b4b1f1d8af3d8ebf6dbd73e SHA512 4dff6394d26445c124a9c93494b71dfa74fe696c147f765e0cbe053f800ec53fe47ba59e2c8e74c704b58e5fce02d2b40bb96a8777bc7580198e89be5d998ae6 DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch new file mode 100644 index 000000000000..3898dcbcef3c --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch @@ -0,0 +1,38 @@ +From b2974a504f67e4af9c376927d1d0fd3c99de3255 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 1 Apr 2024 20:00:25 +0200 +Subject: [PATCH] Fix build with KF6 + +Set QT_NO_CREATE_VERSIONLESS_FUNCTIONS, otherwise Qt5 and Qt6 conflict + +Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de> +--- + CMakeLists.txt | 1 + + src/gui/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 687733588813..07d3266cb9dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,7 @@ endif() + + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED 17) ++set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON) + + include(FeatureSummary) + +diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt +index 6e4acf203d19..37f459db4384 100644 +--- a/src/gui/CMakeLists.txt ++++ b/src/gui/CMakeLists.txt +@@ -58,7 +58,7 @@ set(client_UI_SRCS + if(QUICK_COMPILER) + qtquick_compiler_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc) + else() +- qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc) ++ qt5_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc) + endif() + + set(client_SRCS diff --git a/net-misc/nextcloud-client/nextcloud-client-3.10.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.11.1.ebuild index 94cff32e49fb..756e6e5d023f 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.10.0.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.11.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 @@ -14,7 +14,7 @@ S="${WORKDIR}/desktop-${PV/_/-}" LICENSE="CC-BY-3.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" IUSE="doc dolphin nautilus test webengine" RESTRICT="!test? ( test )" @@ -30,6 +30,7 @@ RDEPEND=" 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 diff --git a/net-misc/nextcloud-client/nextcloud-client-3.10.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild index 94cff32e49fb..151c9bcdf637 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.10.1.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.13.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 @@ -14,7 +14,7 @@ S="${WORKDIR}/desktop-${PV/_/-}" LICENSE="CC-BY-3.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="doc dolphin nautilus test webengine" RESTRICT="!test? ( test )" @@ -26,10 +26,11 @@ RDEPEND=" dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 + dev-qt/qtdeclarative:5[widgets] 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 @@ -66,6 +67,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch + "${FILESDIR}"/${PN}-3.13.2-fix_build_kf6.patch ) src_prepare() { @@ -92,7 +94,7 @@ src_configure() { } src_test() { - virtx cmake_src_test + TEST_VERBOSE=1 virtx cmake_src_test } src_compile() { diff --git a/net-misc/nextcloud-client/nextcloud-client-3.8.2-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.8.2-r1.ebuild deleted file mode 100644 index 23b5a83aabf2..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-3.8.2-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 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 ~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/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() { - 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/nextcloud-client/nextcloud-client-3.9.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.9.1.ebuild deleted file mode 100644 index 23b5a83aabf2..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-3.9.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 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 ~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/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() { - 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/nicstat/nicstat-1.95.ebuild b/net-misc/nicstat/nicstat-1.95.ebuild index 1936dbeeb9d5..18f9993c3b4f 100644 --- a/net-misc/nicstat/nicstat-1.95.ebuild +++ b/net-misc/nicstat/nicstat-1.95.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -9,15 +9,11 @@ DESCRIPTION="Network traffic statics utility for Solaris and Linux" HOMEPAGE="https://sourceforge.net/projects/nicstat/ https://github.com/scotte/nicstat/" EGIT_COMMIT="a716ee81cbf1e177267e20a880b5a0d9fa5b689e" SRC_URI="https://github.com/scotte/nicstat/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" LICENSE="Artistic-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} src_compile() { $(tc-getCC) ${CFLAGS} ${PN}.c -o ${PN} ${LDFLAGS} || die diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 8fb940e466de..5da6e016e1cb 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,3 +1,4 @@ DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794 DIST ntp-4.2.8p17.tar.gz 7120469 BLAKE2B 5c0e90a234cdeab76e7443b42dfd5a0c3c78693a11bdb0fa21c8def91adbdf9b9871498df9d211509632812a9107501da3470104122e9621577541ffd6cd1ab6 SHA512 e003bfe6f46065890663bc6791b02277f64318b692e49d8d678b76c23b245f357834eb483b0a44f1f47783166e5504686b36494af77f6eebe6f844cd3f2b6a8c +DIST ntp-4.2.8p18.tar.gz 7210799 BLAKE2B 9a7bb767d2d8ae3a7224542df7978f8289cbdf28488c5e4dce4c549cdd1063259f69548898a352c0463ce83c4725bfd7c7dbf673ee3b74e490d7b1275760497c SHA512 c314f645d7d85e1028327657f30557cdfd86d417565b6c9fcbb40fca8a4c22a97b70908e8b73c6b31e14915b5b910ae0055fd42e819dd3cb48583b2a826c3fc4 diff --git a/net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch b/net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch new file mode 100644 index 000000000000..8676603a6cee --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch @@ -0,0 +1,19 @@ +https://bugs.ntp.org/show_bug.cgi?id=2646 +https://bugs.gentoo.org/533966 + +--- a/ntpd/ntpd.c ++++ b/ntpd/ntpd.c +@@ -1299,10 +1299,10 @@ + */ + cap_t caps; + char *captext; +- ++ + captext = (scan_addrs_once) +- ? "cap_sys_time=pe" +- : "cap_sys_time,cap_net_bind_service=pe"; ++ ? "cap_ipc_lock,cap_sys_time=pe" ++ : "cap_ipc_lock,cap_sys_time,cap_net_bind_service=pe"; + caps = cap_from_text(captext); + if (!caps) { + msyslog(LOG_ERR, diff --git a/net-misc/ntp/ntp-4.2.8_p17.ebuild b/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild index 51599bc5e173..2fcce5d7239a 100644 --- a/net-misc/ntp/ntp-4.2.8_p17.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p17-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 @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" DEPEND=" @@ -65,6 +65,9 @@ src_configure() { # bug #264109 append-cppflags -D_GNU_SOURCE + # https://bugs.gentoo.org/922508 + append-lfs-flags + # avoid libmd5/libelf export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no export ac_cv_lib_elf_nlist=no diff --git a/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild new file mode 100644 index 000000000000..3303e33398f6 --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic systemd tmpfiles + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="https://www.ntp.org/" +SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +DEPEND=" + >=dev-libs/libevent-2.0.9:=[threads(+)?] + readline? ( >=sys-libs/readline-4.1:= ) + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( dev-libs/openssl:= ) + parse-clocks? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + acct-group/ntp + acct-user/ntp + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +BDEPEND=" + acct-group/ntp + acct-user/ntp + virtual/pkgconfig +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch # bug #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530 + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch +) + +src_prepare() { + default + + # Make sure every build uses the same install layout, bug #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + + # bug #622754 + eautoreconf + + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die +} + +src_configure() { + # bug #264109 + append-cppflags -D_GNU_SOURCE + + # https://bugs.gentoo.org/922508 + append-lfs-flags + + # avoid libmd5/libelf + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no + export ac_cv_lib_elf_nlist=no + # blah, no real configure options #176333 + export ac_cv_header_dns_sd_h=$(usex zeroconf) + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + # Unity builds, we don't really need support for it, bug #804109 + export PATH_RUBY=/bin/false + + local myeconfargs=( + --cache-file="${S}"/config.cache + + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + + # Increase the default memlimit from 32MiB to 128MiB, bug #533232 + --with-memlock=256 + + # Avoid overriding the user's toolchain settings, bug #895802 + --with-hardenfile=/dev/null + + $(use_enable caps linuxcaps) + $(use_enable parse-clocks) + $(use_enable debug debugging) + $(use_with readline lineeditlibs readline) + $(use_enable samba ntp-signd) + $(use_with snmp ntpsnmpd) + $(use_with ssl crypto) + $(use_enable threads thread-support) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Move ntpd/ntpdate to sbin, bug #66671 + dodir /usr/sbin + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + + insinto /etc + doins "${FILESDIR}"/ntp.conf + + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/man1/ntpd.1 || die + else + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if ! use openntpd; then + tmpfiles_process ntp.conf + fi + + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} diff --git a/net-misc/ntp/ntp-4.2.8_p18.ebuild b/net-misc/ntp/ntp-4.2.8_p18.ebuild new file mode 100644 index 000000000000..04b70f2428cc --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p18.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic systemd tmpfiles + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="https://www.ntp.org/" +SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +DEPEND=" + >=dev-libs/libevent-2.0.9:=[threads(+)?] + readline? ( >=sys-libs/readline-4.1:= ) + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( dev-libs/openssl:= ) + parse-clocks? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + acct-group/ntp + acct-user/ntp + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +BDEPEND=" + acct-group/ntp + acct-user/ntp + virtual/pkgconfig +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8_p18-ipc-caps.patch # bug #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530 + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch +) + +src_prepare() { + default + + # Make sure every build uses the same install layout, bug #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + + # bug #622754 + eautoreconf + + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die +} + +src_configure() { + # Ancient codebase, lto-type-mismatch in testsuite in packetProcesisng.c + # where patching it then needs Ruby. + filter-lto + + # bug #264109 + append-cppflags -D_GNU_SOURCE + + # https://bugs.gentoo.org/922508 + append-lfs-flags + + # avoid libmd5/libelf + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no + export ac_cv_lib_elf_nlist=no + # blah, no real configure options #176333 + export ac_cv_header_dns_sd_h=$(usex zeroconf) + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + # Unity builds, we don't really need support for it, bug #804109 + export PATH_RUBY=/bin/false + + local myeconfargs=( + --cache-file="${S}"/config.cache + + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + + # Increase the default memlimit from 32MiB to 128MiB, bug #533232 + --with-memlock=256 + + # Avoid overriding the user's toolchain settings, bug #895802 + --with-hardenfile=/dev/null + + $(use_enable caps linuxcaps) + $(use_enable parse-clocks) + $(use_enable debug debugging) + $(use_with readline lineeditlibs readline) + $(use_enable samba ntp-signd) + $(use_with snmp ntpsnmpd) + $(use_with ssl crypto) + $(use_enable threads thread-support) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Move ntpd/ntpdate to sbin, bug #66671 + dodir /usr/sbin + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + + insinto /etc + doins "${FILESDIR}"/ntp.conf + + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/man1/ntpd.1 || die + else + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if ! use openntpd; then + tmpfiles_process ntp.conf + fi + + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 38ee02fb9e65..44aebb180d23 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -1,3 +1,5 @@ -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 +DIST waf-2.0.27 105950 BLAKE2B b01cc3539f6d9c8aadd9ef95b4821f9b5314e92b4bc7b930ff193e0382de1b23f0b92da88bfe0273df146437c24779f5f5443895dc0743e8acae58e03c7cb406 SHA512 22c21dfcbf5ed25c25040ab04f62326f271b2b18ff96ca7598dadf68230d21d70cef1c9d7ef56721edbd9c737a56576fd4a9ffac1b00cb93d5c013b8f3a9d97e diff --git a/net-misc/ntpsec/files/flit.toml b/net-misc/ntpsec/files/flit.toml new file mode 100644 index 000000000000..b3c782f9bc30 --- /dev/null +++ b/net-misc/ntpsec/files/flit.toml @@ -0,0 +1,34 @@ +[project] +name = "ntp" +version = "@NTPSEC_VERSION_EXTENDED@" +dependencies = ["argparse"] +requires-python = ">=2.6" +authors = [ + {name = "the NTPsec project", email = "devel@ntpsec.org"}, +] +maintainers = [ + {name = "the NTPsec project", email = "devel@ntpsec.org"} +] +description = "The NTP reference implementation, refactored" +license = {text = "BSD 2 License"} +keywords = ["ntp"] +classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'License :: OSI Approved :: BSD License', + 'Operating System :: POSIX', + 'Programming Language :: Python', +] + +[project.urls] +Homepage = "https://www.ntpsec.org/" +Documentation = "https://www.ntpsec.org/latest/" +Repository = "https://gitlab.com/NTPsec/ntpsec/" +"Bug Tracker" = "https://gitlab.com/NTPsec/ntpsec/-/issues" +Changelog = "https://gitlab.com/NTPsec/ntpsec/-/blob/master/NEWS.adoc" + +[build-system] +requires = ["flit_core >=3.2,<4"] +build-backend = "flit_core.buildapi" + +[tool.flit.module] +name = "ntp" diff --git a/net-misc/ntpsec/files/ntpsec-1.2.3-pep517-no-egg.patch b/net-misc/ntpsec/files/ntpsec-1.2.3-pep517-no-egg.patch new file mode 100644 index 000000000000..549a69792af4 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.2.3-pep517-no-egg.patch @@ -0,0 +1,38 @@ +diff --git a/pylib/ntp-in.egg-info b/pylib/ntp-in.egg-info +deleted file mode 100644 +index b672a8431..000000000 +--- a/pylib/ntp-in.egg-info ++++ /dev/null +@@ -1,12 +0,0 @@ +-Metadata-Version: 1.0 +-Name: ntpsec +-Version: @NTPSEC_VERSION_EXTENDED@ +-Platform: POSIX +-Summary: The NTP reference implementation, refactored +-Home-page: https://ntpsec.org/ +-License: Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, CC-BY-4.0, ISC, MIT, NTP +-Description: +- The Network Time Protocol suite, refactored +-Author: the NTPsec project +-Author-email: devel@ntpsec.org +-Keywords: +\ No newline at end of file +diff --git a/pylib/wscript b/pylib/wscript +index e285b768b..1137fb814 100644 +--- a/pylib/wscript ++++ b/pylib/wscript +@@ -96,11 +96,9 @@ def build(ctx): + install_path='${PYTHONARCHDIR}/ntp' + ) + +- # pep241 lay an egg +- egg = ['ntp-%s.egg-info' % ctx.env.NTPSEC_VERSION] ++ # pep517 pyproject.toml + ctx( + features="subst", +- source=['ntp-in.egg-info'], +- target=egg ++ source=['pyproject.toml'], ++ target=['../pyproject.toml'] + ) +- ctx.install_files(ctx.env.PYTHONARCHDIR, egg) diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml index 864309f6a22b..a2ce6c3f8cbc 100644 --- a/net-misc/ntpsec/metadata.xml +++ b/net-misc/ntpsec/metadata.xml @@ -27,6 +27,21 @@ <flag name="rclock_nmea">NMEA GPS driver</flag> <flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag> <flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag> + <flag name="oncore">Oncore driver</flag> + <flag name="trimble">Trimble driver</flag> + <flag name="truetime">Trutime driver (deprecated)</flag> + <flag name="gpsd">Enable gpsd daemon support</flag> + <flag name="jjy">JJY driver</flag> + <flag name="generic">Enable support for generic time radios and GPSDOs</flag> + <flag name="spectracom">Spectracom driver</flag> + <flag name="shm">Obtain refclock info from shared memory-segment</flag> + <flag name="pps">PPS cesium clock driver</flag> + <flag name="hpgps">Hewlett Packard GPS driver</flag> + <flag name="zyfer">Zyfer driver</flag> + <flag name="arbiter">Arbiter 1088A/B GPS driver</flag> + <flag name="nmea">NMEA GPS driver</flag> + <flag name="modem">NIST/USNO/PTB Modem Time Services</flag> + <flag name="local">Support for undisciplined local clock (not recommended)</flag> <flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag> </use> </pkgmetadata> diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild new file mode 100644 index 000000000000..00428f679c48 --- /dev/null +++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517="flit" +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE='threads(+)' + +inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" +else + 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 ) + https://waf.io/waf-2.0.27 + " + 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 +) + +IUSE="${NTPSEC_REFCLOCK[@]} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear test" #ionice +REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )" +RESTRICT="!test? ( test )" + +# 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 ) + oncore? ( net-misc/pps-tools ) + pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + !net-misc/ntp + !net-misc/openntpd + acct-group/ntp + acct-user/ntp + 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 +" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" + "${FILESDIR}/${PN}-1.2.3-pep517-no-egg.patch" +) + +WAF_BINARY="${S}/waf" + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded waf which is unsigned + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_prepare() { + cp -v "${DISTDIR}/waf-2.0.27" "${WAF_BINARY}" || die + chmod -v ugo+x "${WAF_BINARY}" || die + 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 +} + +src_configure() { + filter-lto + + local string_127="" + local rclocks=""; + local CLOCKSTRING="" + + for refclock in ${NTPSEC_REFCLOCK[@]} ; do + if use ${refclock} ; then + string_127+="$refclock," + fi + done + CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" + + myconf=( + --notests + --nopyc + --nopyo + --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") + ) + python_setup + cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml" || die + waf-utils_src_configure "${myconf[@]}" +} + +src_compile() { + waf-utils_src_compile --notests + + ln -svf pylib build/main/ntp || die + cd build/main || die + distutils-r1_src_compile +} + +src_test() { + cd build/main || die + distutils-r1_src_test +} + +python_test() { + "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs) || die +} + +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 logrotate 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 + + ln -svf pylib build/main/ntp || die + distutils-r1_src_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.2a.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a.ebuild index f1a082dd891e..52c1058a3b2e 100644 --- a/net-misc/ntpsec/ntpsec-1.2.2a.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.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=8 @@ -67,7 +67,7 @@ BDEPEND+=" >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets - sys-devel/bison + app-alternatives/yacc " PATCHES=( diff --git a/net-misc/ntpsec/ntpsec-1.2.2.ebuild b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild index 0d239684ccaa..2268d6f6574a 100644 --- a/net-misc/ntpsec/ntpsec-1.2.2.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild @@ -1,63 +1,93 @@ -# 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_EXT=1 +DISTUTILS_USE_PEP517="flit" +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE='threads(+)' -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 flag-o-matic waf-utils systemd +inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd -if [[ ${PV} == *9999* ]]; then +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" + 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 ) -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 )" +IUSE="${NTPSEC_REFCLOCK[@]} debug doc early heat libbsd nist ntpviz samba seccomp smear test" #ionice +REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )" +RESTRICT="!test? ( test )" # 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} + oncore? ( net-misc/pps-tools ) + 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 - sys-devel/bison" + app-alternatives/yacc +" PATCHES=( "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" + "${FILESDIR}/${PN}-1.2.3-pep517-no-egg.patch" ) WAF_BINARY="${S}/waf" +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded waf which is unsigned + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + src_prepare() { default @@ -68,12 +98,9 @@ src_prepare() { fi # remove extra default pool servers sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die - - python_copy_sources } src_configure() { - is-flagq -flto* && filter-flags -fuse-linker-plugin filter-lto local string_127="" @@ -81,7 +108,7 @@ src_configure() { local CLOCKSTRING="" for refclock in ${NTPSEC_REFCLOCK[@]} ; do - if use rclock_${refclock} ; then + if use ${refclock} ; then string_127+="$refclock," fi done @@ -91,36 +118,38 @@ src_configure() { --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() { + python_setup + cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml" || die waf-utils_src_configure "${myconf[@]}" } -python_compile() { +src_compile() { waf-utils_src_compile --notests + + ln -svf pylib build/main/ntp || die + cd build/main || die + distutils-r1_src_compile +} + +src_test() { + cd build/main || die + distutils-r1_src_test } python_test() { - waf-utils_src_compile check + "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs) || die } src_install() { - distutils-r1_src_install - # Install heat generating scripts use heat && dosbin "${S}"/contrib/ntpheat{,usb} @@ -137,7 +166,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 @@ -147,9 +176,9 @@ src_install() { # 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() { + ln -svf pylib build/main/ntp || die + distutils-r1_src_install waf-utils_src_install --notests python_fix_shebang "${ED}" python_optimize diff --git a/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3.ebuild index f377b0352861..2fd6e5cad45b 100644 --- a/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3.ebuild @@ -1,25 +1,36 @@ -# 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_EXT=1 +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 flag-o-matic waf-utils systemd -if [[ ${PV} == *9999* ]]; then +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" + 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 - sys-devel/bison" + app-alternatives/yacc +" PATCHES=( "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" @@ -74,7 +92,6 @@ src_prepare() { } src_configure() { - is-flagq -flto* && 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 92757a076a45..2268d6f6574a 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517="flit" +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE='threads(+)' -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 flag-o-matic waf-utils systemd +inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else @@ -36,10 +36,9 @@ NTPSEC_REFCLOCK=( shm pps hpgps zyfer arbiter nmea modem local ) -IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} - -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice -REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" +IUSE="${NTPSEC_REFCLOCK[@]} debug doc early heat libbsd nist ntpviz samba seccomp smear test" #ionice +REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )" +RESTRICT="!test? ( test )" # net-misc/pps-tools oncore,pps DEPEND=" @@ -49,8 +48,8 @@ DEPEND=" sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) - rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools ) + oncore? ( net-misc/pps-tools ) + pps? ( net-misc/pps-tools ) " RDEPEND=" ${DEPEND} @@ -67,16 +66,28 @@ BDEPEND+=" >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets - sys-devel/bison + app-alternatives/yacc " PATCHES=( "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" "${FILESDIR}/${PN}-1.2.2-logrotate.patch" + "${FILESDIR}/${PN}-1.2.3-pep517-no-egg.patch" ) WAF_BINARY="${S}/waf" +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded waf which is unsigned + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + src_prepare() { default @@ -87,8 +98,6 @@ src_prepare() { fi # remove extra default pool servers sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die - - python_copy_sources } src_configure() { @@ -99,7 +108,7 @@ src_configure() { local CLOCKSTRING="" for refclock in ${NTPSEC_REFCLOCK[@]} ; do - if use rclock_${refclock} ; then + if use ${refclock} ; then string_127+="$refclock," fi done @@ -109,36 +118,38 @@ src_configure() { --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() { + python_setup + cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml" || die waf-utils_src_configure "${myconf[@]}" } -python_compile() { +src_compile() { waf-utils_src_compile --notests + + ln -svf pylib build/main/ntp || die + cd build/main || die + distutils-r1_src_compile +} + +src_test() { + cd build/main || die + distutils-r1_src_test } python_test() { - waf-utils_src_compile check + "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs) || die } src_install() { - distutils-r1_src_install - # Install heat generating scripts use heat && dosbin "${S}"/contrib/ntpheat{,usb} @@ -165,9 +176,9 @@ src_install() { # 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() { + ln -svf pylib build/main/ntp || die + distutils-r1_src_install waf-utils_src_install --notests python_fix_shebang "${ED}" python_optimize 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/nxplayer/nxplayer-7.6.2.4.ebuild b/net-misc/nxplayer/nxplayer-7.6.2.4-r1.ebuild index 6c7c06277ceb..9ce1d6a5a12b 100644 --- a/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild +++ b/net-misc/nxplayer/nxplayer-7.6.2.4-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=8 @@ -18,7 +18,7 @@ KEYWORDS="-* ~amd64 ~x86" RDEPEND=" || ( sys-libs/libxcrypt[compat] - sys-libs/glibc[crypt(+)] + sys-libs/glibc[crypt(-)] ) dev-libs/glib:2 dev-libs/openssl:0 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/ofono/Manifest b/net-misc/ofono/Manifest index 1e20cd5b72cf..3d4f5395c13a 100644 --- a/net-misc/ofono/Manifest +++ b/net-misc/ofono/Manifest @@ -1,4 +1,3 @@ -DIST ofono-1.33.tar.xz 1060408 BLAKE2B 646a96c0926ea032fef0357aabe6a4be6da88f4ccbdff59bb86b5de73a9b469362151b212a05234619f5d616b534343137c66e923782c7d50dfe13d2bf66558c SHA512 8d88226aa2b43eca840c6330045ee7a96c91f6003b06fca5ea55b74fc229f0e0ba0c8d98f7945f8c23ec5a8e7057bffef6335c61842e245686e0ed7c5feda589 -DIST ofono-1.34.tar.xz 1060828 BLAKE2B be0d3787ca9226763fb2bff46f1c3cec813d702730d6231986ec5aa43e2d96e08385fa3f64ccff97cf15844e41a33d6c37d1d35c8b0c5fcf3765848e258e3372 SHA512 79ebf0bc795288f07b58eeaa1a0aa3309b4afecae3abdd26c0749e22a4c2e74b65e93cbcfdfd1738dbcb2d0cfb8c687d182d706696a7c1cd5b4ed3bcec059489 -DIST ofono-2.0.tar.xz 1096856 BLAKE2B 28b29577cdd70129fd8f7346bd82e03078452b03bb4baf152c4e406cfc17a5eeac11312999592acad85d7c61c4595403d266482068576573fd1d75a15e610d80 SHA512 3b29845d06784bfec8e60f6590237b77baa0826b1366f7ed8491d41622da19c72290ff8508a4625e5d7d5f68a03237524aa2ef1936b26dbc035fb3e7fa747f23 DIST ofono-2.1.tar.xz 1097624 BLAKE2B 574293a73061470eec322df7fa62d581e8e8d2c5b81e896bff52173a986733f448686186bc0400ccf256fb931e26a1fef6a664dafa8f64935f936c9347e4a054 SHA512 7227939c488c2a62f640d5a8279e0698935aa1df5a2a349e195df9a8d9d9123c73a7f1177aae022b4c805d266c24a9770784193100adffa45f6c36a3ed847bb1 +DIST ofono-2.3.tar.xz 1216872 BLAKE2B e32ea09dbc8f0aa2ca3f322ffc34d9f9d06d862792b05a0f96ddba4ebe4038199ab40a4065582d68a35d2a5725646626bc36c8f9e83d89a42be8d76271144751 SHA512 0c53c2c441d28f89140192fe808769b3b27ef1ebf75e9ee9f9bfa53d0d102a47d11fcb364077ca88cdc598e8368924f477024b44a2adf795efe40b52ffe92dce +DIST ofono-2.9.tar.xz 1302044 BLAKE2B d468c179ead13ab75b5e9872c671bea3c5f7cd59242516ba432c323aefc423ea18fd401a236a7abacf0ff0f2c74c8921828496b8a74269a1dc246f893c89036b SHA512 181f4aad276ea5c5888c6b89187e27b65d42f002d1dd72091f377033bda82bada17364c49773d4a1fd62ea7940d27d7f796da561595b606abbf4b4ec220ae031 diff --git a/net-misc/ofono/ofono-1.33.ebuild b/net-misc/ofono/ofono-1.33.ebuild deleted file mode 100644 index baad2dd7743f..000000000000 --- a/net-misc/ofono/ofono-1.33.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon" -HOMEPAGE="https://git.kernel.org/pub/scm/network/ofono/ofono.git" -SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" -IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" - -REQUIRED_USE="dundee? ( bluetooth )" - -RDEPEND=">=sys-apps/dbus-1.6 - >=dev-libs/glib-2.68 - net-misc/mobile-broadband-provider-info - bluetooth? ( >=net-wireless/bluez-4.99 ) - udev? ( virtual/udev ) - examples? ( dev-python/dbus-python ) - tools? ( virtual/libusb:1 )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( ChangeLog AUTHORS ) - -src_configure() { - econf \ - $(use_enable udev) \ - $(use_enable isimodem) \ - $(use_enable atmodem) \ - $(use_enable cdmamodem) \ - $(use_enable datafiles) \ - $(use_enable dundee) \ - $(use_enable bluetooth) \ - $(use_enable phonesim) \ - $(use_enable provision) \ - $(use_enable qmimodem) \ - $(use_enable tools) \ - $(use_enable examples test) \ - $(use_enable upower) \ - --disable-maintainer-mode \ - --disable-rilmodem - --localstatedir=/var \ - --with-systemdunitdir="$(systemd_get_systemunitdir)" -} - -src_install() { - default - - if use tools ; then - dobin tools/auto-enable \ - tools/huawei-audio \ - tools/lookup-provider-name \ - tools/lookup-apn \ - tools/get-location \ - tools/tty-redirector - fi - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - use doc && dodoc doc/*.txt -} diff --git a/net-misc/ofono/ofono-2.1.ebuild b/net-misc/ofono/ofono-2.1.ebuild index 892057a6974a..d4c3415dffc6 100644 --- a/net-misc/ofono/ofono-2.1.ebuild +++ b/net-misc/ofono/ofono-2.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 @@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" REQUIRED_USE="dundee? ( bluetooth )" diff --git a/net-misc/ofono/ofono-2.0.ebuild b/net-misc/ofono/ofono-2.3.ebuild index 892057a6974a..69e1ff1a5624 100644 --- a/net-misc/ofono/ofono-2.0.ebuild +++ b/net-misc/ofono/ofono-2.3.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 @@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" +IUSE="+atmodem bluetooth +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" REQUIRED_USE="dundee? ( bluetooth )" @@ -33,7 +33,6 @@ src_configure() { $(use_enable udev) \ $(use_enable isimodem) \ $(use_enable atmodem) \ - $(use_enable cdmamodem) \ $(use_enable datafiles) \ $(use_enable dundee) \ $(use_enable bluetooth) \ @@ -44,7 +43,7 @@ src_configure() { $(use_enable examples test) \ $(use_enable upower) \ --disable-maintainer-mode \ - --disable-rilmodem + --disable-rilmodem \ --localstatedir=/var \ --with-systemdunitdir="$(systemd_get_systemunitdir)" } @@ -55,7 +54,6 @@ src_install() { if use tools ; then dobin tools/auto-enable \ tools/huawei-audio \ - tools/lookup-provider-name \ tools/lookup-apn \ tools/get-location \ tools/tty-redirector diff --git a/net-misc/ofono/ofono-1.34.ebuild b/net-misc/ofono/ofono-2.9.ebuild index e55afed80dd2..22baae9798b5 100644 --- a/net-misc/ofono/ofono-1.34.ebuild +++ b/net-misc/ofono/ofono-2.9.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,12 +7,12 @@ inherit systemd DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon" HOMEPAGE="https://git.kernel.org/pub/scm/network/ofono/ofono.git" -SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" +SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" +IUSE="+atmodem bluetooth +datafiles doc dundee examples +isimodem +phonesim +qmimodem tools +udev upower" REQUIRED_USE="dundee? ( bluetooth )" @@ -33,18 +33,16 @@ src_configure() { $(use_enable udev) \ $(use_enable isimodem) \ $(use_enable atmodem) \ - $(use_enable cdmamodem) \ $(use_enable datafiles) \ $(use_enable dundee) \ $(use_enable bluetooth) \ $(use_enable phonesim) \ - $(use_enable provision) \ $(use_enable qmimodem) \ $(use_enable tools) \ $(use_enable examples test) \ $(use_enable upower) \ --disable-maintainer-mode \ - --disable-rilmodem + --disable-rilmodem \ --localstatedir=/var \ --with-systemdunitdir="$(systemd_get_systemunitdir)" } @@ -55,7 +53,6 @@ src_install() { if use tools ; then dobin tools/auto-enable \ tools/huawei-audio \ - tools/lookup-provider-name \ tools/lookup-apn \ tools/get-location \ tools/tty-redirector diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index a1f1b3d20bb2..969d1714e0e4 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -1,2 +1,3 @@ DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745abf4825e7274487637f368d521e03f6f165ec82129f37f135a6cf3d3d43bb9349574b88763a508bb683cdc8882230d2 SHA512 04c9ddb258c132781eaa875412f0a8d48d2127e5b78ba262eb0240dac05025db62f5d357e4b5c35a9009960b30d63ce96156c8dcf3b5eac4257c02d37578e676 DIST oidc-agent-5.0.1.tar.gz 1802435 BLAKE2B 75bc66bb2c6cc89293c7ad155d35b7a7adb73ad7f8a5aadeb029b43a095e2a80f0fc4505737a0c53c60e6f601acbcab990ad4b572b659050fe36e5dd2e7c4092 SHA512 caffa9d7733690917472d2d48ca58092ab722c5f049750de37169dc0a76ccbe374ae3fb5e56b8c578465e84a2f40795eaa26018281b4f851f7a7c94571d2a124 +DIST oidc-agent-5.1.0.tar.gz 1803314 BLAKE2B 8ce1de7ec6dffa3155200664a93433db4f4a116325d8ce60ffff885d534b3d2367e40577b6b22987e817d92f0020fea97e2224947b27ba10847bb0c347dcdf3a SHA512 f3ecda4445478ea02e833b0b9ed75a517c1ff91f5b0c2cb258cc3a7eacb62cb75b56697e15fa755d9cf45e7a0293c8bd2f6ab8d998dd8680726c4143b1e011bc diff --git a/net-misc/oidc-agent/metadata.xml b/net-misc/oidc-agent/metadata.xml index 0da6e4f2bbdc..77a6fd266217 100644 --- a/net-misc/oidc-agent/metadata.xml +++ b/net-misc/oidc-agent/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 --> <longdescription> oidc-agent is a set of tools to manage OpenID Connect tokens and make them easily usable from the command line. We followed the ssh-agent design, so users diff --git a/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild index 9a69211000e7..1df884f36c47 100644 --- a/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild +++ b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" IUSE="test" DEPEND="app-crypt/libsecret diff --git a/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild b/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild new file mode 100644 index 000000000000..6517defe32b2 --- /dev/null +++ b/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tmpfiles xdg-utils + +DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" +HOMEPAGE="https://github.com/indigo-dc/oidc-agent" +SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="test" + +DEPEND="app-crypt/libsecret + dev-libs/cJSON:= + dev-libs/libsodium:= + media-gfx/qrencode + net-libs/libmicrohttpd:= + net-libs/webkit-gtk:4.1= + net-misc/curl + elibc_musl? ( sys-libs/argp-standalone )" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-libs/check )" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.0.1_install-perms.patch + "${FILESDIR}"/${PN}-5.0.1_webkit41.patch +) + +src_prepare() { + xdg_environment_reset + default + sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" +} + +oidc_emake() { + local mymakeargs=( + USE_CJSON_SO=1 + USE_LIST_SO=0 + USE_MUSTACHE_SO=0 + USE_ARGP_SO=$(usex elibc_musl 1 0) + ) + + emake "${mymakeargs[@]}" $@ +} + +src_compile() { + oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157 + oidc_emake +} + +src_install() { + oidc_emake \ + PREFIX="${ED}" \ + BIN_AFTER_INST_PATH="/usr" \ + INCLUDE_PATH="${ED}"/usr/include \ + LIB_PATH="${ED}"/usr/$(get_libdir) \ + install + + # This file is not compatible with Gentoo and in any case, we generally + # let the users load such agents themselves. + rm -f "${ED}"/etc/X11/Xsession.d/91${PN} +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf + + xdg_desktop_database_update + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog + elog "You should use oidc-gen to initially generate your account configuration" + elog "before it can be loaded into oidc-agent using oidc-add. For details, please" + elog "consult the man page of oidc-gen, or full documentation at" + elog " https://indigo-dc.gitbooks.io/oidc-agent/" + elog + else + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if [[ $(ver_cut 1 ${old_ver}) != 5 ]]; then + ewarn "${PN} 5 is a major release with quite some usability improvements but unfortunately also some breaking changes." + ewarn "Please consult" + ewarn " https://indigo-dc.gitbook.io/oidc-agent/oidc-agent5" + ewarn "for instructions on how to upgrade your configuration to this version" + ewarn + ewarn "Furthermore, please restart any running instances of ${PN}" + ewarn "to make sure they are compatible with the updated clients." + ewarn + break + fi + done + fi +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/net-misc/oidentd/oidentd-3.0.0-r1.ebuild b/net-misc/oidentd/oidentd-3.0.0-r1.ebuild index de8a92711131..1bd506c756b1 100644 --- a/net-misc/oidentd/oidentd-3.0.0-r1.ebuild +++ b/net-misc/oidentd/oidentd-3.0.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=8 @@ -24,8 +24,8 @@ RDEPEND=" " BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " PATCHES=( "${FILESDIR}/${P}-ipv6-masquerade.patch" ) diff --git a/net-misc/oidentd/oidentd-3.1.0.ebuild b/net-misc/oidentd/oidentd-3.1.0.ebuild index 9b2726b4bcbd..20e846e17003 100644 --- a/net-misc/oidentd/oidentd-3.1.0.ebuild +++ b/net-misc/oidentd/oidentd-3.1.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 @@ -24,8 +24,8 @@ RDEPEND=" " BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " src_prepare() { diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild index bff1915449d8..78216e9c4d92 100644 --- a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild +++ b/net-misc/olsrd/olsrd-0.9.8_p20210612-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 @@ -28,7 +28,7 @@ RDEPEND="gtk? ( DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="app-alternatives/yacc - sys-devel/flex + app-alternatives/lex virtual/pkgconfig" PATCHES=( 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/omnisync/omnisync-1.0_p20200130.ebuild b/net-misc/omnisync/omnisync-1.0_p20200130-r1.ebuild index c0a9f2f3dae6..149c6e96da64 100644 --- a/net-misc/omnisync/omnisync-1.0_p20200130.ebuild +++ b/net-misc/omnisync/omnisync-1.0_p20200130-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake vcs-snapshot +inherit cmake flag-o-matic vcs-snapshot SNAPSHOT="c55215330b1e8a61af6d34d57d3d8236c8cc7d5b" @@ -20,6 +20,15 @@ RDEPEND="net-libs/gnutls:= net-analyzer/net-snmp:=" DEPEND="${RDEPEND}" DOCS=( readme.txt Changes ) +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861683 + # appears to be terminally dead + filter-lto + + cmake_src_configure +} + src_install() { cmake_src_install newinitd "${FILESDIR}/${PN}.initd" ${PN} diff --git a/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch b/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch new file mode 100644 index 000000000000..ee676d6f9935 --- /dev/null +++ b/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch @@ -0,0 +1,30 @@ +From 8e4fdc1c2794e861cd026864607fa6b04c5237cb Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Tue, 21 May 2024 16:10:45 -0400 +Subject: [PATCH] fix incompatible check for libc compat + +It relied on implicit function declarations, which are banned starting +in c99. Result: the check always failed. + +See: https://wiki.gentoo.org/wiki/Modern_C_porting#How_do_I_reproduce_these_bugs.3F +Bug: https://bugs.gentoo.org/900296 +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + m4/check-libc-compat.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/check-libc-compat.m4 b/m4/check-libc-compat.m4 +index a806cbe..3bb859a 100644 +--- a/m4/check-libc-compat.m4 ++++ b/m4/check-libc-compat.m4 +@@ -1,6 +1,6 @@ + AC_DEFUN([CHECK_PROGNAME], [ + AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [ +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], + [[ extern char *__progname; printf("%s", __progname); ]])], + [ ac_cv_libc_defines___progname="yes" ], + [ ac_cv_libc_defines___progname="no" +-- +2.44.1 + diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild index 23529b8fd7d4..a4562387dfad 100644 --- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild +++ b/net-misc/openntpd/openntpd-6.2_p3-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=7 @@ -8,7 +8,7 @@ inherit systemd MY_P="${P/_p/p}" DESCRIPTION="Lightweight NTP server ported from OpenBSD" -HOMEPAGE="http://www.openntpd.org/" +HOMEPAGE="https://www.openntpd.org/" SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" diff --git a/net-misc/openntpd/openntpd-6.8_p1.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r3.ebuild index ee0f69ce5392..77e63f5456df 100644 --- a/net-misc/openntpd/openntpd-6.8_p1.ebuild +++ b/net-misc/openntpd/openntpd-6.2_p3-r3.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd +inherit autotools systemd MY_P="${P/_p/p}" DESCRIPTION="Lightweight NTP server ported from OpenBSD" -HOMEPAGE="http://www.openntpd.org/" +HOMEPAGE="https://www.openntpd.org/" SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="selinux" DEPEND=" !net-misc/ntp[-openntpd]" + RDEPEND=" ${DEPEND} acct-group/openntpd @@ -26,8 +27,15 @@ RDEPEND=" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/openntpd-6.2p3-fno-common.patch" + # https://github.com/openntpd-portable/openntpd-portable/pull/75 + "${FILESDIR}"/0001-fix-incompatible-check-for-libc-compat.patch +) + src_prepare() { default + eautoreconf # fix /run path sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die @@ -38,7 +46,7 @@ src_prepare() { sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die # fix default config to use gentoo pool - sed -i 's:^server:#server:g' ntpd.conf || die + sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die sed -ie 's/^constraints/#constraints/g' ntpd.conf || die @@ -47,6 +55,7 @@ src_prepare() { src_configure() { econf \ --with-privsep-user=openntpd \ + --with-privsep-path=/var/lib/openntpd/chroot \ --disable-https-constraint } diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r2.ebuild index c203e2a4f687..1b00a44a6fdf 100644 --- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild +++ b/net-misc/openntpd/openntpd-6.8_p1-r2.ebuild @@ -1,14 +1,14 @@ -# 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 systemd +inherit autotools systemd MY_P="${P/_p/p}" DESCRIPTION="Lightweight NTP server ported from OpenBSD" -HOMEPAGE="http://www.openntpd.org/" +HOMEPAGE="https://www.openntpd.org/" SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" @@ -28,8 +28,14 @@ RDEPEND=" S="${WORKDIR}/${MY_P}" +PATCHES=( + # https://github.com/openntpd-portable/openntpd-portable/pull/75 + "${FILESDIR}"/0001-fix-incompatible-check-for-libc-compat.patch +) + src_prepare() { default + eautoreconf # fix /run path sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die diff --git a/net-misc/openr2/Manifest b/net-misc/openr2/Manifest deleted file mode 100644 index 0836806e9a62..000000000000 --- a/net-misc/openr2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openr2-1.3.0.tar.gz 650048 BLAKE2B bff444c839d5f62fc889c1720cb9c17c38c5bd4b0dc3b3884c8fd00226aa6354281cf37c7a748fca4e16e633a94ac055c8f7b5e4bf69d97732846fdbc618ca47 SHA512 2cee4534eeebb91a2cf0f74c9fcd2a16db3966db01a4bae7e3406416546fdc1c5e20bb9172375f55e5dcc30cfcc2c8f7182ef7476253b4fcce9421f74b8d125e diff --git a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch deleted file mode 100644 index 59918934d563..000000000000 --- a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -25,11 +25,6 @@ - AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE - --# let's default to compile with debugging information --# most users will not even care about it --CFLAGS='-ggdb3 -O0' --CXXFLAGS='-ggdb3 -O0' -- - AC_PROG_CC - AC_PROG_LIBTOOL - AC_LANG([C]) -diff -ur ORIG/src/Makefile.am MOD/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,10 +1,10 @@ --AM_CFLAGS = -std=c99 -pedantic -Wall -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes -+AM_CFLAGS = -std=c99 -pedantic -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes - if WANT_OR2_TRACE_STACKS - AM_CFLAGS += -DOR2_TRACE_STACKS - endif - - if HAVE_SVNVERSION --AM_CFLAGS += -DREVISION=\"$(shell svnversion -n .)\" -+AM_CFLAGS += -DREVISION=\"0\" - endif - - lib_LTLIBRARIES = libopenr2.la diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild deleted file mode 100644 index 2f15c2e0e766..000000000000 --- a/net-misc/openr2/openr2-1.3.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol" -HOMEPAGE="https://libopenr2.org/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="net-misc/dahdi" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-misc/openssh-contrib/Manifest b/net-misc/openssh-contrib/Manifest index 4474bb040ac6..3646200f71b5 100644 --- a/net-misc/openssh-contrib/Manifest +++ b/net-misc/openssh-contrib/Manifest @@ -1,25 +1,8 @@ -DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914 -DIST openssh-9.3_p1-X509-glue-14.1.1.patch.xz 936 BLAKE2B f1716ff7801a27aa2aad06f1cca2ca6988eef65fb0ddcbde483e5c9205506ca40b658f5c8c40b2625afb38ff9b56e40831eadcf751c8ee1c11f69ec559f3c147 SHA512 dace01bcf22b625cd00e18ce019b0be31b6f47f714845f3ebb98ebee41b4db0a769fa09cab63ea17536a7106ec90f2b15f87696ae49fa6f6e31bad94ae09719d -DIST openssh-9.3_p1-hpn-15.2-X509-14.1.1-glue.patch.xz 6224 BLAKE2B 47c7054648e8d795b0d9e563d8313242c917df8a3620a60cff2d77f9ae8482cec861244e0f1433f711922f0704b775b7183284960a3baa48a27b99979ad7ffa3 SHA512 728cf2586bcc9480afe71b5106e2286b925857a9e04dce79f744b36cbe3ec2844ac5b4a6bd4b64117f32ad1b04c0943b9d6f935eee826202871588ed9a167387 -DIST openssh-9.3_p1-hpn-15.2-glue.patch.xz 5044 BLAKE2B 73205bd8f702612df7cb6f29e8b353df854428974dc20d5938033157da64418317f326ab8118893dc47173cd871dc7654a3e3ed601289744560becc98729cd3f SHA512 343b77109158b9af5d8d57f4ac7968bce8277fa3b4dcaa19b76593620fbddbfa832bd76c0da52e12179fe5f391f9fef67e7af51b138ab8cc69a8a6471b6a3909 -DIST openssh-9.3_p2-X509-glue-14.1.1.patch.xz 116132 BLAKE2B 7e2b5aa4569a27943cb701dccbca8224e64130a4bce46ce8ba7978a93d3a410fe46957694475fafd51177dbbefa28fc613d9bf69aa436541b03e83dc9b9497ba SHA512 df67a40f27c8af029c3d84e44bd74115e16bfe98efc039bd1f5661c22c5ab1213c2970a80c017775e828f6c5b4e2e815eff28c745888b0dba1ef6c259943ba20 -DIST openssh-9.3_p2-hpn-15.2-X509-14.1.1-glue.patch.xz 5056 BLAKE2B aea1d9dd10abb5dd85d304fb4a415c5fb8b237dd82d8f39c092622d85b51751336f18bff5feb80e9a165e171b92eeeef471272210d926327a649961eb640cb8b SHA512 6d384ad9b3bebc4b90550e089b6c3c8d2959880a2510bea5bd7d723dd831815929dbf67a882105f22b3dd2eef6ed82dea89343175499a57d8e0f6b56ec6abfd6 -DIST openssh-9.3_p2-hpn-15.2-glue.patch.xz 4728 BLAKE2B 9e3c04a289d0a94b03b871027f4f8476e3981602f5a2d9ac8a8602e08d01248a72c48126ff53a174c8dc95f6bd8608ba75bbc74f5eb427e4ecbe7c7794c7c200 SHA512 bb42d001f89b8eb3a5af813d4c526548e13467deeb2811384b473e61c86e6e766aabb9652867953c0f979533ea70111145c424298f11df4faf05e43fb8b1f439 -DIST openssh-9.3p1+x509-14.1.1.diff.gz 1221335 BLAKE2B 9203fbb6955fe44ebd7ed031245a90b8df7e149a6ad3205097ffd5d2d7655a0e6b8cd2e20d7f7216fbc6d3e8bd0a1453f3fc028f04e96c0f244ad0772a0e30ab SHA512 8a1036d680d25f99e1a24ea77a2c303e807c0f5c5323043684da9fcc9ff603f80384688935a654cc97216f84f85f00f590dc35d2ee2b1f0fb169f8b427559b2d -DIST openssh-9.3p1-sctp-1.2.patch.xz 6836 BLAKE2B d12394ecaa7eca6e0b3590cea83b71537edc3230bc5f7b2992a06a67c77247cc4156be0ba151038a5baee1c3f105f76f1917cc5aad08d1aadadfd6e56858781b SHA512 ba5af014e5b825bf4a57368416a15c6e56afd355780e4c5eab44a396c3f4276ac4d813c5c15b83f3b8edf4763855221743796c038433b292fda9417f0b274a71 -DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 45578edf98bba3d23c7cefe60d8a7d3079e7c6676459f7422ace7a2461ab96943fbcadb478633a80f40bc098f2435722850b563714adb78b14922be53cb5753d SHA512 087ff6fe5f6caab4c6c3001d906399e02beffad7277280f11187420c2939fd4befdcb14643862a657ce4cad2f115b82a0a1a2c99df6ee54dcd76b53647637c19 -DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B e6533d64b117a400b76b90f71fa856d352dea57d91e4e89fa375429403ac0734cc0a2f075bc58c6bb4f40a8f9776735aa36bdb0bbf3880a2115cea787633e48b SHA512 6222378eb24a445c6c1db255392b405f5369b1af0e92f558d4ba05b0d83ab0d084cb8f4b91d7ae8636f333d970638a6635e2bc7af885135dd34992d87f2ef1f4 -DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f SHA512 15b8c57aa120186f1d1c3c2b8dc6ffd26733e12f755a6b0a4255d9ec1815a61506275ff5723b4ac029e44bc2ad22852ac36e1101f292348fbfa79aa1a4cd3f35 -DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47 SHA512 759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a -DIST openssh-9.4_p1-X509-glue-14.2.1.patch.xz 904 BLAKE2B 64dd3f145858d7d6b6625fa565a882f7ab43faf78233a2a78b7b13fc1d417ae67c675bebc09dd1343b3504af0c2c47a1fda6ac77a11238e1d2dabcdd394253e9 SHA512 542263bae6135c0493a16c63526da6b98cc425e01f2a1e332156bca4d3d7c7e91cfe1cd86f32c5f67097275eeb543b356faacad665c2a36c22843e2e00d19e10 -DIST openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz 5144 BLAKE2B 324dff4cccc027825b8400225cf322a6882caca30aa567a1bea405142ff9f9ed143b837ef8082011342ae6d22033c22e34499f930d0b9ca1e3c241cac7c15e99 SHA512 e63b2187d3f210ce897b6696b02a364f4f212c1290f7b9bbcceeb15325555427254c54366b7da059ce3cf99e595457e69d8edff4fcb7c18021c7530dea1df4bb -DIST openssh-9.4p1+x509-14.2.1.diff.gz 1221969 BLAKE2B 67b06648aafd849fdcb4c54c4a841c46b6a97d53d7ebdefe6110aba7a0877833ebb2a8d22a1e51a748051f889ba08cc1501ea0e9e221fef2f5c0e8caad170983 SHA512 d90dc7bde008ab793d9f85f1b4b0687f1d084fdf2fc6cfd229748424ddcc4664f558be44fee73d72e88bc99e03a5dd1ec57138a82f77b82e0f65d14bd3ef545a -DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25 -DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a -DIST openssh-9.5_p1-X509-glue-14.3.patch.xz 788 BLAKE2B 641c9936639a7629f6ae82d56f48b9dd39e58087024fe04259e2be5aef3b484a3f8ba6c91e603dd4f80d03c92490ee85cbaccff1e40e4f7ee1064c4a1ac9f191 SHA512 8f9255e3f8a682d7c82125a6064cdd8a80616e4b699a4c101515f15af7185a6b0b98efa246e0ed97a278f377ea616daf2dd98d0dc479c24d1ac3a76c12cd97ec -DIST openssh-9.5_p1-hpn-15.2-X509-14.3-glue.patch.xz 5132 BLAKE2B 82a30622e67fab233591f6b30c634f2f8383eda77de163b6139ca9892c0485d8f174901e5e6788f6c911e0859e563ac6a9022e99099507f76a59908770474e78 SHA512 697b2ce1b2b0aa1bcf95b76b3bc79de7d8793a3c2975bc3bfb23a64fd3a9133df9fd0831848f9388b21f7f1fd597824b221d45b9380ee26beb60040596386d61 -DIST openssh-9.5p1+x509-14.3.diff.gz 1224337 BLAKE2B f695711eeab6b40a8660ac897961068738cb5941c799243888d5a90f56cf4b308803dd88d3d97d7932a72b82ebc269e20c7d142076fb3b03def1245491da0497 SHA512 a7798e2a40a81df882911c485fa240584713135df59c6dab720597b6ef60ecfac85ebd595983d7c5ce8625b758eeb777fe1462845976a2674cad339dadc0719a -DIST openssh-9.5p1.tar.gz 1843001 BLAKE2B 55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796 SHA512 e183fdf7477fd986215b889eea4a945d71385e35305746ccb164e757ecc28166f429c70890a237d8ef4cdcae5132935ba2ecb3b2a658eb73a6afcf6f42277b9c -DIST openssh-9.5p1.tar.gz.asc 833 BLAKE2B abec3d14d9a880008db202be00ed446ccc0a98ce77c16a9e6d6492feac07c8f3284f9cd24f6ee1d904a55f9f23d5cce8a716916975c179a38ef6bde1d36e0acf SHA512 2b6de653420ba02eb99c7e6fba09af3bacfe9c701f3dfc3c94f41a3539c0414954fc5c64cce63c488c5ccd5d4ddb42d3f2184ff7f323342c885c47bf7d426ca1 +DIST openssh-9.6_p1-hpn-15.2-glue.patch.xz 5028 BLAKE2B 74970dc9f244eea2e35270c9abe67bdf0f05a3ddb33ffe6ce54056ade3fbec2abe9cb60e92ea889b01be7429dfd754f2986b175cdb014aab721421e1a4952c87 SHA512 1edafed18b1fd5d64844a3d121aacbf38dcde2b90adc9b4533f3192f1335365736e9cfd82f7c847980c9b1c1b72ee39470b38d6758b3a8f5ed59796d5005492b +DIST openssh-9.7_p1-X509-glue-15.0.patch.xz 1532 BLAKE2B ff2c5ca97607da84345342bec31435304780503d4f066bf181407c85981d8e73b622ca1107b303d0cf7bc61a262f6e8f38d5372a60d8389b8caf671cfa55b94b SHA512 48ec8e54e6e670ee2d2783fb38befd4101869cc7fc1a4e7b72058034a716170da62cae7e94a48acb575a1cec2604d5c02da629fbe482b7dbc5e28cf4d7ef7c01 +DIST openssh-9.7_p1-hpn-15.2-X509-15.0-glue.patch.xz 5472 BLAKE2B 6ebbc663aaaa54d3af3c204f0c2f11d8b3d4e5c842b38b82263d21659cebcceaaa6502c04bb5e06c4200b9aef9d267b61e33f94001efe30f8e57760d43df5292 SHA512 e90ceda65ccfc80c4dec580b6e64f3bd889443d6e7d627dc4fca4900776621d33f3da0856998a63560f195b1ed98e47c4401e40d6840518ee1ccb8ea150f21fe +DIST openssh-9.7p1+x509-15.0.diff.gz 1239003 BLAKE2B 98f6a6d531a9afb70d6f34dcd6609115e017d4b1738a0683dbabf66aba02382cf727db4fb07fd2a62534aa87318982e9d1c41991fdbf7cc3e6593d376ad08208 SHA512 c141bddd73fb78a8f0c92bbed6900bab6617768fc124c10ec4ea70491e1b545bbd962fa35ee5efd134a9851a1b807a5b8bae8e46585cf87a60e0311b49de3226 +DIST openssh-9.7p1.tar.gz 1848766 BLAKE2B 520859fcbdf678808fc8515b64585ab9a90a8055fa869df6fbba3083cb7f73ddb81ed9ea981e131520736a8aed838f85ae68ca63406a410df61039913c5cb48b SHA512 0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55 +DIST openssh-9.7p1.tar.gz.asc 833 BLAKE2B a95e952be48bd55a07d0a95a49dc06c326816c67b8b5d40bd3f64c28aa43122253817b8a088e7a3b8a190375ea39f9fc3400b22d035561f9643c1d32b5caef27 SHA512 e028978e4266de9ad513626b13d70249e4166923fc15f38751178e2b3522ff6ebb9a7ca7dc32d1bb42d42fb92adf9903dba1b734bec083010ed7323aadad8baf diff --git a/net-misc/openssh-contrib/files/openssh-6.7_p1-openssl-ignore-status.patch b/net-misc/openssh-contrib/files/openssh-6.7_p1-openssl-ignore-status.patch deleted file mode 100644 index fa33af39b6f8..000000000000 --- a/net-misc/openssh-contrib/files/openssh-6.7_p1-openssl-ignore-status.patch +++ /dev/null @@ -1,17 +0,0 @@ -the last nibble of the openssl version represents the status. that is, -whether it is a beta or release. when it comes to version checks in -openssh, this component does not matter, so ignore it. - -https://bugzilla.mindrot.org/show_bug.cgi?id=2212 - ---- a/openbsd-compat/openssl-compat.c -+++ b/openbsd-compat/openssl-compat.c -@@ -58,7 +58,7 @@ ssh_compatible_openssl(long headerver, long libver) - * For versions >= 1.0.0, major,minor,status must match and library - * fix version must be equal to or newer than the header. - */ -- mask = 0xfff0000fL; /* major,minor,status */ -+ mask = 0xfff00000L; /* major,minor,status */ - hfix = (headerver & 0x000ff000) >> 12; - lfix = (libver & 0x000ff000) >> 12; - if ( (headerver & mask) == (libver & mask) && lfix >= hfix) diff --git a/net-misc/openssh-contrib/files/openssh-7.5_p1-disable-conch-interop-tests.patch b/net-misc/openssh-contrib/files/openssh-7.5_p1-disable-conch-interop-tests.patch deleted file mode 100644 index a5647ce9d8d3..000000000000 --- a/net-misc/openssh-contrib/files/openssh-7.5_p1-disable-conch-interop-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -Disable conch interop tests which are failing when called -via portage for yet unknown reason and because using conch -seems to be flaky (test is failing when using Python2 but -passing when using Python3). - -Bug: https://bugs.gentoo.org/605446 - ---- a/regress/conch-ciphers.sh -+++ b/regress/conch-ciphers.sh -@@ -3,6 +3,10 @@ - - tid="conch ciphers" - -+# https://bugs.gentoo.org/605446 -+echo "conch interop tests skipped due to Gentoo bug #605446" -+exit 0 -+ - if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then - echo "conch interop tests not enabled" - exit 0 diff --git a/net-misc/openssh-contrib/files/openssh-7.9_p1-include-stdlib.patch b/net-misc/openssh-contrib/files/openssh-7.9_p1-include-stdlib.patch deleted file mode 100644 index c5697c2b8bd1..000000000000 --- a/net-misc/openssh-contrib/files/openssh-7.9_p1-include-stdlib.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/auth-options.c b/auth-options.c -index b05d6d6f..d1f42f04 100644 ---- a/auth-options.c -+++ b/auth-options.c -@@ -26,6 +26,7 @@ - #include <stdarg.h> - #include <ctype.h> - #include <limits.h> -+#include <stdlib.h> - - #include "openbsd-compat/sys-queue.h" - -diff --git a/hmac.c b/hmac.c -index 1c879640..a29f32c5 100644 ---- a/hmac.c -+++ b/hmac.c -@@ -19,6 +19,7 @@ - - #include <sys/types.h> - #include <string.h> -+#include <stdlib.h> - - #include "sshbuf.h" - #include "digest.h" -diff --git a/krl.c b/krl.c -index 8e2d5d5d..c32e147a 100644 ---- a/krl.c -+++ b/krl.c -@@ -28,6 +28,7 @@ - #include <string.h> - #include <time.h> - #include <unistd.h> -+#include <stdlib.h> - - #include "sshbuf.h" - #include "ssherr.h" -diff --git a/mac.c b/mac.c -index 51dc11d7..3d11eba6 100644 ---- a/mac.c -+++ b/mac.c -@@ -29,6 +29,7 @@ - - #include <string.h> - #include <stdio.h> -+#include <stdlib.h> - - #include "digest.h" - #include "hmac.h" diff --git a/net-misc/openssh-contrib/files/openssh-8.0_p1-fix-putty-tests.patch b/net-misc/openssh-contrib/files/openssh-8.0_p1-fix-putty-tests.patch deleted file mode 100644 index 4310aa123fc8..000000000000 --- a/net-misc/openssh-contrib/files/openssh-8.0_p1-fix-putty-tests.patch +++ /dev/null @@ -1,57 +0,0 @@ -Make sure that host keys are already accepted before -running tests. - -https://bugs.gentoo.org/493866 - ---- a/regress/putty-ciphers.sh -+++ b/regress/putty-ciphers.sh -@@ -10,11 +10,17 @@ fi - - for c in aes 3des aes128-ctr aes192-ctr aes256-ctr ; do - verbose "$tid: cipher $c" -+ rm -f ${COPY} - cp ${OBJ}/.putty/sessions/localhost_proxy \ - ${OBJ}/.putty/sessions/cipher_$c - echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c - -- rm -f ${COPY} -+ env HOME=$PWD echo "y" | ${PLINK} -load cipher_$c \ -+ -i ${OBJ}/putty.rsa2 "exit" -+ if [ $? -ne 0 ]; then -+ fail "failed to pre-cache host key" -+ fi -+ - env HOME=$PWD ${PLINK} -load cipher_$c -batch -i ${OBJ}/putty.rsa2 \ - cat ${DATA} > ${COPY} - if [ $? -ne 0 ]; then ---- a/regress/putty-kex.sh -+++ b/regress/putty-kex.sh -@@ -14,6 +14,12 @@ for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do - ${OBJ}/.putty/sessions/kex_$k - echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k - -+ env HOME=$PWD echo "y" | ${PLINK} -load kex_$k \ -+ -i ${OBJ}/putty.rsa2 "exit" -+ if [ $? -ne 0 ]; then -+ fail "failed to pre-cache host key" -+ fi -+ - env HOME=$PWD ${PLINK} -load kex_$k -batch -i ${OBJ}/putty.rsa2 true - if [ $? -ne 0 ]; then - fail "KEX $k failed" ---- a/regress/putty-transfer.sh -+++ b/regress/putty-transfer.sh -@@ -14,6 +14,13 @@ for c in 0 1 ; do - cp ${OBJ}/.putty/sessions/localhost_proxy \ - ${OBJ}/.putty/sessions/compression_$c - echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k -+ -+ env HOME=$PWD echo "y" | ${PLINK} -load compression_$c \ -+ -i ${OBJ}/putty.rsa2 "exit" -+ if [ $? -ne 0 ]; then -+ fail "failed to pre-cache host key" -+ fi -+ - env HOME=$PWD ${PLINK} -load compression_$c -batch \ - -i ${OBJ}/putty.rsa2 cat ${DATA} > ${COPY} - if [ $? -ne 0 ]; then diff --git a/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch b/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch deleted file mode 100644 index 7199227589c6..000000000000 --- a/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:06:45.020527770 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:07:01.294423665 -0700 -@@ -1414,14 +1414,3 @@ - # Example of overriding settings on a per-user basis - #Match User anoncvs - # X11Forwarding no --diff --git a/version.h b/version.h --index 6b4fa372..332fb486 100644 ----- a/version.h --+++ b/version.h --@@ -3,4 +3,5 @@ -- #define SSH_VERSION "OpenSSH_8.5" -- -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_HPN "-hpn15v2" --+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN diff --git a/net-misc/openssh-contrib/files/openssh-8.7_p1-GSSAPI-dns.patch b/net-misc/openssh-contrib/files/openssh-8.7_p1-GSSAPI-dns.patch deleted file mode 100644 index ffc40b70ae3d..000000000000 --- a/net-misc/openssh-contrib/files/openssh-8.7_p1-GSSAPI-dns.patch +++ /dev/null @@ -1,357 +0,0 @@ -diff --git a/auth.c b/auth.c -index 00b168b4..8ee93581 100644 ---- a/auth.c -+++ b/auth.c -@@ -729,118 +729,6 @@ fakepw(void) - return (&fake); - } - --/* -- * Returns the remote DNS hostname as a string. The returned string must not -- * be freed. NB. this will usually trigger a DNS query the first time it is -- * called. -- * This function does additional checks on the hostname to mitigate some -- * attacks on based on conflation of hostnames and IP addresses. -- */ -- --static char * --remote_hostname(struct ssh *ssh) --{ -- struct sockaddr_storage from; -- socklen_t fromlen; -- struct addrinfo hints, *ai, *aitop; -- char name[NI_MAXHOST], ntop2[NI_MAXHOST]; -- const char *ntop = ssh_remote_ipaddr(ssh); -- -- /* Get IP address of client. */ -- fromlen = sizeof(from); -- memset(&from, 0, sizeof(from)); -- if (getpeername(ssh_packet_get_connection_in(ssh), -- (struct sockaddr *)&from, &fromlen) == -1) { -- debug("getpeername failed: %.100s", strerror(errno)); -- return xstrdup(ntop); -- } -- -- ipv64_normalise_mapped(&from, &fromlen); -- if (from.ss_family == AF_INET6) -- fromlen = sizeof(struct sockaddr_in6); -- -- debug3("Trying to reverse map address %.100s.", ntop); -- /* Map the IP address to a host name. */ -- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), -- NULL, 0, NI_NAMEREQD) != 0) { -- /* Host name not found. Use ip address. */ -- return xstrdup(ntop); -- } -- -- /* -- * if reverse lookup result looks like a numeric hostname, -- * someone is trying to trick us by PTR record like following: -- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 -- */ -- memset(&hints, 0, sizeof(hints)); -- hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -- hints.ai_flags = AI_NUMERICHOST; -- if (getaddrinfo(name, NULL, &hints, &ai) == 0) { -- logit("Nasty PTR record \"%s\" is set up for %s, ignoring", -- name, ntop); -- freeaddrinfo(ai); -- return xstrdup(ntop); -- } -- -- /* Names are stored in lowercase. */ -- lowercase(name); -- -- /* -- * Map it back to an IP address and check that the given -- * address actually is an address of this host. This is -- * necessary because anyone with access to a name server can -- * define arbitrary names for an IP address. Mapping from -- * name to IP address can be trusted better (but can still be -- * fooled if the intruder has access to the name server of -- * the domain). -- */ -- memset(&hints, 0, sizeof(hints)); -- hints.ai_family = from.ss_family; -- hints.ai_socktype = SOCK_STREAM; -- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { -- logit("reverse mapping checking getaddrinfo for %.700s " -- "[%s] failed.", name, ntop); -- return xstrdup(ntop); -- } -- /* Look for the address from the list of addresses. */ -- for (ai = aitop; ai; ai = ai->ai_next) { -- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, -- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && -- (strcmp(ntop, ntop2) == 0)) -- break; -- } -- freeaddrinfo(aitop); -- /* If we reached the end of the list, the address was not there. */ -- if (ai == NULL) { -- /* Address not found for the host name. */ -- logit("Address %.100s maps to %.600s, but this does not " -- "map back to the address.", ntop, name); -- return xstrdup(ntop); -- } -- return xstrdup(name); --} -- --/* -- * Return the canonical name of the host in the other side of the current -- * connection. The host name is cached, so it is efficient to call this -- * several times. -- */ -- --const char * --auth_get_canonical_hostname(struct ssh *ssh, int use_dns) --{ -- static char *dnsname; -- -- if (!use_dns) -- return ssh_remote_ipaddr(ssh); -- else if (dnsname != NULL) -- return dnsname; -- else { -- dnsname = remote_hostname(ssh); -- return dnsname; -- } --} -- - /* These functions link key/cert options to the auth framework */ - - /* Log sshauthopt options locally and (optionally) for remote transmission */ -diff --git a/canohost.c b/canohost.c -index a810da0e..18e9d8d4 100644 ---- a/canohost.c -+++ b/canohost.c -@@ -202,3 +202,117 @@ get_local_port(int sock) - { - return get_sock_port(sock, 1); - } -+ -+/* -+ * Returns the remote DNS hostname as a string. The returned string must not -+ * be freed. NB. this will usually trigger a DNS query the first time it is -+ * called. -+ * This function does additional checks on the hostname to mitigate some -+ * attacks on legacy rhosts-style authentication. -+ * XXX is RhostsRSAAuthentication vulnerable to these? -+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) -+ */ -+ -+static char * -+remote_hostname(struct ssh *ssh) -+{ -+ struct sockaddr_storage from; -+ socklen_t fromlen; -+ struct addrinfo hints, *ai, *aitop; -+ char name[NI_MAXHOST], ntop2[NI_MAXHOST]; -+ const char *ntop = ssh_remote_ipaddr(ssh); -+ -+ /* Get IP address of client. */ -+ fromlen = sizeof(from); -+ memset(&from, 0, sizeof(from)); -+ if (getpeername(ssh_packet_get_connection_in(ssh), -+ (struct sockaddr *)&from, &fromlen) == -1) { -+ debug("getpeername failed: %.100s", strerror(errno)); -+ return xstrdup(ntop); -+ } -+ -+ ipv64_normalise_mapped(&from, &fromlen); -+ if (from.ss_family == AF_INET6) -+ fromlen = sizeof(struct sockaddr_in6); -+ -+ debug3("Trying to reverse map address %.100s.", ntop); -+ /* Map the IP address to a host name. */ -+ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), -+ NULL, 0, NI_NAMEREQD) != 0) { -+ /* Host name not found. Use ip address. */ -+ return xstrdup(ntop); -+ } -+ -+ /* -+ * if reverse lookup result looks like a numeric hostname, -+ * someone is trying to trick us by PTR record like following: -+ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 -+ */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -+ hints.ai_flags = AI_NUMERICHOST; -+ if (getaddrinfo(name, NULL, &hints, &ai) == 0) { -+ logit("Nasty PTR record \"%s\" is set up for %s, ignoring", -+ name, ntop); -+ freeaddrinfo(ai); -+ return xstrdup(ntop); -+ } -+ -+ /* Names are stored in lowercase. */ -+ lowercase(name); -+ -+ /* -+ * Map it back to an IP address and check that the given -+ * address actually is an address of this host. This is -+ * necessary because anyone with access to a name server can -+ * define arbitrary names for an IP address. Mapping from -+ * name to IP address can be trusted better (but can still be -+ * fooled if the intruder has access to the name server of -+ * the domain). -+ */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = from.ss_family; -+ hints.ai_socktype = SOCK_STREAM; -+ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { -+ logit("reverse mapping checking getaddrinfo for %.700s " -+ "[%s] failed.", name, ntop); -+ return xstrdup(ntop); -+ } -+ /* Look for the address from the list of addresses. */ -+ for (ai = aitop; ai; ai = ai->ai_next) { -+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, -+ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && -+ (strcmp(ntop, ntop2) == 0)) -+ break; -+ } -+ freeaddrinfo(aitop); -+ /* If we reached the end of the list, the address was not there. */ -+ if (ai == NULL) { -+ /* Address not found for the host name. */ -+ logit("Address %.100s maps to %.600s, but this does not " -+ "map back to the address.", ntop, name); -+ return xstrdup(ntop); -+ } -+ return xstrdup(name); -+} -+ -+/* -+ * Return the canonical name of the host in the other side of the current -+ * connection. The host name is cached, so it is efficient to call this -+ * several times. -+ */ -+ -+const char * -+auth_get_canonical_hostname(struct ssh *ssh, int use_dns) -+{ -+ static char *dnsname; -+ -+ if (!use_dns) -+ return ssh_remote_ipaddr(ssh); -+ else if (dnsname != NULL) -+ return dnsname; -+ else { -+ dnsname = remote_hostname(ssh); -+ return dnsname; -+ } -+} -diff --git a/readconf.c b/readconf.c -index 03369a08..b45898ce 100644 ---- a/readconf.c -+++ b/readconf.c -@@ -161,6 +161,7 @@ typedef enum { - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssTrustDns, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist, - oHashKnownHosts, -@@ -207,9 +208,11 @@ static struct { - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, - # else - { "gssapiauthentication", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, - #endif - #ifdef ENABLE_PKCS11 - { "pkcs11provider", oPKCS11Provider }, -@@ -1117,6 +1120,10 @@ parse_time: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -2307,6 +2314,7 @@ initialize_options(Options * options) - options->pubkey_authentication = -1; - options->gss_authentication = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -2465,6 +2473,8 @@ fill_default_options(Options * options) - options->gss_authentication = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -diff --git a/readconf.h b/readconf.h -index f7d53b06..c3a91898 100644 ---- a/readconf.h -+++ b/readconf.h -@@ -40,6 +40,7 @@ typedef struct { - int hostbased_authentication; /* ssh2's rhosts_rsa */ - int gss_authentication; /* Try GSS authentication */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -diff --git a/ssh_config.5 b/ssh_config.5 -index cd0eea86..27101943 100644 ---- a/ssh_config.5 -+++ b/ssh_config.5 -@@ -832,6 +832,16 @@ The default is - Forward (delegate) credentials to the server. - The default is - .Cm no . -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -diff --git a/sshconnect2.c b/sshconnect2.c -index fea50fab..aeff639b 100644 ---- a/sshconnect2.c -+++ b/sshconnect2.c -@@ -776,6 +776,13 @@ userauth_gssapi(struct ssh *ssh) - OM_uint32 min; - int r, ok = 0; - gss_OID mech = NULL; -+ const char *gss_host; -+ -+ if (options.gss_trust_dns) { -+ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); -+ gss_host = auth_get_canonical_hostname(ssh, 1); -+ } else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ -@@ -790,7 +797,7 @@ userauth_gssapi(struct ssh *ssh) - elements[authctxt->mech_tried]; - /* My DER encoding requires length<128 */ - if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt, -- mech, authctxt->host)) { -+ mech, gss_host)) { - ok = 1; /* Mechanism works */ - } else { - authctxt->mech_tried++; diff --git a/net-misc/openssh-contrib/files/openssh-8.9_p1-allow-ppoll_time64.patch b/net-misc/openssh-contrib/files/openssh-8.9_p1-allow-ppoll_time64.patch deleted file mode 100644 index 8c46625aa29c..000000000000 --- a/net-misc/openssh-contrib/files/openssh-8.9_p1-allow-ppoll_time64.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 2e065ba3..4ce80cb2 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_ppoll - SC_ALLOW(__NR_ppoll), - #endif -+#ifdef __NR_ppoll_time64 -+ SC_ALLOW(__NR_ppoll_time64), -+#endif - #ifdef __NR_poll - SC_ALLOW(__NR_poll), - #endif diff --git a/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch b/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch deleted file mode 100644 index 9e08b2a553c2..000000000000 --- a/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gss-serv.c b/gss-serv.c -index b5d4bb2d..00e3d118 100644 ---- a/gss-serv.c -+++ b/gss-serv.c -@@ -105,7 +105,7 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx) - gss_create_empty_oid_set(&status, &oidset); - gss_add_oid_set_member(&status, ctx->oid, &oidset); - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -+ if (gethostname(lname, HOST_NAME_MAX)) { - gss_release_oid_set(&status, &oidset); - return (-1); - } diff --git a/net-misc/openssh-contrib/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch b/net-misc/openssh-contrib/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch deleted file mode 100644 index 4d098b2231c7..000000000000 --- a/net-misc/openssh-contrib/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 23b40b643..d93a357c6 100644 ---- 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-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch b/net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch deleted file mode 100644 index b571ae253fff..000000000000 --- a/net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://bugzilla.mindrot.org/show_bug.cgi?id=3548 ---- a/openbsd-compat/openssl-compat.c -+++ b/openbsd-compat/openssl-compat.c -@@ -48,19 +48,25 @@ ssh_compatible_openssl(long headerver, long libver) - if (headerver == libver) - return 1; - -- /* for versions < 1.0.0, major,minor,fix,status must match */ -- if (headerver < 0x1000000f) { -- mask = 0xfffff00fL; /* major,minor,fix,status */ -- return (headerver & mask) == (libver & mask); -+ /* -+ * For versions < 3.0.0, major,minor,status must match and library -+ * fix version must be equal to or newer than the header. -+ */ -+ if (headerver < 0x3000000f) { -+ mask = 0xfff0000fL; /* major,minor,status */ -+ hfix = (headerver & 0x000ff000) >> 12; -+ lfix = (libver & 0x000ff000) >> 12; -+ if ( (headerver & mask) == (libver & mask) && lfix >= hfix) -+ return 1; - } - - /* -- * For versions >= 1.0.0, major,minor,status must match and library -- * fix version must be equal to or newer than the header. -+ * For versions >= 3.0.0, major must match and minor,status must be -+ * equal to or greater than the header. - */ -- mask = 0xfff00000L; /* major,minor,status */ -- hfix = (headerver & 0x000ff000) >> 12; -- lfix = (libver & 0x000ff000) >> 12; -+ mask = 0xf000000fL; /* major, status */ -+ hfix = (headerver & 0x0ffffff0L) >> 12; -+ lfix = (libver & 0x0ffffff0L) >> 12; - if ( (headerver & mask) == (libver & mask) && lfix >= hfix) - return 1; - return 0; ---- a/openbsd-compat/regress/opensslvertest.c -+++ b/openbsd-compat/regress/opensslvertest.c -@@ -31,7 +31,7 @@ struct version_test { - { 0x0090802fL, 0x0090804fL, 1}, /* newer library fix version: ok */ - { 0x0090802fL, 0x0090801fL, 1}, /* older library fix version: ok */ - { 0x0090802fL, 0x0090702fL, 0}, /* older library minor version: NO */ -- { 0x0090802fL, 0x0090902fL, 0}, /* newer library minor version: NO */ -+ { 0x0090802fL, 0x0090902fL, 1}, /* newer library minor version: ok */ - { 0x0090802fL, 0x0080802fL, 0}, /* older library major version: NO */ - { 0x0090802fL, 0x1000100fL, 0}, /* newer library major version: NO */ - -@@ -41,7 +41,7 @@ struct version_test { - { 0x1000101fL, 0x1000100fL, 1}, /* older library patch version: ok */ - { 0x1000101fL, 0x1000201fL, 1}, /* newer library fix version: ok */ - { 0x1000101fL, 0x1000001fL, 0}, /* older library fix version: NO */ -- { 0x1000101fL, 0x1010101fL, 0}, /* newer library minor version: NO */ -+ { 0x1000101fL, 0x1010101fL, 1}, /* newer library minor version: ok */ - { 0x1000101fL, 0x0000101fL, 0}, /* older library major version: NO */ - { 0x1000101fL, 0x2000101fL, 0}, /* newer library major version: NO */ - }; diff --git a/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch b/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch deleted file mode 100644 index f1336bbe0380..000000000000 --- a/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/912766 -https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621 - -From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001 -From: Darren Tucker <dtucker@dtucker.net> -Date: Sat, 19 Aug 2023 07:39:08 +1000 -Subject: [PATCH] Fix zlib version check for 1.3 and future version. - -bz#3604. ---- a/configure.ac -+++ b/configure.ac -@@ -1464,7 +1464,7 @@ else - [[ - int a=0, b=0, c=0, d=0, n, v; - n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d); -- if (n != 3 && n != 4) -+ if (n < 1) - exit(1); - v = a*1000000 + b*10000 + c*100 + d; - fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v); - diff --git a/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch b/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch new file mode 100644 index 000000000000..379a3981d7ea --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch @@ -0,0 +1,44 @@ +From 45b491ce13fcf7dbc0b3bd6df986c9cf59190721 Mon Sep 17 00:00:00 2001 +From: Jordan R Abrahams-Whitehead <ajordanr@google.com> +Date: Tue, 12 Dec 2023 22:54:02 +0000 +Subject: [PATCH] Allow MAP_NORESERVE in sandbox seccomp filter maps + +While debugging Scudo on ChromeOS, we found that the no reserve mode +immediately crashed `sshd`. We tracked it down to the +sandbox-seccomp-filter. + +Being able to mmap with MAP_NORESERVE is useful (if not necessary) for +some overcommitting allocators. + +During mmap calls, the flag MAP_NORESERVE is used by some allocators +such as LLVM's Scudo for layout optimisation. This causes the sandbox +seccomp filter for the client subprocess to die with some Scudo +configurations. + +Upstream patch submission: +https://lists.mindrot.org/pipermail/openssh-unix-dev/2023-December/041095.html +--- + sandbox-seccomp-filter.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 23b40b643..a49c5ca99 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -190,9 +190,11 @@ + + #if defined(__NR_mmap) || defined(__NR_mmap2) + # ifdef MAP_FIXED_NOREPLACE +-# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_FIXED_NOREPLACE ++# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \ ++ |MAP_NORESERVE|MAP_FIXED_NOREPLACE + # else +-# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED ++# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \ ++ |MAP_NORESERVE + # endif /* MAP_FIXED_NOREPLACE */ + /* Use this for both __NR_mmap and __NR_mmap2 variants */ + # define SC_MMAP(_nr) \ +-- +2.43.0.472.g3155946c3a-goog + diff --git a/net-misc/openssh-contrib/files/openssh-9.6_p1-CVE-2024-6387.patch b/net-misc/openssh-contrib/files/openssh-9.6_p1-CVE-2024-6387.patch new file mode 100644 index 000000000000..7b7fb70380d9 --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.6_p1-CVE-2024-6387.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/935271 +Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2. +--- a/log.c ++++ b/log.c +@@ -451,12 +451,14 @@ void + sshsigdie(const char *file, const char *func, int line, int showfunc, + LogLevel level, const char *suffix, const char *fmt, ...) + { ++#ifdef SYSLOG_R_SAFE_IN_SIGHAND + va_list args; + + va_start(args, fmt); + sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, + suffix, fmt, args); + va_end(args); ++#endif + _exit(1); + } + diff --git a/net-misc/openssh-contrib/files/openssh-9.6_p1-chaff-logic.patch b/net-misc/openssh-contrib/files/openssh-9.6_p1-chaff-logic.patch new file mode 100644 index 000000000000..90544d1a457e --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.6_p1-chaff-logic.patch @@ -0,0 +1,16 @@ +"Minor logic error in ObscureKeystrokeTiming" +https://marc.info/?l=oss-security&m=171982317624594&w=2 +--- a/clientloop.c ++++ b/clientloop.c +@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, + if (timespeccmp(&now, &chaff_until, >=)) { + /* Stop if there have been no keystrokes for a while */ + stop_reason = "chaff time expired"; +- } else if (timespeccmp(&now, &next_interval, >=)) { +- /* Otherwise if we were due to send, then send chaff */ ++ } else if (timespeccmp(&now, &next_interval, >=) && ++ !ssh_packet_have_data_to_write(ssh)) { ++ /* If due to send but have no data, then send chaff */ + if (send_chaff(ssh)) + nchaff++; + } diff --git a/net-misc/openssh-contrib/files/openssh-9.6_p1-fix-xmss-c99.patch b/net-misc/openssh-contrib/files/openssh-9.6_p1-fix-xmss-c99.patch new file mode 100644 index 000000000000..cf06b80cd5fa --- /dev/null +++ b/net-misc/openssh-contrib/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-contrib/files/openssh-8.6_p1-hpn-version.patch b/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch index 6dc290d6737b..95a69815b822 100644 --- a/net-misc/openssh-contrib/files/openssh-8.6_p1-hpn-version.patch +++ b/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch @@ -5,7 +5,7 @@ index 34808b5c..88d7ccac 100644 @@ -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", + if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s\r\n", - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, version_addendum == NULL ? "" : " ", diff --git a/net-misc/openssh-contrib/files/openssh-9.7_p1-X509-CVE-2024-6387.patch b/net-misc/openssh-contrib/files/openssh-9.7_p1-X509-CVE-2024-6387.patch new file mode 100644 index 000000000000..7de772777107 --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.7_p1-X509-CVE-2024-6387.patch @@ -0,0 +1,29 @@ +diff -u a/openssh-9.7p1+x509-15.0.diff b/openssh-9.7p1+x509-15.0.diff +--- a/openssh-9.7p1+x509-15.0.diff 2024-07-02 08:34:12.300470515 -0700 ++++ b/openssh-9.7p1+x509-15.0.diff 2024-07-02 08:35:27.016991183 -0700 +@@ -69916,7 +69916,7 @@ + closelog(); + #endif + } +-@@ -424,81 +473,121 @@ ++@@ -424,81 +473,113 @@ + } + + void +@@ -69955,15 +69955,7 @@ + +sshsigdie(const char *file, const char *func, int line, + + const char *fmt,...) + { +-+#if 1 +-+/* NOTE: "OpenSSH bug 3286". See grace_alarm_handler() in sshd.c. +-+ * Logging in signal handler cannot be considered as safe. +-+ * Let enable log as now daemon does not sent explicitly alarm +-+ * signal. This should avoid logging in child signal handler. +-+ */ +-+# define DO_LOG_SAFE_IN_SIGHAND +-+#endif +-+#ifdef DO_LOG_SAFE_IN_SIGHAND +++#ifdef SYSLOG_R_SAFE_IN_SIGHAND + va_list args; + + va_start(args, fmt); diff --git a/net-misc/openssh-contrib/files/openssh-9.7_p1-config-tweaks.patch b/net-misc/openssh-contrib/files/openssh-9.7_p1-config-tweaks.patch new file mode 100644 index 000000000000..229f7484cff5 --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.7_p1-config-tweaks.patch @@ -0,0 +1,27 @@ +diff -Naur a/ssh_config b/ssh_config +--- a/ssh_config 2024-03-11 05:20:49.000000000 +0000 ++++ b/ssh_config 2024-06-10 16:30:15.863023773 +0100 +@@ -13,6 +13,9 @@ + # Thus, host-specific definitions should be at the beginning of the + # configuration file, and defaults at the end. + ++# Make sure that all Host and Match options are below this Include! ++Include "/etc/ssh/ssh_config.d/*.conf" ++ + # Site-wide defaults for some commonly used options. For a comprehensive + # list of available options, their meanings and defaults, please see the + # ssh_config(5) man page. +diff -Naur a/sshd_config b/sshd_config +--- a/sshd_config 2024-06-10 16:19:01.530491925 +0100 ++++ b/sshd_config 2024-06-10 16:32:49.766386759 +0100 +@@ -105,8 +105,8 @@ + # no default banner path + #Banner none + +-# override default of no subsystems +-Subsystem sftp /usr/libexec/sftp-server ++# Make sure that all Match options are below this Include! ++Include "/etc/ssh/sshd_config.d/*.conf" + + # Example of overriding settings on a per-user basis + #Match User anoncvs diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild deleted file mode 100644 index 0f1d186dacc6..000000000000 --- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild +++ /dev/null @@ -1,532 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig - -# Make it more portable between straight releases -# and _p? releases. -MY_P=${P/-contrib/} -PARCH=${MY_P/_} - -# PV to USE for HPN patches -#HPN_PV="${PV^^}" -HPN_PV="8.5_P1" - -HPN_VER="15.2" -HPN_PATCHES=( - openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - openssh-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) -HPN_GLUE_PATCH="openssh-9.3_p1-hpn-${HPN_VER}-glue.patch" -HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}" - -SCTP_VER="1.2" -SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" - -X509_VER="14.1.1" -X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" -X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch" -X509_HPN_GLUE_PATCH="openssh-9.3_p1-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" - -DESCRIPTION="Port of OpenBSD's free SSH release with HPN/SCTP/X509 patches" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( - $(printf "mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}") - https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz - )} - ${X509_VER:+X509? ( - https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} - https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz - ${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )} - )} - verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) -" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -#KEYWORDS="~amd64" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - hpn? ( ssl ) - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp ssl !xmss ) - 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(+)] ) - sctp? ( net-misc/lksctp-tools[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=" - !net-misc/openssh - 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} - pam? ( >=sys-auth/pambase-20081028 ) - !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) -" -# Weird dep construct for newer gcc-config for bug #872416 -BDEPEND=" - sys-devel/autoconf - virtual/pkgconfig - || ( - >=sys-devel/gcc-config-2.6 - >=sys-devel/clang-toolchain-symlinks-14-r1:14 - >=sys-devel/clang-toolchain-symlinks-15-r1:15 - >=sys-devel/clang-toolchain-symlinks-16-r1:* - ) - verify-sig? ( sec-keys/openpgp-keys-openssh ) -" - -PATCHES=( - "${FILESDIR}/openssh-7.9_p1-include-stdlib.patch" - "${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex - "${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch" - "${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch" - "${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch" - "${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" - "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 - "${FILESDIR}/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044 - "${FILESDIR}/openssh-9.3_p1-openssl-version-compat-check.patch" - "${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767 -) - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - local missing=() - check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); } - check_feature hpn HPN_VER - check_feature sctp SCTP_PATCH - check_feature X509 X509_PATCH - if [[ ${#missing[@]} -ne 0 ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${missing[*]}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "Missing requested third party patch." - 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_unpack() { - default - - # We don't have signatures for HPN, X509, so we have to write this ourselves - use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply -- "${PATCHES[@]}" - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" &>/dev/null || die - eapply "${WORKDIR}/${X509_GLUE_PATCH}" - popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}/openssh-9.0_p1-X509-uninitialized-delay.patch" - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - - if use hpn ; then - local hpn_patchdir="${T}/openssh-${PV}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" || die - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${WORKDIR}/${HPN_GLUE_PATCH}" - use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}" - use sctp && eapply "${FILESDIR}"/openssh-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - # Before re-enabling, check https://bugs.gentoo.org/354113#c6 - # and be sure to have tested it. - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use sctp || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - eapply_user #473004 - - # 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 - --with-hardening - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(usex X509 '' "$(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 - # https://bugs.gentoo.org/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 CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - 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() { - 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 - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild deleted file mode 100644 index be111b810be1..000000000000 --- a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild +++ /dev/null @@ -1,507 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig - -# Make it more portable between straight releases -# and _p? releases. -MY_P=${P/-contrib/} -PARCH=${MY_P/_} - -# PV to USE for HPN patches -#HPN_PV="${PV^^}" -HPN_PV="8.5_P1" - -HPN_VER="15.2" -HPN_PATCHES=( - openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) -HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch" -HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}" - -X509_VER="14.1.1" -X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" -X509_PATCH="${X509_PATCH/p2/p1}" -X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch" -X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" - -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[@]}") - https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz - )} - ${X509_VER:+X509? ( - https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} - https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz - ${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )} - )} - verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) -" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - hpn? ( ssl ) - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( ssl !xmss ) - 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=" - !net-misc/openssh - 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} - pam? ( >=sys-auth/pambase-20081028 ) - !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) -" -# Weird dep construct for newer gcc-config for bug #872416 -BDEPEND=" - sys-devel/autoconf - virtual/pkgconfig - || ( - >=sys-devel/gcc-config-2.6 - >=sys-devel/clang-toolchain-symlinks-14-r1:14 - >=sys-devel/clang-toolchain-symlinks-15-r1:15 - >=sys-devel/clang-toolchain-symlinks-16-r1:* - ) - verify-sig? ( sec-keys/openpgp-keys-openssh ) -" - -PATCHES=( - "${FILESDIR}/openssh-7.9_p1-include-stdlib.patch" - "${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex - "${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch" - "${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch" - "${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch" - "${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" - "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 - "${FILESDIR}/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044 - "${FILESDIR}/openssh-9.3_p1-openssl-version-compat-check.patch" - "${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767 -) - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - local missing=() - check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); } - check_feature hpn HPN_VER - check_feature X509 X509_PATCH - if [[ ${#missing[@]} -ne 0 ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${missing[*]}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "Missing requested third party patch." - 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_unpack() { - default - - # We don't have signatures for HPN, X509, so we have to write this ourselves - use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply -- "${PATCHES[@]}" - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" &>/dev/null || die - eapply "${WORKDIR}/${X509_GLUE_PATCH}" - popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}/openssh-9.0_p1-X509-uninitialized-delay.patch" - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use hpn ; then - local hpn_patchdir="${T}/openssh-${PV}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" || die - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${WORKDIR}/${HPN_GLUE_PATCH}" - use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}" - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - # Before re-enabling, check https://bugs.gentoo.org/354113#c6 - # and be sure to have tested it. - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - eapply_user #473004 - - # 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 - --with-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) - $(usex X509 '' "$(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 - # https://bugs.gentoo.org/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 CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - 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() { - 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 - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh-contrib/openssh-contrib-9.4_p1-r1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.4_p1-r1.ebuild deleted file mode 100644 index f89717ebbebf..000000000000 --- a/net-misc/openssh-contrib/openssh-contrib-9.4_p1-r1.ebuild +++ /dev/null @@ -1,506 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig - -# Make it more portable between straight releases -# and _p? releases. -MY_P=${P/-contrib/} -PARCH=${MY_P/_} - -# PV to USE for HPN patches -#HPN_PV="${PV^^}" -HPN_PV="8.5_P1" - -HPN_VER="15.2" -HPN_PATCHES=( - openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) -HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch" -HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}" - -X509_VER="14.2.1" -X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" -X509_PATCH="${X509_PATCH/p2/p1}" -X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch" -#X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" -X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER%.1}-glue.patch" - -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[@]}") - https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz - )} - ${X509_VER:+X509? ( - https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} - https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz - ${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )} - )} - verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) -" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - hpn? ( ssl ) - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( ssl !xmss ) - 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=" - !net-misc/openssh - 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} - pam? ( >=sys-auth/pambase-20081028 ) - !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) -" -# Weird dep construct for newer gcc-config for bug #872416 -BDEPEND=" - sys-devel/autoconf - virtual/pkgconfig - || ( - >=sys-devel/gcc-config-2.6 - >=sys-devel/clang-toolchain-symlinks-14-r1:14 - >=sys-devel/clang-toolchain-symlinks-15-r1:15 - >=sys-devel/clang-toolchain-symlinks-16-r1:* - ) - verify-sig? ( sec-keys/openpgp-keys-openssh ) -" - -PATCHES=( - "${FILESDIR}/openssh-7.9_p1-include-stdlib.patch" - "${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex - "${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch" - "${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch" - "${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch" - "${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" - "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 - "${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767 -) - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - local missing=() - check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); } - check_feature hpn HPN_VER - check_feature X509 X509_PATCH - if [[ ${#missing[@]} -ne 0 ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${missing[*]}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "Missing requested third party patch." - 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_unpack() { - default - - # We don't have signatures for HPN, X509, so we have to write this ourselves - use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply -- "${PATCHES[@]}" - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" &>/dev/null || die - eapply "${WORKDIR}/${X509_GLUE_PATCH}" - popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}/openssh-9.0_p1-X509-uninitialized-delay.patch" - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use hpn ; then - local hpn_patchdir="${T}/openssh-${PV}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" || die - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${WORKDIR}/${HPN_GLUE_PATCH}" - use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}" - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - # Before re-enabling, check https://bugs.gentoo.org/354113#c6 - # and be sure to have tested it. - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - eapply_user #473004 - - # 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 - --with-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) - $(usex X509 '' "$(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 - # https://bugs.gentoo.org/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 CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - 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() { - 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 - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r4.ebuild index c3edf7d34d2d..6686d35c898f 100644 --- a/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild +++ b/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r4.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 -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig +inherit user-info optfeature flag-o-matic autotools pam systemd toolchain-funcs verify-sig # Make it more portable between straight releases # and _p? releases. @@ -19,10 +19,10 @@ HPN_PATCHES=( openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff ) -HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch" +HPN_GLUE_PATCH="openssh-9.6_p1-hpn-${HPN_VER}-glue.patch" HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}" -X509_VER="14.3" +X509_VER="15.0" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" X509_PATCH="${X509_PATCH/p2/p1}" X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch" @@ -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? ( @@ -59,7 +59,7 @@ REQUIRED_USE=" ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) - X509? ( ssl !xmss ) + X509? ( ssl !xmss !security-key ) xmss? ( ssl ) test? ( ssl ) " @@ -74,51 +74,45 @@ LIB_DEPEND=" 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=" - !net-misc/openssh acct-group/sshd acct-user/sshd !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( ${LIB_DEPEND} ) " -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} + !net-misc/openssh pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) " -# Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - sys-devel/autoconf + dev-build/autoconf virtual/pkgconfig - || ( - >=sys-devel/gcc-config-2.6 - >=sys-devel/clang-toolchain-symlinks-14-r1:14 - >=sys-devel/clang-toolchain-symlinks-15-r1:15 - >=sys-devel/clang-toolchain-symlinks-16-r1:* - ) verify-sig? ( sec-keys/openpgp-keys-openssh ) " PATCHES=( - "${FILESDIR}/openssh-7.9_p1-include-stdlib.patch" - "${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex - "${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch" - "${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch" - "${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch" - "${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" - "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 + "${FILESDIR}/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/openssh-9.6_p1-fix-xmss-c99.patch" + "${FILESDIR}/openssh-9.7_p1-config-tweaks.patch" +) + +NON_X509_PATCHES=( + "${FILESDIR}/openssh-9.6_p1-chaff-logic.patch" + "${FILESDIR}/openssh-9.6_p1-CVE-2024-6387.patch" ) pkg_pretend() { @@ -158,15 +152,16 @@ src_prepare() { # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - eapply -- "${PATCHES[@]}" + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + eapply -- "${PATCHES[@]}" local PATCHSET_VERSION_MACROS=() if use X509 ; then pushd "${WORKDIR}" &>/dev/null || die eapply "${WORKDIR}/${X509_GLUE_PATCH}" + eapply "${FILESDIR}/openssh-9.7_p1-X509-CVE-2024-6387.patch" popd &>/dev/null || die eapply "${WORKDIR}"/${X509_PATCH%.*} @@ -185,6 +180,8 @@ src_prepare() { -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ "${S}"/version.h || die "Failed to sed-in X.509 patch version" PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) + else + eapply "${NON_X509_PATCHES[@]}" fi if use hpn ; then @@ -198,7 +195,7 @@ src_prepare() { eapply "${hpn_patchdir}" - use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" + use X509 || eapply "${FILESDIR}/openssh-9.6_p1-hpn-version.patch" einfo "Patching Makefile.in for HPN patch set ..." sed -i \ @@ -297,7 +294,27 @@ src_configure() { --datadir="${EPREFIX}"/usr/share/openssh --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd - --with-hardening + # 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) @@ -305,6 +322,7 @@ src_configure() { $(use_with pam) $(use_with pie) $(use_with selinux) + $(use_with security-key security-key-builtin) $(usex X509 '' "$(use_with security-key security-key-builtin)") $(use_with ssl openssl) $(use_with ssl ssl-engine) @@ -312,7 +330,6 @@ src_configure() { if use elibc_musl; then # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 myconf+=( --disable-utmp --disable-wtmp ) fi @@ -323,24 +340,7 @@ src_configure() { 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() { +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 @@ -351,15 +351,9 @@ tweak_ssh_configs() { 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 + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die # Send locale environment variables (bug #367017) SendEnv ${locale_vars[*]} @@ -367,16 +361,16 @@ tweak_ssh_configs() { SendEnv COLORTERM EOF - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + cat <<-EOF > "${WORKDIR}"/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 + 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 >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die # Allow client to pass locale environment variables (bug #367017) AcceptEnv ${locale_vars[*]} @@ -384,8 +378,13 @@ tweak_ssh_configs() { AcceptEnv COLORTERM EOF + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-subsystem.conf || die + # override default of no subsystems + Subsystem sftp ${EPREFIX}/usr/$(get_libdir)/misc/sftp-server + EOF + if use pam ; then - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die UsePAM yes # This interferes with PAM. PasswordAuthentication no @@ -396,13 +395,34 @@ tweak_ssh_configs() { fi if use livecd ; then - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + 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 + 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 REGRESS_INTEROP_PUTTY=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + src_install() { emake install-nokeys DESTDIR="${D}" fperms 600 /etc/ssh/sshd_config @@ -414,20 +434,25 @@ src_install() { newpamd "${FILESDIR}"/sshd.pam_include.2 sshd fi - tweak_ssh_configs - doman contrib/ssh-copy-id.1 dodoc CREDITS OVERVIEW README* TODO sshd_config use hpn && dodoc HPN-README use X509 || dodoc ChangeLog - 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' + + # Install dropins with explicit mode, bug 906638, 915840 + diropts -m0755 + insopts -m0644 + insinto /etc/ssh + doins -r "${WORKDIR}"/etc/ssh/ssh_config.d + diropts -m0700 + insopts -m0600 + doins -r "${WORKDIR}"/etc/ssh/sshd_config.d } pkg_preinst() { @@ -437,6 +462,9 @@ pkg_preinst() { } 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 diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 6b2564313240..a99ea426fb91 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,8 +1,6 @@ -DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 45578edf98bba3d23c7cefe60d8a7d3079e7c6676459f7422ace7a2461ab96943fbcadb478633a80f40bc098f2435722850b563714adb78b14922be53cb5753d SHA512 087ff6fe5f6caab4c6c3001d906399e02beffad7277280f11187420c2939fd4befdcb14643862a657ce4cad2f115b82a0a1a2c99df6ee54dcd76b53647637c19 -DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B e6533d64b117a400b76b90f71fa856d352dea57d91e4e89fa375429403ac0734cc0a2f075bc58c6bb4f40a8f9776735aa36bdb0bbf3880a2115cea787633e48b SHA512 6222378eb24a445c6c1db255392b405f5369b1af0e92f558d4ba05b0d83ab0d084cb8f4b91d7ae8636f333d970638a6635e2bc7af885135dd34992d87f2ef1f4 -DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f SHA512 15b8c57aa120186f1d1c3c2b8dc6ffd26733e12f755a6b0a4255d9ec1815a61506275ff5723b4ac029e44bc2ad22852ac36e1101f292348fbfa79aa1a4cd3f35 -DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47 SHA512 759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a -DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25 -DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a -DIST openssh-9.5p1.tar.gz 1843001 BLAKE2B 55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796 SHA512 e183fdf7477fd986215b889eea4a945d71385e35305746ccb164e757ecc28166f429c70890a237d8ef4cdcae5132935ba2ecb3b2a658eb73a6afcf6f42277b9c -DIST openssh-9.5p1.tar.gz.asc 833 BLAKE2B abec3d14d9a880008db202be00ed446ccc0a98ce77c16a9e6d6492feac07c8f3284f9cd24f6ee1d904a55f9f23d5cce8a716916975c179a38ef6bde1d36e0acf SHA512 2b6de653420ba02eb99c7e6fba09af3bacfe9c701f3dfc3c94f41a3539c0414954fc5c64cce63c488c5ccd5d4ddb42d3f2184ff7f323342c885c47bf7d426ca1 +DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd SHA512 0ebf81e39914c3a90d7777a001ec7376a94b37e6024baf3e972c58f0982b7ddef942315f5e01d56c00ff95603b4a20ee561ab918ecc55511df007ac138160509 +DIST openssh-9.6p1.tar.gz.asc 833 BLAKE2B 9363d02f85457aa90069020827306a2f49d8406e32f5ee1d231844648dd2ffa02fa9b7325b8677a11e46a0ba0d9ffc86d9c989435d691a02f5354a956c49f9f9 SHA512 aec5a5bd6ce480a8e5b5879dc55f8186aec90fe61f085aa92ad7d07f324574aa781be09c83b7443a32848d091fd44fb12c1842d49cee77afc351e550ffcc096d +DIST openssh-9.7p1.tar.gz 1848766 BLAKE2B 520859fcbdf678808fc8515b64585ab9a90a8055fa869df6fbba3083cb7f73ddb81ed9ea981e131520736a8aed838f85ae68ca63406a410df61039913c5cb48b SHA512 0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55 +DIST openssh-9.7p1.tar.gz.asc 833 BLAKE2B a95e952be48bd55a07d0a95a49dc06c326816c67b8b5d40bd3f64c28aa43122253817b8a088e7a3b8a190375ea39f9fc3400b22d035561f9643c1d32b5caef27 SHA512 e028978e4266de9ad513626b13d70249e4166923fc15f38751178e2b3522ff6ebb9a7ca7dc32d1bb42d42fb92adf9903dba1b734bec083010ed7323aadad8baf +DIST openssh-9.8p1.tar.gz 1910393 BLAKE2B 3bf983c4ef5358054ed0104cd51d3e0069fbc2b80d8522d0df644d5508ec1d26a67bf061b1b5698d1cdf0d2cbba16b4cdca12a4ce30da24429094576a075e192 SHA512 95dec2f18e58eb47994f3de4430253e0665e185564b65088ca5f4108870e05feddef8cda8d3c0a4b75f18b98cc2c024df0e27de53b48c1a16da8da483cb8292a +DIST openssh-9.8p1.tar.gz.asc 833 BLAKE2B 5291e8c03ab9a75acb44285cd7fc010f4a33551f142499624165dac708fc05a6d077df81555aa41037b45f6301e4e5db3161a7a23404473f8a233a877fc55cc3 SHA512 4df1f1be2c6ab7f3aebaedd0a773b0e8c8929abb30cd3415873ad55d012cfa113f792e888e5e772dd468c394aeb7e35d62893a514dbc0ab1a03acd79918657f7 diff --git a/net-misc/openssh/files/openssh-9.3_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-9.3_p1-GSSAPI-dns.patch deleted file mode 100644 index cbc0ec2d9c2d..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p1-GSSAPI-dns.patch +++ /dev/null @@ -1,345 +0,0 @@ ---- a/auth.c -+++ b/auth.c -@@ -637,118 +637,6 @@ - return (&fake); - } - --/* -- * Returns the remote DNS hostname as a string. The returned string must not -- * be freed. NB. this will usually trigger a DNS query the first time it is -- * called. -- * This function does additional checks on the hostname to mitigate some -- * attacks on based on conflation of hostnames and IP addresses. -- */ -- --static char * --remote_hostname(struct ssh *ssh) --{ -- struct sockaddr_storage from; -- socklen_t fromlen; -- struct addrinfo hints, *ai, *aitop; -- char name[NI_MAXHOST], ntop2[NI_MAXHOST]; -- const char *ntop = ssh_remote_ipaddr(ssh); -- -- /* Get IP address of client. */ -- fromlen = sizeof(from); -- memset(&from, 0, sizeof(from)); -- if (getpeername(ssh_packet_get_connection_in(ssh), -- (struct sockaddr *)&from, &fromlen) == -1) { -- debug("getpeername failed: %.100s", strerror(errno)); -- return xstrdup(ntop); -- } -- -- ipv64_normalise_mapped(&from, &fromlen); -- if (from.ss_family == AF_INET6) -- fromlen = sizeof(struct sockaddr_in6); -- -- debug3("Trying to reverse map address %.100s.", ntop); -- /* Map the IP address to a host name. */ -- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), -- NULL, 0, NI_NAMEREQD) != 0) { -- /* Host name not found. Use ip address. */ -- return xstrdup(ntop); -- } -- -- /* -- * if reverse lookup result looks like a numeric hostname, -- * someone is trying to trick us by PTR record like following: -- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 -- */ -- memset(&hints, 0, sizeof(hints)); -- hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -- hints.ai_flags = AI_NUMERICHOST; -- if (getaddrinfo(name, NULL, &hints, &ai) == 0) { -- logit("Nasty PTR record \"%s\" is set up for %s, ignoring", -- name, ntop); -- freeaddrinfo(ai); -- return xstrdup(ntop); -- } -- -- /* Names are stored in lowercase. */ -- lowercase(name); -- -- /* -- * Map it back to an IP address and check that the given -- * address actually is an address of this host. This is -- * necessary because anyone with access to a name server can -- * define arbitrary names for an IP address. Mapping from -- * name to IP address can be trusted better (but can still be -- * fooled if the intruder has access to the name server of -- * the domain). -- */ -- memset(&hints, 0, sizeof(hints)); -- hints.ai_family = from.ss_family; -- hints.ai_socktype = SOCK_STREAM; -- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { -- logit("reverse mapping checking getaddrinfo for %.700s " -- "[%s] failed.", name, ntop); -- return xstrdup(ntop); -- } -- /* Look for the address from the list of addresses. */ -- for (ai = aitop; ai; ai = ai->ai_next) { -- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, -- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && -- (strcmp(ntop, ntop2) == 0)) -- break; -- } -- freeaddrinfo(aitop); -- /* If we reached the end of the list, the address was not there. */ -- if (ai == NULL) { -- /* Address not found for the host name. */ -- logit("Address %.100s maps to %.600s, but this does not " -- "map back to the address.", ntop, name); -- return xstrdup(ntop); -- } -- return xstrdup(name); --} -- --/* -- * Return the canonical name of the host in the other side of the current -- * connection. The host name is cached, so it is efficient to call this -- * several times. -- */ -- --const char * --auth_get_canonical_hostname(struct ssh *ssh, int use_dns) --{ -- static char *dnsname; -- -- if (!use_dns) -- return ssh_remote_ipaddr(ssh); -- else if (dnsname != NULL) -- return dnsname; -- else { -- dnsname = remote_hostname(ssh); -- return dnsname; -- } --} -- - /* These functions link key/cert options to the auth framework */ - - /* Log sshauthopt options locally and (optionally) for remote transmission */ ---- a/canohost.c -+++ b/canohost.c -@@ -205,3 +205,117 @@ - { - return get_sock_port(sock, 1); - } -+ -+/* -+ * Returns the remote DNS hostname as a string. The returned string must not -+ * be freed. NB. this will usually trigger a DNS query the first time it is -+ * called. -+ * This function does additional checks on the hostname to mitigate some -+ * attacks on legacy rhosts-style authentication. -+ * XXX is RhostsRSAAuthentication vulnerable to these? -+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) -+ */ -+ -+static char * -+remote_hostname(struct ssh *ssh) -+{ -+ struct sockaddr_storage from; -+ socklen_t fromlen; -+ struct addrinfo hints, *ai, *aitop; -+ char name[NI_MAXHOST], ntop2[NI_MAXHOST]; -+ const char *ntop = ssh_remote_ipaddr(ssh); -+ -+ /* Get IP address of client. */ -+ fromlen = sizeof(from); -+ memset(&from, 0, sizeof(from)); -+ if (getpeername(ssh_packet_get_connection_in(ssh), -+ (struct sockaddr *)&from, &fromlen) == -1) { -+ debug("getpeername failed: %.100s", strerror(errno)); -+ return xstrdup(ntop); -+ } -+ -+ ipv64_normalise_mapped(&from, &fromlen); -+ if (from.ss_family == AF_INET6) -+ fromlen = sizeof(struct sockaddr_in6); -+ -+ debug3("Trying to reverse map address %.100s.", ntop); -+ /* Map the IP address to a host name. */ -+ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), -+ NULL, 0, NI_NAMEREQD) != 0) { -+ /* Host name not found. Use ip address. */ -+ return xstrdup(ntop); -+ } -+ -+ /* -+ * if reverse lookup result looks like a numeric hostname, -+ * someone is trying to trick us by PTR record like following: -+ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 -+ */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -+ hints.ai_flags = AI_NUMERICHOST; -+ if (getaddrinfo(name, NULL, &hints, &ai) == 0) { -+ logit("Nasty PTR record \"%s\" is set up for %s, ignoring", -+ name, ntop); -+ freeaddrinfo(ai); -+ return xstrdup(ntop); -+ } -+ -+ /* Names are stored in lowercase. */ -+ lowercase(name); -+ -+ /* -+ * Map it back to an IP address and check that the given -+ * address actually is an address of this host. This is -+ * necessary because anyone with access to a name server can -+ * define arbitrary names for an IP address. Mapping from -+ * name to IP address can be trusted better (but can still be -+ * fooled if the intruder has access to the name server of -+ * the domain). -+ */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = from.ss_family; -+ hints.ai_socktype = SOCK_STREAM; -+ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { -+ logit("reverse mapping checking getaddrinfo for %.700s " -+ "[%s] failed.", name, ntop); -+ return xstrdup(ntop); -+ } -+ /* Look for the address from the list of addresses. */ -+ for (ai = aitop; ai; ai = ai->ai_next) { -+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, -+ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && -+ (strcmp(ntop, ntop2) == 0)) -+ break; -+ } -+ freeaddrinfo(aitop); -+ /* If we reached the end of the list, the address was not there. */ -+ if (ai == NULL) { -+ /* Address not found for the host name. */ -+ logit("Address %.100s maps to %.600s, but this does not " -+ "map back to the address.", ntop, name); -+ return xstrdup(ntop); -+ } -+ return xstrdup(name); -+} -+ -+/* -+ * Return the canonical name of the host in the other side of the current -+ * connection. The host name is cached, so it is efficient to call this -+ * several times. -+ */ -+ -+const char * -+auth_get_canonical_hostname(struct ssh *ssh, int use_dns) -+{ -+ static char *dnsname; -+ -+ if (!use_dns) -+ return ssh_remote_ipaddr(ssh); -+ else if (dnsname != NULL) -+ return dnsname; -+ else { -+ dnsname = remote_hostname(ssh); -+ return dnsname; -+ } -+} ---- a/readconf.c -+++ b/readconf.c -@@ -160,6 +160,7 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssTrustDns, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist, - oHashKnownHosts, -@@ -207,9 +208,11 @@ - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, - # else - { "gssapiauthentication", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, - #endif - #ifdef ENABLE_PKCS11 - { "pkcs11provider", oPKCS11Provider }, -@@ -1125,6 +1128,10 @@ - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -2341,6 +2348,7 @@ - options->pubkey_authentication = -1; - options->gss_authentication = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -2501,6 +2509,8 @@ - options->gss_authentication = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) ---- a/readconf.h -+++ b/readconf.h -@@ -41,6 +41,7 @@ - int hostbased_authentication; /* ssh2's rhosts_rsa */ - int gss_authentication; /* Try GSS authentication */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ ---- a/ssh_config.5 -+++ b/ssh_config.5 -@@ -843,6 +843,16 @@ - Forward (delegate) credentials to the server. - The default is - .Cm no . -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 ---- a/sshconnect2.c -+++ b/sshconnect2.c -@@ -764,6 +764,13 @@ - OM_uint32 min; - int r, ok = 0; - gss_OID mech = NULL; -+ const char *gss_host; -+ -+ if (options.gss_trust_dns) { -+ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); -+ gss_host = auth_get_canonical_hostname(ssh, 1); -+ } else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ -@@ -778,7 +785,7 @@ - elements[authctxt->mech_tried]; - /* My DER encoding requires length<128 */ - if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt, -- mech, authctxt->host)) { -+ mech, gss_host)) { - ok = 1; /* Mechanism works */ - } else { - authctxt->mech_tried++; 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.3_p1-gss-use-HOST_NAME_MAX.patch b/net-misc/openssh/files/openssh-9.3_p1-gss-use-HOST_NAME_MAX.patch deleted file mode 100644 index b50ac7c00181..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p1-gss-use-HOST_NAME_MAX.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gss-serv.c -+++ b/gss-serv.c -@@ -105,7 +105,7 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx) - gss_create_empty_oid_set(&status, &oidset); - gss_add_oid_set_member(&status, ctx->oid, &oidset); - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -+ if (gethostname(lname, HOST_NAME_MAX)) { - gss_release_oid_set(&status, &oidset); - return (-1); - } diff --git a/net-misc/openssh/files/openssh-9.3_p1-openssl-ignore-status.patch b/net-misc/openssh/files/openssh-9.3_p1-openssl-ignore-status.patch deleted file mode 100644 index fa33af39b6f8..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p1-openssl-ignore-status.patch +++ /dev/null @@ -1,17 +0,0 @@ -the last nibble of the openssl version represents the status. that is, -whether it is a beta or release. when it comes to version checks in -openssh, this component does not matter, so ignore it. - -https://bugzilla.mindrot.org/show_bug.cgi?id=2212 - ---- a/openbsd-compat/openssl-compat.c -+++ b/openbsd-compat/openssl-compat.c -@@ -58,7 +58,7 @@ ssh_compatible_openssl(long headerver, long libver) - * For versions >= 1.0.0, major,minor,status must match and library - * fix version must be equal to or newer than the header. - */ -- mask = 0xfff0000fL; /* major,minor,status */ -+ mask = 0xfff00000L; /* major,minor,status */ - hfix = (headerver & 0x000ff000) >> 12; - lfix = (libver & 0x000ff000) >> 12; - if ( (headerver & mask) == (libver & mask) && lfix >= hfix) diff --git a/net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch b/net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch deleted file mode 100644 index b571ae253fff..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://bugzilla.mindrot.org/show_bug.cgi?id=3548 ---- a/openbsd-compat/openssl-compat.c -+++ b/openbsd-compat/openssl-compat.c -@@ -48,19 +48,25 @@ ssh_compatible_openssl(long headerver, long libver) - if (headerver == libver) - return 1; - -- /* for versions < 1.0.0, major,minor,fix,status must match */ -- if (headerver < 0x1000000f) { -- mask = 0xfffff00fL; /* major,minor,fix,status */ -- return (headerver & mask) == (libver & mask); -+ /* -+ * For versions < 3.0.0, major,minor,status must match and library -+ * fix version must be equal to or newer than the header. -+ */ -+ if (headerver < 0x3000000f) { -+ mask = 0xfff0000fL; /* major,minor,status */ -+ hfix = (headerver & 0x000ff000) >> 12; -+ lfix = (libver & 0x000ff000) >> 12; -+ if ( (headerver & mask) == (libver & mask) && lfix >= hfix) -+ return 1; - } - - /* -- * For versions >= 1.0.0, major,minor,status must match and library -- * fix version must be equal to or newer than the header. -+ * For versions >= 3.0.0, major must match and minor,status must be -+ * equal to or greater than the header. - */ -- mask = 0xfff00000L; /* major,minor,status */ -- hfix = (headerver & 0x000ff000) >> 12; -- lfix = (libver & 0x000ff000) >> 12; -+ mask = 0xf000000fL; /* major, status */ -+ hfix = (headerver & 0x0ffffff0L) >> 12; -+ lfix = (libver & 0x0ffffff0L) >> 12; - if ( (headerver & mask) == (libver & mask) && lfix >= hfix) - return 1; - return 0; ---- a/openbsd-compat/regress/opensslvertest.c -+++ b/openbsd-compat/regress/opensslvertest.c -@@ -31,7 +31,7 @@ struct version_test { - { 0x0090802fL, 0x0090804fL, 1}, /* newer library fix version: ok */ - { 0x0090802fL, 0x0090801fL, 1}, /* older library fix version: ok */ - { 0x0090802fL, 0x0090702fL, 0}, /* older library minor version: NO */ -- { 0x0090802fL, 0x0090902fL, 0}, /* newer library minor version: NO */ -+ { 0x0090802fL, 0x0090902fL, 1}, /* newer library minor version: ok */ - { 0x0090802fL, 0x0080802fL, 0}, /* older library major version: NO */ - { 0x0090802fL, 0x1000100fL, 0}, /* newer library major version: NO */ - -@@ -41,7 +41,7 @@ struct version_test { - { 0x1000101fL, 0x1000100fL, 1}, /* older library patch version: ok */ - { 0x1000101fL, 0x1000201fL, 1}, /* newer library fix version: ok */ - { 0x1000101fL, 0x1000001fL, 0}, /* older library fix version: NO */ -- { 0x1000101fL, 0x1010101fL, 0}, /* newer library minor version: NO */ -+ { 0x1000101fL, 0x1010101fL, 1}, /* newer library minor version: ok */ - { 0x1000101fL, 0x0000101fL, 0}, /* older library major version: NO */ - { 0x1000101fL, 0x2000101fL, 0}, /* newer library major version: NO */ - }; diff --git a/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch b/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch deleted file mode 100644 index f1336bbe0380..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/912766 -https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621 - -From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001 -From: Darren Tucker <dtucker@dtucker.net> -Date: Sat, 19 Aug 2023 07:39:08 +1000 -Subject: [PATCH] Fix zlib version check for 1.3 and future version. - -bz#3604. ---- a/configure.ac -+++ b/configure.ac -@@ -1464,7 +1464,7 @@ else - [[ - int a=0, b=0, c=0, d=0, n, v; - n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d); -- if (n != 3 && n != 4) -+ if (n < 1) - exit(1); - v = a*1000000 + b*10000 + c*100 + d; - fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v); - diff --git a/net-misc/openssh/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch b/net-misc/openssh/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch new file mode 100644 index 000000000000..379a3981d7ea --- /dev/null +++ b/net-misc/openssh/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch @@ -0,0 +1,44 @@ +From 45b491ce13fcf7dbc0b3bd6df986c9cf59190721 Mon Sep 17 00:00:00 2001 +From: Jordan R Abrahams-Whitehead <ajordanr@google.com> +Date: Tue, 12 Dec 2023 22:54:02 +0000 +Subject: [PATCH] Allow MAP_NORESERVE in sandbox seccomp filter maps + +While debugging Scudo on ChromeOS, we found that the no reserve mode +immediately crashed `sshd`. We tracked it down to the +sandbox-seccomp-filter. + +Being able to mmap with MAP_NORESERVE is useful (if not necessary) for +some overcommitting allocators. + +During mmap calls, the flag MAP_NORESERVE is used by some allocators +such as LLVM's Scudo for layout optimisation. This causes the sandbox +seccomp filter for the client subprocess to die with some Scudo +configurations. + +Upstream patch submission: +https://lists.mindrot.org/pipermail/openssh-unix-dev/2023-December/041095.html +--- + sandbox-seccomp-filter.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 23b40b643..a49c5ca99 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -190,9 +190,11 @@ + + #if defined(__NR_mmap) || defined(__NR_mmap2) + # ifdef MAP_FIXED_NOREPLACE +-# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_FIXED_NOREPLACE ++# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \ ++ |MAP_NORESERVE|MAP_FIXED_NOREPLACE + # else +-# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED ++# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \ ++ |MAP_NORESERVE + # endif /* MAP_FIXED_NOREPLACE */ + /* Use this for both __NR_mmap and __NR_mmap2 variants */ + # define SC_MMAP(_nr) \ +-- +2.43.0.472.g3155946c3a-goog + diff --git a/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch b/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch new file mode 100644 index 000000000000..7b7fb70380d9 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/935271 +Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2. +--- a/log.c ++++ b/log.c +@@ -451,12 +451,14 @@ void + sshsigdie(const char *file, const char *func, int line, int showfunc, + LogLevel level, const char *suffix, const char *fmt, ...) + { ++#ifdef SYSLOG_R_SAFE_IN_SIGHAND + va_list args; + + va_start(args, fmt); + sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, + suffix, fmt, args); + va_end(args); ++#endif + _exit(1); + } + diff --git a/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch b/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch new file mode 100644 index 000000000000..90544d1a457e --- /dev/null +++ b/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch @@ -0,0 +1,16 @@ +"Minor logic error in ObscureKeystrokeTiming" +https://marc.info/?l=oss-security&m=171982317624594&w=2 +--- a/clientloop.c ++++ b/clientloop.c +@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, + if (timespeccmp(&now, &chaff_until, >=)) { + /* Stop if there have been no keystrokes for a while */ + stop_reason = "chaff time expired"; +- } else if (timespeccmp(&now, &next_interval, >=)) { +- /* Otherwise if we were due to send, then send chaff */ ++ } else if (timespeccmp(&now, &next_interval, >=) && ++ !ssh_packet_have_data_to_write(ssh)) { ++ /* If due to send but have no data, then send chaff */ + if (send_chaff(ssh)) + nchaff++; + } 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/files/openssh-9.7_p1-config-tweaks.patch b/net-misc/openssh/files/openssh-9.7_p1-config-tweaks.patch new file mode 100644 index 000000000000..229f7484cff5 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.7_p1-config-tweaks.patch @@ -0,0 +1,27 @@ +diff -Naur a/ssh_config b/ssh_config +--- a/ssh_config 2024-03-11 05:20:49.000000000 +0000 ++++ b/ssh_config 2024-06-10 16:30:15.863023773 +0100 +@@ -13,6 +13,9 @@ + # Thus, host-specific definitions should be at the beginning of the + # configuration file, and defaults at the end. + ++# Make sure that all Host and Match options are below this Include! ++Include "/etc/ssh/ssh_config.d/*.conf" ++ + # Site-wide defaults for some commonly used options. For a comprehensive + # list of available options, their meanings and defaults, please see the + # ssh_config(5) man page. +diff -Naur a/sshd_config b/sshd_config +--- a/sshd_config 2024-06-10 16:19:01.530491925 +0100 ++++ b/sshd_config 2024-06-10 16:32:49.766386759 +0100 +@@ -105,8 +105,8 @@ + # no default banner path + #Banner none + +-# override default of no subsystems +-Subsystem sftp /usr/libexec/sftp-server ++# Make sure that all Match options are below this Include! ++Include "/etc/ssh/sshd_config.d/*.conf" + + # Example of overriding settings on a per-user basis + #Match User anoncvs diff --git a/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch b/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch new file mode 100644 index 000000000000..c0546e747a1f --- /dev/null +++ b/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch @@ -0,0 +1,14 @@ +https://bugzilla.mindrot.org/show_bug.cgi?id=3707 +https://bugs.gentoo.org/935353 +--- a/openbsd-compat/port-linux.c ++++ b/openbsd-compat/port-linux.c +@@ -366,7 +366,7 @@ ssh_systemd_notify(const char *fmt, ...) + error_f("socket \"%s\": %s", path, strerror(errno)); + goto out; + } +- if (connect(fd, &addr, sizeof(addr)) != 0) { ++ if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) { + error_f("socket \"%s\" connect: %s", path, strerror(errno)); + goto out; + } + diff --git a/net-misc/openssh/files/sshd.service.2 b/net-misc/openssh/files/sshd.service.2 new file mode 100644 index 000000000000..d935ea763f0d --- /dev/null +++ b/net-misc/openssh/files/sshd.service.2 @@ -0,0 +1,15 @@ +[Unit] +Description=OpenSSH server daemon +After=network.target auditd.service + +[Service] +Type=notify-reload +ExecStartPre=/usr/bin/ssh-keygen -A +ExecStart=/usr/sbin/sshd -D -e +KillMode=process +OOMPolicy=continue +Restart=on-failure +RestartSec=42s + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/openssh/openssh-9.3_p2.ebuild b/net-misc/openssh/openssh-9.6_p1-r3.ebuild index c52228de519f..c944856ebe5b 100644 --- a/net-misc/openssh/openssh-9.3_p2.ebuild +++ b/net-misc/openssh/openssh-9.6_p1-r3.ebuild @@ -1,9 +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 user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig +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. @@ -13,15 +14,15 @@ 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 )" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc + 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 X xmss" +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" RESTRICT="!test? ( test )" @@ -56,39 +57,28 @@ RDEPEND=" pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( ${LIB_DEPEND} ) " -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} !net-misc/openssh-contrib pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) " -# Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - sys-devel/autoconf + dev-build/autoconf virtual/pkgconfig - || ( - >=sys-devel/gcc-config-2.6 - >=sys-devel/clang-toolchain-symlinks-14-r1:14 - >=sys-devel/clang-toolchain-symlinks-15-r1:15 - >=sys-devel/clang-toolchain-symlinks-16-r1:* - ) verify-sig? ( sec-keys/openpgp-keys-openssh ) " PATCHES=( - "${FILESDIR}/${PN}-9.3_p1-GSSAPI-dns.patch" #165444 integrated into gsskex - "${FILESDIR}/${PN}-9.3_p1-openssl-ignore-status.patch" "${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.3_p1-gss-use-HOST_NAME_MAX.patch" #834044 - "${FILESDIR}/${PN}-9.3_p1-openssl-version-compat-check.patch" - "${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766 + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" ) pkg_pretend() { @@ -130,18 +120,12 @@ pkg_pretend() { } src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - eapply -- "${PATCHES[@]}" - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - eapply_user #473004 + default # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox sed -e '/\t\tpercent \\/ d' \ @@ -189,7 +173,27 @@ src_configure() { --datadir="${EPREFIX}"/usr/share/openssh --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd - --with-hardening + # 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) @@ -203,8 +207,7 @@ src_configure() { ) if use elibc_musl; then - # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) myconf+=( --disable-utmp --disable-wtmp ) fi @@ -327,6 +330,9 @@ pkg_preinst() { } 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 diff --git a/net-misc/openssh/openssh-9.4_p1-r1.ebuild b/net-misc/openssh/openssh-9.6_p1-r5.ebuild index dbfa1b7bbe14..eaae6cd6082f 100644 --- a/net-misc/openssh/openssh-9.4_p1-r1.ebuild +++ b/net-misc/openssh/openssh-9.6_p1-r5.ebuild @@ -1,9 +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 user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig +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. @@ -13,15 +14,15 @@ 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 )" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc + 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" +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 X xmss" +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" RESTRICT="!test? ( test )" @@ -56,36 +57,31 @@ RDEPEND=" pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( ${LIB_DEPEND} ) " -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} !net-misc/openssh-contrib pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) " -# Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - sys-devel/autoconf + dev-build/autoconf virtual/pkgconfig - || ( - >=sys-devel/gcc-config-2.6 - >=sys-devel/clang-toolchain-symlinks-14-r1:14 - >=sys-devel/clang-toolchain-symlinks-15-r1:15 - >=sys-devel/clang-toolchain-symlinks-16-r1:* - ) verify-sig? ( sec-keys/openpgp-keys-openssh ) " PATCHES=( - "${FILESDIR}/${PN}-9.3_p1-GSSAPI-dns.patch" #165444 integrated into gsskex "${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.3_p2-zlib-1.3.patch" #912766 + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" + "${FILESDIR}/${PN}-9.6_p1-CVE-2024-6387.patch" + "${FILESDIR}/${PN}-9.6_p1-chaff-logic.patch" ) pkg_pretend() { @@ -127,18 +123,12 @@ pkg_pretend() { } src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - eapply -- "${PATCHES[@]}" - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - eapply_user #473004 + default # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox sed -e '/\t\tpercent \\/ d' \ @@ -186,7 +176,27 @@ src_configure() { --datadir="${EPREFIX}"/usr/share/openssh --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd - --with-hardening + # 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) @@ -200,8 +210,7 @@ src_configure() { ) if use elibc_musl; then - # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) myconf+=( --disable-utmp --disable-wtmp ) fi @@ -324,6 +333,9 @@ pkg_preinst() { } 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 diff --git a/net-misc/openssh/openssh-9.3_p1-r1.ebuild b/net-misc/openssh/openssh-9.7_p1-r6.ebuild index a487a61fc387..af5db8a1a650 100644 --- a/net-misc/openssh/openssh-9.3_p1-r1.ebuild +++ b/net-misc/openssh/openssh-9.7_p1-r6.ebuild @@ -1,9 +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 user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig +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. @@ -13,15 +14,15 @@ 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 )" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc + 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 X xmss" +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" RESTRICT="!test? ( test )" @@ -56,39 +57,30 @@ RDEPEND=" pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( ${LIB_DEPEND} ) " -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} !net-misc/openssh-contrib pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) " -# Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - sys-devel/autoconf + dev-build/autoconf virtual/pkgconfig - || ( - >=sys-devel/gcc-config-2.6 - >=sys-devel/clang-toolchain-symlinks-14-r1:14 - >=sys-devel/clang-toolchain-symlinks-15-r1:15 - >=sys-devel/clang-toolchain-symlinks-16-r1:* - ) verify-sig? ( sec-keys/openpgp-keys-openssh ) " PATCHES=( - "${FILESDIR}/${PN}-9.3_p1-GSSAPI-dns.patch" #165444 integrated into gsskex - "${FILESDIR}/${PN}-9.3_p1-openssl-ignore-status.patch" - "${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.3_p1-gss-use-HOST_NAME_MAX.patch" #834044 - "${FILESDIR}/${PN}-9.3_p1-openssl-version-compat-check.patch" - "${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766 + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" + "${FILESDIR}/${PN}-9.7_p1-config-tweaks.patch" + "${FILESDIR}/${PN}-9.6_p1-CVE-2024-6387.patch" + "${FILESDIR}/${PN}-9.6_p1-chaff-logic.patch" ) pkg_pretend() { @@ -101,6 +93,9 @@ pkg_pretend() { 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" @@ -127,18 +122,12 @@ pkg_pretend() { } src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - eapply -- "${PATCHES[@]}" + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - eapply_user #473004 + default # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox sed -e '/\t\tpercent \\/ d' \ @@ -186,7 +175,27 @@ src_configure() { --datadir="${EPREFIX}"/usr/share/openssh --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd - --with-hardening + # 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) @@ -200,8 +209,7 @@ src_configure() { ) if use elibc_musl; then - # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) myconf+=( --disable-utmp --disable-wtmp ) fi @@ -212,24 +220,7 @@ src_configure() { 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() { +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 @@ -240,15 +231,9 @@ tweak_ssh_configs() { 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 + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die # Send locale environment variables (bug #367017) SendEnv ${locale_vars[*]} @@ -256,16 +241,16 @@ tweak_ssh_configs() { SendEnv COLORTERM EOF - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + cat <<-EOF > "${WORKDIR}"/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 + 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 >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die # Allow client to pass locale environment variables (bug #367017) AcceptEnv ${locale_vars[*]} @@ -273,8 +258,13 @@ tweak_ssh_configs() { AcceptEnv COLORTERM EOF + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-subsystem.conf || die + # override default of no subsystems + Subsystem sftp ${EPREFIX}/usr/$(get_libdir)/misc/sftp-server + EOF + if use pam ; then - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die UsePAM yes # This interferes with PAM. PasswordAuthentication no @@ -285,13 +275,34 @@ tweak_ssh_configs() { fi if use livecd ; then - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + 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 + 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 @@ -303,18 +314,24 @@ src_install() { 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' + + # 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() { @@ -324,6 +341,9 @@ pkg_preinst() { } 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 diff --git a/net-misc/openssh/openssh-9.5_p1-r2.ebuild b/net-misc/openssh/openssh-9.8_p1-r2.ebuild index b9a20909630a..8c6f3c5cb671 100644 --- a/net-misc/openssh/openssh-9.5_p1-r2.ebuild +++ b/net-misc/openssh/openssh-9.8_p1-r2.ebuild @@ -1,9 +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 user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig +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. @@ -13,15 +14,15 @@ 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 )" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc + 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 X xmss" +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" RESTRICT="!test? ( test )" @@ -56,34 +57,29 @@ RDEPEND=" pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( ${LIB_DEPEND} ) " -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} !net-misc/openssh-contrib pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) " -# Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - sys-devel/autoconf + dev-build/autoconf virtual/pkgconfig - || ( - >=sys-devel/gcc-config-2.6 - >=sys-devel/clang-toolchain-symlinks-14-r1:14 - >=sys-devel/clang-toolchain-symlinks-15-r1:15 - >=sys-devel/clang-toolchain-symlinks-16-r1:* - ) 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.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" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" + "${FILESDIR}/${PN}-9.7_p1-config-tweaks.patch" + "${FILESDIR}/${PN}-9.8_p1-musl-connect.patch" ) pkg_pretend() { @@ -125,18 +121,12 @@ pkg_pretend() { } src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - eapply -- "${PATCHES[@]}" - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - eapply_user #473004 + default # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox sed -e '/\t\tpercent \\/ d' \ @@ -184,7 +174,27 @@ src_configure() { --datadir="${EPREFIX}"/usr/share/openssh --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd - --with-hardening + # 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) @@ -198,8 +208,7 @@ src_configure() { ) if use elibc_musl; then - # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) myconf+=( --disable-utmp --disable-wtmp ) fi @@ -210,24 +219,7 @@ src_configure() { 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() { +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 @@ -238,15 +230,9 @@ tweak_ssh_configs() { 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 + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die # Send locale environment variables (bug #367017) SendEnv ${locale_vars[*]} @@ -254,16 +240,16 @@ tweak_ssh_configs() { SendEnv COLORTERM EOF - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + cat <<-EOF > "${WORKDIR}"/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 + 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 >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die # Allow client to pass locale environment variables (bug #367017) AcceptEnv ${locale_vars[*]} @@ -271,8 +257,13 @@ tweak_ssh_configs() { AcceptEnv COLORTERM EOF + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-subsystem.conf || die + # override default of no subsystems + Subsystem sftp ${EPREFIX}/usr/$(get_libdir)/misc/sftp-server + EOF + if use pam ; then - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die UsePAM yes # This interferes with PAM. PasswordAuthentication no @@ -283,13 +274,34 @@ tweak_ssh_configs() { fi if use livecd ; then - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + 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 + 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 @@ -301,18 +313,24 @@ src_install() { 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.service.2 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() { @@ -322,6 +340,9 @@ pkg_preinst() { } 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 @@ -375,4 +396,40 @@ pkg_postinst() { 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 + + openssh_maybe_restart +} + +openssh_maybe_restart() { + local ver + declare -a versions + read -ra versions <<<"${REPLACING_VERSIONS}" + for ver in "${versions[@]}"; do + # Exclude 9.8_p1 because it didn't have the safety check + [[ ${ver} == 9.8_p1 ]] && break + + if [[ ${ver%_*} == "${PV%_*}" ]]; then + # No major version change has occurred + return + fi + done + + if [[ ${ROOT} ]]; then + return + elif [[ -d /run/systemd/system ]] && sshd -t >/dev/null 2>&1; then + ewarn "The ebuild will now attempt to restart OpenSSH to avoid" + ewarn "bricking the running instance. See bug #709748." + ebegin "Attempting to restart openssh via 'systemctl try-restart sshd'" + systemctl try-restart sshd + eend $? + elif [[ -d /run/openrc ]]; then + # We don't check for sshd -t here because the OpenRC init script + # has a stop_pre() which does checkconfig, i.e. we defer to it + # to give nicer output for a failed sanity check. + ewarn "The ebuild will now attempt to restart OpenSSH to avoid" + ewarn "bricking the running instance. See bug #709748." + ebegin "Attempting to restart openssh via 'rc-service -q --ifstarted --nodeps sshd restart'" + rc-service -q --ifstarted --nodeps sshd restart + eend $? + fi } diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 3bebee2ed69e..19823fb47223 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1 +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.8-gcc14-build-fix.patch b/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch new file mode 100644 index 000000000000..6a439dc0544a --- /dev/null +++ b/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch @@ -0,0 +1,32 @@ +https://github.com/openvswitch/ovs/commit/335a5deac3ff91448ca14651e92f39dfdd512fcf.patch +From: Ilya Maximets <i.maximets@ovn.org> +Date: Thu, 18 Jan 2024 15:59:05 +0100 +Subject: [PATCH] ovs-atomic: Fix inclusion of Clang header by GCC 14. + +GCC 14 started to advertise c_atomic extension, older versions didn't +do that. Add check for __clang__, so GCC doesn't include headers +designed for Clang. + +Another option would be to prefer stdatomic implementation instead, +but some older versions of Clang are not able to use stdatomic.h +supplied by GCC as described in commit: + 07ece367fb5f ("ovs-atomic: Prefer Clang intrinsics over <stdatomic.h>.") + +This change fixes OVS build with GCC on Fedora Rawhide (40). + +Reported-by: Jakob Meng <code@jakobmeng.de> +Acked-by: Jakob Meng <jmeng@redhat.com> +Acked-by: Eelco Chaudron <echaudro@redhat.com> +Acked-by: Simon Horman <horms@ovn.org> +Signed-off-by: Ilya Maximets <i.maximets@ovn.org> +--- a/lib/ovs-atomic.h ++++ b/lib/ovs-atomic.h +@@ -328,7 +328,7 @@ + #if __CHECKER__ + /* sparse doesn't understand some GCC extensions we use. */ + #include "ovs-atomic-pthreads.h" +- #elif __has_extension(c_atomic) ++ #elif __clang__ && __has_extension(c_atomic) + #include "ovs-atomic-clang.h" + #elif HAVE_ATOMIC && __cplusplus >= 201103L + #include "ovs-atomic-c++.h" diff --git a/net-misc/openvswitch/openvswitch-2.17.8.ebuild b/net-misc/openvswitch/openvswitch-2.17.8.ebuild new file mode 100644 index 000000000000..03f00817ad77 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.17.8.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_OPTIONAL_USE="modules" +PYTHON_COMPAT=( python3_{10..11} ) + +inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="https://www.openvswitch.org" +SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +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/twisted[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + ') + debug? ( dev-lang/perl ) + unwind? ( sys-libs/libunwind:= ) + ssl? ( dev-libs/openssl:= )" +DEPEND="${RDEPEND} + sys-apps/util-linux[caps] + valgrind? ( dev-debug/valgrind )" +BDEPEND="virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ')" + +PATCHES=( + "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" + "${FILESDIR}/${PN}-2.17.8-gcc14-build-fix.patch" +) + +CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" +MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" +BUILD_TARGETS="all" + +pkg_setup() { + if use modules ; then + 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-r1_pkg_setup + else + CONFIG_CHECK+=" ~OPENVSWITCH" + linux-info_pkg_setup + fi +} + +src_prepare() { + default + + # Never build kernelmodules, doing this manually + sed -i \ + -e '/^SUBDIRS/d' \ + datapath/Makefile.in || die "sed failed" + + eautoreconf +} + +src_configure() { + set_arch_to_kernel + python_setup + + # monitor is statically enabled for bug #596206 + # use monitor || export ovs_cv_python="no" + # pyside is staticly disabled + export ovs_cv_pyuic4="no" + + # flake8 is primarily a style guide tool, running it as part of the tests + # in Gentoo does not make much sense, only breaks them: bug #607280 + export ovs_cv_flake8="no" + + # Only adds a diagram to the man page, just skip it as we don't + # want to add a BDEPEND on graphviz right now. bug #856286 + export ovs_cv_dot="no" + + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + + local linux_config + use modules && linux_config="--with-linux=${KV_OUT_DIR}" + + export ac_cv_lib_unwind_unw_backtrace="$(usex unwind)" + + # Need PYTHON3 variable for bug #860240 + PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \ + --with-rundir=/run/openvswitch \ + --with-logdir=/var/log/openvswitch \ + --with-pkidir=/etc/ssl/openvswitch \ + --with-dbdir=/var/lib/openvswitch \ + $(use_enable ssl) \ + $(use_enable !debug ndebug) +} + +src_compile() { + default + + use modules && linux-mod-r1_src_compile +} + +src_install() { + default + + local SCRIPT + if use monitor; then + # ovs-bugtool is installed to sbin by the build system, but we + # install it to bin below, and these clash in merged-usr + # https://bugs.gentoo.org/889846 + rm "${ED}"/usr/sbin/ovs-bugtool || die + + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do + python_doscript utilities/"${SCRIPT}" + done + rm -r "${ED}"/usr/share/openvswitch/python || die + fi + + keepdir /var/{lib,log}/openvswitch + keepdir /etc/ssl/openvswitch + fperms 0750 /etc/ssl/openvswitch + + rm -rf "${ED}"/var/run || die + + newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server + newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd + newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server + newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd + + systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service + systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service + systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service + newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf + + insinto /etc/logrotate.d + newins rhel/etc_logrotate.d_openvswitch openvswitch + + use modules && linux-mod-r1_src_install +} + +pkg_postinst() { + use modules && linux-mod-r1_pkg_postinst + + tmpfiles_process openvswitch.conf + + # Only needed on non-systemd, but helps anyway + elog "Use the following command to create an initial database for ovsdb-server:" + elog " emerge --config =${CATEGORY}/${PF}" + elog "(will create a database in /var/lib/openvswitch/conf.db)" + elog "or to convert the database to the current schema after upgrading." +} + +pkg_config() { + local db="${EROOT%}"/var/lib/openvswitch/conf.db + if [[ -e "${db}" ]] ; then + einfo "Database '${db}' already exists, doing schema migration..." + einfo "(if the migration fails, make sure that ovsdb-server is not running)" + ovsdb-tool convert "${db}" \ + "${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" + else + einfo "Creating new database '${db}'..." + ovsdb-tool create "${db}" \ + "${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" + fi +} diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild index 1edab262a4b7..cc166256aed4 100644 --- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MODULES_OPTIONAL_USE="modules" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools linux-info 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" @@ -21,7 +21,7 @@ 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}] ') @@ -30,8 +30,12 @@ RDEPEND="${PYTHON_DEPS} ssl? ( dev-libs/openssl:= )" DEPEND="${RDEPEND} sys-apps/util-linux[caps] - valgrind? ( dev-util/valgrind )" -BDEPEND="virtual/pkgconfig" + valgrind? ( dev-debug/valgrind )" +BDEPEND="virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ')" PATCHES=( "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" @@ -46,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 @@ -101,7 +105,7 @@ src_configure() { src_compile() { default - use modules && linux-mod_src_compile + use modules && linux-mod-r1_src_compile } src_install() { @@ -139,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/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest index 38a42a0f794f..bc9d1ab9bc39 100644 --- a/net-misc/owncloud-client/Manifest +++ b/net-misc/owncloud-client/Manifest @@ -1,3 +1,3 @@ DIST libregraphapi-1.0.1.tar.gz 105266 BLAKE2B b5122ca5bb757c58bba0f29eaf119685c0ed119a9a72951f4098d8180e5bf05332b36fa6c884ca29b0414051c9c6d6ca081e3c7eeb7b9810202f11c1a70c5190 SHA512 aaa710642c36b4038dc61e7df4fc904a82a2ab6c34da03c3f5328075e41ab319f6616866b7f9ae472ff256b421751f8f5ce7ce0a6d3451bda75cfa3b307df082 -DIST ownCloud-4.1.0.11250.tar.xz 4122856 BLAKE2B 63bdd6047a75e07f6097fec37fb8092675ede50aada272bb8817e0d6ac1aa690cb7257a3d984bac58ed6320543f038cd2c89c49d9161d70ec8a3268997c42af3 SHA512 5f8f43cc8e3ceb2beeebe11fd93937df54e66ce9020a628da232523176815968364667a093cdea6bdf44dca9e1b67878ef76f38c48287327efc0fc3f85f22fb5 DIST ownCloud-4.2.0.11670.tar.xz 4126004 BLAKE2B 60a5855239b32bfb6769d38de3eced3dcb6c642d702fa33439dfebdc97947dfaed1f0081d2ec8913edc7ab8688872115abd739e21eae7d06e96cbcd92abb5565 SHA512 277d18581155f663c0c18b44a6c0fb9b31c84695e0980da486028b91c1d1c9f5a7ba956afbc11fb2e7fc4679e46a30c2d737667208f5c0599a39bf91a109ce99 +DIST ownCloud-5.2.1.13040.tar.xz 3989152 BLAKE2B f1bdee88acaa83e2adf66f37ac52070f5f92ba63584b66463a2378439756ed78f8dbecb088a909668cb8ee0c52c58e520906ffd1783feb2ddce7f4d433d39257 SHA512 182768b385e9ef8c841045617e6b2d5c47a1b621d2898ca8d7a6ed153ef2d1ca67072f620d6f380189f239db13a6a50fe178d1c00bd669c81a7df86a52e2a5c5 diff --git a/net-misc/owncloud-client/metadata.xml b/net-misc/owncloud-client/metadata.xml index 4587207f73ca..e0dec496e7ee 100644 --- a/net-misc/owncloud-client/metadata.xml +++ b/net-misc/owncloud-client/metadata.xml @@ -9,4 +9,7 @@ <flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag> <flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag> </use> + <upstream> + <remote-id type="github">owncloud/client</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/owncloud-client/owncloud-client-4.1.0.11250.ebuild b/net-misc/owncloud-client/owncloud-client-4.1.0.11250.ebuild deleted file mode 100644 index 0abca4d750a4..000000000000 --- a/net-misc/owncloud-client/owncloud-client-4.1.0.11250.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -MY_PN="ownCloud" -REGRAPHAPI_PV="1.0.1" -DESCRIPTION="Synchronize files from ownCloud Server with your computer" -HOMEPAGE="https://owncloud.com/" -SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz - https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${REGRAPHAPI_PV}.tar.gz - -> libregraphapi-${REGRAPHAPI_PV}.tar.gz" -S=${WORKDIR}/${MY_PN}-${PV} - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="dolphin keyring nautilus test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-db/sqlite-3.4:3 - dev-libs/qtkeychain[keyring?,qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python )" - -DEPEND="${RDEPEND} - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -BDEPEND=" - dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules" - -PATCHES=( "${FILESDIR}"/${PN}-3.1.0.9872-no_cmake_fetch.patch - "${FILESDIR}"/${PN}-3.2.0.10193-no_fortify_override.patch - ) - -src_prepare() { - mv ../libre-graph-api-cpp-qt-client-${REGRAPHAPI_PV} \ - src/libsync/libregraphapisrc-src || die - - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} diff --git a/net-misc/owncloud-client/owncloud-client-5.2.1.13040-r1.ebuild b/net-misc/owncloud-client/owncloud-client-5.2.1.13040-r1.ebuild new file mode 100644 index 000000000000..17ed5c205d07 --- /dev/null +++ b/net-misc/owncloud-client/owncloud-client-5.2.1.13040-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +MY_PN="ownCloud" +DESCRIPTION="Synchronize files from ownCloud Server with your computer" +HOMEPAGE="https://owncloud.com/" +SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz" +S=${WORKDIR}/${MY_PN}-${PV} + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="keyring test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-db/sqlite-3.4:3 + dev-libs/kdsingleapplication[qt6(+)] + dev-libs/qtkeychain[keyring?,qt6(+)] + dev-qt/qtbase:6[concurrent,gui,network,ssl,widgets] + net-libs/libre-graph-api-cpp-qt-client + sys-fs/inotify-tools" + +DEPEND="${RDEPEND} + test? ( + dev-util/cmocka + dev-qt/qtbase:6[test] + )" + +BDEPEND=" + dev-qt/qttools:6[linguist] + kde-frameworks/extra-cmake-modules" + +PATCHES=( "${FILESDIR}"/${PN}-3.2.0.10193-no_fortify_override.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_TESTING=$(usex test) + -DKDE_INSTALL_SYSCONFDIR=/etc + ) + + cmake_src_configure +} diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest index 8a8e9d5374dd..a25c4d0f12d3 100644 --- a/net-misc/packETH/Manifest +++ b/net-misc/packETH/Manifest @@ -1 +1,2 @@ DIST packETH-2.1.tar.gz 458750 BLAKE2B c08096e0781fc0174922d2eece31fa5e789ccfd7745eac0f16fbd515c6b5f72c7b9f7575fd215a3a1d0b69d6ae1f08427e5d145abbc83b9cbfeb6c6657d28b35 SHA512 55be4a2eb517c1d040664ea1a16d59dab20b06edbbd073cbf709deb4dfcec8d8eb12b88dfbd578f9bdb0ca614036ac4bbb00be6f865b774da2aa62ce8d3d767e +DIST packETH-3.0.tar.gz 288127 BLAKE2B 5ada3df3ebcfb29ea4b035678899d5271a2c9189513ddd43821f2e264fb31dd8923779c39bdf6066e3cd153c04e4409bdad8fde31f02b01e0dd9650117d6c45a SHA512 5b63483159d7b34c236b797fbdac3526d06fd5e0db34664163b19e643e942ad0919b4eae637047f69f017510e943188219345ff1c6fefa09dcb4023c09501f06 diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml index fe1725b8caa9..dbaf797912a7 100644 --- a/net-misc/packETH/metadata.xml +++ b/net-misc/packETH/metadata.xml @@ -10,5 +10,6 @@ </use> <upstream> <remote-id type="sourceforge">packeth</remote-id> +<remote-id type="github">jemcek/packETH</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/packETH/packETH-2.1-r1.ebuild b/net-misc/packETH/packETH-2.1-r1.ebuild new file mode 100644 index 000000000000..91f156e28ba9 --- /dev/null +++ b/net-misc/packETH/packETH-2.1-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Packet generator tool for ethernet" +HOMEPAGE="http://packeth.sourceforge.net/" +SRC_URI="https://github.com/jemcek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli +gtk" +REQUIRED_USE=" + || ( cli gtk ) +" + +RDEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + ) +" +DEPEND=" + ${RDEPEND} + gtk? ( virtual/pkgconfig ) +" +PATCHES=( + "${FILESDIR}"/${PN}-1.8.1-libs-and-flags.patch + "${FILESDIR}"/${PN}-2.1-fno-common.patch +) +DOCS=( AUTHORS CHANGELOG README ) + +src_prepare() { + default + use gtk && eautoreconf +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861695 + # https://github.com/jemcek/packETH/issues/42 + filter-lto + + use gtk && default +} + +src_compile() { + use gtk && default + use cli && emake \ + CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -C cli +} + +src_install() { + use gtk && default + + if use cli; then + dobin cli/${PN}cli + local i + for i in NEWS README TODO; do newdoc cli/${i} ${i}.cli; done + fi +} diff --git a/net-misc/packETH/packETH-2.1.ebuild b/net-misc/packETH/packETH-2.1.ebuild index 1d4deb15c02e..1ef386ad25be 100644 --- a/net-misc/packETH/packETH-2.1.ebuild +++ b/net-misc/packETH/packETH-2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 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="Packet generator tool for ethernet" HOMEPAGE="http://packeth.sourceforge.net/" @@ -39,6 +39,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861695 + # https://github.com/jemcek/packETH/issues/42 + filter-lto + use gtk && default } diff --git a/net-misc/packETH/packETH-3.0.ebuild b/net-misc/packETH/packETH-3.0.ebuild new file mode 100644 index 000000000000..5ac86e17d30c --- /dev/null +++ b/net-misc/packETH/packETH-3.0.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 flag-o-matic toolchain-funcs + +DESCRIPTION="Packet generator tool for ethernet" +HOMEPAGE="http://packeth.sourceforge.net/" +SRC_URI="https://github.com/jemcek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli +gtk" +REQUIRED_USE=" + || ( cli gtk ) +" + +RDEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + ) +" +DEPEND=" + ${RDEPEND} + gtk? ( virtual/pkgconfig ) +" +PATCHES=( + "${FILESDIR}"/${PN}-1.8.1-libs-and-flags.patch +) +DOCS=( AUTHORS CHANGELOG README ) + +src_prepare() { + default + use gtk && eautoreconf +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861695 + # https://github.com/jemcek/packETH/issues/42 + filter-lto + + use gtk && default +} + +src_compile() { + use gtk && default + use cli && emake \ + CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -C cli +} + +src_install() { + use gtk && default + + if use cli; then + dobin cli/${PN}cli + local i + for i in NEWS README TODO; do newdoc cli/${i} ${i}.cli; done + fi +} diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest new file mode 100644 index 000000000000..d1b7a339a1a1 --- /dev/null +++ b/net-misc/passt/Manifest @@ -0,0 +1,5 @@ +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 +DIST passt-2024.06.07.tar.xz 198360 BLAKE2B 378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488 SHA512 103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0 diff --git a/net-misc/passt/files/Makefile-2024.03.20.patch b/net-misc/passt/files/Makefile-2024.03.20.patch new file mode 100644 index 000000000000..30f36d1f084d --- /dev/null +++ b/net-misc/passt/files/Makefile-2024.03.20.patch @@ -0,0 +1,13 @@ +Addressing following bugs: +https://bugs.gentoo.org/924494 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,7 @@ + + FLAGS := -Wall -Wextra -Wno-format-zero-length + FLAGS += -pedantic -std=c11 -D_XOPEN_SOURCE=700 -D_GNU_SOURCE +-FLAGS += -D_FORTIFY_SOURCE=2 -O2 -pie -fPIE ++FLAGS += -O2 -pie -fPIE + FLAGS += -DPAGE_SIZE=$(shell getconf PAGE_SIZE) + FLAGS += -DNETNS_RUN_DIR=\"/run/netns\" + FLAGS += -DPASST_AUDIT_ARCH=AUDIT_ARCH_$(AUDIT_ARCH) diff --git a/net-misc/passt/metadata.xml b/net-misc/passt/metadata.xml new file mode 100644 index 000000000000..35350e9c2beb --- /dev/null +++ b/net-misc/passt/metadata.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>me@rahil.rocks</email> + <name>Rahil Bhimjiani</name> + </maintainer> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + passt implements a translation layer between a Layer-2 network interface and native Layer-4 sockets (TCP, UDP, ICMP/ICMPv6 echo) on a host. It doesn't require any capabilities or privileges, and it can be used as a simple replacement for Slirp. + + pasta (same binary as passt, different command) offers equivalent functionality, for network namespaces: traffic is forwarded using a tap interface inside the namespace, without the need to create further interfaces on the host, hence not requiring any capabilities or privileges. + + qrap is a wrapper, designed specifically for usage with qemu(1) and passt(1), connecting a UNIX domain socket to a file descriptor, and running qemu(1) with given arguments. + </longdescription> + <upstream> + <bugs-to>https://passt.top/passt/bugs</bugs-to> + <doc>https://passt.top/passt/about/</doc> + </upstream> +</pkgmetadata> diff --git a/net-misc/passt/passt-2024.03.26.ebuild b/net-misc/passt/passt-2024.03.26.ebuild new file mode 100644 index 000000000000..90df839f93d9 --- /dev/null +++ b/net-misc/passt/passt-2024.03.26.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="4988e2b" + +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 ~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}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-2024.04.05.ebuild b/net-misc/passt/passt-2024.04.05.ebuild new file mode 100644 index 000000000000..e4201215e520 --- /dev/null +++ b/net-misc/passt/passt-2024.04.05.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="954589b" + +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 ~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}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-2024.04.26.ebuild b/net-misc/passt/passt-2024.04.26.ebuild new file mode 100644 index 000000000000..c73a0f7c146b --- /dev/null +++ b/net-misc/passt/passt-2024.04.26.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="d03c4e2" + +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 ~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}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-2024.05.10.ebuild b/net-misc/passt/passt-2024.05.10.ebuild new file mode 100644 index 000000000000..ce44d6abe4eb --- /dev/null +++ b/net-misc/passt/passt-2024.05.10.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="7288448" + +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 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}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-2024.06.07.ebuild b/net-misc/passt/passt-2024.06.07.ebuild new file mode 100644 index 000000000000..65a98bc9f51b --- /dev/null +++ b/net-misc/passt/passt-2024.06.07.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="8a83b53" + +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 ~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}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-9999.ebuild b/net-misc/passt/passt-9999.ebuild new file mode 100644 index 000000000000..65a98bc9f51b --- /dev/null +++ b/net-misc/passt/passt-9999.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="8a83b53" + +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 ~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}" + + emake $(usev static) +} 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/metadata.xml b/net-misc/pedro/metadata.xml index 776ccf273d9d..85e4ed814fa2 100644 --- a/net-misc/pedro/metadata.xml +++ b/net-misc/pedro/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"> - <email>keri@gentoo.org</email> - <name>Keri Harris</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> 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/pingu/pingu-1.5.ebuild b/net-misc/pingu/pingu-1.5.ebuild deleted file mode 100644 index 1d074daa34ea..000000000000 --- a/net-misc/pingu/pingu-1.5.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd tmpfiles toolchain-funcs - -DESCRIPTION="Policy routing daemon with failover and load-balancing" -HOMEPAGE="https://github.com/ncopa/pingu" -SRC_URI="https://github.com/ncopa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc" - -RDEPEND="dev-libs/libev:=" -DEPEND="${RDEPEND} - sys-kernel/linux-headers - virtual/pkgconfig - doc? ( app-text/asciidoc )" - -# Fix QA with install into path /run/pingu must be created at runtime -PATCHES=( "${FILESDIR}"/"${P}"-makefile.patch ) - -src_prepare() { - default - - # Fix compilation issue - sed -i '/icp->un.frag.__unused = 0;/d' src/icmp.c \ - || die "sed failed for src/icmp.c" -} - -src_configure() { - ./configure "$(use_enable debug)" "$(use_enable doc)" \ - --prefix=/usr || die "configure failed" -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - default - - newtmpfiles "${FILESDIR}"/pingu.tmpfile pingu.conf - newinitd "${FILESDIR}"/pingu.initd pingu - newconfd "${FILESDIR}"/pingu.confd pingu - systemd_dounit "${FILESDIR}"/pingu.service - keepdir /var/lib/pingu - insinto /etc/pingu - newins pingu.conf pingu.conf.example -} - -pkg_postinst() { - tmpfiles_process pingu.conf -} 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/portspoof/portspoof-1.3.ebuild b/net-misc/portspoof/portspoof-1.3-r1.ebuild index aa2143647342..7eec0c399ab3 100644 --- a/net-misc/portspoof/portspoof-1.3.ebuild +++ b/net-misc/portspoof/portspoof-1.3-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2023 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 DESCRIPTION="return SYN+ACK for every port connection attempt" HOMEPAGE="http://portspoof.org/" @@ -18,15 +20,27 @@ else fi src_prepare() { + default if [[ ${PV} == "9999" ]] ; then - mv configure.in configure.ac || die + mv configure.in configure.ac || die eautoreconf fi sed -i \ 's#/usr/local/bin/portspoof -D -c /usr/local/etc/portspoof.conf -s /usr/local/etc/portspoof_signatures#/usr/bin/portspoof -D -c /etc/portspoof.conf -s /etc/portspoof_signatures#'\ system_files/init.d/portspoof.sh sed -i '/#include <sys\/sysctl.h>/d' src/connection.h || die - eapply_user +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861698 + # https://github.com/drk1wi/portspoof/issues/48 + # + # Do not trust it with LTO either + append-flags -fno-strict-aliasing + filter-lto + + default } src_install() { diff --git a/net-misc/portspoof/portspoof-9999.ebuild b/net-misc/portspoof/portspoof-9999.ebuild index aa2143647342..7eec0c399ab3 100644 --- a/net-misc/portspoof/portspoof-9999.ebuild +++ b/net-misc/portspoof/portspoof-9999.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2023 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 DESCRIPTION="return SYN+ACK for every port connection attempt" HOMEPAGE="http://portspoof.org/" @@ -18,15 +20,27 @@ else fi src_prepare() { + default if [[ ${PV} == "9999" ]] ; then - mv configure.in configure.ac || die + mv configure.in configure.ac || die eautoreconf fi sed -i \ 's#/usr/local/bin/portspoof -D -c /usr/local/etc/portspoof.conf -s /usr/local/etc/portspoof_signatures#/usr/bin/portspoof -D -c /etc/portspoof.conf -s /etc/portspoof_signatures#'\ system_files/init.d/portspoof.sh sed -i '/#include <sys\/sysctl.h>/d' src/connection.h || die - eapply_user +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861698 + # https://github.com/drk1wi/portspoof/issues/48 + # + # Do not trust it with LTO either + append-flags -fno-strict-aliasing + filter-lto + + default } src_install() { diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest index 5dd68809c8d0..1549eddf5141 100644 --- a/net-misc/proxychains/Manifest +++ b/net-misc/proxychains/Manifest @@ -1 +1,2 @@ DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95 +DIST proxychains-ng-4.17.tar.xz 45288 BLAKE2B 3e34742dc06fa80fceeb5250c48584c53fc8d4231147d9ef7a5aff21acfae0f814916c89033d1f92d3cf0cbb96d4031cb9769fa81c1cba81259ca34fb1182f63 SHA512 aa35ae27305065a7f296cbf99b3308b2ac759287761a5d234ddaa558292467fae88c33a3ced1d71329cf6a7e8f56aa4e2ffd4274d57d87857f13ca8393d5d983 diff --git a/net-misc/proxychains/files/proxychains-4.17-makefile.patch b/net-misc/proxychains/files/proxychains-4.17-makefile.patch new file mode 100644 index 000000000000..149fd39be88e --- /dev/null +++ b/net-misc/proxychains/files/proxychains-4.17-makefile.patch @@ -0,0 +1,54 @@ +diff --git a/Makefile b/Makefile +index 11d0df8..8e9874d 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,9 +28,8 @@ LOBJS = src/version.o \ + + GENH = src/version.h + +-CFLAGS += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe +-NO_AS_NEEDED = -Wl,--no-as-needed +-LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL) $(PTHREAD) ++CFLAGS = -Wall -std=c99 -D_GNU_SOURCE ++LIBS = -ldl -lpthread + INC = + PIC = -fPIC + AR = $(CROSS_COMPILE)ar +@@ -41,15 +40,15 @@ LDSO_SUFFIX = so + LD_SET_SONAME = -Wl,-soname= + INSTALL = ./tools/install.sh + +-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX) ++LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX) + + SHARED_LIBS = $(LDSO_PATHNAME) + ALL_LIBS = $(SHARED_LIBS) +-PXCHAINS = proxychains4 +-PXCHAINS_D = proxychains4-daemon ++PXCHAINS = proxychains ++PXCHAINS_D = proxychains-daemon + ALL_TOOLS = $(PXCHAINS) $(PXCHAINS_D) + ALL_CONFIGS = src/proxychains.conf +-ZSH_COMPLETION = completions/zsh/_proxychains4 ++ZSH_COMPLETION = completions/zsh/_proxychains + + -include config.mak + +@@ -93,14 +92,13 @@ src/version.o: src/version.h + $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $< + + $(LDSO_PATHNAME): $(LOBJS) +- $(CC) $(LDFLAGS) $(FAT_LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) \ +- $(USER_LDFLAGS) -shared -o $@ $^ $(SOCKET_LIBS) ++ $(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -shared $(PIC) -o $@ $^ $(LIBS) $(SOCKET_LIBS) + + $(PXCHAINS): $(OBJS) +- $(CC) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) $(LIBDL) -o $@ ++ $(CC) $(LDFLAGS) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) $(LIBDL) -o $@ + + $(PXCHAINS_D): $(DOBJS) +- $(CC) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) -o $@ + + + .PHONY: all clean install install-config install-libs install-tools install-zsh-completion diff --git a/net-misc/proxychains/metadata.xml b/net-misc/proxychains/metadata.xml index 17257e610c72..63d1cbd32283 100644 --- a/net-misc/proxychains/metadata.xml +++ b/net-misc/proxychains/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <maintainer type="person" proxied="yes"> + <email>hlein@korelogic.com</email> + <name>Hank Leininger</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription lang="en"> Program that hooks network-related libc functions diff --git a/net-misc/proxychains/proxychains-4.17.ebuild b/net-misc/proxychains/proxychains-4.17.ebuild new file mode 100644 index 000000000000..54aa7c5f8772 --- /dev/null +++ b/net-misc/proxychains/proxychains-4.17.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PN=${PN}-ng +MY_P=${MY_PN}-${PV} + +DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)" +HOMEPAGE="https://github.com/rofl0r/proxychains-ng/" +SRC_URI="http://ftp.barfooze.de/pub/sabotage/tarballs/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86" + +S=${WORKDIR}/${MY_P} + +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + +src_prepare() { + default + sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die + mv completions/zsh/_proxychains4 completions/zsh/_proxychains || die + tc-export CC +} + +src_configure() { + # not autotools + ./configure \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --sysconfdir="${EPREFIX}"/etc \ + || die +} + +src_install() { + dobin ${PN} + dodoc AUTHORS README TODO + + dolib.so lib${PN}.so.${PV} + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1} + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so + + insinto /etc + doins src/${PN}.conf +} diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest index 82769e032db0..400919b07711 100644 --- a/net-misc/proxytunnel/Manifest +++ b/net-misc/proxytunnel/Manifest @@ -1 +1 @@ -DIST proxytunnel-1.11.1.tar.gz 55935 BLAKE2B fb24dcf5351eb252d7ba661c667cab25066592f6b7356360225d1492fcb621a39954062ebeb63c5cc1b9b66499538d69b8412ee6a770c88257f4ef0397f627c0 SHA512 2cc59285ca63beb063f3408655f31b2e9748f11cfff70e39b07dc3381348dd92c71a66974e83d360565ea107e53d830a57bc375e940a51388ced406ec5907006 +DIST proxytunnel-1.12.2.tar.gz 58973 BLAKE2B ffa518278660c816b27ae6c497d744d6588ba9be29fab2ce254bcbc4695fc8e5339e836da541c6aed7a73c2d1e5207f529ca9b818ddbf02b699856d43bb85a57 SHA512 b336e24e9243900999f7253032d666322404377e62d56e2365c13008f242dcc8f7c7c3075d362a9ee29d424aa698feca7d973f839362a40314caa984ee8ad352 diff --git a/net-misc/proxytunnel/proxytunnel-1.11.1.ebuild b/net-misc/proxytunnel/proxytunnel-1.12.2.ebuild index abdb6f3ed56f..3de0355f2f6c 100644 --- a/net-misc/proxytunnel/proxytunnel-1.11.1.ebuild +++ b/net-misc/proxytunnel/proxytunnel-1.12.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=7 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/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild index 837b1c73c4fd..596bd3f68add 100644 --- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild +++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild @@ -1,9 +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_PEP517=setuptools inherit desktop distutils-r1 diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild index e099c0d732d9..41b49563f683 100644 --- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild +++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild @@ -1,9 +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_PEP517=setuptools inherit desktop distutils-r1 diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest index df4e3c0e67ea..e13e75e9f078 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -1,2 +1,2 @@ -DIST putty-0.78.tar.gz 2811628 BLAKE2B 544fa7d3f7acfeb76cdb19e5ff3b60c81e4a1101ba16fab107d1f403745f792ab562d438d64a8a0a429b31ec426806c296a7b4e03916f8f32d2c227a54c32c71 SHA512 d7a3e2eabd5f1f65fc0f3f1ee0789c30fbe891b57f63ddeac0b92befcb6aecd4a748f04a21c76ee42d992deb77c2e1a0454a71cc620ef26fbf23af660bd84bb5 +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/metadata.xml b/net-misc/putty/metadata.xml index ba7ec402bc1d..6d9cc6eb57e8 100644 --- a/net-misc/putty/metadata.xml +++ b/net-misc/putty/metadata.xml @@ -15,6 +15,5 @@ <use> <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag> <flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>. If disabled only the CLI tools puttygen, plink, pscp and psftp will be built</flag> - <flag name="gtk2">Build the PuTTY client with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3</flag> </use> </pkgmetadata> diff --git a/net-misc/putty/putty-0.78.ebuild b/net-misc/putty/putty-0.81.ebuild index dd68284f8bf4..fdd92be3c643 100644 --- a/net-misc/putty/putty-0.78.ebuild +++ b/net-misc/putty/putty-0.81.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 @@ -23,7 +23,8 @@ RDEPEND=" !net-misc/pssh gtk? ( dev-libs/glib:2 - x11-libs/gdk-pixbuf + x11-libs/cairo + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango @@ -36,7 +37,7 @@ DEPEND=" BDEPEND=" dev-lang/perl virtual/pkgconfig - doc? ( app-doc/halibut ) + doc? ( app-text/halibut ) " src_unpack() { diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild deleted file mode 100644 index f3873e1fcf7f..000000000000 --- a/net-misc/putty/putty-9999.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake desktop xdg-utils - -DESCRIPTION="A Free Telnet/SSH Client" -HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" -SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2" -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git" -else - SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86" -fi -LICENSE="MIT" - -SLOT="0" -IUSE="debug doc +gtk gtk2 gssapi" - -RDEPEND=" - !net-misc/pssh - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/pango - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3[X] ) - ) - gssapi? ( virtual/krb5 ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - doc? ( app-doc/halibut ) -" - -REQUIRED_USE=" - gtk2? ( gtk ) -" - -src_unpack() { - [[ ${PV} == *9999 ]] && git-r3_src_unpack - default -} - -src_configure() { - cd "${S}"/unix || die - local mycmakeargs=( - -DPUTTY_DEBUG="$(usex debug)" - -DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)" - -DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '') - -DPUTTY_IPV6=yes - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile all doc -} - -src_install() { - cmake_src_install - - doman "${BUILD_DIR}"/doc/*.1 - - if use doc ; then - docinto html - dodoc "${BUILD_DIR}"/doc/html/*.html - fi - - if use gtk ; then - local i - for i in 16 22 24 32 48 64 128 256; do - newicon -s ${i} \ - "${WORKDIR}"/${PN}-icons/${PN}-${i}.png \ - ${PN}.png - done - - # install desktop file provided by Gustav Schaffter in #49577 - make_desktop_entry ${PN} PuTTY ${PN} Network - fi -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} 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-r1.ebuild b/net-misc/r8125/r8125-9.013.02-r1.ebuild new file mode 100644 index 000000000000..9c0cdfaa93f8 --- /dev/null +++ b/net-misc/r8125/r8125-9.013.02-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 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/Download/List?cate_id=584" +# 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=y + ENABLE_RX_PACKET_FRAGMENT=y + ) + + linux-mod-r1_src_compile +} 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/r8152/Manifest b/net-misc/r8152/Manifest index f03e2096515f..cb9a42a0c0e3 100644 --- a/net-misc/r8152/Manifest +++ b/net-misc/r8152/Manifest @@ -1,2 +1 @@ -DIST r8152-2.16.3.tar.bz2 73331 BLAKE2B 9e22ee6d9d0197def782f77bfd0c88a2d8827d4f8cc0bbb1a6583ab67533cd07ba79a16cd9350272ed18c733fe809ea1ff70596627abdc65d452bdf817628bc8 SHA512 c37bf5199d3a857c9a7a12f3aa4ecfe9c04b49413aea862a053ebee24c137cd35769e5d5cc7e2bb7dd3bf9057f51ffada0b4e0c53cb3d417e05c8e3fc830705c DIST r8152-2.17.1.tar.bz2 75156 BLAKE2B 05b55ea17a579add9a9abee89db490685086bfe29aeea6cbfbdbb63a81dbee4d1cac151822c178e52febe4bee14a3b5deb20737f671fcdbc6dd6d01938b1d18c SHA512 e465b524ee8aaed12da8258195fb8a4c9fea0862812c1ab268e31ad6ec61444c4f4332d643124063b389fd1df7a271c6c057537d4cbe67188a1a2262b4793f42 diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch deleted file mode 100644 index 076d78f46062..000000000000 --- a/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: https://github.com/wget/realtek-r8152-linux/commit/6ffb3760c34a904467d70830ac9c10211e8f5d3a -From: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr> -Date: Wed, 14 Sep 2022 15:13:31 +0200 -Subject: [PATCH] Fix for linux 5.19 without breaking older kernel - compatibility - ---- a/r8152.c -+++ b/r8152.c -@@ -20458,9 +20458,13 @@ static ssize_t sg_en_store(struct device *dev, struct device_attribute *attr, - return -EINVAL; - } - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) -+/* LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) */ -+ netif_set_tso_max_size(netdev, tso_size); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+/* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ - netif_set_gso_max_size(netdev, tso_size); --#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ -+#endif - - return count; - } -@@ -20620,12 +20624,16 @@ static int rtl8152_probe(struct usb_interface *intf, - rtl_get_mapt_ver(tp); - - netdev->ethtool_ops = &ops; --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) -+/* LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) */ -+ netif_set_tso_max_size(netdev, RTL_LIMITED_TSO_SIZE); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+/* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ - if (!tp->sg_use) - netif_set_gso_max_size(netdev, RTL_LIMITED_TSO_SIZE); - #else - netdev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6); --#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ -+#endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) - /* MTU range: 68 - 1500 or 9194 */ diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch deleted file mode 100644 index d20db413a16b..000000000000 --- a/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/ervinpopescu/realtek-r8152-linux/commit/0029747c3cf68dbccbebfcb560277040673dfe36.patch -From: ervinpopescu <ervin.popescu10@gmail.com> -Date: Tue, 15 Nov 2022 19:30:16 +0200 -Subject: [PATCH] Fix for linux 6.1 without breaking older kernel compatibility - ---- a/r8152.c -+++ b/r8152.c -@@ -17558,7 +17558,6 @@ static void r8156_init(struct r8152 *tp) - // break; - // } - -- - r8153b_mcu_spdown_en(tp, false); - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); -@@ -18339,7 +18338,6 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) - cmd->autoneg = AUTONEG_DISABLE; - } - -- - if (netif_running(netdev) && netif_carrier_ok(netdev)) { - u16 speed = rtl8152_get_speed(tp); - -@@ -19202,7 +19200,6 @@ static int rtltool_ioctl(struct r8152 *tp, struct ifreq *ifr) - } - break; - -- - case RTLTOOL_USB_OCP_WRITE_DWORD: - if (!tp->rtk_enable_diag && net_ratelimit()) - netif_warn(tp, drv, netdev, -@@ -20708,10 +20705,14 @@ static int rtl8152_probe(struct usb_interface *intf, - - usb_set_intfdata(intf, tp); - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) - if (tp->support_2500full) - netif_napi_add(netdev, &tp->napi, r8152_poll, 256); - else - netif_napi_add(netdev, &tp->napi, r8152_poll, 64); -+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) */ -+ netif_napi_add(netdev, &tp->napi, r8152_poll); -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) */ - - ret = register_netdev(netdev); - if (ret != 0) { diff --git a/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch b/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch new file mode 100644 index 000000000000..2449d2883346 --- /dev/null +++ b/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch @@ -0,0 +1,32 @@ +Bug: https://bugs.gentoo.org/926829 +Patch from Christian Bricart to remove strlcpy and replace with strscpy +so this builds with linux kernels =>6.8. + +Signed-Off-By: Jay Faulkner <jay@jvf.cc> + +diff -Naur r8152-2.17.1/compatibility.h r8152-2.17.1.patched/compatibility.h +--- r8152-2.17.1/compatibility.h 2024-03-12 09:43:05.150688533 +0100 ++++ r8152-2.17.1.patched/compatibility.h 2024-03-12 09:46:20.913759268 +0100 +@@ -18,6 +18,10 @@ + #include <net/gso.h> + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) ++#define strscpy strlcpy ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) + #include <linux/mdio.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) +diff -Naur r8152-2.17.1/r8152.c r8152-2.17.1.patched/r8152.c +--- r8152-2.17.1/r8152.c 2024-03-12 09:43:05.130688336 +0100 ++++ r8152-2.17.1.patched/r8152.c 2024-03-12 09:45:13.264694513 +0100 +@@ -19691,7 +19691,7 @@ + uinfo->idVendor = __le16_to_cpu(udev->descriptor.idVendor); + uinfo->idProduct = __le16_to_cpu(udev->descriptor.idProduct); + uinfo->bcdDevice = __le16_to_cpu(udev->descriptor.bcdDevice); +- strlcpy(uinfo->devpath, udev->devpath, sizeof(udev->devpath)); ++ strscpy(uinfo->devpath, udev->devpath, sizeof(udev->devpath)); + pla_ocp_read(tp, PLA_IDR, sizeof(uinfo->dev_addr), + uinfo->dev_addr); + diff --git a/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch b/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch new file mode 100644 index 000000000000..433d3deab34e --- /dev/null +++ b/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch @@ -0,0 +1,117 @@ +From: https://github.com/wget/realtek-r8152-linux/pull/41 +From a5b3b4a882a3a637ccfa447dc7d2e84eac9ef0fc Mon Sep 17 00:00:00 2001 +From: "oleg.hoefling" <oleg.hoefling@gmail.com> +Date: Wed, 22 May 2024 00:44:37 +0200 +Subject: [PATCH] add compat for 6.9.X kernels + +Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com> +--- a/r8152.c ++++ b/r8152.c +@@ -950,7 +950,10 @@ struct r8152 { + void (*up)(struct r8152 *tp); + void (*down)(struct r8152 *tp); + void (*unload)(struct r8152 *tp); +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ int (*eee_get)(struct r8152 *tp, struct ethtool_keee *eee); ++ int (*eee_set)(struct r8152 *tp, struct ethtool_keee *eee); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + int (*eee_get)(struct r8152 *tp, struct ethtool_eee *eee); + int (*eee_set)(struct r8152 *tp, struct ethtool_eee *eee); + #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ +@@ -19099,7 +19102,11 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data) + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++static int r8152_get_eee(struct r8152 *tp, struct ethtool_keee *eee) ++#else + static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee) ++#endif + { + u32 lp, adv, supported = 0; + u16 val; +@@ -19115,17 +19122,32 @@ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee) + + eee->eee_enabled = tp->eee_en; + eee->eee_active = !!(supported & adv & lp); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ ethtool_convert_legacy_u32_to_link_mode(eee->supported, supported); ++ ethtool_convert_legacy_u32_to_link_mode(eee->advertised, tp->eee_adv); ++ ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised, lp); ++#else + eee->supported = supported; + eee->advertised = tp->eee_adv; + eee->lp_advertised = lp; ++#endif + + return 0; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++static int r8152_set_eee(struct r8152 *tp, struct ethtool_keee *eee) ++#else + static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee) ++#endif + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ u32 advertised = 0; ++ ethtool_convert_link_mode_to_legacy_u32(&advertised, eee->advertised); ++ u16 val = ethtool_adv_to_mmd_eee_adv_t(advertised); ++#else + u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised); +- ++#endif + tp->eee_en = eee->eee_enabled; + tp->eee_adv = val; + +@@ -19134,7 +19156,11 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee) + return 0; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++static int r8153_get_eee(struct r8152 *tp, struct ethtool_keee *eee) ++#else + static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee) ++#endif + { + u32 lp, adv, supported = 0; + u16 val; +@@ -19150,15 +19176,25 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee) + + eee->eee_enabled = tp->eee_en; + eee->eee_active = !!(supported & adv & lp); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ ethtool_convert_legacy_u32_to_link_mode(eee->supported, supported); ++ ethtool_convert_legacy_u32_to_link_mode(eee->advertised, tp->eee_adv); ++ ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised, lp); ++#else + eee->supported = supported; + eee->advertised = tp->eee_adv; + eee->lp_advertised = lp; ++#endif + + return 0; + } + + static int ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata) ++#else + rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) ++#endif + { + struct r8152 *tp = netdev_priv(net); + int ret; +@@ -19185,7 +19221,11 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) + } + + static int ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata) ++#else + rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) ++#endif + { + struct r8152 *tp = netdev_priv(net); + int ret; diff --git a/net-misc/r8152/r8152-2.16.3-r1.ebuild b/net-misc/r8152/r8152-2.16.3-r1.ebuild deleted file mode 100644 index 82753f37ac20..000000000000 --- a/net-misc/r8152/r8152-2.16.3-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 udev - -DESCRIPTION="r8152 driver for Realtek USB FE / GBE / 2.5G Gaming Ethernet Family Controller" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software" -SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND="virtual/udev" -DEPEND="${RDEPEND}" - -IUSE="+center-tap-short" - -# https://github.com/wget/realtek-r8152-linux/ keeps reasonably up to date -# with kernel support patches. It appears to be used by the AUR maintainer. -PATCHES=( - "${FILESDIR}"/${PN}-2.16.3-kernel-5.19-fix.patch - "${FILESDIR}"/${PN}-2.16.3-kernel-6.1-fix.patch - "${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch - "${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch -) - -src_compile() { - local modlist=( ${PN}=kernel/net/usb:. ) - local modargs=( - KERNELDIR="${KV_OUT_DIR}" - CONFIG_CTAP_SHORT="$(usex center-tap-short on off)" - ) - - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - udev_dorules 50-usb-realtek-net.rules -} - -pkg_postinst() { - linux-mod-r1_pkg_postinst - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/net-misc/r8152/r8152-2.17.1.ebuild b/net-misc/r8152/r8152-2.17.1.ebuild index 7d3f7b0a6e6e..0c0485efb61b 100644 --- a/net-misc/r8152/r8152-2.17.1.ebuild +++ b/net-misc/r8152/r8152-2.17.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 @@ -11,7 +11,7 @@ SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND="virtual/udev" DEPEND="${RDEPEND}" @@ -23,6 +23,8 @@ IUSE="+center-tap-short" PATCHES=( "${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch "${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch + "${FILESDIR}"/${PN}-2.17.1-kernel-6.8-strscpy.patch + "${FILESDIR}"/${PN}-2.17.1-kernel-6.9-fix.patch ) src_compile() { diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 9ead16377f3e..6421e16e2073 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,2 +1,2 @@ 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/files/r8168-8.053.00-kernel-6.9.patch b/net-misc/r8168/files/r8168-8.053.00-kernel-6.9.patch new file mode 100644 index 000000000000..526805cd1166 --- /dev/null +++ b/net-misc/r8168/files/r8168-8.053.00-kernel-6.9.patch @@ -0,0 +1,119 @@ +From 94426e16197c244d03aad0434e3490acdaa830fe Mon Sep 17 00:00:00 2001 +From: Masato TOYOSHIMA <phoepsilonix@phoepsilonix.love> +Date: Tue, 14 May 2024 14:52:58 +0900 +Subject: [PATCH] Linux 6.9 compat: change to ethtool_keee from ethtool_eee + +linux/include/linux/ethtool.h + +struct ethtool_ops + int (*get_eee)(struct net_device *dev, struct ethtool_keee *eee); + int (*set_eee)(struct net_device *dev, struct ethtool_keee *eee); + +change to ethtool_keee from ethtool_eee + rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata) + rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata) +--- + src/r8168_n.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 44 insertions(+) + +diff --git a/src/r8168_n.c b/src/r8168_n.c +index ad63f42..3d67641 100755 +--- a/src/r8168_n.c ++++ b/src/r8168_n.c +@@ -7941,7 +7941,11 @@ rtl8168_device_lpi_t_to_ethtool_lpi_t(struct rtl8168_private *tp , u32 lpi_timer + } + + static int ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata) ++#else + rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) ++#endif + { + struct rtl8168_private *tp = netdev_priv(net); + struct ethtool_eee *eee = &tp->eee; +@@ -7975,9 +7979,15 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) + + edata->eee_enabled = !!val; + edata->eee_active = !!(supported & adv & lp); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ ethtool_convert_legacy_u32_to_link_mode(edata->supported, supported); ++ ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv); ++ ethtool_convert_legacy_u32_to_link_mode(edata->lp_advertised, lp); ++#else + edata->supported = supported; + edata->advertised = adv; + edata->lp_advertised = lp; ++#endif + edata->tx_lpi_enabled = edata->eee_enabled; + edata->tx_lpi_timer = tx_lpi_timer; + +@@ -7985,11 +7995,19 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) + } + + static int ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata) ++#else + rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) ++#endif + { + struct rtl8168_private *tp = netdev_priv(net); + struct ethtool_eee *eee = &tp->eee; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ u32 advertising, adv; ++#else + u32 advertising; ++#endif + int rc = 0; + + if (!rtl8168_support_eee(tp)) +@@ -8013,6 +8031,18 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) + } + + advertising = tp->advertising; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ ethtool_convert_link_mode_to_legacy_u32(&adv, edata->advertised); ++ if (linkmode_empty(edata->advertised)) { ++ adv = advertising & eee->supported; ++ ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv); ++ } else if (!linkmode_empty(edata->advertised) & ~advertising) { ++ dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of autoneg advertised speeds %x\n", ++ adv, advertising); ++ rc = -EINVAL; ++ goto out; ++ } ++#else + if (!edata->advertised) { + edata->advertised = advertising & eee->supported; + } else if (edata->advertised & ~advertising) { +@@ -8021,15 +8051,29 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) + rc = -EINVAL; + goto out; + } ++#endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ if (!linkmode_empty(edata->advertised) & ~eee->supported) { ++ dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n", ++ adv, eee->supported); ++ rc = -EINVAL; ++ goto out; ++ } ++#else + if (edata->advertised & ~eee->supported) { + dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n", + edata->advertised, eee->supported); + rc = -EINVAL; + goto out; + } ++#endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) ++ ethtool_convert_link_mode_to_legacy_u32(&eee->advertised, edata->advertised); ++#else + eee->advertised = edata->advertised; ++#endif + eee->eee_enabled = edata->eee_enabled; + + if (eee->eee_enabled) 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.052.01.ebuild b/net-misc/r8168/r8168-8.053.00.ebuild index 8d93a0a7f5fe..940d0ae9f3df 100644 --- a/net-misc/r8168/r8168-8.052.01.ebuild +++ b/net-misc/r8168/r8168-8.053.00.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 @@ -6,19 +6,20 @@ EAPI=8 inherit linux-mod-r1 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" - -SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" +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" +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." +PATCHES=( "${FILESDIR}"/${PN}-8.053.00-kernel-6.9.patch ) + src_compile() { local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) local modargs=( diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest index 52b20c665f6f..c42872589a4a 100644 --- a/net-misc/rabbitmq-server/Manifest +++ b/net-misc/rabbitmq-server/Manifest @@ -1,2 +1 @@ -DIST rabbitmq-server-3.11.2.tar.xz 3752644 BLAKE2B bc98808579cbaa12371fc95d137fd18a0d784a859471d4dac6c328e819bb7ba5cb0256509a678788452f6dbeaa6fc48b4dbe39b24bd7cf0b1698fb6e4f67cb03 SHA512 ceec07fb9dfe8ba76850aa94543396a4e878aca13b9e3e303e86bb44bbbb1cea863148a1480b83517bfd2bdc66b814c3177ad2ed595604f5710f8f98e8dcc439 -DIST rabbitmq-server-3.12.9.tar.xz 4437392 BLAKE2B 19c1e88e79c29af0c06d732d25098ee7b5575e8f269ba08e3247a65ba206c8cdc819767572071063dcbd8816756366d0a3f059d8e060ffe47fb221e1546b4c23 SHA512 c6015ee9593336104fc043ed20d99a476e7b36802ae36798f23c2caf91a01a71913963fdbe6de249f234cb3ba82379e5c5b2976e07d098c287ee72e3f238f2eb +DIST rabbitmq-server-3.13.1.tar.xz 5083312 BLAKE2B 1821d05c1be2da491019605de7877f26cb8d47bf67f901d5bb2ede961558a44900a3b8697e254167eb5622d37b20b668dc919fadbe5c5c98f5cc644b948986b3 SHA512 022c6e213cf7cea865a6931a3481897efea65dffa649dd77df9d88bb5f9b7abaaa83b525f983de4cb336b1e0469073cadc2ce48d4f47f93005c87b9fdadb3857 diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.11.2-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.11.2-r1.ebuild deleted file mode 100644 index 1db10de5cfac..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.11.2-r1.ebuild +++ /dev/null @@ -1,86 +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="xml(+)" - -inherit python-any-r1 systemd - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" -HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -RESTRICT="test" - -# See https://www.rabbitmq.com/which-erlang.html for Erlang version -# See https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_cli#requirements for Elixir version -RDEPEND=" - acct-group/rabbitmq - acct-user/rabbitmq - >=dev-lang/erlang-25.0[ssl] <dev-lang/erlang-25.4 -" -DEPEND="${RDEPEND} - app-arch/zip - app-arch/unzip - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - >=dev-lang/elixir-1.13.4 <dev-lang/elixir-1.15.0 - dev-libs/libxslt - $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]') -" - -python_check_deps() { - python_has_version -d "dev-python/simplejson[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_compile() { - emake all docs dist -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i deps/rabbit/scripts/rabbitmq-env || die - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins - - einfo "Installing server scripts to /usr/sbin" - rm -v deps/rabbit/scripts/*.bat || die - exeinto /usr/libexec/rabbitmq - for script in deps/rabbit/scripts/*; do - doexe ${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script) - done - - # install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq - systemd_dounit "${FILESDIR}/rabbitmq.service" - - # install documentation - dodoc deps/rabbit/docs/*.example - dodoc deps/rabbit/README.md - doman deps/rabbit/docs/*.5 - doman deps/rabbit/docs/*.8 - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq /etc/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/lib/rabbitmq/mnesia -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.12.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild index 1ba1abad96c0..2fdd45494c53 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.12.9.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-3.13.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 @@ -14,15 +14,15 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/${ LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" RESTRICT="test" # See https://www.rabbitmq.com/which-erlang.html for Erlang version -# See https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_cli#requirements for Elixir version +# See https://github.com/rabbitmq/rabbitmq-server/blob/main/deps/rabbitmq_cli/mix.exs for Elixir version RDEPEND=" acct-group/rabbitmq acct-user/rabbitmq - >=dev-lang/erlang-25.0[ssl] <dev-lang/erlang-26.2 + >=dev-lang/erlang-26.0[ssl] <dev-lang/erlang-26.3 " DEPEND=" ${RDEPEND} @@ -30,7 +30,7 @@ DEPEND=" app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto - >=dev-lang/elixir-1.13.4 <dev-lang/elixir-1.16.0 + >=dev-lang/elixir-1.13.4 <dev-lang/elixir-1.17.0 dev-libs/libxslt ${PYTHON_DEPS} " @@ -40,7 +40,11 @@ pkg_setup() { } src_compile() { - emake all docs dist + # Disable parallel make + # https://bugs.gentoo.org/930093 + # https://bugs.gentoo.org/930098 + # https://bugs.gentoo.org/930133 + emake -j1 all docs dist } src_install() { @@ -53,10 +57,11 @@ src_install() { einfo "Installing Erlang modules to ${targetdir}" insinto "${targetdir}" + chmod +x escript/* || die + insopts -m0755 doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins einfo "Installing server scripts to /usr/sbin" - rm -v deps/rabbit/scripts/*.bat || die exeinto /usr/libexec/rabbitmq for script in deps/rabbit/scripts/*; do doexe ${script} @@ -83,6 +88,7 @@ src_install() { } pkg_preinst() { + # https://www.rabbitmq.com/docs/upgrade#rabbitmq-version-upgradability if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.12; then elog "Upgrading to RabbitMQ 3.12 requires all feature flags" elog "from 3.11 to be enabled. If any feature flags are not" diff --git a/net-misc/radvd/files/radvd-2.19-configure-c99.patch b/net-misc/radvd/files/radvd-2.19-configure-c99.patch new file mode 100644 index 000000000000..38a6d070657f --- /dev/null +++ b/net-misc/radvd/files/radvd-2.19-configure-c99.patch @@ -0,0 +1,46 @@ +https://github.com/radvd-project/radvd/commit/5acb1c64766dfaf37c9745632f99feecf11d1403 + +From 5acb1c64766dfaf37c9745632f99feecf11d1403 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 3 Feb 2023 02:33:13 +0000 +Subject: [PATCH] configure.ac: Fix -Wint-conversion warnings + +These become fatal with Clang 15 and may lead to incorrect configure +test results. + +``` +-ignoreme: warning: incompatible pointer to integer conversion initializing 'int' with an expression of type 'uint16_t[8]' (aka 'unsigned short[8]') [-Wint-conversion] ++ignoreme: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'uint16_t[8]' (aka 'unsigned short[8]') [-Wint-conversion] + int u = in6_u.s6_addr16; + ^ ~~~~~~~~~~~~~~~ +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -178,15 +178,19 @@ AC_HEADER_TIME + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_MSG_CHECKING(whether struct sockaddr_in6 has sin6_scope_id) +-AC_TRY_COMPILE([#include <sys/types.h> +-#include <netinet/in.h>], [static struct sockaddr_in6 ac_sin6; int ac_size = +-sizeof (ac_sin6.sin6_scope_id);], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID], ++AC_TRY_COMPILE([#include <stdint.h> ++#include <sys/types.h> ++#include <netinet/in.h>], [ ++static struct sockaddr_in6 ac_sin6; ++uint32_t ac_size = sizeof (ac_sin6.sin6_scope_id); ++], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID], + 1, [whether struct sockaddr_in6 has sin6_scope_id])], + AC_MSG_RESULT(no)) + + AC_MSG_CHECKING(whether struct in6_addr has u6_addrXX and defines s6_addrXX) +-AC_TRY_COMPILE([#include <netinet/in.h>], [static struct in6_addr in6_u; +-int u = in6_u.s6_addr16;], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR], ++AC_TRY_COMPILE([#include <stdint.h> ++#include <netinet/in.h>], [static struct in6_addr in6_u; ++uint16_t u = in6_u.s6_addr16[0];], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR], + 1, [whether struct in6_addr has u6_addrXX and defines s6_addrXX])], + AC_MSG_RESULT(no)) + + diff --git a/net-misc/radvd/files/radvd-2.19.init b/net-misc/radvd/files/radvd-2.19.init new file mode 100644 index 000000000000..069801e841ab --- /dev/null +++ b/net-misc/radvd/files/radvd-2.19.init @@ -0,0 +1,83 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +CONFIGFILE=/etc/radvd.conf +PIDFILE=/run/radvd/radvd.pid +SYSCTL_FORWARD=net.ipv6.conf.all.forwarding + +description="IPv6 Router Advertisement Daemon" + +extra_commands="configtest" +extra_started_commands="reload" +description_configtest="Test the configuration and run startup tests" +description_reload="Reload the radvd configuration file" + +depend() { + need net +} + +checkconfig() { + if [ ! -f "${CONFIGFILE}" ]; then + eerror "Configuration file ${CONFIGFILE} not found" + return 1 + fi + + if ! /usr/sbin/radvd -c -C "${CONFIGFILE}" ; then + eerror "Configuration file ${CONFIGFILE} failed test" + return 1 + fi +} + +configtest() { + ebegin "Checking ${RC_SVCNAME} configuration" + checkconfig + eend $? +} + +start() { + if [ "${FORWARD}" != "no" ]; then + ebegin "Enabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null + eend $? + fi + + checkconfig || return 1 + + checkpath -d -o radvd:radvd "${PIDFILE%/*}" + + ebegin "Starting IPv6 Router Advertisement Daemon" + start-stop-daemon --start --exec /usr/sbin/radvd \ + --pidfile "${PIDFILE}" \ + -- -C "${CONFIGFILE}" -p "${PIDFILE}" -u radvd ${OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping IPv6 Router Advertisement Daemon" + start-stop-daemon --stop --exec /usr/sbin/radvd --pidfile "${PIDFILE}" + eend $? + + if [ "${FORWARD}" != "no" ]; then + ebegin "Disabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=0" > /dev/null + eend $? + fi +} + +reload() { + if [ "${FORWARD}" != "no" ]; then + ebegin "Enabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null + eend $? + fi + + checkconfig || return 1 + + checkpath -d -o radvd:radvd "${PIDFILE%/*}" + + ebegin "Reloading IPv6 Router Advertisement Daemon" + start-stop-daemon --signal HUP \ + --exec /usr/sbin/radvd --pidfile "${PIDFILE}" + eend $? +} diff --git a/net-misc/radvd/radvd-2.19-r5.ebuild b/net-misc/radvd/radvd-2.19-r5.ebuild index 59f57cdf5ed5..5baaa8d279bc 100644 --- a/net-misc/radvd/radvd-2.19-r5.ebuild +++ b/net-misc/radvd/radvd-2.19-r5.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 @@ SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" IUSE="selinux test" RESTRICT="!test? ( test )" diff --git a/net-misc/radvd/radvd-2.19-r4.ebuild b/net-misc/radvd/radvd-2.19-r6.ebuild index 24730014369e..1d81dd69fda5 100644 --- a/net-misc/radvd/radvd-2.19-r4.ebuild +++ b/net-misc/radvd/radvd-2.19-r6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit readme.gentoo-r1 systemd toolchain-funcs +inherit autotools readme.gentoo-r1 systemd toolchain-funcs DESCRIPTION="Linux IPv6 Router Advertisement Daemon" HOMEPAGE="https://radvd.litech.org/" @@ -11,29 +11,37 @@ SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="selinux test" RESTRICT="!test? ( test )" -BDEPEND="virtual/pkgconfig" -DEPEND=" +BDEPEND=" sys-devel/bison sys-devel/flex - test? ( dev-libs/check ) -" + virtual/pkgconfig" +DEPEND="test? ( dev-libs/check )" RDEPEND=" acct-group/radvd acct-user/radvd - selinux? ( sec-policy/selinux-radvd ) -" - -DOCS=( CHANGES README TODO radvd.conf.example ) + selinux? ( sec-policy/selinux-radvd )" PATCHES=( "${FILESDIR}"/${P}-musl-include.patch + "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-configure-c99.patch ) +src_prepare() { + default + + # Drop once clang16 patch is in a release + eautoreconf +} + src_configure() { + # Needs reentrant functions (yyset_in), bug #884375 + export LEX=flex + econf --with-pidfile=/run/radvd/radvd.pid \ --with-systemdsystemunitdir=no \ $(use_with test check) @@ -44,23 +52,25 @@ src_compile() { } src_install() { + HTML_DOCS=( INTRO.html ) default - - docinto html - dodoc INTRO.html + dodoc radvd.conf.example newinitd "${FILESDIR}"/${PN}-2.15.init ${PN} newconfd "${FILESDIR}"/${PN}.conf ${PN} systemd_dounit "${FILESDIR}"/${PN}.service - readme.gentoo_create_doc -} - -DISABLE_AUTOFORMATTING=1 -DOC_CONTENTS="Please create a configuration file ${ROOT}/etc/radvd.conf. -See ${ROOT}/usr/share/doc/${PF} for an example. + DISABLE_AUTOFORMATTING=1 + local DOC_CONTENTS="Please create a configuration file ${EPREFIX}/etc/radvd.conf. +See ${EPREFIX}/usr/share/doc/${PF} for an example. grsecurity users should allow a specific group to read /proc and add the radvd user to that group, otherwise radvd may segfault on startup." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-misc/radvd/radvd-2.19-r2.ebuild b/net-misc/radvd/radvd-2.19-r7.ebuild index ac71ff204c83..803571c1bfce 100644 --- a/net-misc/radvd/radvd-2.19-r2.ebuild +++ b/net-misc/radvd/radvd-2.19-r7.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit readme.gentoo-r1 systemd toolchain-funcs +inherit autotools readme.gentoo-r1 systemd toolchain-funcs DESCRIPTION="Linux IPv6 Router Advertisement Daemon" HOMEPAGE="https://radvd.litech.org/" @@ -11,28 +11,37 @@ SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="selinux test" RESTRICT="!test? ( test )" -BDEPEND="virtual/pkgconfig" -CDEPEND="dev-libs/libdaemon" -DEPEND=" - ${CDEPEND} +BDEPEND=" sys-devel/bison sys-devel/flex - test? ( dev-libs/check ) -" + virtual/pkgconfig" +DEPEND="test? ( dev-libs/check )" RDEPEND=" - ${CDEPEND} acct-group/radvd acct-user/radvd - selinux? ( sec-policy/selinux-radvd ) -" + selinux? ( sec-policy/selinux-radvd )" -DOCS=( CHANGES README TODO radvd.conf.example ) +PATCHES=( + "${FILESDIR}"/${P}-musl-include.patch + "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-configure-c99.patch +) + +src_prepare() { + default + + # Drop once clang16 patch is in a release + eautoreconf +} src_configure() { + # Needs reentrant functions (yyset_in), bug #884375 + export LEX=flex + econf --with-pidfile=/run/radvd/radvd.pid \ --with-systemdsystemunitdir=no \ $(use_with test check) @@ -43,23 +52,25 @@ src_compile() { } src_install() { + HTML_DOCS=( INTRO.html ) default + dodoc radvd.conf.example - docinto html - dodoc INTRO.html - - newinitd "${FILESDIR}"/${PN}-2.15.init ${PN} + newinitd "${FILESDIR}"/${PN}-2.19.init ${PN} newconfd "${FILESDIR}"/${PN}.conf ${PN} systemd_dounit "${FILESDIR}"/${PN}.service - readme.gentoo_create_doc -} - -DISABLE_AUTOFORMATTING=1 -DOC_CONTENTS="Please create a configuration file ${ROOT}/etc/radvd.conf. -See ${ROOT}/usr/share/doc/${PF} for an example. + DISABLE_AUTOFORMATTING=1 + local DOC_CONTENTS="Please create a configuration file ${EPREFIX}/etc/radvd.conf. +See ${EPREFIX}/usr/share/doc/${PF} for an example. grsecurity users should allow a specific group to read /proc and add the radvd user to that group, otherwise radvd may segfault on startup." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest index e9e8b85e7266..29ddf91d5457 100644 --- a/net-misc/rclone/Manifest +++ b/net-misc/rclone/Manifest @@ -1,6 +1,2 @@ -DIST rclone-1.62.2-deps.tar.xz 294265336 BLAKE2B 7f44b9972ab902ea53beb2cb6475dc4bbc1ca3b7254d1177a8d49107d6ce90724b0bb37567aecbd9421151ca0f7e7eaa01e6b4ed0d995264ddfc944cae98220e SHA512 2e1a6b864094b364745402b857036ebdea4dd83dddee6f18e3e40fbb0e740bae4d460b6f592d9ee50632fa73d6447f8dee0748a73a738a6dce263a20a1eae975 -DIST rclone-1.62.2.tar.gz 16172767 BLAKE2B 29dd755a25adb3b332b45a662dd6ae1280c38a940e76cc6e3c5ccd38620b43b0b9f0a4598d752583ddff7e2c860416e4e36b6cdfc00cf81f03437ac13e88aba3 SHA512 c29b666ab5573e80f9e61955e987cf3834306bfebce209775f5838a0844e26b5c5ec41d64b8a8444745a99fd8e9c104b18631aeffb438e89839f996221b1c8ca -DIST rclone-1.63.0-deps.tar.xz 297987608 BLAKE2B cfda8663ca32b36f5e56db74a724bded03473d4626a55111cf6e06c70b9d8a1678e371eb129cfa5ab4c09df67a22a6887e1681c099e4459f83521c6ad424e4e7 SHA512 604339abaead46ea4332c3eb8459575a6e26b5440f8743a17a5ae95954adf7f8f17039aea555b5e5534211d5091fd345646a6b43e1deba4fb4fb2576fb783881 -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.67.0-deps.tar.xz 367523832 BLAKE2B 45e33614658aa619f0abe4cb48ae8eb82d39cf3f56ef9c9f0fcfbc14c2ba2868ff237ae0ab1f308bab31352e176209029604c18c22d180d68c0605a6a671a3c2 SHA512 2e4aba47f37ca67c7ba827d9c70bae858cb9633861c546e9cf19205a11109c52ea8e3e7b13f3073be5ab6405770b7c58bb00124393b712bd59fa25da6930987e +DIST rclone-1.67.0.tar.gz 17232236 BLAKE2B 8241234a970335bb67a5f51b11fdc79afe4a3894c1df2409d141cc8662fec669c1d273e7e67383291703cf66a4168a0ff3c3f8e28d569b0df340c0e7b4a4c324 SHA512 9d336c6a03ba7711f88fbd6ff019b4ce02825467b9656bba8811e9c27fe857ba5d64d863e1f5f3129cbcc89509891615d911794376c90775901a7de1b0741448 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.62.2-r1.ebuild b/net-misc/rclone/rclone-1.62.2-r1.ebuild deleted file mode 100644 index fad2bbf730a5..000000000000 --- a/net-misc/rclone/rclone-1.62.2-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 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" -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 -" - -DESCRIPTION="A program to sync files to and from various cloud storage providers" -HOMEPAGE="https://rclone.org/" - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" -SLOT="0" -IUSE="" - -RDEPEND="sys-fs/fuse:3" - -src_compile() { - go build -mod=readonly . || die "compile failed" -} - -src_test() { - # Setting CI skips unreliable tests, see fstest/testy/testy.go - # TestAddPlugin and TestRemovePlugin fail - RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README.md - - ./rclone genautocomplete bash ${PN}.bash || die - newbashcomp ${PN}.bash ${PN} - - ./rclone genautocomplete zsh ${PN}.zsh || die - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} -} diff --git a/net-misc/rclone/rclone-1.63.0.ebuild b/net-misc/rclone/rclone-1.63.0.ebuild deleted file mode 100644 index 715bda67b36e..000000000000 --- a/net-misc/rclone/rclone-1.63.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 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" -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 -" - -DESCRIPTION="A program to sync files to and from various cloud storage providers" -HOMEPAGE="https://rclone.org/" - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" -SLOT="0" -IUSE="" - -RDEPEND="sys-fs/fuse:3" - -src_compile() { - go build -mod=readonly . || die "compile failed" -} - -src_test() { - # Setting CI skips unreliable tests, see fstest/testy/testy.go - # TestAddPlugin and TestRemovePlugin fail - RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README.md - - ./rclone genautocomplete bash ${PN}.bash || die - newbashcomp ${PN}.bash ${PN} - - ./rclone genautocomplete zsh ${PN}.zsh || die - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} -} diff --git a/net-misc/rclone/rclone-1.63.1.ebuild b/net-misc/rclone/rclone-1.63.1.ebuild deleted file mode 100644 index 715bda67b36e..000000000000 --- a/net-misc/rclone/rclone-1.63.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 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" -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 -" - -DESCRIPTION="A program to sync files to and from various cloud storage providers" -HOMEPAGE="https://rclone.org/" - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" -SLOT="0" -IUSE="" - -RDEPEND="sys-fs/fuse:3" - -src_compile() { - go build -mod=readonly . || die "compile failed" -} - -src_test() { - # Setting CI skips unreliable tests, see fstest/testy/testy.go - # TestAddPlugin and TestRemovePlugin fail - RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README.md - - ./rclone genautocomplete bash ${PN}.bash || die - newbashcomp ${PN}.bash ${PN} - - ./rclone genautocomplete zsh ${PN}.zsh || die - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} -} diff --git a/net-misc/rclone/rclone-1.67.0.ebuild b/net-misc/rclone/rclone-1.67.0.ebuild new file mode 100644 index 000000000000..aea77db97b4b --- /dev/null +++ b/net-misc/rclone/rclone-1.67.0.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/rdesktop/rdesktop-1.9.0-r4.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild index c20a105b9d13..00c0ed9fec58 100644 --- a/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild +++ b/net-misc/rdesktop/rdesktop-1.9.0-r4.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 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="A Remote Desktop Protocol Client" HOMEPAGE="http://www.rdesktop.org/" @@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${PV/_/-} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr" RDEPEND=" @@ -59,6 +59,13 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861824 + # https://github.com/rdesktop/rdesktop/issues/414 + # + # Upstream is "in need of new maintainers" so it may never be fixed. + filter-lto + if use pulseaudio; then sound_conf="--with-sound=pulse" elif use ao; then diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml index 4c0d3032d69c..115e9d64a669 100644 --- a/net-misc/redir/metadata.xml +++ b/net-misc/redir/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"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/redir/redir-3.3.ebuild b/net-misc/redir/redir-3.3.ebuild index fdef86a0e2dd..26a860e1ab9f 100644 --- a/net-misc/redir/redir-3.3.ebuild +++ b/net-misc/redir/redir-3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,6 +9,6 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86" DOCS=( ChangeLog.md README.md transproxy.txt ) diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 047b8137bcb9..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.33.tar.bz2 2105164 BLAKE2B 94f73f895f7e0478779d71097ee57ba049299e702527df2cf8a48ea41647f641684131b10b2f4faa7cf831ccea29611a68c2427127a2ebea87acac54f996a446 SHA512 c019131d2c3756946a332a3037286c8370a2e07b20a416c657cc2852ece9e59236499a2c5e45d4e9f391d9265089763957c6968c668e110c350e668053db6d82 +DIST Remmina-v1.4.35.tar.bz2 2150047 BLAKE2B 3ba730cd4009a797ee7d66bbe4390e9db221ee5cf0b008e0eb3df4a992d7260ddc65983c8c34d1aa1bb2190ed1104653e269369565d7e4eecaf3078ffc84330c SHA512 36dc419b4473c71f6b3e53338f4a3cf7a1fe60534ea0dce375b4c9fd00cd9d8a618c4376be4d031bdee1eed8b4aade4538a6cc414629ef6dde41cdcd513a6d36 diff --git a/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch b/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch deleted file mode 100644 index 5725349b2cae..000000000000 --- a/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch +++ /dev/null @@ -1,54 +0,0 @@ -From dbd6f94974c4d7df313963ffefecb1ff8ca9ecb6 Mon Sep 17 00:00:00 2001 -From: myheroyuki <myheroyuki@outlook.com> -Date: Sun, 24 Sep 2023 23:15:58 +0900 -Subject: [PATCH] [REM-2981] Move ssh-unrelated code outside of HAVE_LIBSSH - ifdef - ---- - src/remmina_file_editor.c | 23 ++++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) - -diff --git a/src/remmina_file_editor.c b/src/remmina_file_editor.c -index feee4a031..1c1fa9858 100644 ---- a/src/remmina_file_editor.c -+++ b/src/remmina_file_editor.c -@@ -361,17 +361,6 @@ static GtkWidget *remmina_file_editor_create_notebook_tab(RemminaFileEditor *gfe - return grid; - } - --#ifdef HAVE_LIBSSH -- --static void remmina_file_editor_ssh_tunnel_server_custom_radio_on_toggled(GtkToggleButton *togglebutton, RemminaFileEditor *gfe) --{ -- TRACE_CALL(__func__); -- gtk_widget_set_sensitive(GTK_WIDGET(gfe->priv->ssh_tunnel_server_entry), -- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_enabled_check)) && -- (gfe->priv->ssh_tunnel_server_custom_radio == NULL || -- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_server_custom_radio)))); --} -- - - static void remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleButton *togglebutton, - RemminaFileEditor *gfe) -@@ -392,6 +381,18 @@ static void remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleBut - } - } - -+#ifdef HAVE_LIBSSH -+ -+static void remmina_file_editor_ssh_tunnel_server_custom_radio_on_toggled(GtkToggleButton *togglebutton, RemminaFileEditor *gfe) -+{ -+ TRACE_CALL(__func__); -+ gtk_widget_set_sensitive(GTK_WIDGET(gfe->priv->ssh_tunnel_server_entry), -+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_enabled_check)) && -+ (gfe->priv->ssh_tunnel_server_custom_radio == NULL || -+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_server_custom_radio)))); -+} -+ -+ - static void remmina_file_editor_ssh_tunnel_enabled_check_on_toggled(GtkToggleButton *togglebutton, - RemminaFileEditor *gfe, RemminaProtocolSSHSetting ssh_setting) - { --- -2.42.0 - diff --git a/net-misc/remmina/remmina-1.4.31.ebuild b/net-misc/remmina/remmina-1.4.35-r1.ebuild index b362cbf26010..e5f045ac8a94 100644 --- a/net-misc/remmina/remmina-1.4.31.ebuild +++ b/net-misc/remmina/remmina-1.4.35-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 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake optfeature python-single-r1 xdg +inherit cmake python-single-r1 xdg MY_P="${PN^}-v${PV}" @@ -34,10 +34,9 @@ COMMON_DEPEND=" crypt? ( dev-libs/libgcrypt:0= ) keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) - kwallet? ( kde-frameworks/kwallet ) + kwallet? ( kde-frameworks/kwallet:5 ) python? ( ${PYTHON_DEPS} ) - rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] - <net-misc/freerdp-3[X] + rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129:2=[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] @@ -64,7 +63,7 @@ RDEPEND=" DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${PN^}-v${PV}" pkg_setup() { use python && python-single-r1_pkg_setup @@ -102,9 +101,3 @@ src_configure() { ) cmake_src_configure } - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] -} diff --git a/net-misc/remmina/remmina-1.4.33.ebuild b/net-misc/remmina/remmina-1.4.35-r2.ebuild index 9217f07d5493..acf07642ef72 100644 --- a/net-misc/remmina/remmina-1.4.33.ebuild +++ b/net-misc/remmina/remmina-1.4.35-r2.ebuild @@ -1,24 +1,24 @@ -# 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_{10..12} ) -inherit cmake optfeature python-single-r1 xdg +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" +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" +KEYWORDS="amd64 ~arm64 ~riscv x86" +IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf X" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) || ( X wayland )" COMMON_DEPEND=" dev-libs/glib:2 @@ -27,17 +27,18 @@ COMMON_DEPEND=" dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf - x11-libs/gtk+:3[wayland?] - x11-libs/libX11 - x11-libs/libxkbfile + x11-libs/gtk+:3[X?,wayland?] + X? ( + 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 ) + kwallet? ( kde-frameworks/kwallet:5 ) python? ( ${PYTHON_DEPS} ) - rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] - <net-misc/freerdp-3[X] + rdp? ( net-misc/freerdp:3= cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] @@ -64,14 +65,13 @@ RDEPEND=" DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) -S="${WORKDIR}/${PN^}-v.${PV}-2c4e1479433e51418ecb6089f35182bfebc5b57e" +S="${WORKDIR}/${PN^}-v${PV}" pkg_setup() { use python && python-single-r1_pkg_setup } src_prepare() { - PATCHES+=( "${FILESDIR}"/${PN}-1.4.32-REM-2981.patch ) #914851 xdg_environment_reset cmake_src_prepare } @@ -83,7 +83,7 @@ src_configure() { -DWITH_CUPS=$(usex cups) -DWITH_EXAMPLES=$(usex examples) -DWITH_FREERDP=$(usex rdp) - -DWITH_FREERDP3=OFF + -DWITH_FREERDP3=ON -DWITH_GCRYPT=$(usex crypt) -DWITH_GETTEXT=$(usex nls) -DWITH_ICON_CACHE=OFF @@ -103,9 +103,3 @@ src_configure() { ) cmake_src_configure } - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] -} diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 6b0d954a83e2..a5939be1ad9c 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,4 +1,4 @@ -DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80 SHA512 96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6 -DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377 DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3 +DIST rsync-3.3.0.tar.gz 1153969 BLAKE2B 75a3cc50452086aebd16f42d7a309c173cbc1ea156227afb10d2106d0b9043e973676995b8199d22840775ae3df8db97d1c0de5f3aa58afa130c5b1348c3f825 SHA512 df5c53bc2f2b0e7e30f475903e5e4296dc2fbcf08e9ea6c3c61462d0e52b067c27e82deeb4be79102c86e9aa55a825182e126f22df44dabf5b7328acb2a01d10 +DIST rsync-3.3.0.tar.gz.asc 195 BLAKE2B bd077217bd44d406ac49a55b0c0d38c2accd4867b9fbf78a13fe906f52e1773d5a69aa3116a0c245abdeb1af54705d6ffc75aaba8b276ba9229bbb3340d7c3e8 SHA512 611d26374e0ff98ffb11b6ad6555f08773b9f09e1fbf232abc73c5d472b0defd28fd559bd42707774204d055b93be289f19f4db94bbdfe0b0935918fd922cced diff --git a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch deleted file mode 100644 index 9d081ab52c5b..000000000000 --- a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN rsync-3.2.4.orig/configure.ac rsync-3.2.4/configure.ac ---- rsync-3.2.4.orig/configure.ac 2022-12-01 22:26:34.856659562 +0100 -+++ rsync-3.2.4/configure.ac 2022-12-01 22:31:43.849290989 +0100 -@@ -1067,21 +1067,6 @@ - with_included_popt=yes - fi - --if test x"$GCC" = x"yes"; then -- if test x"$with_included_popt" != x"yes"; then -- # Turn pedantic warnings into errors to ensure an array-init overflow is an error. -- CFLAGS="$CFLAGS -pedantic-errors" -- else -- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to -- # turn off pedantic warnings (which will not lose the error for array-init overflow). -- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists -- # -Wpedantic and use that as a flag. -- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in -- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; -- esac -- fi --fi -- - AC_MSG_CHECKING([whether to use included libpopt]) - if test x"$with_included_popt" = x"yes"; then - AC_MSG_RESULT($srcdir/popt) diff --git a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch deleted file mode 100644 index d5a02f0e3159..000000000000 --- a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/WayneD/rsync/issues/324 -https://github.com/WayneD/rsync/commit/3592ac3c025da23b2dd291561ec6113940b9c11b - -From 3592ac3c025da23b2dd291561ec6113940b9c11b Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayne@opencoder.net> -Date: Sun, 19 Jun 2022 10:02:51 -0700 -Subject: [PATCH] Include bsd/strings.h if it exists - -Some systems apparently put strlcpy() into a separate bsd/strings.h file -without putting the function into a separate library. Thus, configure -finds that the function exists for linking but the build does not have -the declaration (which rsync only supplies if it is also supplying its -own version of the function). ---- - configure.ac | 3 ++- - rsync.h | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 37dbb18a..37241637 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,8 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \ - netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \ - sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \ - popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \ -- zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h) -+ zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h \ -+ bsd/string.h) - AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include <netinet/in.h>]]) - AC_HEADER_MAJOR_FIXED - -diff --git a/rsync.h b/rsync.h -index e5aacd25..1cc037c5 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -338,6 +338,9 @@ enum delret { - # endif - # include <string.h> - #endif -+#ifdef HAVE_BSD_STRING_H -+# include <bsd/string.h> -+#endif - #ifdef HAVE_STRINGS_H - # include <strings.h> - #endif diff --git a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch b/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch deleted file mode 100644 index 18e56c31ce2a..000000000000 --- a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://lists.samba.org/archive/rsync-announce/2022/000111.html ---- a/configure.ac -+++ b/configure.ac -@@ -1117,7 +1117,7 @@ else - fi - - AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[ --AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) - if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then - AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type]) - fi diff --git a/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch b/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch new file mode 100644 index 000000000000..952af573dfc7 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/917517 +https://github.com/WayneD/rsync/issues/511 +https://bugzilla.suse.com/show_bug.cgi?id=1214249 +https://bugzilla.redhat.com/show_bug.cgi?id=2229654 +https://src.fedoraproject.org/rpms/rsync/raw/06d55616ec86c3a68a8af917783788b928fefcc4/f/rsync-3.2.7-buffer-overflow.patch + +From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby <jslaby@suse.cz> +Date: Fri, 18 Aug 2023 08:26:20 +0200 +Subject: [PATCH] exclude: fix crashes with fortified strlcpy() + +Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when +its third parameter (size) is larger than the buffer: + $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx + sending incremental file list + *** buffer overflow detected ***: terminated + +It's in the exclude code in setup_merge_file(): + strlcpy(y, save, MAXPATHLEN); + +Note the 'y' pointer was incremented, so it no longer points to memory +with MAXPATHLEN "owned" bytes. + +Fix it by remembering the number of copied bytes into the 'save' buffer +and use that instead of MAXPATHLEN which is clearly incorrect. + +Fixes #511. +--- + exclude.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/exclude.c b/exclude.c +index ffe55b167..1a5de3b9e 100644 +--- a/exclude.c ++++ b/exclude.c +@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + parent_dirscan = True; + while (*y) { + char save[MAXPATHLEN]; +- strlcpy(save, y, MAXPATHLEN); ++ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ ++ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; + *y = '\0'; + dirbuf_len = y - dirbuf; + strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); +@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + lp->head = NULL; + } + lp->tail = NULL; +- strlcpy(y, save, MAXPATHLEN); ++ strlcpy(y, save, copylen); + while ((*x++ = *y++) != '/') {} + } + parent_dirscan = False; diff --git a/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch b/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch new file mode 100644 index 000000000000..1b99dc61088b --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch @@ -0,0 +1,32 @@ +https://github.com/WayneD/rsync/pull/558 + +From d869bcd3850b9a80f27f5aee4d41725f39d84ea7 Mon Sep 17 00:00:00 2001 +From: Ivan Babrou <github@ivan.computer> +Date: Mon, 1 Jan 2024 19:31:01 -0800 +Subject: [PATCH] configure.ac: fix failing IPv6 check due to missing return + type + +Fixing this warning escalated to an error, resuting in no IPv6 support: + +``` +configure.sh:7679: checking whether to enable ipv6 +configure.sh:7718: clang -o conftest -g -O2 -DHAVE_CONFIG_H -Wall -W conftest.c >&5 +conftest.c:73:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] +main() +^ +int +1 error generated. +configure.sh:7718: $? = 1 +configure.sh: program exited with status 1 +``` +--- a/configure.ac ++++ b/configure.ac +@@ -392,7 +392,7 @@ AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]), + #include <stdlib.h> + #include <sys/types.h> + #include <sys/socket.h> +-main() ++int main() + { + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); diff --git a/net-misc/rsync/files/rsyncd.conf-3.2.7-r5 b/net-misc/rsync/files/rsyncd.conf-3.2.7-r5 new file mode 100644 index 000000000000..fe9189182f83 --- /dev/null +++ b/net-misc/rsync/files/rsyncd.conf-3.2.7-r5 @@ -0,0 +1,15 @@ +# /etc/rsyncd.conf + +# Minimal configuration file for rsync daemon +# See rsync(1) and rsyncd.conf(5) man pages for help + +# This line is required by the /etc/init.d/rsyncd script +pid file = @GENTOO_PORTAGE_EPREFIX@/run/rsyncd.pid +use chroot = yes +read only = yes + +# Simple example for enabling your own local rsync server +#[gentoo-portage] +# path = @GENTOO_PORTAGE_EPREFIX@/var/db/repos/gentoo +# comment = Gentoo ebuild repository +# exclude = /distfiles /packages /lost+found diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml index 4dd797f7c406..cceaeff88940 100644 --- a/net-misc/rsync/metadata.xml +++ b/net-misc/rsync/metadata.xml @@ -8,7 +8,7 @@ <upstream> <changelog>https://rsync.samba.org/ftp/rsync/NEWS</changelog> <remote-id type="cpe">cpe:/a:samba:rsync</remote-id> - <remote-id type="github">WayneD/rsync</remote-id> + <remote-id type="github">RsyncProject/rsync</remote-id> </upstream> <use> <flag name="rrsync">Install rrsync script to setup restricted rsync users via ssh logins</flag> diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild index c20934382d87..ef0a743c83ee 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-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 @@ -78,6 +78,7 @@ fi PATCHES=( "${FILESDIR}"/${P}-flist-memcmp-ub.patch + "${FILESDIR}"/${P}-fortify-source-3.patch ) pkg_setup() { diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild new file mode 100644 index 000000000000..831a218e466c --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7-r4.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{9..11} ) +inherit flag-o-matic prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + 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 + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch + "${FILESDIR}"/${P}-fortify-source-3.patch + "${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi +} + +src_configure() { + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + --enable-ipv6 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable lz4) + $(use_with rrsync) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die + + exeinto /usr/share/rsync + doexe support/* + + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit packaging/systemd/rsync.service rsyncd.service +} + +pkg_postinst() { + if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" + ewarn "using the --compress option." + ewarn + ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} diff --git a/net-misc/rsync/rsync-3.2.7-r5.ebuild b/net-misc/rsync/rsync-3.2.7-r5.ebuild new file mode 100644 index 000000000000..d3fe9c36b093 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7-r5.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{9..11} ) +inherit flag-o-matic prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + 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 + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch + "${FILESDIR}"/${P}-fortify-source-3.patch + "${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi +} + +src_configure() { + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + --enable-ipv6 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable lz4) + $(use_with rrsync) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die + + exeinto /usr/share/rsync + doexe support/* + + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit packaging/systemd/rsync.service rsyncd.service +} + +pkg_postinst() { + if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" + ewarn "using the --compress option." + ewarn + ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} diff --git a/net-misc/rsync/rsync-3.3.0-r1.ebuild b/net-misc/rsync/rsync-3.3.0-r1.ebuild new file mode 100644 index 000000000000..ebe9b1a3ec8a --- /dev/null +++ b/net-misc/rsync/rsync-3.3.0-r1.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit flag-o-matic prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + 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 + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi +} + +src_configure() { + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + --enable-ipv6 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable lz4) + $(use_with rrsync) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die + + exeinto /usr/share/rsync + doexe support/* + + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit packaging/systemd/rsync.service rsyncd.service +} + +pkg_postinst() { + if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" + ewarn "using the --compress option." + ewarn + ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild index 485e9b7c45e5..36f1dca4b602 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.3.0.ebuild @@ -1,17 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -if [[ ${PV} != 3.2.4 ]]; then - # Make sure we revert the autotools hackery applied in 3.2.4. - die "Please use rsync-9999.ebuild as a basis for version bumps" -fi - -WANT_LIBTOOL=none - -PYTHON_COMPAT=( python3_{9..10} ) -inherit autotools flag-o-matic prefix python-single-r1 systemd +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -24,6 +19,10 @@ else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc inherit verify-sig + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + if [[ ${PV} == *_pre* ]] ; then SRC_DIR="src-previews" else @@ -38,24 +37,35 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="acl? ( virtual/acl ) +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) examples? ( ${PYTHON_DEPS} dev-lang/perl ) - lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0= ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) - xxhash? ( dev-libs/xxhash ) - zstd? ( >=app-arch/zstd-1.4 ) - >=dev-libs/popt-1.5 + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" -BDEPEND="examples? ( ${PYTHON_DEPS} )" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" if [[ ${PV} == *9999 ]] ; then BDEPEND+=" ${PYTHON_DEPS} @@ -66,17 +76,10 @@ else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi -PATCHES=( - "${FILESDIR}"/${P}-unsigned-char-checksum.patch - # https://github.com/WayneD/rsync/issues/324 - "${FILESDIR}"/${P}-strlcpy.patch - "${FILESDIR}"/${P}-notpedantic.patch -) - pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - 9999 needs commonmark at build time - if [[ ${PV} == *9999 ]] || use examples ; then + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then python-single-r1_pkg_setup fi } @@ -84,22 +87,35 @@ pkg_setup() { src_prepare() { default - eautoconf -o configure.sh - eautoheader && touch config.h.in + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi } src_configure() { - # Force enable IPv6 on musl - upstream bug: - # https://bugzilla.samba.org/show_bug.cgi?id=10715 - use elibc_musl && use ipv6 && append-cppflags -DINET6 - local myeconfargs=( --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf --without-included-popt + --enable-ipv6 $(use_enable acl acl-support) $(use_enable iconv) - $(use_enable ipv6) $(use_enable lz4) + $(use_with rrsync) $(use_enable ssl openssl) $(use_with !system-zlib included-zlib) $(use_enable xattr xattr-support) @@ -107,6 +123,14 @@ src_configure() { $(use_enable zstd) ) + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + econf "${myeconfargs[@]}" } @@ -134,7 +158,9 @@ src_install() { # Install the useful contrib scripts if use examples ; then - python_fix_shebang support/ + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die exeinto /usr/share/rsync doexe support/* diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index 37556cf395c4..6ea497c2e733 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.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 # Uncomment when introducing a patch which touches configure -#RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{9..11} ) +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" @@ -76,10 +76,6 @@ else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi -PATCHES=( - "${FILESDIR}"/${P}-flist-memcmp-ub.patch -) - pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - 9999 needs commonmark at build time @@ -91,6 +87,8 @@ pkg_setup() { src_prepare() { default + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then eaclocal -I m4 eautoconf -o configure.sh diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest index 2f18403d071c..330991fe45d4 100644 --- a/net-misc/rwhoisd/Manifest +++ b/net-misc/rwhoisd/Manifest @@ -1 +1,2 @@ +DIST rwhoisd-1.5.9.6-fix-build-for-clang16.patch.xz 71604 BLAKE2B f528fdf51203210a9c3c268569f3b84d668e45a000d76bd52e3b4eb3f9ad0f317aeb46e26475ca4c79b768232be9116f2ae13feac4e888d40b8359a72c3cb30c SHA512 ed82d09f6ceecaa607b800906780d68e276d26eba480da1a0d7d4867fcf692a9cf6eca90b16066b2065a749f9a07b47bb55bd45a8976058fd63bc25a9040324e DIST rwhoisd-1.5.9.6.tar.gz 491955 BLAKE2B 97587fc6a728cde58bc5049a9bf27ec1673ce7beb751aa0de7c787d08185b597e16a4920e89fa5aaabc6e7e1b5dfecedc50aaf55cbdbe7f85a43d6a125848cb9 SHA512 ab5674d9ed9f9c5fc00b2859b1336c766c546ca067ddf9d3863a0728c6d0eac11be3a9cd22dce8c25999ed8c8e5377e6da4aa1252e396d5b3c8e959794903c52 diff --git a/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch new file mode 100644 index 000000000000..8b207d0683ac --- /dev/null +++ b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch @@ -0,0 +1,89 @@ +https://github.com/arineng/rwhoisd/pull/3/commits/285e84dddee471886d84da3ea3579facb9fe7e99 + +From 285e84dddee471886d84da3ea3579facb9fe7e99 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> +Date: Fri, 1 Dec 2023 13:32:08 +0100 +Subject: [PATCH] Fix a return value of signal handlers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 14 will error if a value returned from a function does not match +a function prototype. This can be reproduced with -Wreturn-mismatch +option and is a problem compilers where a signal handler should return +void: + + daemon.c: In function ‘sigchld_handler’: + daemon.c:108:10: error: ‘return’ with a value, in function returning void + 108 | return 0; + | ^ + daemon.c:92:1: note: declared here + 92 | sigchld_handler( + | ^~~~~~~~~~~~~~~ + daemon.c: In function ‘sighup_handler’: + daemon.c:117:10: error: ‘return’ with a value, in function returning void + 117 | return 0; + | ^ + daemon.c:112:1: note: declared here + 112 | sighup_handler( + | ^~~~~~~~~~~~~~ + daemon.c: In function ‘exit_handler’: + daemon.c:127:10: error: ‘return’ with a value, in function returning void + 127 | return 0; + | ^ + +This patch fixes it. +--- + rwhoisd/configure.ac | 3 +++ + rwhoisd/server/daemon.c | 6 ++++++ + 2 files changed, 9 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 0b822ac..b1d659f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,6 +114,9 @@ AC_CHECK_FUNCS(getcwd gethostname socket strftime uname flock lockf \ + setsid crypt memset memcpy usleep wait3 getaddrinfo vsnprintf) + AC_REPLACE_FUNCS(strerror) + ++AS_IF([test "${ac_cv_type_signal}" = "int"], ++ AC_DEFINE([RETSIGTYPE_IS_INT], [1], [Define if RETSIGTYPE is int.]) ++ ) + + dnl Optional software. + +diff --git a/server/daemon.c b/server/daemon.c +index a5c638b..c943da9 100644 +--- a/server/daemon.c ++++ b/server/daemon.c +@@ -105,7 +105,9 @@ sigchld_handler( + /* reset the signal handler -- some older systems remove the signal + handler upon use. POSIX systems should not do this */ + signal(SIGCHLD, (__sighandler_t)sigchld_handler); ++#ifdef RETSIGTYPE_IS_INT + return 0; ++#endif + } + + static RETSIGTYPE +@@ -114,7 +116,9 @@ sighup_handler( + { + hup_recvd = TRUE; + signal(SIGHUP, (__sighandler_t)sighup_handler); ++#ifdef RETSIGTYPE_IS_INT + return 0; ++#endif + } + + static RETSIGTYPE +@@ -124,7 +128,9 @@ exit_handler( + log(L_LOG_NOTICE, UNKNOWN, "Exiting"); + delpid(); + exit(0); ++#ifdef RETSIGTYPE_IS_INT + return 0; ++#endif + } + + static void set_sighup (void) + diff --git a/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch new file mode 100644 index 000000000000..c015559fc891 --- /dev/null +++ b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch @@ -0,0 +1,33 @@ +Date: Wed, 1 Mar 2023 22:04:45 +0100 +Subject: [PATCH] fix direct ar call + +Prevent build to directly call ar and use a variable instead. + +Bug: https://bugs.gentoo.org/725194 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/common/Makefile.in ++++ b/common/Makefile.in +@@ -1,7 +1,7 @@ + + # programs + CC = @CC@ +-AR = ar ++AR = @AR@ + RANLIB = @RANLIB@ + SHELL = /bin/sh + +--- a/configure.ac ++++ b/configure.ac +@@ -4,6 +4,8 @@ dnl This has been updated to use autoconf-2.52. + AC_INIT + AC_CONFIG_SRCDIR([common/attributes.c]) + ++AC_CHECK_TOOL(AR, ar, false) ++ + dnl Random substitution variables + if test -f VERSION; then + RWHOIS_VERSION=`cat VERSION` +-- +2.39.2 diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild index 11231a66647f..1a2f4ab1ba55 100644 --- a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild +++ b/net-misc/rwhoisd/rwhoisd-1.5.9.6-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=7 @@ -21,7 +21,7 @@ RDEPEND=" acct-user/rwhoisd " BDEPEND=" - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild new file mode 100644 index 000000000000..3a5b26274eb5 --- /dev/null +++ b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="ARIN rwhois daemon" +HOMEPAGE="https://projects.arin.net/rwhois/" +SRC_URI="https://github.com/arineng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/rwhoisd-1.5.9.6-fix-build-for-clang16.patch.xz" +S="${WORKDIR}/${P}/${PN}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="virtual/libcrypt:=" +RDEPEND=" + ${DEPEND} + acct-group/rwhoisd + acct-user/rwhoisd +" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc +" + +# upstream PR: https://github.com/arineng/rwhoisd/pull/2 +PATCHES=( + "${WORKDIR}/${P}-fix-build-for-clang16.patch" + "${FILESDIR}/${P}-fix-direct-ar-call.patch" + "${FILESDIR}/${P}-c99.patch" +) + +src_prepare() { + default + eautoreconf #893906 +} + +src_compile() { + append-cflags -DNEW_STYLE_BIN_SORT -std=gnu89 + + emake -C common + emake -C regexp + emake -C mkdb + + default +} + +src_install() { + default + + doinitd "${FILESDIR}"/rwhoisd + newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd +} + +pkg_postinst() { + einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd." + einfo "It is highly inadvisable to run rwhoisd as root." +} diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest index f3ffdd6f8d03..450c69141a2c 100644 --- a/net-misc/rygel/Manifest +++ b/net-misc/rygel/Manifest @@ -1 +1,2 @@ -DIST rygel-0.42.4.tar.xz 1700196 BLAKE2B b83f9534c2294b88a180b20f90df6c43a220db83473429a41b034bfe3fff501f0f4e1f17deaa72001b8e3a886477f2c788dcf457463a275165652cc8c33da6e8 SHA512 b346e9ebfa6349c32b67557bef57bf7ddcf92782d112e875d64b7bd26718cbf89d7c5178b03defeba606ddfeb5bc94c685c10bdbd3fbd14f6942c72d96a9331a +DIST rygel-0.42.5.tar.xz 1704072 BLAKE2B a00be296956def2bc90b978df5b8c4b23a122b9c30adfa66c634249b5daafe8d21de1cac40417095d72d42e80522ce58fe678a7f7780bd1e134aa2cd66f3d2bf SHA512 cd1aaff4e2eb2c25931197d70f518a30dab75604d62b9f071bc560570c352371d132a10caaf94956d34ecd24505ccd9a7b9f5bf324d544c676ca1f47b124f533 +DIST rygel-0.42.6.tar.xz 1709832 BLAKE2B 3f93f830c05561be235b3aa1f1d5fed30d1fda94422345b129747b3c35d4d4a88a320af5f2eae293c8126b1a7b94a24c9a1c00c60fb60745ee3614eb1e559bfd SHA512 c388a16ef68a36c2de8f7280ea2cec179872e009686697c81d984cc723b143c9880c335ca6a26394e6d60cf4e4294e692122fd76cb2ac72adfb9a53f7805c239 diff --git a/net-misc/rygel/rygel-0.42.4.ebuild b/net-misc/rygel/rygel-0.42.5.ebuild index 53fd5ee1a17e..2e511bf9e740 100644 --- a/net-misc/rygel/rygel-0.42.4.ebuild +++ b/net-misc/rygel/rygel-0.42.5.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 diff --git a/net-misc/rygel/rygel-0.42.6.ebuild b/net-misc/rygel/rygel-0.42.6.ebuild new file mode 100644 index 000000000000..84bce3e400b8 --- /dev/null +++ b/net-misc/rygel/rygel-0.42.6.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 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/s3cmd/Manifest b/net-misc/s3cmd/Manifest index c4392dc2b593..9414ff997781 100644 --- a/net-misc/s3cmd/Manifest +++ b/net-misc/s3cmd/Manifest @@ -1,2 +1,3 @@ DIST s3cmd-2.2.0.tar.gz 134390 BLAKE2B d578aa13a7b8599c70dc6daa5d21950331b0b07278479d1f3947e6be78a9bd108c7f8ea6f198fa518dfa6ad44d907d979a29d5d9f1a15e4f73484fcebb118225 SHA512 07b2410554233b435b3476e09fd14354abaa19374cc1211f861147023470599483c18d213a44b5c9aee32d71b5a4bc5d9ce25721fb077cbadfd208d457e13845 DIST s3cmd-2.3.0.tar.gz 136754 BLAKE2B 61feff68d008536d4d31009f4ad18da37ccd0cdab9bfdf151b7112ac66f43bde78f042bc2ad36998fe070428a10a9ba99db5d6d39e9eb74e829a855eb11d1697 SHA512 3507fb8b597617a384508149cb30bdfa8bc8a7b3705782fbf9a943c4be413dc5b7cfb3572b632e8bebbb644ab31f418428ccca996c0d2ba840ad88df1f5a406a +DIST s3cmd-2.4.0.tar.gz 144976 BLAKE2B d854281a029b9865dc40d6bebd0994840a201ad573dfc628916daec00a6b38022f3f3c80aa745870c0b594443da747b1967d24976701e4d97167cfc087ae6dd8 SHA512 78a7fb193ef94759e6b59c8bccc2e736f4195f7de781f6a5d11a5685a3cf93ca9ef946bdefbfe0b0dafd0ea0612c8944283c3177f280d14edfca6553e62e0b49 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 new file mode 100644 index 000000000000..a3e56368e7f9 --- /dev/null +++ b/net-misc/s3cmd/s3cmd-2.4.0.ebuild @@ -0,0 +1,32 @@ +# 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="xml(+)" +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +DESCRIPTION="Command line client for Amazon S3" +HOMEPAGE="https://s3tools.org/s3cmd" +SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz" +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~loong ~x86 ~amd64-linux ~x64-macos" + +RDEPEND=" + || ( + dev-python/python-magic[${PYTHON_USEDEP}] + sys-apps/file[python,${PYTHON_USEDEP}] + ) + dev-python/python-dateutil[${PYTHON_USEDEP}] + " + +src_install() { + distutils-r1_src_install + rm -r "${ED}/usr/share/doc/packages" || die +} diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest index bba355c99153..9bb86350bfed 100644 --- a/net-misc/s6-networking/Manifest +++ b/net-misc/s6-networking/Manifest @@ -1,3 +1,2 @@ -DIST s6-networking-2.5.1.3.tar.gz 114490 BLAKE2B 09b74ff4c881e0c30162a1a01d0d372c0dab2888efaeb1cb97402c485fca2d1360aaa936b291237cab7d43af870d9653b833a9a0e57c57b23918b4128186b476 SHA512 abc90d374a24507998041fd8dcd5f9c2d91bf94046e3da8d324546471f482b5929d863bd2bc846581da32f6c980ef5c2e5d6780655c757316ef0b67e37c72a19 -DIST s6-networking-2.6.0.0.tar.gz 112145 BLAKE2B 1e111614da26283c0a9ee46b0d09d554c4efaf6866b322d5850512058d3237cc060b2ca6d5d1bd0e60791598e034c5fe222a2b6cf5bf271af8ee9e4403f61ea3 SHA512 dcd9a9c8e2d17fcfca96d44b1b86760a0f0e303a638f566ba064b4eb071e18736baa188cfcdb2ae27c0b00a2ed7876a9da6361a8e3a4719b70f462925df913e7 -DIST s6-networking-2.7.0.0.tar.gz 114592 BLAKE2B ce4eab80788bd4c7406e4b5732cb035e483ef1d788ea24a61886fa23402af5df23380d17464020ea562810563162e18fbd49644e9ac3d4827802e2caf294bab7 SHA512 b0dd1b0007704ca087bf49ae93cc09b7cbaa59f6ab99a0281f6bb9de38b25da18be925bc27f1bb74f984f60579f4ebdba41f276ea529b77344d9f3155bad314c +DIST s6-networking-2.7.0.2.tar.gz 115997 BLAKE2B 24728f3b5e08eb94b295f345231a348c072c08a84d42585763bed8fe7057eeee6860b0d00f8548a86a896db98f1c4f51346b12f9361d500f962de6defe39308e SHA512 49f80c68d639f2b7ac7451ca2ace828ca4e8c1eeffec4a9b31f8157c26a87228275ea14d8b6495b0af0879a961b37910aa2b769d8db56d8731d0827c96053631 +DIST s6-networking-2.7.0.3.tar.gz 116055 BLAKE2B 1f2a6c3796aac95526fac68c8918831089eecb1536f42e4bfd85640eac8e4b0197ca03a039eb37671e1f0032419dfa4f7397b03a352b8c38c17609e75d79f09c SHA512 50d369303bd448d09a3f6431e64fb0f0b13383c92764b499ed881af3a6a8c4f779f1f9d98341943f6fdc8b18d16df444897d3750212df89efd838b6de562eede diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml index fe3882aa2b2f..0bd640ba770c 100644 --- a/net-misc/s6-networking/metadata.xml +++ b/net-misc/s6-networking/metadata.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <longdescription lang="en"> s6-networking is a suite of small networking utilities for Unix systems. It includes command-line client and server management, TCP access diff --git a/net-misc/s6-networking/s6-networking-2.5.1.3.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.3.ebuild deleted file mode 100644 index 492f2d8e74d0..000000000000 --- a/net-misc/s6-networking/s6-networking-2.5.1.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -RDEPEND=" - dev-lang/execline:= - >=dev-libs/skalibs-2.13.0.0:= - net-dns/s6-dns:= - sys-apps/s6:=[execline] - ssl? ( dev-libs/libretls ) -" -DEPEND="${RDEPEND}" - -HTML_DOCS=( doc/. ) - -src_prepare() { - default - - # Avoid QA warning for LDFLAGS addition - sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die - - sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die -} - -src_configure() { - tc-export AR CC RANLIB - - local myconf=( - --bindir=/bin - --dynlibdir="/$(get_libdir)" - --libdir="/usr/$(get_libdir)/${PN}" - --with-dynlib="/$(get_libdir)" - --with-lib="/usr/$(get_libdir)/s6" - --with-lib="/usr/$(get_libdir)/s6-dns" - --with-lib="/usr/$(get_libdir)/skalibs" - --with-sysdeps="/usr/$(get_libdir)/skalibs" - --enable-shared - --disable-allstatic - --disable-static - --disable-static-libc - $(use_enable ssl ssl libtls) - ) - - econf "${myconf[@]}" -} diff --git a/net-misc/s6-networking/s6-networking-2.7.0.0.ebuild b/net-misc/s6-networking/s6-networking-2.7.0.2.ebuild index 89c525c1c791..7d7abc64001e 100644 --- a/net-misc/s6-networking/s6-networking-2.7.0.0.ebuild +++ b/net-misc/s6-networking/s6-networking-2.7.0.2.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 -inherit toolchain-funcs +inherit optfeature toolchain-funcs DESCRIPTION="Suite of small networking utilities for Unix systems" HOMEPAGE="https://www.skarnet.org/software/s6-networking/" @@ -11,12 +11,12 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" LICENSE="ISC" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="ssl" RDEPEND=" dev-lang/execline:= - >=dev-libs/skalibs-2.14.0.0:= + >=dev-libs/skalibs-2.14.1.0:= >=net-dns/s6-dns-2.3.7.0:= sys-apps/s6:=[execline] ssl? ( dev-libs/libretls:= ) @@ -55,3 +55,7 @@ src_configure() { econf "${myconf[@]}" } + +pkg_postinst() { + optfeature "man pages" app-doc/s6-networking-man-pages +} diff --git a/net-misc/s6-networking/s6-networking-2.6.0.0.ebuild b/net-misc/s6-networking/s6-networking-2.7.0.3.ebuild index c9b205f31f83..7d7abc64001e 100644 --- a/net-misc/s6-networking/s6-networking-2.6.0.0.ebuild +++ b/net-misc/s6-networking/s6-networking-2.7.0.3.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 -inherit toolchain-funcs +inherit optfeature toolchain-funcs DESCRIPTION="Suite of small networking utilities for Unix systems" HOMEPAGE="https://www.skarnet.org/software/s6-networking/" @@ -11,13 +11,13 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" LICENSE="ISC" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="ssl" RDEPEND=" dev-lang/execline:= - >=dev-libs/skalibs-2.14.0.0:= - net-dns/s6-dns:= + >=dev-libs/skalibs-2.14.1.0:= + >=net-dns/s6-dns-2.3.7.0:= sys-apps/s6:=[execline] ssl? ( dev-libs/libretls:= ) " @@ -55,3 +55,7 @@ src_configure() { econf "${myconf[@]}" } + +pkg_postinst() { + optfeature "man pages" app-doc/s6-networking-man-pages +} 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/seafile-client/Manifest b/net-misc/seafile-client/Manifest index 9f7e4110e118..6014a70f8943 100644 --- a/net-misc/seafile-client/Manifest +++ b/net-misc/seafile-client/Manifest @@ -1,7 +1,2 @@ -DIST seafile-client-8.0.10.tar.gz 11718520 BLAKE2B b8163085c9973df6965b194c964d2b326d4faea3191bf9b62a147bd0a49670f1eb3d0758fbe6f822f99f54c95c32717d9c3533cbc15e71cd8251c1c6ef67f662 SHA512 c4efb1698ed6dfbf3199e4e03293035c8052bd66632a1d04d9020bd226cce748fbcfc8d90c10284c9b1ee6bad20546263a9e09819fc420365625a2fbd4f4a697 DIST seafile-client-8.0.9.tar.gz 11716754 BLAKE2B 2087d2b31ce4696fdaaaa723da7a353c54ebebef86c84b62146d806692066165d0499f5fd6d3be108130d28c297020eafc3497be03131c8a8751f34f33eece90 SHA512 d0b55883f8d00138c092309994047652c6a5aa8b66182f83b6c852f1721794d9d8125da5fba282e9efdb92a0a97a55ecd6e225ab6a7916718a05ea2b7f4bd944 -DIST seafile-client-9.0.0.tar.gz 11714587 BLAKE2B 3432c5b1a971b794379953392689a8451335b1e31a23d09a762b181d66d99a8ee1a2694bcd0cdeb31e2d3c5d98e11d582c9464c11e558c9febb894361dfebfce SHA512 42975fcae3691ffa69671e39c75af1dd863f43cbab65f2022f3c4ee72462c6725107bda77856d16caa4db1e9b5e81c45fe629ffe362a88bbfae8fef558118cae -DIST seafile-client-9.0.1.tar.gz 11713910 BLAKE2B 9a9cd710327a853295c6320a2c161b96d8a359cc9eea0272b65a9c0749c4c25f2f7287b8312d1dd11a7740145a036a596f48ccc1fae850447133ea67fa454a10 SHA512 27533dfdd3657470e3eb3f80814bec7a9ae9176978941651104a526630d70c4747d4e859c16f7af9a046d3a7ae4152e0ba17f11106aa34bb1f0cfd05cba44f88 -DIST seafile-client-9.0.2.tar.gz 11720252 BLAKE2B cb31d863b0b99a1e79845eb02adf8d7a4ea9ff7cbc25499d70d0aca2ea0dd5aaa61b37f21cf4e3b51ea09a2df55bc010817f7892448240b2447e177b344ba153 SHA512 8a0b64abc12f4c3a512486332a126dbf2028b70f5675d4224f9fcd5a0e767d2cb4364cc375e267e131b87843074a556ba814e179b90be9bab1a658b8cf8e168d -DIST seafile-client-9.0.2_p1.tar.gz 11718007 BLAKE2B dc31e7060b70e20dd288725273d6563df587d084fc8ac5b7e9df865cf5a2869c935b014b78094633d900c7e98e1929eee1e5cde26393684de257aba34910e35b SHA512 32a4afcf6456a4f64e5a0ab6cf6cb29eb0cad8ef548c744e14d53c14e8042ba24d296e781fda9f46bfa468490c2dd37c56faa4559c2e814da8d1334fea1057a8 DIST seafile-client-9.0.3.tar.gz 11718581 BLAKE2B cb2cecc9b02df4edb7b7191fd609ee5bc3548849c68b3c0cd8f59641bd0716791c2272633c0ba0f4f7b374a1302fd81a8f1396736961cb4e6e4ef1dd8db82c85 SHA512 c2d77c5f9407fd6d4ce3dfd47044de83a3c3e0bbbd1b66f1566ad54a8aa5391f51f70c7e094f16216a653a5ef0e9b8de1025ee56ce56c496c31c87983fbee4d7 diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml index 652f773a8e4b..1e23f1b9995c 100644 --- a/net-misc/seafile-client/metadata.xml +++ b/net-misc/seafile-client/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@retornaz.com</email> - <name>Quentin Retornaz</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="shibboleth">Build support for Shibboleth single sign-on</flag> </use> diff --git a/net-misc/seafile-client/seafile-client-8.0.10.ebuild b/net-misc/seafile-client/seafile-client-8.0.10.ebuild deleted file mode 100644 index ecbcb8656017..000000000000 --- a/net-misc/seafile-client/seafile-client-8.0.10.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="342002ab35791d217b4e45a04ede7135f301a5a4" - -inherit xdg cmake - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/openssl:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - >=net-libs/libsearpc-3.2.0_p1 - ~net-misc/seafile-${PV} - sys-libs/zlib - virtual/opengl - elibc_musl? ( sys-libs/fts-standalone ) - shibboleth? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" - "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" -) - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - # 863554 - use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) - cmake_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-9.0.0.ebuild b/net-misc/seafile-client/seafile-client-9.0.0.ebuild deleted file mode 100644 index bb0e0f264d2f..000000000000 --- a/net-misc/seafile-client/seafile-client-9.0.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="f8ee58c29d7cb73dd8eaff7aad79540ec7611bdd" - -inherit xdg cmake - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/openssl:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - >=net-libs/libsearpc-3.2.0_p1 - ~net-misc/seafile-${PV} - sys-libs/zlib - virtual/opengl - elibc_musl? ( sys-libs/fts-standalone ) - shibboleth? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" - "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" -) - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - # 863554 - use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) - cmake_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-9.0.1.ebuild b/net-misc/seafile-client/seafile-client-9.0.1.ebuild deleted file mode 100644 index dd99f3b10724..000000000000 --- a/net-misc/seafile-client/seafile-client-9.0.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="c72a52f34fea1ed58c977121edafdaee5c2588dd" - -inherit xdg cmake - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/openssl:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - >=net-libs/libsearpc-3.2.0_p1 - ~net-misc/seafile-${PV} - sys-libs/zlib - virtual/opengl - elibc_musl? ( sys-libs/fts-standalone ) - shibboleth? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" - "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" -) - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - # 863554 - use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) - cmake_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-9.0.2.ebuild b/net-misc/seafile-client/seafile-client-9.0.2.ebuild deleted file mode 100644 index 2a5185179892..000000000000 --- a/net-misc/seafile-client/seafile-client-9.0.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="6924eae5c315d8f673b8daecfab31684c148f5f1" - -inherit xdg cmake - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/openssl:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - >=net-libs/libsearpc-3.2.0_p1 - ~net-misc/seafile-${PV} - sys-libs/zlib - virtual/opengl - elibc_musl? ( sys-libs/fts-standalone ) - shibboleth? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" - "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" -) - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - # 863554 - use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) - cmake_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-9.0.2_p1.ebuild b/net-misc/seafile-client/seafile-client-9.0.2_p1.ebuild deleted file mode 100644 index c41a733f88a8..000000000000 --- a/net-misc/seafile-client/seafile-client-9.0.2_p1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="e0817802502097f085b8ece7e14a04ec77772332" - -inherit xdg cmake - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/openssl:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - >=net-libs/libsearpc-3.2.0_p1 - ~net-misc/seafile-${PV} - sys-libs/zlib - virtual/opengl - elibc_musl? ( sys-libs/fts-standalone ) - shibboleth? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" - "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" -) - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - # 863554 - use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) - cmake_src_configure -} diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest index 0b397237b244..ed2334a2a495 100644 --- a/net-misc/seafile/Manifest +++ b/net-misc/seafile/Manifest @@ -1,7 +1,2 @@ -DIST seafile-8.0.10.gh.tar.gz 749686 BLAKE2B 76c5f6e71dcf12c6950bfde17e529ea8d24efed78069d9bbc93c78f04167be371884aa069b6665afc21be5114352b7a73e5cf09d6f7f9cea6bad323c956ef254 SHA512 9ef1f01d180fe08452c39bd35683610844ff849fa261d98ac7366fde6af27886e823976f6fa2e82407fb844dcb4de8160658abd807eb1d4932e999a4ad75dd50 DIST seafile-8.0.9.gh.tar.gz 740920 BLAKE2B c62c7ccea536934a92166db5d2acea45b65f5508c1e5d4f70749c922c12d29da11bc2265203c91e87fe0096cc3f4b6ec4f6125b538a4de88725583871b05e67e SHA512 c4621ea4c08fcd9c5d4cf683152f7504c37212272b5a9535da869de846b71a7f5e9a72c5544f9b7487ad8025a6cdf2866c15788828cc27937209d8242fc13cb8 -DIST seafile-9.0.0.tar.gz 749947 BLAKE2B df9e68d1ee46c03d5d7cab35f141b6e7a890e78a5864bf55b4ac2913a214e24660f57157123845b62aa72c6ad1e689d6cf53bbe6b43f44c0178a867cb0e6c78e SHA512 3ab5a62faf7210e27df58a33f790b4aaeeb5b897532ec45af283bbaf70bdf40532c8be6481ef43752fc1e646e2d8d1c890f3e039df1d058d7067e2bae99e40fb -DIST seafile-9.0.1.tar.gz 750253 BLAKE2B a076e1ee7df817a47cb2c586025be5126771baf520d66189c640138c9400d9ead04e4d8bcb98ef4071c6115b23f1e835b1cfd3772a305b730e219ffd45bc23de SHA512 69371da95cc66657a83c9fb232c6560424be31d0ddc277870b474379ce3d2dc116c43dc0ab09e4aa79badcb87bb4bfad423f5cf1b466c8dfcc31272afe81b516 -DIST seafile-9.0.2.tar.gz 751089 BLAKE2B 92f9329e109c797024c576b95def27db7a22ca1125c4305ca310020f68ecfb393a11c68ef040fe2c5d672a4671d5a5689cb6d15281c781541d8ffd3d2e7c7d50 SHA512 199702fb533e7a95c84ff10aeceb02850704ad18a953a1d27f34cce9536be5297386327f9adbc6b23b44ec051cfdd59c094e8c7923cefd37536f4d50023a07ef -DIST seafile-9.0.2_p1.tar.gz 752398 BLAKE2B e60d543eebfe2113690803baf285e146d66d03477ae93316e24ce5eafd23ddc03fc46998470e447f5b79ec8441baac27008d3e2ad38b600936ee614709ac5b75 SHA512 01fd51de18d63c8142d89ce017e7e6bdd469a3ee1f94341b90f5654ff603c88f8ee19ff4cfa0d5e0b06b17d23d66ed6ac2a3af8b03e8db34f49e18243b9eace7 DIST seafile-9.0.3.tar.gz 752618 BLAKE2B fc03756934ed36bf6706250e8a41a8d069a4cf0d69fcb76a44acd3a134a80e0705e72cfa1b8e44d1d4cf01e7f94e5781da3e3af88fc9f2cc4cfccbc8ecc15e11 SHA512 07312e56d642de63a5621870d6fe5ff42a0545d5b7def020dabdd36c9a06500c86801a02138de9e3dc6ff16cfdda43b59d651a08395207e108692cfa61db027f diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml index 29c3d3908c0d..8864ea04f064 100644 --- a/net-misc/seafile/metadata.xml +++ b/net-misc/seafile/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@retornaz.com</email> - <name>Quentin Retornaz</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">haiwen/seafile</remote-id> </upstream> diff --git a/net-misc/seafile/seafile-8.0.10-r3.ebuild b/net-misc/seafile/seafile-8.0.10-r3.ebuild deleted file mode 100644 index b4431663a028..000000000000 --- a/net-misc/seafile/seafile-8.0.10-r3.ebuild +++ /dev/null @@ -1,66 +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} ) - -# Upstream is moving tags repeatedly, then we use commit hash. -# (Please file a bug upstream if this happens!) -#RELEASE_COMMIT="6bd36a957573eda6a53f3d1bc538dbfc001aa9fd" - -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" -#SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" -#S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" -SRC_URI="https://github.com/haiwen/seafile/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') - dev-libs/openssl:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/libevent:= - net-libs/libwebsockets:=[client] - net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] - net-misc/curl - sys-apps/util-linux - sys-libs/zlib - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - $(vala_depend)" - -pkg_setup() { - python-single-r1_pkg_setup - vala_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # Remove unnecessary .la files - find "${ED}" -name '*.la' -delete || die - python_fix_shebang "${ED}"/usr/bin/seaf-cli -} diff --git a/net-misc/seafile/seafile-8.0.9-r1.ebuild b/net-misc/seafile/seafile-8.0.9-r2.ebuild index a00e58b3b0fa..f44fa93c9cb2 100644 --- a/net-misc/seafile/seafile-8.0.9-r1.ebuild +++ b/net-misc/seafile/seafile-8.0.9-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 @@ -23,9 +23,6 @@ KEYWORDS="amd64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 diff --git a/net-misc/seafile/seafile-9.0.0.ebuild b/net-misc/seafile/seafile-9.0.0.ebuild deleted file mode 100644 index 45069b35de3e..000000000000 --- a/net-misc/seafile/seafile-9.0.0.ebuild +++ /dev/null @@ -1,65 +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} ) - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="c244a274912070a39864369a6a21c55566fe2fda" - -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') - dev-libs/openssl:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/libevent:= - net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] - net-libs/libwebsockets[client] - net-misc/curl - sys-apps/util-linux - sys-libs/zlib - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - $(vala_depend)" - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -pkg_setup() { - python-single-r1_pkg_setup - vala_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # Remove unnecessary .la files - find "${ED}" -name '*.la' -delete || die - python_fix_shebang "${ED}"/usr/bin/seaf-cli -} diff --git a/net-misc/seafile/seafile-9.0.1.ebuild b/net-misc/seafile/seafile-9.0.1.ebuild deleted file mode 100644 index 344085961b58..000000000000 --- a/net-misc/seafile/seafile-9.0.1.ebuild +++ /dev/null @@ -1,65 +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} ) - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="7405ce29a9f84493254c8aeef02d34f970961eb9" - -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') - dev-libs/openssl:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/libevent:= - net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] - net-libs/libwebsockets[client] - net-misc/curl - sys-apps/util-linux - sys-libs/zlib - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - $(vala_depend)" - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -pkg_setup() { - python-single-r1_pkg_setup - vala_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # Remove unnecessary .la files - find "${ED}" -name '*.la' -delete || die - python_fix_shebang "${ED}"/usr/bin/seaf-cli -} diff --git a/net-misc/seafile/seafile-9.0.2.ebuild b/net-misc/seafile/seafile-9.0.2.ebuild deleted file mode 100644 index 954c05702ace..000000000000 --- a/net-misc/seafile/seafile-9.0.2.ebuild +++ /dev/null @@ -1,65 +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} ) - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="dd400f71101d0fe330d87776d595bbc935100719" - -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') - dev-libs/openssl:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/libevent:= - net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] - net-libs/libwebsockets[client] - net-misc/curl - sys-apps/util-linux - sys-libs/zlib - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - $(vala_depend)" - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -pkg_setup() { - python-single-r1_pkg_setup - vala_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # Remove unnecessary .la files - find "${ED}" -name '*.la' -delete || die - python_fix_shebang "${ED}"/usr/bin/seaf-cli -} diff --git a/net-misc/seafile/seafile-9.0.2_p1.ebuild b/net-misc/seafile/seafile-9.0.2_p1.ebuild deleted file mode 100644 index 4b8ab33574ed..000000000000 --- a/net-misc/seafile/seafile-9.0.2_p1.ebuild +++ /dev/null @@ -1,65 +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} ) - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="f3b2eb7372eabcf1d1c267d8ed4a72fa8be5e1e3" - -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') - dev-libs/openssl:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/libevent:= - net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] - net-libs/libwebsockets[client] - net-misc/curl - sys-apps/util-linux - sys-libs/zlib - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - $(vala_depend)" - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -pkg_setup() { - python-single-r1_pkg_setup - vala_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # Remove unnecessary .la files - find "${ED}" -name '*.la' -delete || die - python_fix_shebang "${ED}"/usr/bin/seaf-cli -} diff --git a/net-misc/seafile/seafile-9.0.3.ebuild b/net-misc/seafile/seafile-9.0.3-r1.ebuild index 12f795caa8dc..0fe9c3b19303 100644 --- a/net-misc/seafile/seafile-9.0.3.ebuild +++ b/net-misc/seafile/seafile-9.0.3-r1.ebuild @@ -20,9 +20,6 @@ KEYWORDS="~amd64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 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/Manifest b/net-misc/ser2net/Manifest index 1e582c5cffa9..8856e9cc1668 100644 --- a/net-misc/ser2net/Manifest +++ b/net-misc/ser2net/Manifest @@ -1 +1,2 @@ DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10 +DIST ser2net-4.6.2.tar.gz 474345 BLAKE2B b495628f7aeda3804c43e59f76a54bfb872551011ccf338a81dc4ed92fa89b36a7356f45b5d4d6804969505eb90b117a348c7a2f78e08a4ed08c730c58df2e40 SHA512 3bd7ceb743f1503c055e0c206cfd2b987fee8ba532683a8470c7c078134b68d115809ef94c38fe926ff29363930e014d9cc9a44cc32a8ed93559e193a13204f8 diff --git a/net-misc/ser2net/files/ser2net.confd-r2 b/net-misc/ser2net/files/ser2net.confd-r2 new file mode 100644 index 000000000000..a443ce752a75 --- /dev/null +++ b/net-misc/ser2net/files/ser2net.confd-r2 @@ -0,0 +1,21 @@ +# Config file for /etc/init.d/ser2net + +# Set the configuration file to one other than the default of /etc/ser2net/ser2net.yaml +# +#CONFIG_FILE="/etc/ser2net/ser2net.yaml" + +# Enables the control port and sets the TCP port to listen to for the control port. +# A port number may be of the form [host,]port, such as 127.0.0.1,2000 or localhost,2000. +# If this is specified, it will only bind to the IP address specified for the port. +# Otherwise, it will bind to all the addresses on the machine. +# +#CONTROL_PORT="" + +# Enable or disable UUCP locking (default=yes) +# +#UUCP_LOCKS="no" + +# see the ser2net(8) manual page for additional options you can configure here +# +#EXTRA_OPTS="" + diff --git a/net-misc/ser2net/files/ser2net.initd-r2 b/net-misc/ser2net/files/ser2net.initd-r2 new file mode 100644 index 000000000000..0321e8a9bbb6 --- /dev/null +++ b/net-misc/ser2net/files/ser2net.initd-r2 @@ -0,0 +1,37 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Serial to network proxy (${RC_SVCNAME#*.})" +pidfile="/var/run/${RC_SVCNAME}.pid" +command="/usr/sbin/ser2net" +name="${description}" + +extra_started_commands="reload" +description_reload="Reread configuration file and make the appropriate changes" +start_stop_daemon_args="--quiet" +command_args_background="-P ${pidfile}" +command_args_foreground="-n" + +depend() { + use logger + need net +} + +start_pre() { + command_args="${EXTRA_OPTS}" + CONFIG_FILE_DEFAULT="/etc/ser2net/ser2net.yaml" + + yesno "${UUCP_LOCKS:-yes}" || command_args="${command_args} -u" + [ -n "${CONTROL_PORT}" ] && command_args="${command_args} -p ${CONTROL_PORT}" + [ -z "${CONFIG_FILE}" ] && CONFIG_FILE="${CONFIG_FILE_DEFAULT}" + [ "${CONFIG_FILE}" != "${CONFIG_FILE_DEFAULT}" ] && command_args="${command_args} -c ${CONFIG_FILE}" + + return 0 +} + +reload() { + ebegin "Reloading ${description}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend ${?} +} diff --git a/net-misc/ser2net/metadata.xml b/net-misc/ser2net/metadata.xml index 1fe9d8c02aa9..72212e7f69df 100644 --- a/net-misc/ser2net/metadata.xml +++ b/net-misc/ser2net/metadata.xml @@ -1,8 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>perfinion@gentoo.org</email> + <name>Jason Zaman</name> + </maintainer> + + <longdescription> + Serial to network interface, a proxy that allows telnet/tcp connections + to be made to serial ports on a machine. + </longdescription> + <upstream> <remote-id type="sourceforge">ser2net</remote-id> + <remote-id type="github">cminyard/ser2net</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/ser2net/ser2net-2.10.0-r1.ebuild b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild index 6e1a55411988..a4441cf96772 100644 --- a/net-misc/ser2net/ser2net-2.10.0-r1.ebuild +++ b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild @@ -1,15 +1,15 @@ -# 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" HOMEPAGE="https://sourceforge.net/projects/ser2net" +SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz" -KEYWORDS="amd64 ppc x86" -SLOT="0" LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" IUSE="tcpd" DEPEND="tcpd? ( sys-apps/tcp-wrappers )" diff --git a/net-misc/ser2net/ser2net-4.6.2.ebuild b/net-misc/ser2net/ser2net-4.6.2.ebuild new file mode 100644 index 000000000000..3fd27c27be52 --- /dev/null +++ b/net-misc/ser2net/ser2net-4.6.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Serial To Network Proxy" +HOMEPAGE="https://sourceforge.net/projects/ser2net" +SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="pam" + +DEPEND=" + dev-libs/libyaml:= + net-misc/gensio + pam? ( sys-libs/pam ) +" +RDEPEND="${DEPEND}" + +# Test suite requires a kernel module +RESTRICT="test" + +src_configure() { + econf --without-sysfs-led-support $(use_with pam) +} + +src_install() { + default + + insinto /etc/${PN} + doins ${PN}.yaml + + newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r2" ${PN} +} 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/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service index bbc3ba7e2b2d..b48db1add6ff 100644 --- a/net-misc/sks/files/sks-db.service +++ b/net-misc/sks/files/sks-db.service @@ -3,8 +3,13 @@ Description=SKS database thread After=network.target [Service] -ExecStart=/usr/bin/sks db +Environment=SKS_DIR=/var/lib/sks +EnvironmentFile=-/etc/sysconfig/sks +ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} ${SKS_DIR}/SKS ${SKS_DIR}/PTree +ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/* +ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS} User=sks +# WorkingDirectory cannot use a variable WorkingDirectory=/var/lib/sks [Install] diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service index 97ee52ffc0ed..d56731d1c961 100644 --- a/net-misc/sks/files/sks-recon.service +++ b/net-misc/sks/files/sks-recon.service @@ -1,10 +1,13 @@ [Unit] Description=SKS key reconnaissance thread -After=network.target +After=network.target sks-db.service [Service] -ExecStart=/usr/bin/sks recon +Environment=SKS_DIR=/var/lib/sks +EnvironmentFile=-/etc/sysconfig/sks +ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS} User=sks +# WorkingDirectory cannot use a variable WorkingDirectory=/var/lib/sks [Install] diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild index 133ea06cb8e7..133ea06cb8e7 100644 --- a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild +++ b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest index 48559692e3d5..c688c4964b29 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1 +1,3 @@ -DIST smb4k-3.2.4.tar.xz 4314512 BLAKE2B 48af157db0196e2c59723f51f5ca3c26d74ba7b11e9b6638be2618679904bd50123670519b69d4410583ab8a78af8941ced9b23ab8ca37a526d22e5e4e4fa758 SHA512 2eb9ffc320d5b53a23cda1a2d20394106835521b3fa84a399763857c03db1177455ba5d03a66d8da9655ee0d1b970275f5f851ca3671f51c44281d4817f5e39b +DIST smb4k-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz 33212 BLAKE2B 774f56888ff29da7bbe9f94b74838d628052520b3c5f97e52d4f3b3dd20c0207d1e706e398b24a54c7a03cc3b9c5693c70e18f4418bfd9c83d8e3ce48cd19fe9 SHA512 004ebf52194a2801c01429990b00ada1b7e2850d1087d3efacf29542cac6a9bb351181ff8ef6713550279d9c5c2f415dcdfba847ef5c848a564b2454e6c05e81 +DIST smb4k-3.2.5.tar.xz 4314812 BLAKE2B 9c5ca6f3d9607be1e5673f7d32a8dc5f191045ccc5607a4ccd9d48d07fc698278db5bbe5e8ffcc4fa9a1f390d52e7ebb877bc01146754873af5d3c266aad16d2 SHA512 6273c9701cf3d65f9b1d7ce0cbe929dc8f422b6a7a308f0b3c4c08e30acf2d189bc1ef4f960dad25aaf71b38b29ce6c41ba8adf50f0bb139e25a0d65a8e67a28 +DIST smb4k-3.2.72.tar.xz 4341620 BLAKE2B 8fe3a2f6e30c9565197882aed92f27db862e0e6c9df35dda1b9187d7279618cae6359c1282ba474ae5b4fe39b8446e133aa95e0f10d0d4087580813944b49ba2 SHA512 0140bca46d21f0355e0cf06ec3cc140b84bd3f334c291c7f2f7dcf379c5520c35d8e77fe7eade5b156462c3a366730405fff8f9678cc5e0e061b3ca837b9de6d diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml index fd3d2f045638..3874c260304c 100644 --- a/net-misc/smb4k/metadata.xml +++ b/net-misc/smb4k/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <remote-id type="cpe">cpe:/a:smb4k_project:smb4k</remote-id> + <remote-id type="kde-invent">network/smb4k</remote-id> <remote-id type="sourceforge">smb4k</remote-id> </upstream> <use> diff --git a/net-misc/smb4k/smb4k-3.2.4.ebuild b/net-misc/smb4k/smb4k-3.2.5-r2.ebuild index 44fb29f09729..652cf6fbbece 100644 --- a/net-misc/smb4k/smb4k-3.2.4.ebuild +++ b/net-misc/smb4k/smb4k-3.2.5-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 ECM_HANDBOOK="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.5 +KFMIN=5.106.0 +QTMIN=5.15.9 inherit ecm kde.org DESCRIPTION="Advanced network neighborhood browser" @@ -13,8 +13,9 @@ 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" - KEYWORDS="amd64 ~arm64 ~riscv x86" + 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 LICENSE="GPL-2" @@ -46,10 +47,7 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 net-fs/samba[cups] - discovery? ( - net-libs/kdsoap:= - net-libs/kdsoap-ws-discovery-client - ) + discovery? ( net-libs/kdsoap:=[qt5(+)] ) " RDEPEND="${DEPEND} plasma? ( @@ -58,11 +56,21 @@ RDEPEND="${DEPEND} ) " +PATCHES=( + "${WORKDIR}/${PN}-3.2.5-bundled-kdsoap-ws-discovery-client.patch" +) + src_configure() { local mycmakeargs=( -DSMB4K_WITH_WS_DISCOVERY=$(usex discovery) -DSMB4K_INSTALL_PLASMOID=$(usex plasma) ) + + use discovery && mycmakeargs+=( + # do not attempt to find now Qt6-based system version + -DCMAKE_DISABLE_FIND_PACKAGE_KDSoapWSDiscoveryClient=ON + ) + ecm_src_configure } diff --git a/net-misc/smb4k/smb4k-3.2.72.ebuild b/net-misc/smb4k/smb4k-3.2.72.ebuild new file mode 100644 index 000000000000..9e0ab7802da4 --- /dev/null +++ b/net-misc/smb4k/smb4k-3.2.72.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.3.0 +QTMIN=6.6.2 +inherit ecm kde.org + +DESCRIPTION="Advanced network neighborhood browser" +HOMEPAGE="https://apps.kde.org/smb4k/ +https://sourceforge.net/p/smb4k/home/Home/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="https://downloads.sourceforge.net/${PN}/Development/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+discovery plasma" + +DEPEND=" + >=dev-libs/qtkeychain-0.14.2:=[qt6] + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdnssd-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + net-fs/samba[cups] + discovery? ( + >=net-libs/kdsoap-2.2.0:=[qt6] + >=net-libs/kdsoap-ws-discovery-client-0.4.0 + ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 + plasma? ( + >=kde-frameworks/kirigami-${KFMIN}:6 + kde-plasma/libplasma:6 + ) +" + +src_configure() { + local mycmakeargs=( + -DSMB4K_WITH_WS_DISCOVERY=$(usex discovery) + -DSMB4K_INSTALL_PLASMOID=$(usex plasma) + ) + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + elog "Users of Samba 4.7 and above please note that for the time being," + elog "the following setting has to be added to or changed in the [global]" + elog "section of the smb.conf file:" + elog + elog "[global]" + elog "client max protocol = NT1" +} 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/sntpd/metadata.xml b/net-misc/sntpd/metadata.xml index 54c215eaad58..b43af146c1a4 100644 --- a/net-misc/sntpd/metadata.xml +++ b/net-misc/sntpd/metadata.xml @@ -2,9 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - </maintainer> - <maintainer type="person"> <email>conikost@gentoo.org</email> <name>Conrad Kostecki</name> </maintainer> diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index ea585d6d46d3..5171cae8235d 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,3 +1,2 @@ -DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b SHA512 81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad SHA512 3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651 DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a SHA512 dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b diff --git a/net-misc/socat/socat-1.7.4.3.ebuild b/net-misc/socat/socat-1.7.4.3.ebuild deleted file mode 100644 index f60964294e44..000000000000 --- a/net-misc/socat/socat-1.7.4.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bindist ipv6 readline ssl tcpd" - -DEPEND="ssl? ( dev-libs/openssl:0= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND="${DEPEND}" - -# Tests are a large bash script -# Hard to disable individual tests needing network or privileges -# in 1.7.4.2: FAILED: 59 329 -RESTRICT="test ssl? ( readline? ( bindist ) )" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -pkg_setup() { - # bug #587740 - if use readline && use ssl ; then - elog "You are enabling both readline and ssl (openssl) USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_configure() { - # bug #293324 - filter-flags '-Wno-error*' - - tc-export AR - - # getprotobynumber_r doesn't exist on musl, so avoid probing for it - # and possibly getting it wrong. TODO: fix configure? - # (Grabbed from Alpine Linux: https://git.alpinelinux.org/aports/commit/main/socat/APKBUILD?id=5edc9195355ced3db991c1a7cda5648d52019b11) - # bug #831016 - use elibc_musl && export sc_cv_getprotobynumber_r=2 - - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} diff --git a/net-misc/socat/socat-1.7.4.4.ebuild b/net-misc/socat/socat-1.7.4.4.ebuild deleted file mode 100644 index 26efc8a7d17f..000000000000 --- a/net-misc/socat/socat-1.7.4.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bindist ipv6 readline ssl tcpd" - -DEPEND="ssl? ( dev-libs/openssl:0= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND="${DEPEND}" - -# Tests are a large bash script -# Hard to disable individual tests needing network or privileges -# in 1.7.4.2: FAILED: 59 329 -RESTRICT="test ssl? ( readline? ( bindist ) )" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -pkg_setup() { - # bug #587740 - if use readline && use ssl ; then - elog "You are enabling both readline and ssl (openssl) USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_configure() { - # bug #293324 - filter-flags '-Wno-error*' - - tc-export AR - - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} diff --git a/net-misc/sock/sock-1.1-r2.ebuild b/net-misc/sock/sock-1.1-r2.ebuild index dae97e0a2c19..80a0820652d1 100644 --- a/net-misc/sock/sock-1.1-r2.ebuild +++ b/net-misc/sock/sock-1.1-r2.ebuild @@ -1,13 +1,13 @@ -# 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 -DESCRIPTION="A shell interface to network sockets" -HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/${P}.tar.gz" +DESCRIPTION="Shell interface to network sockets" +HOMEPAGE="https://mj.ucw.cz/sw/" +SRC_URI="https://mj.ucw.cz/download/net/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild index 784e8b2cbbec..66b660705e66 100644 --- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild +++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-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 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYPI_NO_NORMALIZE=1 inherit distutils-r1 pypi 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-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild index 83318d830e49..784cfaef5d9a 100644 --- a/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.42-r3.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 VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg @@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then 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" + KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86" SPICE_PROTOCOL_VER=0.14.3 fi @@ -74,7 +74,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND=" $(python_gen_any_dep ' 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..508b80c65082 --- /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 1f2e35fdf1d5..5f81513a6c11 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.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 VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg @@ -74,7 +74,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND=" $(python_gen_any_dep ' diff --git a/net-misc/spiped/metadata.xml b/net-misc/spiped/metadata.xml index 9ad514a59f64..96c92ae9ee97 100644 --- a/net-misc/spiped/metadata.xml +++ b/net-misc/spiped/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <longdescription> Spiped (pronounced "ess-pipe-dee") is a utility for creating symmetrically encrypted and authenticated pipes between socket addresses, so that one may diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest index 0f334983106a..81c68555db51 100644 --- a/net-misc/ssh-askpass-fullscreen/Manifest +++ b/net-misc/ssh-askpass-fullscreen/Manifest @@ -1 +1 @@ -DIST ssh-askpass-fullscreen-1.2.tar.gz 101597 BLAKE2B 86c632f83d99ed3d6934b921e499fdb75821659d5b54d380a9d7b04355b93602a481e94320d795b614f2e4c67e7a3ffe1e8380065840e31cb9f5e29c5ae8a75d SHA512 478ae81d8d8b174f9a7ba8f7071aca80503ee3ceed945f12fc44f69d08df4ede010de64ab96cacc901b5b29f4a0e4efb86c220e40f2903b8a4306acc4381f88d +DIST ssh-askpass-fullscreen-1.2.tar.bz2 82078 BLAKE2B 5fbb18e99978e9d2632bb01b6f608c4bb2ed656958bc6e8c9ff9819561abd7dc8a09b333a4cc181115ca3439bf9731e1bdb697d551a771ce4b0777e64b90b88b SHA512 ba8ba726ea618adc66fa1b8b4b1cdbf78bd82ed98bc17dcb5285a78f9e0e1c9ece8b715b8cf89f7beae3d62a80f1dfaf8f561269b92f61445df3ec59ce16522e diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild index 35f4e0804a82..aa0502e311e4 100644 --- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild +++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.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=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="A small SSH Askpass replacement written with GTK2" HOMEPAGE="https://github.com/atj/ssh-askpass-fullscreen" -SRC_URI="https://github.com/atj/${PN}/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/atj/${PN}/releases/download/v${PV}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest index fb538dbfd674..2f0ae502f5e3 100644 --- a/net-misc/sshpass/Manifest +++ b/net-misc/sshpass/Manifest @@ -1 +1,2 @@ DIST sshpass-1.09.tar.gz 112857 BLAKE2B b19e1b7d057e286a895312c62453b9aa5369efb3c617bb24fc7b6b0e521d4c65fad091c68b93cda17aef8350c243bdc2c22d5d58590f6359715159d9dca57bae SHA512 9b4ba83ca4d34364e7c43e29f98493dc3d595d24dc68c2fe3c244600d92a0f8bc0a6a7f8f43d64c0b4d714eb196516f297d904fa66035a76dae89a3726c0f2ff +DIST sshpass-1.10.tar.gz 139652 BLAKE2B 8fb0191abeb43c6c345dd4073f01541337f37d7c286679f50108c0d908a9d3a4179e2ee30bdbd81e3ebb0f277d14e1b8f329fac2e03500ebf15334c79069a386 SHA512 d0fbceb956baee79803fec8bd9a2e0d1e342cbc90fb8bb4baa5a01914f870393f43bd07b62aa1da208318b4971005b9bbccf0e926c590124de11a272169db81d 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 new file mode 100644 index 000000000000..5f9c807632cf --- /dev/null +++ b/net-misc/sshpass/sshpass-1.10.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Tool for non-interactively performing password authentication with ssh" +HOMEPAGE="https://sourceforge.net/projects/sshpass/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" + +RDEPEND="virtual/openssh" diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index a531724b8ac9..ba17f3fd47bf 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1 +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/metadata.xml b/net-misc/sslh/metadata.xml index 4bd87c436580..d8997e1a4379 100644 --- a/net-misc/sslh/metadata.xml +++ b/net-misc/sslh/metadata.xml @@ -2,14 +2,14 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>kensington@gentoo.org</email> - <name>Michael Palimaka</name> - </maintainer> - <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> + <use> + <flag name="libev">Support event loops via <pkg>dev-libs/libev</pkg></flag> + </use> <upstream> <remote-id type="github">yrutschle/sslh</remote-id> + <remote-id type="cpe">cpe:/a:sslh_project:sslh</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/sslh/sslh-2.1.1.ebuild b/net-misc/sslh/sslh-2.1.1.ebuild new file mode 100644 index 000000000000..1a3dc9b9f8e3 --- /dev/null +++ b/net-misc/sslh/sslh-2.1.1.ebuild @@ -0,0 +1,84 @@ +# 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 + sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die + systemd_newunit scripts/systemd.sslh.service sslh.service + exeinto /usr/lib/systemd/system-generators/ + doexe systemd-sslh-generator + fi +} 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 d00e3490d2df..efb4eb40c48d 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-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="7" @@ -11,19 +11,21 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + 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 systemd tcpd" +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" @@ -31,11 +33,11 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { - default sed -i \ -e '/MAN/s:| gzip -9 - >:>:' \ -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die + Makefile.in || die + default } src_compile() { @@ -51,13 +53,19 @@ src_compile() { emake \ CC="$(tc-getCC)" \ USELIBCAP=$(usev caps) \ + USELIBEV=$(usev libev) \ USELIBWRAP=$(usev tcpd) \ USESYSTEMD=$(usev systemd) } src_install() { dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh + if use libev; then + dosbin sslh-ev + dosym sslh-fork /usr/sbin/sslh + else + dosym sslh-fork /usr/sbin/sslh + fi doman ${PN}.8 @@ -68,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/streamlink/Manifest b/net-misc/streamlink/Manifest index beee40438f76..511109c6732f 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,3 +1,4 @@ -DIST streamlink-6.2.0.tar.gz 690986 BLAKE2B 5f7cab73ea366580aeb837b8f8a27fa7cd5ca687afa53908900dc9f290a0da916778fda8351acda00f795688b156ca0f37302e67128ce30e9838a45111b88ecd SHA512 2747ebc584caa8ebb2fde5d4f309c911a52fd1a8d2d0e832487e589873c270534e0d0b18120a2db7a68e150e301e57db1e8d63f1d5bb6244f364e9cbd6606213 -DIST streamlink-6.4.1.tar.gz 715775 BLAKE2B 40b6c080a8fa2815b12562aafde9ce1dd2c8fabe405e21d90fc7767c9e6c085f60c3d0dc9f33c77b85015aa64e2d209464662908674638719581278d128b3f1c SHA512 8886b990637e9f4e87b4fcdc00c2d3e11203746e7256c0d85aee3128f65baaf37ea730c2626c3ec8f0f5ee0042bbd271c4a6290bd346d59915f2f554602f0db4 -DIST streamlink-6.4.2.tar.gz 716194 BLAKE2B e66d03ffa97ffdad7ec76532be530ef94ff80838754728aa85f53b0fb778c506d45042b467477eacb72fb9031ffc7d1df727f72af53bfb0201fbad21d28e6763 SHA512 b43e65201c16483378b6cb36e9d93f6e64ba0eb37e2554b3e94395b1e30a3422d5d91db0eb6c35166e61f9b1fbce474fa93908545f063a3fb995669989cde274 +DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e8063f15a965f45d8cc6033b49899b15c19af23aa2a845f8aec74341932721b792dad6bff70400f0dea24a19f1415ed SHA512 0955faab177bcdd0f66500f837124bf0f426829cb5c847fa18bb85aa3fcd7c27a750bab13f3e247b5187e9561713330b582b10729d82984d98081856e976ae65 +DIST streamlink-6.7.4.tar.gz 744387 BLAKE2B bd8fb9af560fbe164a63fd1b698100765c716b44b6f3364e6ad072f69d0fdee9d22dd0fda6c297f249915c9a60f10e2089228a8c19244a7ef18b5809632bf96a SHA512 266c66626624814d708a228d4e2e62c443c3973fb139632a88086619c755fa80d97fad077a2a7383f9beb3e2f4464274beb0bb446b85f6f63d6704a88a9c2e29 +DIST streamlink-6.8.1.tar.gz 748765 BLAKE2B bf42375bc37432c66e8d2c9d8c3b31cfbda8c990bc4d7b83970198c4f60b5dc30d5ce3daf339bb842bc058955edff55df16da4f4cc0362410eaaff1bb6d74e28 SHA512 51cb03ca2414ec64f95704833568bb48aaae458e77f6ef3f4d858b564908cff4944c07a0b4d3bb648a0fe2bbb6a43a7964333878e31aef0b2a6ff3b9048b8e1d +DIST streamlink-6.8.3.tar.gz 753510 BLAKE2B 94ac37947911765d14d135582eb86acb682af3f84e3bb4faeef9d3bb0a2d75f06a4a2b9ca57ac7966e5e4e8b14cdf2a62611e15990705ebd4995442b12badbc9 SHA512 a5053ea38d4f444e478c0ea5d9ff9f858637a29f3bdfca532796bb178ad78e4de17623dabb64cccd141005688ff2dc7349246a01919e507483baea55e084b75c diff --git a/net-misc/streamlink/metadata.xml b/net-misc/streamlink/metadata.xml index c8aa42c057c3..11ea36c5ea13 100644 --- a/net-misc/streamlink/metadata.xml +++ b/net-misc/streamlink/metadata.xml @@ -5,6 +5,7 @@ <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">streamlink/streamlink</remote-id> <remote-id type="pypi">streamlink</remote-id> diff --git a/net-misc/streamlink/streamlink-6.2.0.ebuild b/net-misc/streamlink/streamlink-6.2.0.ebuild deleted file mode 100644 index 01f6fa60c3bb..000000000000 --- a/net-misc/streamlink/streamlink-6.2.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" - inherit git-r3 -fi - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE='xml(+),threads(+)' -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" - -if [[ ${PV} != 9999* ]]; then - SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="BSD-2 Apache-2.0" -SLOT="0" - -DEPEND=" - $(python_gen_cond_dep ' - dev-python/certifi[${PYTHON_USEDEP}] - >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] - dev-python/isodate[${PYTHON_USEDEP}] - >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] - >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] - dev-python/pycountry[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] - >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] - >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] - >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] - ') -" -RDEPEND=" - ${DEPEND} - media-video/ffmpeg -" -BDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] - test? ( - >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-trio[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - ) - ') -" - -distutils_enable_tests pytest diff --git a/net-misc/streamlink/streamlink-6.7.3.ebuild b/net-misc/streamlink/streamlink-6.7.3.ebuild new file mode 100644 index 000000000000..d4cd319b5be4 --- /dev/null +++ b/net-misc/streamlink/streamlink-6.7.3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + inherit git-r3 +fi + +DISTUTILS_SINGLE_IMPL=1 +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="amd64 ~arm ~arm64 ~x86" +fi + +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +# See https://github.com/streamlink/streamlink/pull/5895 re exceptiongroup dep +RDEPEND=" + media-video/ffmpeg + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + dev-python/exceptiongroup[${PYTHON_USEDEP}] + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + ) + ') +" + +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi + +distutils_enable_tests pytest + +python_test() { + # Skip tests requiring <dev-python/pytest-8.0.0 + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) + + epytest +} diff --git a/net-misc/streamlink/streamlink-6.4.1.ebuild b/net-misc/streamlink/streamlink-6.7.4.ebuild index d73952536218..6d9015879476 100644 --- a/net-misc/streamlink/streamlink-6.4.1.ebuild +++ b/net-misc/streamlink/streamlink-6.7.4.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 @@ -33,6 +33,9 @@ fi RDEPEND=" media-video/ffmpeg $(python_gen_cond_dep ' + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) + $(python_gen_cond_dep ' dev-python/certifi[${PYTHON_USEDEP}] || ( dev-python/chardet[${PYTHON_USEDEP}] @@ -72,3 +75,25 @@ if [[ ${PV} == 9999* ]]; then fi distutils_enable_tests pytest + +python_test() { + # Skip tests requiring <dev-python/pytest-8.0.0 + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) + + epytest +} diff --git a/net-misc/streamlink/streamlink-6.4.2.ebuild b/net-misc/streamlink/streamlink-6.8.1.ebuild index d73952536218..6d9015879476 100644 --- a/net-misc/streamlink/streamlink-6.4.2.ebuild +++ b/net-misc/streamlink/streamlink-6.8.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 @@ -33,6 +33,9 @@ fi RDEPEND=" media-video/ffmpeg $(python_gen_cond_dep ' + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) + $(python_gen_cond_dep ' dev-python/certifi[${PYTHON_USEDEP}] || ( dev-python/chardet[${PYTHON_USEDEP}] @@ -72,3 +75,25 @@ if [[ ${PV} == 9999* ]]; then fi distutils_enable_tests pytest + +python_test() { + # Skip tests requiring <dev-python/pytest-8.0.0 + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) + + epytest +} diff --git a/net-misc/streamlink/streamlink-6.8.3.ebuild b/net-misc/streamlink/streamlink-6.8.3.ebuild new file mode 100644 index 000000000000..9f91275dbba4 --- /dev/null +++ b/net-misc/streamlink/streamlink-6.8.3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + inherit git-r3 +fi + +DISTUTILS_SINGLE_IMPL=1 +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="amd64 ~arm ~arm64 ~x86" +fi + +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +RDEPEND=" + media-video/ffmpeg + $(python_gen_cond_dep ' + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + ) + ') +" + +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi + +distutils_enable_tests pytest + +python_test() { + # Skip tests requiring <dev-python/pytest-8.0.0 + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) + + epytest +} diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild index d73952536218..3e4bc7e2f370 100644 --- a/net-misc/streamlink/streamlink-9999.ebuild +++ b/net-misc/streamlink/streamlink-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 @@ -12,7 +12,7 @@ DISTUTILS_SINGLE_IMPL=1 # >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools # https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE='xml(+),threads(+)' inherit distutils-r1 @@ -33,6 +33,9 @@ fi RDEPEND=" media-video/ffmpeg $(python_gen_cond_dep ' + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) + $(python_gen_cond_dep ' dev-python/certifi[${PYTHON_USEDEP}] || ( dev-python/chardet[${PYTHON_USEDEP}] @@ -72,3 +75,25 @@ if [[ ${PV} == 9999* ]]; then fi distutils_enable_tests pytest + +python_test() { + # Skip tests requiring <dev-python/pytest-8.0.0 + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) + + epytest +} diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch index 75eb2738e6b0..4dcc9837edc9 100644 --- a/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch +++ b/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch @@ -1,6 +1,5 @@ -diff -ur streamtuner-0.99.99.orig/src/plugins/live365/live365.c streamtuner-0.99.99/src/plugins/live365/live365.c ---- streamtuner-0.99.99.orig/src/plugins/live365/live365.c 2004-12-19 12:27:03.000000000 +0200 -+++ streamtuner-0.99.99/src/plugins/live365/live365.c 2009-01-18 20:03:35.000000000 +0200 +--- a/src/plugins/live365/live365.c ++++ b/src/plugins/live365/live365.c @@ -1411,7 +1411,7 @@ st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q"); @@ -10,9 +9,8 @@ diff -ur streamtuner-0.99.99.orig/src/plugins/live365/live365.c streamtuner-0.99 return TRUE; } -diff -ur streamtuner-0.99.99.orig/src/plugins/local/local.c streamtuner-0.99.99/src/plugins/local/local.c ---- streamtuner-0.99.99.orig/src/plugins/local/local.c 2004-12-13 09:39:29.000000000 +0200 -+++ streamtuner-0.99.99/src/plugins/local/local.c 2009-01-18 20:03:49.000000000 +0200 +--- a/src/plugins/local/local.c ++++ b/src/plugins/local/local.c @@ -1057,7 +1057,7 @@ init_handler(); @@ -22,9 +20,8 @@ diff -ur streamtuner-0.99.99.orig/src/plugins/local/local.c streamtuner-0.99.99/ st_action_register("view-web", _("Open a web page"), "epiphany %q"); return TRUE; -diff -ur streamtuner-0.99.99.orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c ---- streamtuner-0.99.99.orig/src/plugins/shoutcast/shoutcast.c 2004-12-19 17:21:00.000000000 +0200 -+++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c 2009-01-18 20:03:42.000000000 +0200 +--- a/src/plugins/shoutcast/shoutcast.c ++++ b/src/plugins/shoutcast/shoutcast.c @@ -959,7 +959,7 @@ init_handler(); @@ -34,9 +31,8 @@ diff -ur streamtuner-0.99.99.orig/src/plugins/shoutcast/shoutcast.c streamtuner- st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q"); st_action_register("view-web", _("Open a web page"), "epiphany %q"); -diff -ur streamtuner-0.99.99.orig/src/plugins/xiph/xiph.c streamtuner-0.99.99/src/plugins/xiph/xiph.c ---- streamtuner-0.99.99.orig/src/plugins/xiph/xiph.c 2004-12-13 11:57:33.000000000 +0200 -+++ streamtuner-0.99.99/src/plugins/xiph/xiph.c 2009-01-18 20:04:17.000000000 +0200 +--- a/src/plugins/xiph/xiph.c ++++ b/src/plugins/xiph/xiph.c @@ -957,7 +957,7 @@ init_handler(); @@ -46,9 +42,8 @@ diff -ur streamtuner-0.99.99.orig/src/plugins/xiph/xiph.c streamtuner-0.99.99/sr return TRUE; } -diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preselections.c streamtuner-0.99.99/src/streamtuner/st-preselections.c ---- streamtuner-0.99.99.orig/src/streamtuner/st-preselections.c 2004-12-13 11:57:52.000000000 +0200 -+++ streamtuner-0.99.99/src/streamtuner/st-preselections.c 2009-01-18 20:04:02.000000000 +0200 +--- a/src/streamtuner/st-preselections.c ++++ b/src/streamtuner/st-preselections.c @@ -390,7 +390,7 @@ { st_preselections_init_handler(); diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch index 2e5d843420da..d739f309893a 100644 --- a/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch +++ b/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch @@ -1,6 +1,50 @@ -diff -ur streamtuner-0.99.99.orig/data/streamtuner.pc.in streamtuner-0.99.99/data/streamtuner.pc.in ---- streamtuner-0.99.99.orig/data/streamtuner.pc.in 2004-12-11 04:03:20.000000000 +0200 -+++ streamtuner-0.99.99/data/streamtuner.pc.in 2007-07-29 09:40:44.000000000 +0300 +--- a/configure.ac ++++ b/configure.ac +@@ -23,14 +23,6 @@ + AM_CONFIG_HEADER(config.h) + AC_PROG_LIBTOOL + +-if $CONFIG_SHELL ./libtool --features | grep "enable shared" >/dev/null 2>&1; then :; else +- if test "$enable_shared" = no; then +- AC_MSG_ERROR([streamtuner requires shared libraries: do not use --disable-shared]) +- else +- AC_MSG_ERROR([streamtuner requires shared libraries but the target system does not support them]) +- fi +-fi +- + ### i18n + + GETTEXT_PACKAGE=AC_PACKAGE_NAME +@@ -49,9 +41,6 @@ + + # check for ANSI C headers + AC_HEADER_STDC +-if test $ac_cv_header_stdc != yes; then +- AC_MSG_ERROR([ANSI C headers not present]) +-fi + + ### build dependencies + +@@ -62,7 +51,7 @@ + + AM_PATH_GTK_2_0(2.4.0,, [AC_MSG_ERROR([unable to find the GTK+ library])]) + +-AM_PATH_CURL(7.10.8,, [AC_MSG_ERROR([unable to find the libcurl library])]) ++PKG_CHECK_MODULES([CURL], [libcurl >= 7.10.8]) + + if ST_FEATURE_ENABLED(xiph); then + PKG_CHECK_MODULES(LIBXML, libxml-2.0,, [ST_FEATURE_DISABLE(xiph, [libxml not found])]) +@@ -70,7 +59,7 @@ + + if ST_FEATURE_ENABLED(local); then + if ST_FEATURE_ENABLED(local-metadata); then +- AM_PATH_TAGLIB_C(1.2,, [ST_FEATURE_DISABLE(local-metadata, [TagLib not found])]) ++ PKG_CHECK_MODULES([TAGLIB], [taglib_c]) + fi + else + if ST_FEATURE_ENABLED(local-metadata); then +--- a/data/streamtuner.pc.in ++++ b/data/streamtuner.pc.in @@ -1,9 +1,8 @@ prefix=@prefix@ includedir=@includedir@/streamtuner @@ -12,21 +56,19 @@ diff -ur streamtuner-0.99.99.orig/data/streamtuner.pc.in streamtuner-0.99.99/dat Requires: gmodule-2.0 gtk+-2.0 -Cflags: -I${includedir} -I${oldincludedir} +Cflags: -I${includedir} -diff -ur streamtuner-0.99.99.orig/docs/reference/Makefile.in streamtuner-0.99.99/docs/reference/Makefile.in ---- streamtuner-0.99.99.orig/docs/reference/Makefile.in 2004-12-21 17:31:18.000000000 +0200 -+++ streamtuner-0.99.99/docs/reference/Makefile.in 2007-07-29 09:41:15.000000000 +0300 -@@ -517,7 +517,7 @@ - @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html - @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html - @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) --@ENABLE_GTK_DOC_TRUE@ sed -i "" -e \ -+@ENABLE_GTK_DOC_TRUE@ sed -i -e \ - @ENABLE_GTK_DOC_TRUE@ 's/background: #ffeeee/background: #daffd1/g; \ - @ENABLE_GTK_DOC_TRUE@ s/border: solid 1px #ffaaaa/border: solid 1px #74ff54/g; \ - @ENABLE_GTK_DOC_TRUE@ s/background: #eeeeff/background: #feffde/g; \ -diff -ur streamtuner-0.99.99.orig/help/omf.make streamtuner-0.99.99/help/omf.make ---- streamtuner-0.99.99.orig/help/omf.make 2004-03-23 18:17:10.000000000 +0200 -+++ streamtuner-0.99.99/help/omf.make 2007-07-29 09:42:50.000000000 +0300 +--- a/docs/gtk-doc.make ++++ b/docs/gtk-doc.make +@@ -95,7 +95,7 @@ + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- sed -i "" -e \ ++ sed -i -e \ + 's/background: #ffeeee/background: #daffd1/g; \ + s/border: solid 1px #ffaaaa/border: solid 1px #74ff54/g; \ + s/background: #eeeeff/background: #feffde/g; \ +--- a/help/omf.make ++++ b/help/omf.make @@ -42,7 +42,9 @@ for file in $(omffile); do \ $(INSTALL_DATA) $(srcdir)/$$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ @@ -38,9 +80,27 @@ diff -ur streamtuner-0.99.99.orig/help/omf.make streamtuner-0.99.99/help/omf.mak uninstall-local-omf: -for file in $(srcdir)/*.omf; do \ -diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-category-store.c streamtuner-0.99.99/src/streamtuner/st-category-store.c ---- streamtuner-0.99.99.orig/src/streamtuner/st-category-store.c 2004-12-18 11:17:32.000000000 +0200 -+++ streamtuner-0.99.99/src/streamtuner/st-category-store.c 2007-07-29 09:41:46.000000000 +0300 +--- a/src/sglib/Makefile.am ++++ b/src/sglib/Makefile.am +@@ -6,6 +6,5 @@ + sg-parser.h \ + sg-util.c \ + sg-util.h +-libsglib_la_LDFLAGS = -static + + AM_CPPFLAGS = $(WARN_CFLAGS) $(GLIB_CFLAGS) +--- a/src/sgtk/Makefile.am ++++ b/src/sgtk/Makefile.am +@@ -21,7 +21,6 @@ + sgtk-util.h + nodist_libsgtk_la_SOURCES = \ + $(top_srcdir)/art/auth.h +-libsgtk_la_LDFLAGS = -static + + AM_CPPFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) \ + -I$(top_srcdir)/src/sglib +--- a/src/streamtuner/st-category-store.c ++++ b/src/streamtuner/st-category-store.c @@ -356,7 +356,6 @@ { STCategoryBag **bag = data; @@ -58,9 +118,8 @@ diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-category-store.c streamtune } static gboolean -diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-network-preferences-page.c streamtuner-0.99.99/src/streamtuner/st-network-preferences-page.c ---- streamtuner-0.99.99.orig/src/streamtuner/st-network-preferences-page.c 2004-12-16 15:05:07.000000000 +0200 -+++ streamtuner-0.99.99/src/streamtuner/st-network-preferences-page.c 2007-07-29 09:43:21.000000000 +0300 +--- a/src/streamtuner/st-network-preferences-page.c ++++ b/src/streamtuner/st-network-preferences-page.c @@ -183,10 +183,10 @@ st_preferences_bind_boolean(GTK_TOGGLE_BUTTON(page->priv->proxy_check), &st_settings.proxy_enabled); @@ -74,9 +133,8 @@ diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-network-preferences-page.c ST_TRANSFER_PROXY_SOCKS5); st_preferences_bind_string(GTK_ENTRY(page->priv->server_entry), &st_settings.proxy_server); -diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preferences.c streamtuner-0.99.99/src/streamtuner/st-preferences.c ---- streamtuner-0.99.99.orig/src/streamtuner/st-preferences.c 2004-10-17 20:43:18.000000000 +0300 -+++ streamtuner-0.99.99/src/streamtuner/st-preferences.c 2007-07-29 09:43:21.000000000 +0300 +--- a/src/streamtuner/st-preferences.c ++++ b/src/streamtuner/st-preferences.c @@ -140,13 +140,13 @@ } @@ -93,9 +151,8 @@ diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preferences.c streamtuner-0 g_signal_connect(radio, "toggled", G_CALLBACK(st_preferences_radio_toggled_h), ptr); } -diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preferences.h streamtuner-0.99.99/src/streamtuner/st-preferences.h ---- streamtuner-0.99.99.orig/src/streamtuner/st-preferences.h 2004-10-17 20:42:06.000000000 +0300 -+++ streamtuner-0.99.99/src/streamtuner/st-preferences.h 2007-07-29 09:43:21.000000000 +0300 +--- a/src/streamtuner/st-preferences.h ++++ b/src/streamtuner/st-preferences.h @@ -42,7 +42,7 @@ void st_preferences_bind_int_spin (GtkSpinButton *spin, int *ptr); @@ -105,9 +162,8 @@ diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preferences.h streamtuner-0 int value); #endif /* _ST_PREFERENCES_H */ -diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-shell.c streamtuner-0.99.99/src/streamtuner/st-shell.c ---- streamtuner-0.99.99.orig/src/streamtuner/st-shell.c 2004-12-20 18:09:03.000000000 +0200 -+++ streamtuner-0.99.99/src/streamtuner/st-shell.c 2007-07-29 09:43:21.000000000 +0300 +--- a/src/streamtuner/st-shell.c ++++ b/src/streamtuner/st-shell.c @@ -465,8 +465,10 @@ static void st_shell_make_window (STShell *shell) diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch index 41f80c4a9076..758c992908d3 100644 --- a/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch +++ b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch @@ -1,5 +1,5 @@ ---- a/src/plugins/shoutcast/shoutcast.c.orig 2004-12-19 15:21:00.000000000 +0000 -+++ b/src/plugins/shoutcast/shoutcast.c 2008-03-16 10:39:24.000000000 +0000 +--- a/src/plugins/shoutcast/shoutcast.c ++++ b/src/plugins/shoutcast/shoutcast.c @@ -94,6 +94,8 @@ GNode *parent_node; diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r6.ebuild index c07f5be960e3..2bade45c8ab6 100644 --- a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild +++ b/net-misc/streamtuner/streamtuner-0.99.99-r6.ebuild @@ -1,14 +1,16 @@ -# 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 +GNOME2_EAUTORECONF="yes" inherit gnome2 DESCRIPTION="Stream directory browser for browsing internet radio streams" HOMEPAGE="https://www.nongnu.org/streamtuner/" -SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz - https://savannah.nongnu.org/download/${PN}/${P}-pygtk-2.6.diff" +SRC_URI=" + https://savannah.nongnu.org/download/${PN}/${P}.tar.gz + https://savannah.nongnu.org/download/${PN}/${P}-pygtk-2.6.diff" LICENSE="BSD" SLOT="0" @@ -20,12 +22,11 @@ RDEPEND=" net-misc/curl xiph? ( dev-libs/libxml2:2 ) >=media-libs/taglib-1.2 - x11-misc/xdg-utils -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig -" + x11-misc/xdg-utils" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/gtk-doc-am + virtual/pkgconfig" src_prepare() { eapply "${FILESDIR}"/${P}-gentoo.patch diff --git a/net-misc/stunnel/stunnel-5.71-r1.ebuild b/net-misc/stunnel/stunnel-5.71-r1.ebuild new file mode 100644 index 000000000000..cff4677b2a3c --- /dev/null +++ b/net-misc/stunnel/stunnel-5.71-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-any-r1 ssl-cert systemd tmpfiles + +DESCRIPTION="TLS/SSL - Port Wrapper" +HOMEPAGE="https://www.stunnel.org/index.html" +SRC_URI=" + https://www.stunnel.org/downloads/${P}.tar.gz + ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz + http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="selinux stunnel3 systemd tcpd test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/openssl:= + tcpd? ( sys-apps/tcp-wrappers ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND=" + ${DEPEND} + acct-user/stunnel + acct-group/stunnel + selinux? ( sec-policy/selinux-stunnel ) + stunnel3? ( dev-lang/perl ) +" +# autoconf-archive for F_S patch +BDEPEND=" + dev-build/autoconf-archive + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/cryptography[${PYTHON_USEDEP}]') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.71-dont-clobber-fortify-source.patch + "${FILESDIR}"/${PN}-5.71-respect-EPYTHON-for-tests.patch +) + +python_check_deps() { + python_has_version "dev-python/cryptography[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # Hack away generation of certificate + sed -i -e "s/^install-data-local:/do-not-run-this:/" \ + tools/Makefile.am || die "sed failed" + + echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel || die + + # We pass --disable-fips to configure, so avoid spurious test failures + rm tests/plugins/p10_fips.py tests/plugins/p11_fips_cipher.py || die + + # Needed for FORTIFY_SOURCE patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --libdir="${EPREFIX}/usr/$(get_libdir)" + --with-ssl="${EPREFIX}"/usr + --disable-fips + $(use_enable tcpd libwrap) + $(use_enable systemd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + rm -rf "${ED}"/usr/share/doc/${PN} || die + rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ + "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 || die + + if ! use stunnel3 ; then + rm -f "${ED}"/usr/bin/stunnel3 || die + fi + + dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md + docinto html + dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ + tools/importCA.html + + insinto /etc/stunnel + doins "${FILESDIR}"/stunnel.conf + newinitd "${FILESDIR}"/stunnel-r2 stunnel + + doenvd "${T}"/20stunnel + + systemd_dounit "${S}/tools/stunnel.service" + newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]]; then + install_cert /etc/stunnel/stunnel + chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + fi + + tmpfiles_process stunnel.conf + + einfo "If you want to run multiple instances of stunnel, create a new config" + einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " + einfo "\'pid= \' with a unique filename. For openrc make a symlink from the" + einfo "stunnel init script to \'stunnel.name\' and use that to start|stop" + einfo "your custom instance" +} diff --git a/net-misc/stunnel/stunnel-5.71.ebuild b/net-misc/stunnel/stunnel-5.71.ebuild index 0366717dd2c4..d23e61f1ca70 100644 --- a/net-misc/stunnel/stunnel-5.71.ebuild +++ b/net-misc/stunnel/stunnel-5.71.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,7 +21,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="selinux stunnel3 systemd tcpd test" RESTRICT="!test? ( test )" @@ -39,7 +39,7 @@ RDEPEND=" " # autoconf-archive for F_S patch BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive test? ( ${PYTHON_DEPS} ) " diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest index 8a15696fb58f..86e4db3ae2ad 100644 --- a/net-misc/suite3270/Manifest +++ b/net-misc/suite3270/Manifest @@ -1,2 +1,3 @@ DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b DIST suite3270-4.2ga5-src.tgz 4192998 BLAKE2B 2e29a9e9f25688bd5fc84101cab684c0fcdde9eff5e65cf0f247e9942990c812174eec17569716928de299fec0d87e77c785d8415370f7245cc0909c7e2020dd SHA512 4a5847c81262a099c68a914141bc7eba7b7b46f0ed4dabc1e7421b4244ea1ca5877e472262f9a4ab2f1a9ca72bde3901f8281dc0957046d3355ed98377de0492 +DIST suite3270-4.3ga6-src.tgz 13188235 BLAKE2B 2ca334b82cc42818ac9d0733a8d93f3b73e598f9de94e7166972d88079cfcf98877eb08587ac24e096f9b6457c96344abd37c4bb9d7af4f7e50c3ef191f82714 SHA512 5250d382185acb7f89cb2a6ff5050aa05be809e7bd2bbe25cf74bd3177ebba8ea24d990b3f20e308a5cffa8bdbd5d1c82ba956db76a2812b5ae42ea57602d2bd 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 new file mode 100644 index 000000000000..b04eebf8fc56 --- /dev/null +++ b/net-misc/suite3270/suite3270-4.2_p5-r2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_p/ga} +MY_P=${PN}-${MY_PV} +SUB_PV=${PV:0:3} +S="${WORKDIR}"/${PN}-${SUB_PV} + +# Only the x3270 package installs fonts +FONT_PN="x3270" +FONT_S="${S}"/${FONT_PN} + +inherit autotools font + +DESCRIPTION="Complete 3270 (S390) access package" +HOMEPAGE="http://x3270.bgp.nu/" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ~s390 sparc x86" +IUSE="X cjk doc ncurses ssl tcl" + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) + ssl? ( dev-libs/openssl:= ) + ncurses? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + tcl? ( dev-lang/tcl:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + X? ( + x11-apps/bdftopcf + >=x11-apps/mkfontscale-1.2.0 + x11-misc/xbitmaps + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.1-musl-wint-t-fix.patch + "${FILESDIR}"/${PN}-4.2_p5-ncurses-pkg-config.patch + "${FILESDIR}"/${PN}-4.2_p5-egrep.patch +) + +src_prepare() { + default + + # Some subdirs (like c3270/x3270/s3270) install the same set of data files + # (they have the same contents). Wrap that in a retry to avoid errors. + cat <<-EOF > _install + #!/bin/sh + for n in 1 2 3 4 5; do + install "\$@" && exit + echo "retrying ..." + done + exit 1 + EOF + chmod a+rx _install || die + # Can't use the ${INSTALL} var as top level configure also uses it. + # https://sourceforge.net/p/x3270/bugs/15/ + export ac_cv_path_install="${S}"/_install + + AT_NOEAUTOHEADER=yes eautoreconf +} + +src_configure() { + econf \ + --cache-file="${S}"/config.cache \ + --enable-s3270 \ + --enable-pr3287 \ + $(use_enable ncurses c3270) \ + $(use_enable tcl tcl3270) \ + $(use_enable X x3270) \ + $(use_with X x) \ + $(use_with X fontdir "${FONTDIR}") +} + +src_install() { + use X && dodir "${FONTDIR}" + + emake DESTDIR="${D}" install{,.man} + + use X && font_src_install +} + +pkg_postinst() { + use X && font_pkg_postinst +} + +pkg_postrm() { + use X && font_pkg_postrm +} diff --git a/net-misc/suite3270/suite3270-4.3_p6.ebuild b/net-misc/suite3270/suite3270-4.3_p6.ebuild new file mode 100644 index 000000000000..6566aedd07d5 --- /dev/null +++ b/net-misc/suite3270/suite3270-4.3_p6.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_p/ga} +MY_P=${PN}-${MY_PV} +SUB_PV=${PV:0:3} +S="${WORKDIR}"/${PN}-${SUB_PV} + +# Only the x3270 package installs fonts +FONT_PN="x3270" +FONT_S="${S}"/${FONT_PN} + +inherit autotools font + +DESCRIPTION="Complete 3270 (S390) access package" +HOMEPAGE="http://x3270.bgp.nu/" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86" +IUSE="cjk doc gui ncurses ssl tcl" + +RDEPEND=" + gui? ( + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) + ssl? ( dev-libs/openssl:= ) + ncurses? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + tcl? ( dev-lang/tcl:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( x11-base/xorg-proto ) +" +BDEPEND=" + gui? ( + x11-apps/bdftopcf + >=x11-apps/mkfontscale-1.2.0 + x11-misc/xbitmaps + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.1-musl-wint-t-fix.patch + "${FILESDIR}"/${PN}-4.2_p5-ncurses-pkg-config.patch +) + +src_prepare() { + default + + # Some subdirs (like c3270/x3270/s3270) install the same set of data files + # (they have the same contents). Wrap that in a retry to avoid errors. + cat <<-EOF > _install || die + #!/bin/sh + for n in 1 2 3 4 5; do + install "\$@" && exit + echo "retrying ..." + done + exit 1 + EOF + chmod a+rx _install || die + # Can't use the ${INSTALL} var as top level configure also uses it. + # https://sourceforge.net/p/x3270/bugs/15/ + export ac_cv_path_install="${S}"/_install + + AT_NOEAUTOHEADER=yes eautoreconf +} + +src_configure() { + econf \ + --cache-file="${S}"/config.cache \ + --enable-s3270 \ + --enable-pr3287 \ + $(use_enable ncurses c3270) \ + $(use_enable tcl tcl3270) \ + $(use_enable gui x3270) \ + $(use_with gui x) \ + $(use_with gui fontdir "${FONTDIR}") +} + +src_install() { + use gui && dodir "${FONTDIR}" + + emake DESTDIR="${D}" install{,.man} + + use gui && font_src_install +} + +pkg_postinst() { + use gui && font_pkg_postinst +} + +pkg_postrm() { + use gui && font_pkg_postrm +} diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest new file mode 100644 index 000000000000..2efe3ef8929a --- /dev/null +++ b/net-misc/sunshine/Manifest @@ -0,0 +1,10 @@ +DIST LizardByte-build-deps-2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec.tar.gz 24171 BLAKE2B bcc8f1829eae4ba85a9cbdaca7876a4a52c979f3b8ef0f0a56876fcb171025544bd1997455c2b8fff59564deca433366ae03f14cbb0929f78c87f991b269156f SHA512 892184ec0ff321b2b7e2000dc605d1162955cb04ff259f6032f124f1ff50a1fe485e2cf2c0b735788f8615c9aba87ca040205599cb4b91881daa462a53340bd7 +DIST LizardByte-tray-4d8b798cafdd11285af9409c16b5f792968e0045.tar.gz 1068346 BLAKE2B 6da778c6dc1efb1147363de239a4170dad23288322285b847ed86837b316162bce861b848b8371ea8562efbfa0d36dc6921e8a36da0a05740e3f6aa1da29fae1 SHA512 9c6535a6a3ba4489b5af0821a8c42bbb706259c10d70237bd3d3b31283a7e8ad0e3c2326a34c229d899389156909c36252a931ea47eef8daeb8b7c54b26e92cb +DIST Simple-Web-Server-27b41f5ee154cca0fce4fe2955dd886d04e3a4ed.tar.bz2 63258 BLAKE2B e80a6cd92825038ca75b973281b676584f9e488b45b1f9c6ed526236c0a7188b97ae2bba9d7b5557893452dd1ba8778faff2ade840cc169d20b4cf0e51fc8394 SHA512 2eba1d8bd53bb3e29e51a72000918b44730f73b4df26824f25cb6a4860dd21f8aaa7f77124fb500ffe9601ebeca66d1c21a06cad239ed27481e9cae088afbd44 +DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 +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.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-0.22.0-nvcodec.patch b/net-misc/sunshine/files/sunshine-0.22.0-nvcodec.patch new file mode 100644 index 000000000000..bc7681beedf0 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-0.22.0-nvcodec.patch @@ -0,0 +1,27 @@ +From 36b5a18ffd0cdf379b579db91bfaacc46e8c4757 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 18 Feb 2024 10:25:25 +0000 +Subject: [PATCH] Be less strict about the nv-codec-headers version + +Using the bundled version is awkward. Restrict the major version only +and deal with any issues later. +--- + src/nvenc/nvenc_base.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nvenc/nvenc_base.cpp b/src/nvenc/nvenc_base.cpp +index b9eba5a..e11c4e2 100644 +--- a/src/nvenc/nvenc_base.cpp ++++ b/src/nvenc/nvenc_base.cpp +@@ -11,7 +11,7 @@ + // - NV_ENC_*_VER definitions where the value inside NVENCAPI_STRUCT_VERSION() was increased
+ // - Incompatible struct changes in nvEncodeAPI.h (fields removed, semantics changed, etc.)
+ // - Test both old and new drivers with all supported codecs
+-#if NVENCAPI_VERSION != MAKE_NVENC_VER(12U, 0U)
++#if NVENCAPI_MAJOR_VERSION != 12
+ #error Check and update NVENC code for backwards compatibility!
+ #endif
+
+-- +2.43.0 + diff --git a/net-misc/sunshine/files/sunshine-cross-cbs.patch b/net-misc/sunshine/files/sunshine-cross-cbs.patch new file mode 100644 index 000000000000..e6173597e476 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-cross-cbs.patch @@ -0,0 +1,59 @@ +From 40654399bd090dda20750b184eb6b15bc615a5dc Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 25 Feb 2024 16:24:25 +0000 +Subject: [PATCH] Fix cross-compiling and don't treat x86 as the default case + +If you set arch-specific CFLAGS, then ffmpeg's configure script may +fail when it tries to use these flags against the build host's compiler. + +Also use CMAKE_SYSTEM_PROCESSOR to set up cross-compiling without +relying on any custom variables. ffmpeg normalises its --arch option and +will accept just about any string that you'll likely throw at it. + +diff --git a/cmake/ffmpeg_cbs.cmake b/cmake/ffmpeg_cbs.cmake +index 573bec0..4a75e1a 100644 +--- a/cmake/ffmpeg_cbs.cmake ++++ b/cmake/ffmpeg_cbs.cmake +@@ -30,23 +30,30 @@ if (WIN32) + set(LEADING_SH_COMMAND sh) + endif () + +-if (CROSS_COMPILE_ARM) +- set(FFMPEG_EXTRA_CONFIGURE +- --arch=aarch64 +- --enable-cross-compile) ++string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} arch) ++ ++if (${arch} STREQUAL "aarch64" OR ${arch} STREQUAL "arm64") + set(CBS_ARCH_PATH arm) +-elseif (CROSS_COMPILE_PPC) +- set(FFMPEG_EXTRA_CONFIGURE +- --arch=powerpc64le +- --enable-cross-compile) ++elseif (${arch} STREQUAL "ppc64le") + set(CBS_ARCH_PATH ppc) +-else () ++elseif (${arch} STREQUAL "amd64" OR ${arch} STREQUAL "x86_64") + set(CBS_ARCH_PATH x86) ++else () ++ message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++endif () ++ ++if (CMAKE_CROSSCOMPILING) ++ set(FFMPEG_EXTRA_CONFIGURE --arch=${arch} --enable-cross-compile) + endif () + + # The generated config.h needs to have `CONFIG_CBS_` flags enabled (from `--enable-bsfs`) + execute_process( + COMMAND ${LEADING_SH_COMMAND} ./configure ++ --cc=${CMAKE_C_COMPILER} ++ --cxx=${CMAKE_CXX_COMPILER} ++ --ar=${CMAKE_AR} ++ --ranlib=${CMAKE_RANLIB} ++ --optflags=${CMAKE_C_FLAGS} + --disable-all + --disable-autodetect + --disable-iconv +-- +2.43.2 + diff --git a/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch b/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch new file mode 100644 index 000000000000..172ae3ff7d59 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch @@ -0,0 +1,162 @@ +From 20c589554a1b10dad206619e11d143c420aa6c82 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Mon, 1 Jan 2024 11:17:08 +0000 +Subject: [PATCH 1/2] Allow a custom FFmpeg build to be provided using CMake + options + +--- + cmake/dependencies/common.cmake | 90 ++++++++++++++++++--------------- + 1 file changed, 50 insertions(+), 40 deletions(-) + +diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake +index 29bed10..d43a6e0 100644 +--- a/cmake/dependencies/common.cmake ++++ b/cmake/dependencies/common.cmake +@@ -20,53 +20,63 @@ pkg_check_modules(MINIUPNP miniupnpc REQUIRED) + include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS}) + + # ffmpeg pre-compiled binaries +-if(WIN32) +- if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") +- message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++if(NOT DEFINED FFMPEG_PREPARED_BINARIES) ++ if(WIN32) ++ if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") ++ message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++ endif() ++ set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl) ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/windows-x86_64") ++ elseif(APPLE) ++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/macos-x86_64") ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/macos-aarch64") ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc") ++ message(FATAL_ERROR "PowerPC is not supported on macOS") ++ else() ++ message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++ endif() ++ elseif(UNIX) ++ set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) ++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") ++ list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-x86_64") ++ set(CPACK_DEB_PLATFORM_PACKAGE_DEPENDS "libmfx1,") ++ set(CPACK_RPM_PLATFORM_PACKAGE_REQUIRES "intel-mediasdk >= 22.3.0,") ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-aarch64") ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64") ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-powerpc64le") ++ else() ++ message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++ endif() + endif() +- set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl) +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/windows-x86_64") +-elseif(APPLE) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/macos-x86_64") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/macos-aarch64") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc") +- message(FATAL_ERROR "PowerPC is not supported on macOS") +- else() +- message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++ if(EXISTS "${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a") ++ set(HDR10_PLUS_LIBRARY ++ "${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a") + endif() +-elseif(UNIX) +- set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +- list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-x86_64") +- set(CPACK_DEB_PLATFORM_PACKAGE_DEPENDS "libmfx1,") +- set(CPACK_RPM_PLATFORM_PACKAGE_REQUIRES "intel-mediasdk >= 22.3.0,") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-aarch64") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-powerpc64le") +- else() +- message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) +- endif() +-endif() +-set(FFMPEG_INCLUDE_DIRS +- "${FFMPEG_PREPARED_BINARIES}/include") +-if(EXISTS "${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a") +- set(HDR10_PLUS_LIBRARY +- "${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a") +-endif() +-set(FFMPEG_LIBRARIES ++ set(FFMPEG_LIBRARIES ++ "${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libcbs.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libSvtAv1Enc.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libx264.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libx265.a" ++ ${HDR10_PLUS_LIBRARY} ++ ${FFMPEG_PLATFORM_LIBRARIES}) ++else() ++ set(FFMPEG_LIBRARIES + "${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a" + "${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a" + "${FFMPEG_PREPARED_BINARIES}/lib/libcbs.a" +- "${FFMPEG_PREPARED_BINARIES}/lib/libSvtAv1Enc.a" + "${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a" +- "${FFMPEG_PREPARED_BINARIES}/lib/libx264.a" +- "${FFMPEG_PREPARED_BINARIES}/lib/libx265.a" +- ${HDR10_PLUS_LIBRARY} + ${FFMPEG_PLATFORM_LIBRARIES}) ++endif() ++ ++set(FFMPEG_INCLUDE_DIRS ++ "${FFMPEG_PREPARED_BINARIES}/include") + + # platform specific dependencies + if(WIN32) +-- +2.43.2 + +From 53cd96560114dd700c943db63723e340100446a3 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Mon, 1 Jan 2024 13:34:20 +0000 +Subject: [PATCH 2/2] Move numa from general PLATFORM_LIBRARIES to + FFMPEG_PLATFORM_LIBRARIES + +It's only needed if libx265 was built with NUMA support. This support +may be disabled in a custom FFmpeg build. +--- + cmake/compile_definitions/linux.cmake | 1 - + cmake/dependencies/common.cmake | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/cmake/compile_definitions/linux.cmake b/cmake/compile_definitions/linux.cmake +index b6d1990..ec668f7 100644 +--- a/cmake/compile_definitions/linux.cmake ++++ b/cmake/compile_definitions/linux.cmake +@@ -252,7 +252,6 @@ list(APPEND PLATFORM_TARGET_FILES + list(APPEND PLATFORM_LIBRARIES + Boost::dynamic_linking + dl +- numa + pulse + pulse-simple) + +diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake +index d43a6e0..bddee03 100644 +--- a/cmake/dependencies/common.cmake ++++ b/cmake/dependencies/common.cmake +@@ -38,7 +38,7 @@ if(NOT DEFINED FFMPEG_PREPARED_BINARIES) + message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) + endif() + elseif(UNIX) +- set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) ++ set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 vdpau X11) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) + set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-x86_64") +-- +2.43.2 + 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/files/sunshine-miniupnpc.patch b/net-misc/sunshine/files/sunshine-miniupnpc.patch new file mode 100644 index 000000000000..3847724eedc5 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-miniupnpc.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/934173 +https://github.com/LizardByte/Sunshine/pull/2746 + +From 850f656676d30ffb47028e865982e56be161d179 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 23 Jun 2024 16:21:23 +0100 +Subject: [PATCH] fix(upnp): Support miniupnpc API version 18 (release 2.2.8) + +--- + src/upnp.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/upnp.cpp b/src/upnp.cpp +index 2743ebae..e6ec057b 100644 +--- a/src/upnp.cpp ++++ b/src/upnp.cpp +@@ -109,7 +109,11 @@ namespace upnp { + IGDdatas data; + urls_t urls; + std::array<char, INET6_ADDRESS_STRLEN> lan_addr; ++#if (MINIUPNPC_API_VERSION >= 18) ++ auto status = UPNP_GetValidIGD(device.get(), &urls.el, &data, lan_addr.data(), lan_addr.size(), nullptr, 0); ++#else + auto status = UPNP_GetValidIGD(device.get(), &urls.el, &data, lan_addr.data(), lan_addr.size()); ++#endif + if (status != 1 && status != 2) { + BOOST_LOG(debug) << "No valid IPv6 IGD: "sv << status_string(status); + return false; +@@ -331,7 +335,11 @@ namespace upnp { + std::array<char, INET6_ADDRESS_STRLEN> lan_addr; + + urls_t urls; ++#if (MINIUPNPC_API_VERSION >= 18) ++ auto status = UPNP_GetValidIGD(device.get(), &urls.el, &data, lan_addr.data(), lan_addr.size(), nullptr, 0); ++#else + auto status = UPNP_GetValidIGD(device.get(), &urls.el, &data, lan_addr.data(), lan_addr.size()); ++#endif + if (status != 1 && status != 2) { + BOOST_LOG(error) << status_string(status); + mapped = false; +-- +2.45.2 + diff --git a/net-misc/sunshine/metadata.xml b/net-misc/sunshine/metadata.xml new file mode 100644 index 000000000000..11dc749f56cf --- /dev/null +++ b/net-misc/sunshine/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">LizardByte/Sunshine</remote-id> + <bugs-to>https://bugs.gentoo.org</bugs-to> + </upstream> + <use> + <flag name="cuda">Enable accelerated video encoding on NVIDIA hardware</flag> + <flag name="libdrm">Enable video encoding via <pkg>x11-libs/libdrm</pkg></flag> + <flag name="svt-av1">Enables software AV1 encoding via <pkg>media-libs/svt-av1</pkg></flag> + <flag name="trayicon">Enable system tray icon</flag> + <flag name="x264">Enable software H.264 encoding via <pkg>media-libs/x264</pkg></flag> + <flag name="x265">Enable software HEVC encoding via <pkg>media-libs/x265</pkg></flag> + </use> +</pkgmetadata> diff --git a/net-misc/sunshine/sunshine-0.23.1.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild new file mode 100644 index 000000000000..d197b35c6616 --- /dev/null +++ b/net-misc/sunshine/sunshine-0.23.1.ebuild @@ -0,0 +1,378 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# These don't necessarily have to align with the upstream release. +BUILD_DEPS_COMMIT="2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec" +ENET_COMMIT="04e27590670a87a7cd40f5a05cda97467e4e25a3" +MOONLIGHT_COMMIT="cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e" +NANORS_COMMIT="e9e242e98e27037830490b2a752895ca68f75f8b" +TRAY_COMMIT="4d8b798cafdd11285af9409c16b5f792968e0045" +SWS_COMMIT="27b41f5ee154cca0fce4fe2955dd886d04e3a4ed" +WLRP_COMMIT="2b8d43325b7012cc3f9b55c08d26e50e42beac7d" +FFMPEG_VERSION="6.1.1" + +# To make the assets tarball: +# PV= +# 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 +else + SRC_URI=" + https://github.com/LizardByte/Sunshine/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/LizardByte/build-deps/archive/${BUILD_DEPS_COMMIT}.tar.gz + -> LizardByte-build-deps-${BUILD_DEPS_COMMIT}.tar.gz + https://github.com/cgutman/enet/archive/${ENET_COMMIT}.tar.gz + -> moonlight-enet-${ENET_COMMIT}.tar.gz + https://github.com/moonlight-stream/moonlight-common-c/archive/${MOONLIGHT_COMMIT}.tar.gz + -> moonlight-common-c-${MOONLIGHT_COMMIT}.tar.gz + https://github.com/sleepybishop/nanors/archive/${NANORS_COMMIT}.tar.gz + -> nanors-${NANORS_COMMIT}.tar.gz + https://github.com/LizardByte/tray/archive/${TRAY_COMMIT}.tar.gz + -> LizardByte-tray-${TRAY_COMMIT}.tar.gz + 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}-assets-${PV}.tar.xz + " + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}/Sunshine-${PV}" +fi + +inherit cmake fcaps flag-o-matic systemd toolchain-funcs udev xdg + +DESCRIPTION="Self-hosted game stream host for Moonlight" +HOMEPAGE="https://github.com/LizardByte/Sunshine" +LICENSE="GPL-3" +SLOT="0" +IUSE="cuda debug libdrm svt-av1 trayicon vaapi wayland X x264 x265" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( + cpu_flags_arm_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( cpu_flags_arm_thumb ) + ) +" +PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) +PPC_CPU_REQUIRED_USE=" + cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) + cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) +" +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx + mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${PPC_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +REQUIRED_USE=" + ${CPU_REQUIRED_USE} + || ( cuda libdrm wayland X ) +" + +CDEPEND=" + dev-libs/boost:=[nls] + dev-libs/libevdev + dev-libs/openssl:= + media-libs/opus + net-libs/miniupnpc:= + net-misc/curl + || ( + media-libs/libpulse + media-sound/apulse[sdk] + ) + libdrm? ( + sys-libs/libcap + x11-libs/libdrm + ) + svt-av1? ( media-libs/svt-av1 ) + trayicon? ( + dev-libs/libayatana-appindicator + x11-libs/libnotify + ) + vaapi? ( media-libs/libva:=[wayland?,X?] ) + wayland? ( dev-libs/wayland ) + X? ( x11-libs/libX11 ) + x264? ( media-libs/x264:= ) + x265? ( media-libs/x265:= ) +" + +RDEPEND=" + ${CDEPEND} + media-libs/mesa[vaapi?] + X? ( + x11-libs/libxcb + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + ) +" + +DEPEND=" + ${CDEPEND} + media-libs/amf-headers + =media-libs/nv-codec-headers-12* + wayland? ( dev-libs/wayland-protocols ) +" + +BDEPEND=" + net-libs/nodejs[npm] + virtual/pkgconfig + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-custom-ffmpeg.patch + "${FILESDIR}"/${PN}-0.22.0-nvcodec.patch + "${FILESDIR}"/${PN}-find-npm.patch + "${FILESDIR}"/${PN}-miniupnpc.patch +) + +# Make this mess a bit simpler. +CMAKE_IN_SOURCE_BUILD=1 + +# Make npm behave. +export npm_config_audit=false +export npm_config_color=false +export npm_config_foreground_scripts=true +export npm_config_loglevel=verbose +export npm_config_optional=false +export npm_config_progress=false +export npm_config_save=false + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + local EGIT_REPO_URI="https://github.com/LizardByte/build-deps.git" + local EGIT_SUBMODULES=( '-*' ) + local EGIT_CHECKOUT_DIR=${WORKDIR}/build-deps + git-r3_src_unpack + + # Use upstream server like our ffmpeg package does, not GitHub. + local EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" + local EGIT_SUBMODULES=( '-*' ) + local EGIT_CHECKOUT_DIR=${EGIT_CHECKOUT_DIR}/ffmpeg_sources/ffmpeg + local EGIT_COMMIT=$(git --git-dir=build-deps/.git rev-parse HEAD:ffmpeg_sources/ffmpeg) + local EGIT_BRANCH=release/$(ver_cut 1-2 ${FFMPEG_VERSION}) + git-r3_src_unpack + + local EGIT_REPO_URI="https://github.com/LizardByte/Sunshine.git" + local EGIT_SUBMODULES=( + third-party/{moonlight-common-c{,/enet},nanors,tray,Simple-Web-Server,wlr-protocols} + ) + unset EGIT_CHECKOUT_DIR EGIT_COMMIT EGIT_BRANCH + git-r3_src_unpack + + # This downloads things so must go in src_unpack to avoid the sandbox. + cd "${S}" || die + npm install || die + else + default + ln -snf build-deps-${BUILD_DEPS_COMMIT} build-deps || die + find moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party build-deps/ffmpeg_sources \ + -mindepth 1 -type d -empty -delete || die + ln -snf ../enet-${ENET_COMMIT} moonlight-common-c-${MOONLIGHT_COMMIT}/enet || die + ln -snf ../../moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party/moonlight-common-c || die + ln -snf ../../nanors-${NANORS_COMMIT} "${S}"/third-party/nanors || die + ln -snf ../../tray-${TRAY_COMMIT} "${S}"/third-party/tray || die + ln -snf ../../Simple-Web-Server-${SWS_COMMIT} "${S}"/third-party/Simple-Web-Server || die + ln -snf ../../wlr-protocols-${WLRP_COMMIT} "${S}"/third-party/wlr-protocols || die + ln -snf ../../ffmpeg-${FFMPEG_VERSION} build-deps/ffmpeg_sources/ffmpeg || die + fi +} + +src_prepare() { + # Apply CBS patch. + cd "${WORKDIR}"/build-deps || die + eapply "${FILESDIR}"/${PN}-cross-cbs.patch + + # Apply general ffmpeg patches. + cd "${WORKDIR}"/build-deps/ffmpeg_sources/ffmpeg || die + eapply "${WORKDIR}"/build-deps/ffmpeg_patches/ffmpeg/*.patch + + # Copy ffmpeg sources because CBS build applies extra patches. + cp -a ./ "${WORKDIR}"/ffmpeg-build || die + + cd "${S}" || die + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_prepare + default_src_prepare() { :; } # Hack to avoid double patching! :( + CMAKE_USE_DIR="${S}" cmake_src_prepare +} + +src_configure() { + local myconf=( + --prefix="${S}"/third-party/ffmpeg + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --ar="$(tc-getAR)" + --nm="$(tc-getNM)" + --strip="$(tc-getSTRIP)" + --ranlib="$(tc-getRANLIB)" + --pkg-config="$(tc-getPKG_CONFIG)" + --optflags="${CFLAGS}" + --disable-all + --disable-autodetect + --disable-error-resilience + --disable-everything + --disable-faan + --disable-iconv + --disable-network + --disable-optimizations + --disable-stripping + --enable-amf + --enable-avcodec + --enable-ffnvcodec + --enable-gpl + --enable-nvenc + --enable-static + --enable-swscale + --enable-v4l2_m2m + $(use_enable cuda) + $(use_enable cuda cuda_llvm) + $(use_enable svt-av1 libsvtav1) + $(use_enable vaapi) + $(use_enable x264 libx264) + $(use_enable x265 libx265) + $(usex svt-av1 --enable-encoder=libsvtav1 "") + $(usex vaapi --enable-encoder=h264_vaapi,hevc_vaapi,av1_vaapi "") + $(usex x264 --enable-encoder=libx264 "") + $(usex x265 --enable-encoder=libx265 "") + --enable-encoder=h264_amf,hevc_amf,av1_amf + --enable-encoder=h264_nvenc,hevc_nvenc,av1_nvenc + --enable-encoder=h264_v4l2m2m,hevc_v4l2m2m + ) + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + cd "${WORKDIR}"/ffmpeg-build || die + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=no + -DCMAKE_INSTALL_PREFIX="${S}"/third-party/ffmpeg + ) + 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 + -DSUNSHINE_ASSETS_DIR=share/${PN} + -DSUNSHINE_ENABLE_CUDA=$(usex cuda) + -DSUNSHINE_ENABLE_DRM=$(usex libdrm) + -DSUNSHINE_ENABLE_VAAPI=$(usex vaapi) + -DSUNSHINE_ENABLE_WAYLAND=$(usex wayland) + -DSUNSHINE_ENABLE_X11=$(usex X) + -DSUNSHINE_ENABLE_TRAY=$(usex trayicon) + -DSUNSHINE_REQUIRE_TRAY=$(usex trayicon) + -DSUNSHINE_SYSTEM_WAYLAND_PROTOCOLS=yes + -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 +} + +src_compile() { + emake -C "${WORKDIR}"/ffmpeg-build V=1 + emake -C "${WORKDIR}"/ffmpeg-build V=1 install + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_compile + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_build install + CMAKE_USE_DIR="${S}" npm_config_offline=1 cmake_src_compile +} + +pkg_postinst() { + udev_reload + xdg_pkg_postinst + use libdrm && fcaps cap_sys_admin+p usr/bin/"$(readlink "${EROOT}"/usr/bin/${PN})" + + elog "At upstream's request, please report any issues to https://bugs.gentoo.org" + elog "rather than going directly to them." +} + +pkg_postrm() { + udev_reload + xdg_pkg_postrm +} diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild new file mode 100644 index 000000000000..fc9ced64a545 --- /dev/null +++ b/net-misc/sunshine/sunshine-9999.ebuild @@ -0,0 +1,382 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# These don't necessarily have to align with the upstream release. +BUILD_DEPS_COMMIT="2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec" +ENET_COMMIT="04e27590670a87a7cd40f5a05cda97467e4e25a3" +INPUTTINO_COMMIT="8a33706a146787a1ed3666ce52888634dd16cb86" +MOONLIGHT_COMMIT="cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e" +NANORS_COMMIT="e9e242e98e27037830490b2a752895ca68f75f8b" +TRAY_COMMIT="4d8b798cafdd11285af9409c16b5f792968e0045" +SWS_COMMIT="27b41f5ee154cca0fce4fe2955dd886d04e3a4ed" +WLRP_COMMIT="2b8d43325b7012cc3f9b55c08d26e50e42beac7d" +FFMPEG_VERSION="6.1.1" + +# To make the assets tarball: +# PV= +# 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 +else + SRC_URI=" + https://github.com/LizardByte/Sunshine/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/LizardByte/build-deps/archive/${BUILD_DEPS_COMMIT}.tar.gz + -> LizardByte-build-deps-${BUILD_DEPS_COMMIT}.tar.gz + https://github.com/cgutman/enet/archive/${ENET_COMMIT}.tar.gz + -> moonlight-enet-${ENET_COMMIT}.tar.gz + https://github.com/games-on-whales/inputtino/archive/${INPUTTINO_COMMIT}.tar.gz + -> inputtino-${INPUTTINO_COMMIT}.tar.gz + https://github.com/moonlight-stream/moonlight-common-c/archive/${MOONLIGHT_COMMIT}.tar.gz + -> moonlight-common-c-${MOONLIGHT_COMMIT}.tar.gz + https://github.com/sleepybishop/nanors/archive/${NANORS_COMMIT}.tar.gz + -> nanors-${NANORS_COMMIT}.tar.gz + https://github.com/LizardByte/tray/archive/${TRAY_COMMIT}.tar.gz + -> LizardByte-tray-${TRAY_COMMIT}.tar.gz + 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}-assets-${PV}.tar.xz + " + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}/Sunshine-${PV}" +fi + +inherit cmake fcaps flag-o-matic systemd toolchain-funcs udev xdg + +DESCRIPTION="Self-hosted game stream host for Moonlight" +HOMEPAGE="https://github.com/LizardByte/Sunshine" +LICENSE="GPL-3" +SLOT="0" +IUSE="cuda debug libdrm svt-av1 trayicon vaapi wayland X x264 x265" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( + cpu_flags_arm_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( cpu_flags_arm_thumb ) + ) +" +PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) +PPC_CPU_REQUIRED_USE=" + cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) + cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) +" +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx + mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${PPC_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +REQUIRED_USE=" + ${CPU_REQUIRED_USE} + || ( cuda libdrm wayland X ) +" + +CDEPEND=" + >=dev-libs/boost-1.85:=[nls] + dev-libs/libevdev + dev-libs/openssl:= + media-libs/opus + net-libs/miniupnpc:= + net-misc/curl + || ( + media-libs/libpulse + media-sound/apulse[sdk] + ) + libdrm? ( + sys-libs/libcap + x11-libs/libdrm + ) + svt-av1? ( media-libs/svt-av1 ) + trayicon? ( + dev-libs/libayatana-appindicator + x11-libs/libnotify + ) + vaapi? ( media-libs/libva:=[wayland?,X?] ) + wayland? ( dev-libs/wayland ) + X? ( x11-libs/libX11 ) + x264? ( media-libs/x264:= ) + x265? ( media-libs/x265:= ) +" + +RDEPEND=" + ${CDEPEND} + media-libs/mesa[vaapi?] + X? ( + x11-libs/libxcb + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + ) +" + +DEPEND=" + ${CDEPEND} + media-libs/amf-headers + =media-libs/nv-codec-headers-12* + wayland? ( dev-libs/wayland-protocols ) +" + +BDEPEND=" + net-libs/nodejs[npm] + virtual/pkgconfig + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.22.0-nvcodec.patch +) + +# Make this mess a bit simpler. +CMAKE_IN_SOURCE_BUILD=1 + +# Make npm behave. +export npm_config_audit=false +export npm_config_color=false +export npm_config_foreground_scripts=true +export npm_config_loglevel=verbose +export npm_config_optional=false +export npm_config_progress=false +export npm_config_save=false + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + local EGIT_REPO_URI="https://github.com/LizardByte/build-deps.git" + local EGIT_SUBMODULES=( '-*' ) + local EGIT_CHECKOUT_DIR=${WORKDIR}/build-deps + git-r3_src_unpack + + # Use upstream server like our ffmpeg package does, not GitHub. + local EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" + local EGIT_SUBMODULES=( '-*' ) + local EGIT_CHECKOUT_DIR=${EGIT_CHECKOUT_DIR}/ffmpeg_sources/ffmpeg + local EGIT_COMMIT=$(git --git-dir=build-deps/.git rev-parse HEAD:ffmpeg_sources/ffmpeg) + local EGIT_BRANCH=release/$(ver_cut 1-2 ${FFMPEG_VERSION}) + git-r3_src_unpack + + local EGIT_REPO_URI="https://github.com/LizardByte/Sunshine.git" + local EGIT_SUBMODULES=( + third-party/{inputtino,moonlight-common-c{,/enet},nanors,tray,Simple-Web-Server,wlr-protocols} + ) + unset EGIT_CHECKOUT_DIR EGIT_COMMIT EGIT_BRANCH + git-r3_src_unpack + + # This downloads things so must go in src_unpack to avoid the sandbox. + cd "${S}" || die + npm install || die + else + default + ln -snf build-deps-${BUILD_DEPS_COMMIT} build-deps || die + find moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party build-deps/ffmpeg_sources \ + -mindepth 1 -type d -empty -delete || die + ln -snf ../enet-${ENET_COMMIT} moonlight-common-c-${MOONLIGHT_COMMIT}/enet || die + ln -snf ../../inputtino-${INPUTTINO_COMMIT} "${S}"/third-party/inputtino || die + ln -snf ../../moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party/moonlight-common-c || die + ln -snf ../../nanors-${NANORS_COMMIT} "${S}"/third-party/nanors || die + ln -snf ../../tray-${TRAY_COMMIT} "${S}"/third-party/tray || die + ln -snf ../../Simple-Web-Server-${SWS_COMMIT} "${S}"/third-party/Simple-Web-Server || die + ln -snf ../../wlr-protocols-${WLRP_COMMIT} "${S}"/third-party/wlr-protocols || die + ln -snf ../../ffmpeg-${FFMPEG_VERSION} build-deps/ffmpeg_sources/ffmpeg || die + fi +} + +src_prepare() { + # Apply CBS patch. + cd "${WORKDIR}"/build-deps || die + eapply "${FILESDIR}"/${PN}-cross-cbs.patch + + # Apply general ffmpeg patches. + cd "${WORKDIR}"/build-deps/ffmpeg_sources/ffmpeg || die + eapply "${WORKDIR}"/build-deps/ffmpeg_patches/ffmpeg/*.patch + + # Copy ffmpeg sources because CBS build applies extra patches. + cp -a ./ "${WORKDIR}"/ffmpeg-build || die + + cd "${S}" || die + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_prepare + default_src_prepare() { :; } # Hack to avoid double patching! :( + CMAKE_USE_DIR="${S}" cmake_src_prepare +} + +src_configure() { + local myconf=( + --prefix="${S}"/third-party/ffmpeg + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --ar="$(tc-getAR)" + --nm="$(tc-getNM)" + --strip="$(tc-getSTRIP)" + --ranlib="$(tc-getRANLIB)" + --pkg-config="$(tc-getPKG_CONFIG)" + --optflags="${CFLAGS}" + --disable-all + --disable-autodetect + --disable-error-resilience + --disable-everything + --disable-faan + --disable-iconv + --disable-network + --disable-optimizations + --disable-stripping + --enable-amf + --enable-avcodec + --enable-ffnvcodec + --enable-gpl + --enable-nvenc + --enable-static + --enable-swscale + --enable-v4l2_m2m + $(use_enable cuda) + $(use_enable cuda cuda_llvm) + $(use_enable svt-av1 libsvtav1) + $(use_enable vaapi) + $(use_enable x264 libx264) + $(use_enable x265 libx265) + $(usex svt-av1 --enable-encoder=libsvtav1 "") + $(usex vaapi --enable-encoder=h264_vaapi,hevc_vaapi,av1_vaapi "") + $(usex x264 --enable-encoder=libx264 "") + $(usex x265 --enable-encoder=libx265 "") + --enable-encoder=h264_amf,hevc_amf,av1_amf + --enable-encoder=h264_nvenc,hevc_nvenc,av1_nvenc + --enable-encoder=h264_v4l2m2m,hevc_v4l2m2m + ) + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + cd "${WORKDIR}"/ffmpeg-build || die + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=no + -DCMAKE_INSTALL_PREFIX="${S}"/third-party/ffmpeg + ) + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_configure + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=no + -DBOOST_USE_STATIC=no + -DBUILD_TESTS=no + -DCCACHE_FOUND=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 + -DSUNSHINE_ASSETS_DIR=share/${PN} + -DSUNSHINE_ENABLE_CUDA=$(usex cuda) + -DSUNSHINE_ENABLE_DRM=$(usex libdrm) + -DSUNSHINE_ENABLE_VAAPI=$(usex vaapi) + -DSUNSHINE_ENABLE_WAYLAND=$(usex wayland) + -DSUNSHINE_ENABLE_X11=$(usex X) + -DSUNSHINE_ENABLE_TRAY=$(usex trayicon) + -DSUNSHINE_REQUIRE_TRAY=$(usex trayicon) + -DSUNSHINE_SYSTEM_WAYLAND_PROTOCOLS=yes + -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 +} + +src_compile() { + emake -C "${WORKDIR}"/ffmpeg-build V=1 + emake -C "${WORKDIR}"/ffmpeg-build V=1 install + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_compile + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_build install + CMAKE_USE_DIR="${S}" npm_config_offline=1 cmake_src_compile +} + +pkg_postinst() { + udev_reload + xdg_pkg_postinst + use libdrm && fcaps cap_sys_admin+p usr/bin/"$(readlink "${EROOT}"/usr/bin/${PN})" + + elog "At upstream's request, please report any issues to https://bugs.gentoo.org" + elog "rather than going directly to them." +} + +pkg_postrm() { + udev_reload + xdg_pkg_postrm +} diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest index 3978b0858612..e7cea24a125a 100644 --- a/net-misc/sysrepo/Manifest +++ b/net-misc/sysrepo/Manifest @@ -1 +1,2 @@ +DIST sysrepo-2.2.150.tar.gz 873758 BLAKE2B 55a9d22fede4f226f24b87829c88b72096ea8a18aa9aa44e168cd3f9817f49080a4757c99d5a179cadf0352c3cbbe09d92006195140a9973d39bc0db6ed103d8 SHA512 b9ee7db9ca32c68576fdb300c3c5605c130b6639d942d5e39bd9ce48039fe90e0e69756e7914071f49c2db3083ba36f1f431f3f9bdaf02e3d040646e051e4cef DIST sysrepo-2.2.60.tar.gz 782781 BLAKE2B afaef4e0a3d21a636f84d76ee0de55b1365e0e66cb9335ca748752747af99eb58c368eafd7c087a1df050ff4d1c2800601d125915f2debaad8ccc77278d30b84 SHA512 720299b57a0615ba99e01e7d42bc85d5ba5482d82680c47961f6876400009850e8fdf5c0753c39600ef0947a318394eb6108772ac1a575584f26bdc6e2305a57 diff --git a/net-misc/sysrepo/metadata.xml b/net-misc/sysrepo/metadata.xml index 9c3bb641e9b8..60ca18dd5265 100644 --- a/net-misc/sysrepo/metadata.xml +++ b/net-misc/sysrepo/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>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">sysrepo/sysrepo</remote-id> </upstream> diff --git a/net-misc/sysrepo/sysrepo-2.2.150.ebuild b/net-misc/sysrepo/sysrepo-2.2.150.ebuild new file mode 100644 index 000000000000..0594007d2f3d --- /dev/null +++ b/net-misc/sysrepo/sysrepo-2.2.150.ebuild @@ -0,0 +1,40 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="YANG-based configuration and operational state data store" +HOMEPAGE="https://www.sysrepo.org" +SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=">=net-libs/libyang-2.1.148" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-text/doxygen[dot] )" + +src_configure() { + local mycmakeargs=( + -DENABLE_TESTS=$(usex test) + -DENABLE_VALGRIND_TESTS=OFF + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + + use doc && dodoc -r doc/. +} diff --git a/net-misc/sysrepo/sysrepo-2.2.60.ebuild b/net-misc/sysrepo/sysrepo-2.2.60.ebuild index e88add6bc61d..449c9eed931d 100644 --- a/net-misc/sysrepo/sysrepo-2.2.60.ebuild +++ b/net-misc/sysrepo/sysrepo-2.2.60.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ RESTRICT="!test? ( test )" RDEPEND=">=net-libs/libyang-2.1.55" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" src_configure() { local mycmakeargs=( diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest index 5e4da685e860..e59b65241605 100644 --- a/net-misc/teamviewer/Manifest +++ b/net-misc/teamviewer/Manifest @@ -1,8 +1,8 @@ -DIST teamviewer_15.34.4_amd64.tar.xz 64301620 BLAKE2B fbbbf8efa6fb1189665ee6c39349163b5fcf7cb38ab00f9cc5a1ba52e48b2ca6a2a483f2c416021ce82e12c7dba8a00e23c42e43db0a0dbaff5a89faf90790e2 SHA512 72d826b2b8f1372323666ad5a929413a61dc2496c44c2a9a92c29c47f5d2aa40271735c6ddef1d53b17592c0f8acbe0d44b82e015b902ce1bf1ac22d29baea23 -DIST teamviewer_15.34.4_arm64.tar.xz 66303924 BLAKE2B e3672f70ec3a3bcbeb423bd6211f2b87696d06db4ac767de1795c36626b997b6674c4e7f07b50cac19db68a7652bc4e2ed3fad580d09f17537b5363ce55b1c8c SHA512 08ceabd3a15bb513f1e3d4c77f4f19ea3cc0bcd337dbd7d2b675768d40ae201e44621666c299d6d38e061a75f98ce21830471b2fdcc1eb1dc5bb0b4e5b9f5020 -DIST teamviewer_15.34.4_armhf.tar.xz 58992840 BLAKE2B 756074179f22668058c84cb9d24716b8ee9e4493f0b3f8dcf4e68436520a9f4a18da59c4267440611e02d3ee55e645f6752ae3c46f80a8f1f0673f1c38a9d90a SHA512 8b6bda405240d607b1f349d1323d622de7e1e8046cf1a9fe3b1a8f74b5889d36deea7cc6065a81fb7bdc1871a3f48641612b25730de56c6f3d4a9b4b340c89a4 -DIST teamviewer_15.34.4_i386.tar.xz 65623956 BLAKE2B e49b5b31c9520762edd9defaba1789bc78314c4b5796a77f628fd827e84fb1b8da6459a4fb7934d5227a25b41f3edb01a28ef464fe584c39e6e0ef8710ac970e SHA512 9207d60f517aa2dcad3f1696f648a508a95f6bdc3af52dea68db761f55386f0f101afd485f4125994623dd9902afb4dd26ccba004dfd064845705672d49c9d3e -DIST teamviewer_15.42.4_amd64.tar.xz 81769732 BLAKE2B 0d534aaaefb1eb3664c7f80eab4cd7d32db91e718cbce5cf2a6cb18d959e8ba2e6d77248fc1285f86b19767b59719422cc8ce3e31ee52482d763b1ccd004bd09 SHA512 fb4d0092427459675fc3d1ef53afae4b9bf64e34c586a66e12f19a3cd6a7d3082864bda1a45eb3ca1469db56730c0f17ca1102364f0679c44b2559c502726431 -DIST teamviewer_15.42.4_arm64.tar.xz 82823492 BLAKE2B 74923a0f5e7195465c3c6fbc17f332c9c4f6c12293bb65a6beb1d5f444332577b21bc118c8773f577dde67780b20e7e3f1fee7f2b74d4e046f5cc427bd080752 SHA512 a34068d68b9a3174f467157e08fdf36ba23dc9a9ad6d71ad7c23efe446aad10cfdaffdca5bae9428bb4f2bdf88e2c4d6ec5cbe391f3bd8c03d71caf7700e4cbc -DIST teamviewer_15.42.4_armhf.tar.xz 74843652 BLAKE2B 13390c6d44e6621c9b43898e402c6992ec88e89d600e881b61ceb2fb855a313d5ca951e62269537c5dae76f5661447f6596ea30755d73055917e2ca8f2ee1c98 SHA512 a05e77c814cb382159449e58e15ba9fe629e6152c6c425b4244be76a0f701353de329f67a6e554a57e2da7589fc41f0195ebf5cb652cf5eb4cdb2a42b9a694af -DIST teamviewer_15.42.4_i386.tar.xz 83053560 BLAKE2B b8599abc6da9153b256da7a8618474043883bc5b35a839908efe9eb2446b9db78b8fd9b0a92c49ebfe6ea7b49363c62a044478bacca06ac80396148142e91fdf SHA512 afe8e3f5bf5b20e5ee8415e611e1fa5d6e5c01b4ae3e6884bc60ae229f14727f5fc08c84e49ca638db24e07773b0d3d3302a5166477538f84389228540b84259 +DIST teamviewer_15.53.6_amd64.tar.xz 93437564 BLAKE2B a445f40febbf664047be3a2ffecd67d9e9149e03d7793f17365f0406f056465769571e7c1fc7e2bbfeca4b011fd4ba0b084a5c1460dddf88f6d6ec0ce355dad6 SHA512 a2c0dc70eab9ff46228ff35b3aaf2f7bb61e82fe40a1264bdd065ac9edfb5a506a0212d5a599b74fd02c4e7fe9bcb7451cffdbc24fb884838ca560ce17a8f27d +DIST teamviewer_15.53.6_arm64.tar.xz 93587664 BLAKE2B dcc0fb2348a2edf86268c1f37cdd17f7837ef9a5a982d9bb38987e3eb402c02148ab48b51517f4a35e95cf16ae98b5f7373dad0bd7e5f831c23363daf94d79a5 SHA512 49bdb835e9e2432fb6fb0fce5481d1f0c793dc2e8358a39e6ab3df5904c606b417bbaa0faaf3538bc540122de2bf706c0c5ca595a4cddbb8742401537dd0d9f2 +DIST teamviewer_15.53.6_armhf.tar.xz 86940140 BLAKE2B d5ecc80812e0aea2daaaf11a22d9cef466123679235c17a018f07b21c29c1224e095c301b09a95dadbef8ec7d4591eb01b977d6215af3cbfa93877b46357a96c SHA512 15c925a382182f8735bbfbf13f005baba95aa1169f05638bb6469e4e524bd3a48ee685e34aa858ab5606d5940d5e5e7be6be7bd3ca7874e7ebefa7775e6b5d13 +DIST teamviewer_15.53.6_i386.tar.xz 94894620 BLAKE2B b39d4aa237d7f159957dc598c401fa350a28bf6c9c1a8ae5d249f4b6943e6265e9708f8a1efc7389e8d65624a5f764c31edee6d07d5f2ba3578dd98bd5fbad85 SHA512 32ae67f3a5ac34826224d3acf03da37b6ca6d2037451cc237ffdab2bbce1b05234693def6141016878d50c7fe2ca818ff3d5dc7d2501feb2337fad1b012267f7 +DIST teamviewer_15.55.3_amd64.tar.xz 88796964 BLAKE2B 7c1f6cd3eee569eb3471011b1d98609d29b3be88f57d82b2a1b8675af5c0f2c9fcd2db0091be683a64aa26b946d300179c3506d8c92c224fc83aeb6c6f68dbf8 SHA512 16ed2fec69707d89e1c57c81eb6f765189b82d345c6a58084f58ba5aac2d332038f9c9b80d324455729a8349d81a4f12db3cbf070fb57648ecc0f532127e61f1 +DIST teamviewer_15.55.3_arm64.tar.xz 91624136 BLAKE2B 610b6bb0cd18eda44a58c8590f30a4fa6aa549075cb2fc10a7bce5eddc53595f74ad5a8dfb0ac1254ebbab59897c14804a8c45e7626625fdca90d886d958a876 SHA512 45dd9094cc823f9c1158bc9844bf2da5f1b02e8f7c6b4c19377776978f4c97a8aea8d41b7a9a7b5d0b156fe4c2020ca228415bbb5d8f5687c5e42c3df767b26b +DIST teamviewer_15.55.3_armhf.tar.xz 84907180 BLAKE2B c2a273eed6cb4ef9b84b7a4c10869e4fd9d9244d1176cbb1755307a46fc958c9a335359b917150e96bed5f5bf295fdf7008f5dcba6ba677258d2bc38a8f3d3ed SHA512 7f9635784e2b7bc251be0272dc66064d616d896749f5c29f62fb8b11b51ff8dd77230021f55f6bd64a64f3d290fe32fdba871cf84d902858a6180d8da17b3e72 +DIST teamviewer_15.55.3_i386.tar.xz 90082452 BLAKE2B 404a0fb730f18af2b11949374fa02009bd926e4c24b8a243731bfa7cfd55810e6fb274c3954e8dc5bb790c2fc10393649364338adee0d6979488c589ecd757da SHA512 2629298c7504abb5e6758d1a2d696fe6ee3afb2d43785b8dbc8f04857d1f3ed65f9a8e538732ee0a61917af8759686eefaeea23a69f2735ff84d6ebf3b412195 diff --git a/net-misc/teamviewer/teamviewer-15.42.4.ebuild b/net-misc/teamviewer/teamviewer-15.53.6.ebuild index ceef9a916e07..14af3c7d58bc 100644 --- a/net-misc/teamviewer/teamviewer-15.42.4.ebuild +++ b/net-misc/teamviewer/teamviewer-15.53.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,11 +9,12 @@ MY_MAJOR="$(ver_cut 1)" MY_P="${PN}${MY_MAJOR}" DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet" HOMEPAGE="https://www.teamviewer.com" -MY_URI="https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}" -SRC_URI="amd64? ( ${MY_URI}_amd64.tar.xz ) - arm? ( ${MY_URI}_armhf.tar.xz ) - arm64? ( ${MY_URI}_arm64.tar.xz ) - x86? ( ${MY_URI}_i386.tar.xz )" +MY_URI="https://dl.teamviewer.com/download/linux/version_${MY_MAJOR}x/${PN}_${PV}" +SRC_URI=" + amd64? ( ${MY_URI}_amd64.tar.xz ) + arm? ( ${MY_URI}_armhf.tar.xz ) + arm64? ( ${MY_URI}_arm64.tar.xz ) + x86? ( ${MY_URI}_i386.tar.xz )" S="${WORKDIR}"/teamviewer LICENSE="TeamViewer MIT" @@ -125,7 +126,8 @@ pkg_postinst() { ewarn "Please note that the teamviewer gui works only when started from" ewarn "a session initiated by a display manager." #799137 optfeature_header "Install one of the following display managers:" - optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm + optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm \ + lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm if [[ -z ${REPLACING_VERSIONS} ]]; then elog diff --git a/net-misc/teamviewer/teamviewer-15.34.4.ebuild b/net-misc/teamviewer/teamviewer-15.55.3.ebuild index 075f2b9d405e..14af3c7d58bc 100644 --- a/net-misc/teamviewer/teamviewer-15.34.4.ebuild +++ b/net-misc/teamviewer/teamviewer-15.55.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,17 +9,18 @@ MY_MAJOR="$(ver_cut 1)" MY_P="${PN}${MY_MAJOR}" DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet" HOMEPAGE="https://www.teamviewer.com" -MY_URI="https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}" -SRC_URI="amd64? ( ${MY_URI}_amd64.tar.xz ) - arm? ( ${MY_URI}_armhf.tar.xz ) - arm64? ( ${MY_URI}_arm64.tar.xz ) - x86? ( ${MY_URI}_i386.tar.xz )" +MY_URI="https://dl.teamviewer.com/download/linux/version_${MY_MAJOR}x/${PN}_${PV}" +SRC_URI=" + amd64? ( ${MY_URI}_amd64.tar.xz ) + arm? ( ${MY_URI}_armhf.tar.xz ) + arm64? ( ${MY_URI}_arm64.tar.xz ) + x86? ( ${MY_URI}_i386.tar.xz )" S="${WORKDIR}"/teamviewer LICENSE="TeamViewer MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -RESTRICT="bindist mirror" +RESTRICT="bindist mirror strip" # Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027 BDEPEND="app-arch/xz-utils[extra-filters]" @@ -125,7 +126,8 @@ pkg_postinst() { ewarn "Please note that the teamviewer gui works only when started from" ewarn "a session initiated by a display manager." #799137 optfeature_header "Install one of the following display managers:" - optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm + optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm \ + lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm if [[ -z ${REPLACING_VERSIONS} ]]; then elog diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch new file mode 100644 index 000000000000..332e7951ea53 --- /dev/null +++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch @@ -0,0 +1,31 @@ +build: openpty is declared in different headers on some systems + +Check for util.h next to pty.h for openpty is declared in it on at least +Darwin systems. Solaris needs termios.h + +--- telnet-bsd-1.2/configure.in 2024-07-26 10:13:46.814937718 +0200 ++++ telnet-bsd-1.2/configure.in 2024-07-26 10:19:15.734016104 +0200 +@@ -12,7 +12,7 @@ + AC_SUBST(PACKAGE) + AC_SUBST(VERSION) + +-AC_CHECK_HEADERS([pty.h utmp.h]) ++AC_CHECK_HEADERS([pty.h util.h termios.h utmp.h]) + + if test x"$ac_default_prefix" = x"/usr" + then +--- telnet-bsd-1.2/telnetd/sys_term.c 2024-07-26 10:13:46.859137256 +0200 ++++ telnet-bsd-1.2/telnetd/sys_term.c 2024-07-26 10:19:54.700983107 +0200 +@@ -36,6 +36,12 @@ + #ifdef HAVE_PTY_H + #include <pty.h> + #endif ++#ifdef HAVE_UTIL_H ++#include <util.h> ++#endif ++#ifdef HAVE_TERMIOS_H ++#include <termios.h> ++#endif + + #include "telnetd.h" + #include "pathnames.h" diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild index 8ba189abbfd1..582837e7ab7c 100644 --- a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild +++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild @@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}"/${P}-fbsd.patch "${FILESDIR}"/${PN}-1.2-format-security.patch "${FILESDIR}"/${P}-musl.patch + "${FILESDIR}"/${P}-openpty-util.patch ) src_prepare() { diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.90.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.90.ebuild new file mode 100644 index 000000000000..65b3a6997f9c --- /dev/null +++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.90.ebuild @@ -0,0 +1,18 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XSERVER_VERSION="21.1.13" + +DESCRIPTION="Metapackage for the xorg module provided by tigervnc" +HOMEPAGE="https://tigervnc.org/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +RDEPEND=" + ~net-misc/tigervnc-${PV}[server] + =x11-base/xorg-server-${XSERVER_VERSION%.*}* +" diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index a892cc0077f4..21a2d418a727 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,2 +1,4 @@ DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5 +DIST tigervnc-1.13.90.tar.gz 2082778 BLAKE2B 204f2bdc503f4f13ead2cb641c78390763ebc590822d5759fdb3f1c1e052c761ffa443bdbb8f380d5b6b9f45215506bbd1c20d4bae336ee14d9e3621161a182a SHA512 8787d8b18e491df841947b42492e6ac09ed57c72a2b3a1aa901676b7b73bd8dfab5ce45177333913cf66d604804c55357d15eefe5747c31e97b91ce2b9f44093 +DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 diff --git a/net-misc/tigervnc/files/tigervnc-1.13.90.initd b/net-misc/tigervnc/files/tigervnc-1.13.90.initd new file mode 100644 index 000000000000..bf9eee12787b --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.13.90.initd @@ -0,0 +1,91 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 or later + +# shellcheck shell=sh + +# Create symlinks for all displays. +# For example for display :1, run `ln -s tigervnc /etc/init.d/tigervnc.1` +# Then `rc-update add tigervnc.1 default` +# For compatibility, /etc/init.d/tigervnc will start all displays. + +DISPLAYS=${SVCNAME#*.} +if [ "$DISPLAYS" = "tigervnc" ]; then + should_warn=1 + DISPLAYS=$(grep -v "^#" /etc/tigervnc/vncserver.users | sed -e 's/=.*//' -e 's/^://') +fi + +depend() { + need net +} + +checkconfig() { + if [ -n "${DISPLAYS}" ]; then + if [ "$1" = "start" ]; then + for display in $DISPLAYS; do + user="$(grep "^:${display}" /etc/tigervnc/vncserver.users)" + user=${user#*=} + # bug #690046 + if [ -z "${user}" ]; then + eerror "User is not defined for display :${display} in /etc/tigervnc/vncserver.users" + return 1 + # 1.13.90 changed the default config directory to ~/.config/tigervnc + # but still supports ~/.vnc if not found + elif ! runuser -l "${user}" -s /bin/bash -c \ + "[[ ( -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ${XDG_CONFIG_HOME:-~/.config}/tigervnc/passwd ) || ( ! -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ~/.vnc/passwd ) ]]"; then + eerror "There are no passwords defined for user ${user}." + return 1 + elif [ -e "/tmp/.X11-unix/X${display}" ]; then + eerror "Display :${display} appears to be already in use because of /tmp/.X11-unix/X${display}" + eerror "Remove this file if there is no X server for :${display}" + return 1 + elif [ -e "/tmp/.X${display}-lock" ]; then + eerror "Display :${display} appears to be already in use because of /tmp/.X${display}-lock" + eerror "Remove this file if there is no X server for :${display}" + return 1 + fi + FREEDISPLAYS="${FREEDISPLAYS} ${display}" + done + fi + return 0 + else + eerror 'There are no displays configured in /etc/tigervnc/vncserver.users' + return 1 + fi +} + +checkwarn() { + if [ "${should_warn}" = "1" ]; then + ewarn 'Running /etc/init.d/tigervnc in compatibility mode' + ewarn 'Please migrate to one service per display as detailed here:' + ewarn 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' + fi +} + +start() { + checkwarn + FREEDISPLAYS="" + checkconfig start || return 1 + for display in $FREEDISPLAYS; do + [ -n "${TIGERVNC_XSESSION_FILE}" ] && export TIGERVNC_XSESSION_FILE + ebegin "Starting TigerVNC server :${display}" + start-stop-daemon --start --pidfile=/run/vncsession-":${display}".pid /usr/libexec/vncsession-start -- ":${display}" + eend $? + done +} + +stop() { + checkconfig stop || return 2 + for display in $DISPLAYS; do + ebegin "Stopping TigerVNC server :${display}" + start-stop-daemon --stop --pidfile=/run/vncsession-":${display}".pid + eend $? + done + # Do not fail if a server is missing + /bin/true +} + +restart() { + svc_stop + svc_start +} diff --git a/net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild b/net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild new file mode 100644 index 000000000000..24dd8515063c --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_IN_SOURCE_BUILD=1 +inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg + +XSERVER_VERSION="21.1.13" +XSERVER_PATCH_VERSION="21" + +DESCRIPTION="Remote desktop viewer display system" +HOMEPAGE="https://tigervnc.org" +SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/" +else + SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" +REQUIRED_USE=" + dri3? ( drm ) + java? ( viewer ) + opengl? ( server ) + || ( server viewer ) +" + +# TODO: sys-libs/libselinux +COMMON_DEPEND=" + dev-libs/gmp:= + dev-libs/nettle:= + media-libs/libjpeg-turbo:= + sys-libs/zlib:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + x11-libs/pixman + gnutls? ( net-libs/gnutls:= ) + nls? ( virtual/libiconv ) + server? ( + dev-libs/libbsd + dev-libs/openssl:0= + sys-libs/pam + x11-libs/libXau + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfixes + x11-libs/libXfont2 + x11-libs/libXtst + x11-libs/pixman + x11-apps/xauth + x11-apps/xinit + x11-apps/xkbcomp + x11-apps/xsetroot + x11-misc/xkeyboard-config + opengl? ( media-libs/libglvnd[X] ) + !net-misc/turbovnc[server] + ) + viewer? ( + media-video/ffmpeg:= + x11-libs/fltk:1 + x11-libs/libXi + x11-libs/libXrender + !net-misc/turbovnc[viewer] + ) +" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* ) + server? ( dev-lang/perl ) +" +DEPEND="${COMMON_DEPEND} + java? ( >=virtual/jdk-1.8:* ) + drm? ( x11-libs/libdrm ) + server? ( + media-fonts/font-util + x11-base/xorg-proto + x11-libs/libxcvt + x11-libs/libXi + x11-libs/libxkbfile + x11-libs/libXrender + x11-libs/xtrans + x11-misc/util-macros + opengl? ( media-libs/mesa ) + ) +" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + # Restore Java viewer + "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch + "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch + "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch +) + +src_unpack() { + if [[ ${PV} == *9999 ]]; then + git-r3_src_unpack + use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz + else + default + fi +} + +src_prepare() { + if use server; then + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die + fi + + cmake_src_prepare + + if use server; then + cd unix/xserver || die + eapply ../xserver${XSERVER_PATCH_VERSION}.patch + eautoreconf + sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die + + if use drm; then + cd "${WORKDIR}" && \ + sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die + fi + fi +} + +src_configure() { + if use arm || use hppa; then + append-flags "-fPIC" + fi + + local mycmakeargs=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_NLS=$(usex nls) + -DBUILD_JAVA=$(usex java) + -DBUILD_SERVER=$(usex server) + -DBUILD_VIEWER=$(usex viewer) + ) + + cmake_src_configure + + if use server; then + cd unix/xserver || die + econf \ + $(use_enable opengl glx) \ + $(use_enable drm libdrm) \ + --disable-config-hal \ + --disable-config-udev \ + --disable-devel-docs \ + --disable-dri \ + $(use_enable dri3) \ + --disable-glamor \ + --disable-kdrive \ + --disable-libunwind \ + --disable-linux-acpi \ + --disable-record \ + --disable-selective-werror \ + --disable-static \ + --disable-unit-tests \ + --disable-xephyr \ + $(use_enable xinerama) \ + --disable-xnest \ + --disable-xorg \ + --disable-xvfb \ + --disable-xwin \ + --enable-dri2 \ + --with-pic \ + --without-dtrace \ + --with-sha1=libcrypto + fi +} + +src_compile() { + cmake_src_compile + + if use server; then + # deps of the vnc module and the module itself + local d subdirs=( + fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render + damageext miext Xi xkb composite dix mi os present hw/vnc + ) + for d in "${subdirs[@]}"; do + emake -C unix/xserver/"${d}" + done + fi +} + +src_install() { + cmake_src_install + + if use server; then + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install + rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die + + newconfd "${FILESDIR}"/${PN}-1.13.1.confd ${PN} + newinitd "${FILESDIR}"/${PN}-1.13.90.initd ${PN} + + systemd_douserunit unix/vncserver/vncserver@.service + + # comment out pam_selinux.so, the server does not start if missing + # part of bug #746227 + sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die + + # install vncserver to /usr/bin too, see bug #836620 + dosym -r /usr/libexec/vncserver /usr/bin/vncserver + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && { + elog 'OpenRC users: please migrate to one service per display as documented here:' + elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' + elog + } + + local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" + use server && \ + optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \ + optfeature_header "Install any additional display manager package:" && \ + optfeature "proper session support" ${OPTIONAL_DM} +} diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index 23b38081e296..24dd8515063c 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-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 @@ -6,8 +6,8 @@ EAPI=8 CMAKE_IN_SOURCE_BUILD=1 inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg -XSERVER_VERSION="21.1.8" -XSERVER_PATCH_VERSION="21.1.1" +XSERVER_VERSION="21.1.13" +XSERVER_PATCH_VERSION="21" DESCRIPTION="Remote desktop viewer display system" HOMEPAGE="https://tigervnc.org" @@ -121,7 +121,6 @@ src_prepare() { cd unix/xserver || die eapply ../xserver${XSERVER_PATCH_VERSION}.patch eautoreconf - sed -i 's:\(present.h\):../present/\1:' os/utils.c || die sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die if use drm; then @@ -173,7 +172,6 @@ src_configure() { --enable-dri2 \ --with-pic \ --without-dtrace \ - --disable-present \ --with-sha1=libcrypto fi } @@ -185,7 +183,7 @@ src_compile() { # deps of the vnc module and the module itself local d subdirs=( fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render - damageext miext Xi xkb composite dix mi os hw/vnc + damageext miext Xi xkb composite dix mi os present hw/vnc ) for d in "${subdirs[@]}"; do emake -C unix/xserver/"${d}" @@ -201,7 +199,7 @@ src_install() { rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die newconfd "${FILESDIR}"/${PN}-1.13.1.confd ${PN} - newinitd "${FILESDIR}"/${PN}-1.13.1.initd ${PN} + newinitd "${FILESDIR}"/${PN}-1.13.90.initd ${PN} systemd_douserunit unix/vncserver/vncserver@.service @@ -217,7 +215,11 @@ src_install() { pkg_postinst() { xdg_pkg_postinst - use server && elog 'OpenRC users: please migrate to one service per display as documented here' #FIXME: add link + use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && { + elog 'OpenRC users: please migrate to one service per display as documented here:' + elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' + elog + } local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" use server && \ diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index 4b4495c26cdb..2bd2ee5a59e1 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -1 +1 @@ -DIST tinyssh-20230101.tar.gz 249091 BLAKE2B 5efb6eab07c136763ab27588661618763d2ca174dce4b0f4b5fd5dcca56044f8361342de780931070cff8efe43f6efa68eaf912e9ae38febfcff733f79e23018 SHA512 6beaf266058a89a78c710abd1a02feff0641a93d0d92aa07a1ad1ba3f6b3344bc312bb5a4cd5c06c6dcc83d25e48a801f9cfcfbb3de0f73904f36d32d4430482 +DIST tinyssh-20240101.tar.gz 249848 BLAKE2B 228547c6f4acae3b77a338df1ced3a49e0b4c72257ce081b3b50941c29c5a39a0b1623f6aefce2721b9dde9fae03cb8c1c87b6b019658d578ddcca99e0a021f5 SHA512 b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90 diff --git a/net-misc/tinyssh/files/tinyssh-20240101_c99.patch b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch new file mode 100644 index 000000000000..38b2e845eaa5 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch @@ -0,0 +1,33 @@ +From ae059fda00c11236a32499f105e803f962d1e243 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me> +Date: Tue, 9 Jan 2024 19:51:14 +0100 +Subject: [PATCH] packet_put: Add missing bug.h include for global_die + +``` +packet_put.c:53:9: error: call to undeclared function 'global_die'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + global_die(111); + ^ +1 error generated. +``` + +Upstream: https://github.com/janmojzis/tinyssh/pull/84 + +--- + tinyssh/packet_put.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tinyssh/packet_put.c b/tinyssh/packet_put.c +index 17e8d84..7f46ff6 100644 +--- a/tinyssh/packet_put.c ++++ b/tinyssh/packet_put.c +@@ -6,6 +6,7 @@ Public domain. + + #include "uint32_pack_big.h" + #include "buf.h" ++#include "bug.h" + #include "sshcrypto.h" + #include "ssh.h" + #include "log.h" +-- +2.41.0 + diff --git a/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch new file mode 100644 index 000000000000..8dd35d91b828 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch @@ -0,0 +1,10 @@ +diff --git a/conf-cflags b/conf-cflags +--- a/conf-cflags ++++ b/conf-cflags +@@ -15,6 +15,3 @@ + -fstack-protector-strong + -fwrapv + -fno-strict-overflow +--Os +--fomit-frame-pointer +--funroll-loops diff --git a/net-misc/tinyssh/tinyssh-20230101.ebuild b/net-misc/tinyssh/tinyssh-20240101-r1.ebuild index 4b288ff014ec..442fb8e5f171 100644 --- a/net-misc/tinyssh/tinyssh-20230101.ebuild +++ b/net-misc/tinyssh/tinyssh-20240101-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 @@ -28,10 +28,12 @@ RDEPEND=" sys-apps/ucspi-tcp " -src_prepare() { - # Leave optimization level to user CFLAGS - sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die +PATCHES=( + "${FILESDIR}/tinyssh-20240101_c99.patch" + "${FILESDIR}/tinyssh-20240101_conf_cflags.patch" +) +src_prepare() { # Use make-tinysshcc.sh script, which has no tests and doesn't execute # binaries. See https://github.com/janmojzis/tinyssh/issues/2 sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die 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/ttytter/Manifest b/net-misc/ttytter/Manifest deleted file mode 100644 index 5ed94606d6af..000000000000 --- a/net-misc/ttytter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ttytter-2.1.00.txt 238320 BLAKE2B c12be49a7423a18da2da5b550bf899383115757f1045dac3166497a7a850adf2e195566845d18e5df10bb1d67e2a5570ba93751fd1445987f818f11ca8ca47b7 SHA512 06b52275c454b7ad772baddcc64c311633fa35cc038e5a62895bbe056bc117e60feaae5a3e83917ec506ca3411e66619c84fbcb8cc7db6428082d14182813cc4 diff --git a/net-misc/ttytter/metadata.xml b/net-misc/ttytter/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/net-misc/ttytter/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-misc/ttytter/ttytter-2.1.00.ebuild b/net-misc/ttytter/ttytter-2.1.00.ebuild deleted file mode 100644 index 585c023d30e2..000000000000 --- a/net-misc/ttytter/ttytter-2.1.00.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit readme.gentoo-r1 - -DESCRIPTION="A multi-functional, console-based Twitter client" -HOMEPAGE="http://www.floodgap.com/software/ttytter/" -SRC_URI="http://www.floodgap.com/software/ttytter/dist2/${PV}.txt -> ${P}.txt" - -LICENSE="FFSL" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND=">=dev-lang/perl-5.8 - || ( net-misc/curl www-client/lynx )" - -S=${WORKDIR} - -src_install() { - newbin "${DISTDIR}/${A}" ${PN} - - local DOC_CONTENTS=" - Please consult the following webpage on how to - configure your client. - http://www.floodgap.com/software/ttytter/dl.html" - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest new file mode 100644 index 000000000000..ed012e1186c2 --- /dev/null +++ b/net-misc/tuba/Manifest @@ -0,0 +1,3 @@ +DIST Tuba-0.6.3.gh.tar.gz 1124191 BLAKE2B b5a7107c94d9adf89fc02224891c12b71fc2b640e962006fbfcf1d0673e5f3f73b11423b6d66e8952e2aef122ade6a57607cced5d4707bd91193157fd561ce11 SHA512 b987b9b8434a0abd086a3197154b27bd4a0bca69df07bcec26c59a2da51cf447943e7a05a83529a99670f2b1b7ea1a7dce1da39148844d23706940f3a0a423d8 +DIST Tuba-0.8.1.gh.tar.gz 1737171 BLAKE2B b7bd9b0b6559a108886c46927ebdfb08e533c72fe63bfcb17f46c6aba3b637c99e324c83037a26024094516b659c247f2b6a61390313a4503ad593a4db97a39b SHA512 8e37e806ada3ad507761fbbf7f028f87c83e9e25fc3bd5a922fd9e6b0334c4c86b6c988ac337e5889f7ab05fd62e36044a9934b589583d1eabb2efbfae4f6a5d +DIST Tuba-0.8.2.gh.tar.gz 1751598 BLAKE2B 9fb0a32d7731ca406a6f79223c862fbe0b75493ace5dc2d83cdab111e955ded2f1b42c31542e38b027245df29ba6a84d88014cafdba0214bdb22910c933989bd SHA512 5d00843ae54c7f32adf5bdbecf0798730f797f778aea55bdc6fff1bf7fdb3b386544a209bd621a92774dcbe25d26503ca9da73211355866452069b6fa4542360 diff --git a/net-misc/openr2/metadata.xml b/net-misc/tuba/metadata.xml index b61afa2b03b1..a577af22922b 100644 --- a/net-misc/openr2/metadata.xml +++ b/net-misc/tuba/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> <upstream> - <remote-id type="google-code">openr2</remote-id> + <remote-id type="github">GeopJR/tuba</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/tuba/tuba-0.6.3.ebuild b/net-misc/tuba/tuba-0.6.3.ebuild new file mode 100644 index 000000000000..4f85b302be9c --- /dev/null +++ b/net-misc/tuba/tuba-0.6.3.ebuild @@ -0,0 +1,72 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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/ +" +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/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/gtksourceview-5.6.0:5[introspection,vala] + net-libs/libsoup:3.0[introspection,vala] +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + $(vala_depend) + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + # disable calling updaters (see pkg_post*) + -Ddistro=true + ) + + vala_setup + meson_src_configure +} + +src_install() { + meson_src_install + dosym dev.geopjr.Tuba /usr/bin/tuba +} + +pkg_postinst() { + optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp + + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-misc/tuba/tuba-0.8.1.ebuild b/net-misc/tuba/tuba-0.8.1.ebuild new file mode 100644 index 000000000000..e75bb85f2c86 --- /dev/null +++ b/net-misc/tuba/tuba-0.8.1.ebuild @@ -0,0 +1,75 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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/ +" +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.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] +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + $(vala_depend) + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + # disable calling updaters (see pkg_post*) + -Ddistro=true + # not packaged + -Dclapper=false + ) + + vala_setup + meson_src_configure +} + +src_install() { + meson_src_install + dosym dev.geopjr.Tuba /usr/bin/tuba +} + +pkg_postinst() { + optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp + + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-misc/tuba/tuba-0.8.2.ebuild b/net-misc/tuba/tuba-0.8.2.ebuild new file mode 100644 index 000000000000..e75bb85f2c86 --- /dev/null +++ b/net-misc/tuba/tuba-0.8.2.ebuild @@ -0,0 +1,75 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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/ +" +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.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] +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + $(vala_depend) + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + # disable calling updaters (see pkg_post*) + -Ddistro=true + # not packaged + -Dclapper=false + ) + + vala_setup + meson_src_configure +} + +src_install() { + meson_src_install + dosym dev.geopjr.Tuba /usr/bin/tuba +} + +pkg_postinst() { + optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp + + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 1be657b5e12f..debe294b7e46 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,4 +1,6 @@ DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 +DIST turbovnc-3.1.1.tar.gz 9032635 BLAKE2B 84b6d656bcadf310368f4c59e03c25d2997e8264141bf54dc670e76c1f52e4ea63a71670f134643018f9cae76aa20d51d15a4a9f919a25d21abac80fbc0b43db SHA512 d855b5f6aca9db73474d6a63868212a847c472ae01e4d26ea877bccb911d910730409e13183928426ce07a401da38a55fbcb39e411530f993d758e8dbf244cd1 +DIST turbovnc-3.1.1.tar.gz.sig 543 BLAKE2B 2563db72dbca74781b0c2d76867298c400db61bff120e8bd4167c90347c94a26824f7aa252a2ac9fc1b0c101d56caeaceec74155ae5593428ad23a36373e998a SHA512 0dd0bde26bba3fe7ebbbe3c1a0af5f7e223026f140f031ae29405a47dd5d62183f22ea9fd6e1902b23016887503d80b65f77c48759e540ae8969a17046e41c60 DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100 diff --git a/net-misc/turbovnc/turbovnc-3.1.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.1.ebuild new file mode 100644 index 000000000000..a60e961b75ed --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.1.1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 optfeature verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/" +SRC_URI=" + https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz + verify-sig? ( https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc + +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" + fi +} + +src_prepare() { + use viewer && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDSERVER=$(usex server) + -DTVNC_BUILDWEBSERVER=$(usex server) + ) + + if use server ; then + mycmakeargs+=( + -DTVNC_SYSTEMLIBS=ON + -DTVNC_SYSTEMX11=ON + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + if use ssl ; then + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + fi + + if use viewer ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use viewer ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + if use server; then + rm -r "${ED}"/etc/init.d/ || die + rm -r "${ED}"/etc/sysconfig/ || die + fi + + # Conflicts with x11-base/xorg-server + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +} + +pkg_postinst() { + use server && optfeature "dbus support" sys-apps/dbus +} diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest index be3a8553de32..6f35f3e40083 100644 --- a/net-misc/uftp/Manifest +++ b/net-misc/uftp/Manifest @@ -1 +1 @@ -DIST uftp-5.0.1.tar.gz 240620 BLAKE2B f1c22d8313b8f368729dd972dae9894290aa89a0fd9305d854caf93ead9f9aec7eaf83682683722c7a30a1e11802678f3e0cc3e4054f065b51ea049fa47dce56 SHA512 755b051aadd793e8d3939241d1f8db8b4c5f5be6224284a3ef82a648a9e2189b57dd4fe91230633cf7a582c51543a1d92cf167301c633ce16e9e2417709d36f4 +DIST uftp-5.0.3.tar.gz 240814 BLAKE2B 46a36affb4547c62fcc09bbde5f9b22d1ddce5cf50777f138982de51bb2e681520c9f9bad92b646cd97204de40e01f9782b24329a6eebfeb98fd8e10910786e9 SHA512 edd603cf3ecb363a21365db7b1697ac44d12099c6699cf50c02f4a01ad95a458470308c69446a2d2825c5f4882833c384ad4f658e09ddf80dcab1cb2180f8b54 diff --git a/net-misc/uftp/uftp-5.0.1.ebuild b/net-misc/uftp/uftp-5.0.3.ebuild index b7452e236d95..339a6b7f59d1 100644 --- a/net-misc/uftp/uftp-5.0.1.ebuild +++ b/net-misc/uftp/uftp-5.0.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 diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index a43b259cbb2b..612fd10bc02b 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1 +1,2 @@ -DIST unison-2.51.5.tar.gz 1385407 BLAKE2B cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8 SHA512 4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440 +DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794 SHA512 f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b +DIST unison-2.53.5.tar.gz 1408926 BLAKE2B e7e3db458a485fca8820508a964df5877aed0a2d6a3ea8305298d0c6516591323f3cacdd86c4e057585c0f3b2da8a03a5a3653f543d6f1acb20701f23a81f470 SHA512 eabeed7b428f1985610b47ce8bc7faac515fd24937727612aa45435da3e38d40b6cd6d227eb3b65dc370d46458cecfca9d0e9e1712b2b7fa41b76675f8115c4c diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml index ddea0b516f37..bb6a9ec8d72c 100644 --- a/net-misc/unison/metadata.xml +++ b/net-misc/unison/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">bcpierce00/unison</remote-id> - <bugs-to>https://github.com/bcpierce00/unison/issues</bugs-to> - <doc>https://github.com/bcpierce00/unison/wiki</doc> - <changelog>https://www.cis.upenn.edu/~bcpierce/unison/changes.html</changelog> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">bcpierce00/unison</remote-id> + <bugs-to>https://github.com/bcpierce00/unison/issues</bugs-to> + <changelog>https://www.cis.upenn.edu/~bcpierce/unison/changes.html</changelog> + <doc>https://github.com/bcpierce00/unison/wiki</doc> + </upstream> </pkgmetadata> diff --git a/net-misc/unison/unison-2.51.5.ebuild b/net-misc/unison/unison-2.51.5.ebuild deleted file mode 100644 index 914cd4876cd3..000000000000 --- a/net-misc/unison/unison-2.51.5.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop xdg-utils - -DESCRIPTION="Two-way cross-platform file synchronizer" -HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/ https://github.com/bcpierce00/unison" -SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug doc gtk +ocamlopt threads" - -BDEPEND="dev-lang/ocaml:=[ocamlopt?] - doc? ( app-text/dvipsk - app-text/ghostscript-gpl - dev-texlive/texlive-latex - dev-tex/hevea - www-client/lynx - )" -DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )" -RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] - || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) - >=app-eselect/eselect-unison-0.4" - -DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) - -QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}" - -src_prepare() { - default - # https://github.com/bcpierce00/unison/issues/416 - sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die - # https://github.com/bcpierce00/unison/pull/415 - sed -e "/myName/d" -i doc/docs.ml || die -} - -src_compile() { - local myconf - - if use threads; then - myconf+=( THREADS=true ) - fi - - if use debug; then - myconf+=( DEBUGGING=true ) - fi - - if use gtk; then - myconf+=( UISTYLE=gtk2 ) - else - myconf+=( UISTYLE=text ) - fi - - use ocamlopt || myconf+=( NATIVE=false ) - - if use doc; then - VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=true docs - fi - - # Discard cflags as it will try to pass them to ocamlc... - emake "${myconf[@]}" CFLAGS="" src -} - -src_test() { - emake test CFLAGS="" -} - -src_install() { - # install manually, since it's just too much - # work to force the Makefile to do the right thing. - local binname - cd src || die - for binname in unison unison-fsmonitor; do - newbin ${binname} ${binname}-${SLOT} - done - - if use gtk; then - newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg - make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}" - fi - - if use doc; then - DOCS+=( ../doc/unison-manual.pdf ) - HTML_DOCS=( "../doc/unison-manual.html" ) - fi - - einstalldocs -} - -pkg_postinst() { - elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}" - elog "in your profile files to access exactly this version over ssh." - elog "Or you can use 'eselect unison' to set the version." - eselect unison update || die - - if use gtk; then - xdg_icon_cache_update - fi -} - -pkg_postrm() { - if use gtk; then - xdg_icon_cache_update - fi -} diff --git a/net-misc/unison/unison-2.53.3-r1.ebuild b/net-misc/unison/unison-2.53.3-r1.ebuild new file mode 100644 index 000000000000..b74dc58452c9 --- /dev/null +++ b/net-misc/unison/unison-2.53.3-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg-utils + +DESCRIPTION="Two-way cross-platform file synchronizer" +HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/ + https://github.com/bcpierce00/unison/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git" +else + SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi + +LICENSE="GPL-2" +SLOT="$(ver_cut 1-2)" +IUSE="debug doc gui +ocamlopt +threads" + +BDEPEND=" + dev-lang/ocaml:=[ocamlopt?] + doc? ( + app-text/dvipsk + app-text/ghostscript-gpl + dev-texlive/texlive-latex + ) +" +DEPEND=" + gui? ( + dev-ml/lablgtk:3=[ocamlopt?] + ) +" +RDEPEND=" + >=dev-lang/ocaml-4.08:= + gui? ( + dev-ml/lablgtk:3=[ocamlopt?] + || ( + net-misc/ssh-askpass-fullscreen + net-misc/x11-ssh-askpass + ) + ) +" +IDEPEND=" + >=app-eselect/eselect-unison-0.4 +" + +DOCS=( src/CONTRIB src/README src/ROADMAP.txt src/TODO.txt ) + +QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}" + +gui_cache_update() { + if use gui ; then + xdg_icon_cache_update + xdg_desktop_database_update + fi +} + +src_compile() { + local -a myconf=() + + if use debug ; then + myconf+=( DEBUGGING=true ) + fi + + if use doc ; then + VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs + fi + + if use gui ; then + myconf+=( UISTYLE=gtk3 ) + else + myconf+=( UISTYLE=text ) + fi + + if ! use ocamlopt ; then + myconf+=( NATIVE=false ) + fi + + if use threads ; then + myconf+=( THREADS=true ) + fi + + # Discard cflags as it will try to pass them to ocamlc... + emake "${myconf[@]}" CFLAGS="" -j1 src manpage +} + +src_test() { + emake test CFLAGS="" +} + +src_install() { + # install manually, since it's just too much + # work to force the Makefile to do the right thing. + cd "${S}/src" || die + + local binname + for binname in unison unison-fsmonitor ; do + exeinto /usr/bin + newexe "${binname}" "${binname}-${SLOT}" + done + + cd "${S}" || die + + doman "man/${PN}.1" + + if use gui ; then + newicon -s scalable icons/U.svg "${PN}-${SLOT}.svg" + make_desktop_entry "${PN}-${SLOT}" "${PN} (${SLOT})" "${PN}-${SLOT}" + fi + + if use doc ; then + DOCS+=( doc/unison-manual.pdf ) + fi + + einstalldocs +} + +pkg_postinst() { + elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}" + elog "in your profile files to access exactly this version over ssh." + elog "Or you can use 'eselect unison' to set the version." + + eselect unison update + + gui_cache_update +} + +pkg_postrm() { + eselect unison update + + gui_cache_update +} diff --git a/net-misc/unison/unison-2.53.5-r1.ebuild b/net-misc/unison/unison-2.53.5-r1.ebuild new file mode 100644 index 000000000000..d1619282f060 --- /dev/null +++ b/net-misc/unison/unison-2.53.5-r1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg-utils + +DESCRIPTION="Two-way cross-platform file synchronizer" +HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/ + https://github.com/bcpierce00/unison/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git" +else + SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi + +LICENSE="GPL-2" +SLOT="$(ver_cut 1-2)" +IUSE="doc gui +ocamlopt" + +BDEPEND=" + dev-lang/ocaml:=[ocamlopt?] + doc? ( + app-text/dvipsk + app-text/ghostscript-gpl + dev-texlive/texlive-latex + ) +" +DEPEND=" + gui? ( + dev-ml/lablgtk:3=[ocamlopt?] + ) +" +RDEPEND=" + >=dev-lang/ocaml-4.08:= + gui? ( + dev-ml/lablgtk:3=[ocamlopt?] + || ( + net-misc/ssh-askpass-fullscreen + net-misc/x11-ssh-askpass + ) + ) +" +IDEPEND=" + >=app-eselect/eselect-unison-0.4 +" + +DOCS=( CONTRIBUTING.md README.md src/FEATURES.md src/ROADMAP.txt src/TODO.txt ) + +QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}" + +gui_cache_update() { + if use gui ; then + xdg_icon_cache_update + xdg_desktop_database_update + fi +} + +src_compile() { + local -a myconf=() + + if ! use ocamlopt ; then + myconf+=( NATIVE=false ) + fi + + # Discard cflags as it will try to pass them to ocamlc... + emake "${myconf[@]}" CFLAGS="" -j1 tui fsmonitor manpage + + if use gui ; then + emake "${myconf[@]}" CFLAGS="" -j1 gui + fi + + if use doc ; then + VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs + fi +} + +src_test() { + emake test CFLAGS="" +} + +src_install() { + # install manually, since it's just too much + # work to force the Makefile to do the right thing. + cd "${S}/src" || die + + local -a bins=( + unison + unison-fsmonitor + ) + + if use gui ; then + bins+=( unison-gui ) + fi + + local binname + for binname in "${bins[@]}" ; do + exeinto /usr/bin + newexe "${binname}" "${binname}-${SLOT}" + done + + cd "${S}" || die + + if use gui ; then + newicon -s scalable icons/U.svg "${PN}-${SLOT}.svg" + make_desktop_entry "${PN}-gui-${SLOT}" "${PN^} GUI (${SLOT})" "${PN}-${SLOT}" + fi + + if use doc ; then + DOCS+=( doc/unison-manual.pdf ) + fi + + doman "man/${PN}.1" + einstalldocs +} + +pkg_postinst() { + elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}" + elog "in your profile files to access exactly this version over ssh." + elog "Or you can use 'eselect unison' to set the version." + + eselect unison update + + gui_cache_update +} + +pkg_postrm() { + eselect unison update + + gui_cache_update +} 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/websocat/Manifest b/net-misc/websocat/Manifest index 64886eb61ca6..b7050aeb5f77 100644 --- a/net-misc/websocat/Manifest +++ b/net-misc/websocat/Manifest @@ -1,350 +1,202 @@ DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST aead-0.4.3.crate 14717 BLAKE2B 304e37cb58ebbd8a0ff8f38eb178afad7860cfeb3f1c719f061f4e15282e3cb133089270a1a2dd9299c4007e1963d373578c7fe4139cb222f05a2d15b2313485 SHA512 c1f700a35c5933acc38ca6aa2cb945c4676a4765802d6021c35631de5ace35390a9dc877c1669cfd8789716a73b0397dfe551c32f50774683b0b8573b54fbd77 DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774 -DIST arc-swap-0.4.3.crate 48193 BLAKE2B 4335a97b50f1adb2de484202373b004770a8d4c43eb34193e96953d9a926af5370ed288b30c0b0998e023decd4c76484766f20608d03fc7a0b40112748f737be SHA512 3e5ec14c30c2a061dde5bf1b61ffa753745d1b0fc31081c3a52e3c6b83593f790ce7c25d25bc35a50768a31e8f4dcbe63dd12a1606d2d6939f0096a5bdb6c877 -DIST argon2-0.4.0.crate 28732 BLAKE2B c169a2d281c8c26123b3eecaf7b0c1719809632226287ba8fb2263536019e0adacf415b4171c50884a1ea11cb6f0a06815c26d20f1ba4cf4a2cb2c13f06d4a68 SHA512 e88c9705c7cefee3203621c6aa45425714f721a7174b42632d91cc2615ac510c7a1b0d4840bcfa3ec20bdf1156bdc240b8b4f91944c3dcc0eac8e15372f8e4f0 DIST argon2-0.4.1.crate 28834 BLAKE2B ce5aea2b60a5417b51c02eba16cedf1c0b8e5da8ea06c9ecdff6135f60b63fff56350d77c5b7503b1ea2483e53558f44a535f80ea71876cf816e00ca6a18ff3d SHA512 32dc18c92e73d85baccec4c7650f558574280b85e173bcde639c1a91bef1320bc19a77d6f716f1e3237ad0156a773009c0f0d004c092579c7f82fa3827ba81b4 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 -DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925 DIST autocfg-0.1.8.crate 6621 BLAKE2B 15afc4b27028f542b6977bcf19cc75f7e47df1f4e241e43d858bf451a659a2e937e0a3c1c8918d4fba6d1f66e47ba2f2e329023f3dcaff182e048e9e4f783825 SHA512 d6156e0a8701f38c20b693380ed1ac5b15f84bc87c5ae0541483b9b387e6118d8673d8e5da5f4eee4d736c777e923d3fba7f61589a49c353170a708a709d8db5 -DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb -DIST base64ct-1.5.0.crate 27855 BLAKE2B 43eecd5c663529d69e493bdd779da5b923d0598cdd37ace6893e6ca2d4db3db4055b6b568d7725134eb53ddb0f65a496ef68c3040eccb1734fbafef4abe6d12e SHA512 a159f0af9a9e2cb0ae233d3639990ff6d27b891b7c12288e9673563bd613f485ce16e8986f01d3c665931bd98fb32c54e2bd526c40c5482e2edb1c77829aa230 DIST base64ct-1.5.2.crate 28206 BLAKE2B 1059855de932f0d17c39c05f0b38a01e314284d16bf5fcf7b3627a51ab0aef210fb1c6f6f5b84aac7492769b51de8c235139de77e3f92a6b4a792669d8943236 SHA512 29d704441942d65bb0ce4c6940bab9c803cb79cbdd4118e0cecbe23aea9597b5770271c83ad7d5d9ef6608162807de2711f9f12aba8757f0d93638849de21b10 -DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST blake2-0.10.4.crate 46804 BLAKE2B 694e81198aa92d610a189056558b77765f8231a2dbde4e861396edb57398af30e10c6bfd8bb0b62c2013d4874b5442d3df8857499d0f5fff640649224ac4663a SHA512 ea6fde4969d66de70e0689da8c76efd37c8f70b9f1d1894d5c1e497a980b011cac75ac650170b7f0face9f85f0c35d05e136dcf823e1cbe7df3db58b72c6fa4b -DIST block-buffer-0.10.2.crate 10258 BLAKE2B d3ad2f9f0379e04320e954e1a2226949d83cc1acdda806b98329a5ddcfdbbafdf511907d99ad7daae271a2981ad0c39de218968c22c3487e21a32817d41c23fa SHA512 8f1d99af7c08bf3b54ba7383cf0272eb5a8137f6244bc2d7e6d6761016614514ad7d27c5c51946c5cd7becd84b320f62fc2770e7aa07038d370505c29e032078 DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa -DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250 -DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538 -DIST cc-1.0.41.crate 48185 BLAKE2B 7fb7eba2079aed5bc7775e9e8585f9b1267066bf51cf7aa9f5ad25789f7b57021a457d2811f705d4e6bd0f38d033cea1c6be23894929df8df9f3bf1b2dcb6a20 SHA512 3a39bd28e16c3e7715e0588fb9eaef6b83075e68c1ad7aa0969d89baac1e2753f9e68b56492bf5df5b1a4882fd1b6a1df97ce559149873efacd5aa209a0bf352 -DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 -DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST chacha20-0.8.1.crate 30715 BLAKE2B ce856786955bdc20fc971394b0b4e3afb5b3e8da9b4c5712bd6c773bbe44ae311799c15d2ec8da7efda7230472968d3ff66336c21f0015e3c6015c548e95c543 SHA512 4f17f35e469de65b46ef18e329d41354da22e9dc8d1776ebdfdf620b8afb814ef91b9ed1ce2b81cf67a051b34efc658c12a18e0022f3ca72fea44a9885597d76 DIST chacha20-0.8.2.crate 30716 BLAKE2B ddf2d375d46b3a6d0ae2bb1215d1de1af04e29e6deeef08b71886ab8060f047cbb973ef5b2e7f11cfd7c692fe601efc0087b29a18b0101b8cfcf6b34f91be2c0 SHA512 2718dfc786b3d4fe1cb6817f09c5f174fd3649e7a2eeb8218e2355b3ee59f08b6e81e8f6830e683f9ddabd8ac55628d470b5f5159045106e8a597e39f359139b -DIST chacha20poly1305-0.9.0.crate 68354 BLAKE2B 66f2e68c672c4bdf40a12a5dc3c1615c687f0105932ba455b39fe327d3cfb785fd107892389c13ec778e8a46fa711820961593f451920e8ac391ba898177057d SHA512 5b9f5c2f4074c24e91c19a482a88c8cac4ac69c8a967f6a85ccaa5acfccb4f2f82a68d6f34e42b150b9c11e57722cd30efb99607a5d75b541491e7b1f5062b6d DIST chacha20poly1305-0.9.1.crate 68379 BLAKE2B 47580ca5562b50a8785cf33c5bf58600e7bb795aad1b6985f7c7cefc63f8be40032cb71711c22a1c2d97a2126041b51f17289c98801ef39b40b2593b9a115569 SHA512 d41c347ada6ff99c5fc7f389ea422a5fd7059679d35d4728df360e90a59e66254f6fae2611edae3c012316fea5570166b7db6c3fd88a52d0500a5222bbdc238a DIST cipher-0.3.0.crate 12756 BLAKE2B a572b0140512b7512d496f2706cdfaedb680d47a283e3db8b4be97418585ed988929a3beed44012e8a9d9728cbc21f00b78bcbe376bbf57614d54ea07e4daf4c SHA512 8f0094c7786160730825cff21ca838f52801783f1f4f66755b0771595963b8b99fc926265ff502c66b94a2e6703d592d42bbed96ebf8d3a690bd5e731f0f5c4f -DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 -DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c -DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632 -DIST core-foundation-0.9.2.crate 26857 BLAKE2B 9090a489f2d3cf8cbe59472530470dea0ae9e1a0838207424953be812586aae013f9f6cafc4ecbe68be302f4ca208d8c892c87b5736dadddffd6d739e6427934 SHA512 9f68929963fdeb16954e6642f27173fa5d08d39e835d74f03e18d7cb23e9077572d712e7c9afc8ab0be377fd1d845625986d0a905eb6d55331027be2a25d4f9a DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072 -DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82 -DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5 DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 -DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551 DIST crossbeam-deque-0.7.4.crate 19868 BLAKE2B a9cb1bba32df38980da7a4042610e514ede6f6ba15abd08629aa28b4a70e8c96030eacddf438df0701c4aea8c07cbdb088ad88b1fef24880a50d234160f44123 SHA512 ebc8bb09a46cb9cd999d8abc034b21016510a086282436aa73416b456ec7893b1c70339e05dab45cdb93bef4435939b0d95826f74bdcbb077e5ff31d15377da2 -DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892 DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4 DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444 DIST crossbeam-queue-0.2.3.crate 14753 BLAKE2B 1dc60d5a48672f26f0c3afd0b14efc943fe9aea8fc9b10dc1e551a489a178899f1a82c0bc8bebf8511e112711ebb26170d1f76f9caaf06556bbe8b74242e97b6 SHA512 f53385dea0a2b0830372ee11b9d393022f501a79631a15696d641a812939faad62b61112f9da9dda381fe69ecc3c91462fad95f329eddb002aa941110297cd85 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5 -DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3 -DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f -DIST derivative-1.0.3.crate 39909 BLAKE2B cf76a6a2a82917a09dac420057fa27d405aca3cc4403548633d4ed4f2fb2b8428feb1d76e15f64ca7d8e773b103739a2387495d3fbf9528abba23dfd52c0fc72 SHA512 897bac6fd81555684cecd7afc2a3b6546917562a7637ac0ea4833ab7d74c382383b3452fd554d8ed13a0cc150d9f4484e0c956c16a65404bfef866fc7bf5f0eb DIST derivative-1.0.4.crate 42508 BLAKE2B 9996bf596e7646a242acac394c9ec2f5be20b49ce3cc257c26d51fd676740c46114005b05d270e31235f59916ad90238cfc5d30728b5e114b908c74974254f55 SHA512 b6dd82e4ebacc5df58302d2baa8d47eb12aa6d87bb3fb9ef125bce17e163e5a6d921e99e88d9ac91fed402a912e80ff92067a9d6236a8e52f6f8e8435f790623 -DIST digest-0.10.3.crate 18990 BLAKE2B 871a9939e5a4352781dfcb1bef82aba66ddc32e77a2db5e43488302ac3836adfc87869921e95a2af63e46699419e20d526453ee31f3d7b2171198dc23922dec2 SHA512 bfc9b24e4a6e3df91669a36f8ddcdcfb643e22b3102a200d56bbe88d94e8f1f1e52f5ac29f06253913fbd977b149a3e775c95175b93950340946152f6525803e DIST digest-0.10.5.crate 19503 BLAKE2B a73ef5f7b85869f8f6e2bd1c83f88f155ffab8ae1c687018ddd12f5806385a2664c163101aec84d4c20647a8bfd04095aa997e088a3f56e2664adabff1c5614f SHA512 3542fc0322a8b10dbc229ae83475a0df5f9beee4f879eacab1fda53a7b61136df2961265472ae66d896681bd17f8a68148b25827733bd782c6bae05d2f307951 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055 DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1 DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5 -DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 -DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6d688449a99f9f1885912cbc79327115514ad93d28bbdf1b8a91b2d22f8f62d7e5f5feb61f3024e9a749e11da5 SHA512 16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200 DIST futures-0.1.31.crate 157731 BLAKE2B bd1c51f7b5c6018547d1aee3ec550fa55ca955b48c04c8e9e91e5aa944540fa69fe590d2296085d7e772c7aaac37dce00624323bd6e31f92af269dcdbf30d511 SHA512 4be7199261201ef4dcdac5a5a237a70eee33d8fad9a81f76d739f4fc7ad39c87fb2f4719ed7e7a7bc5773c5b51196e4aa4ced5375292198c8d89a03f1692b341 -DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8 DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8 -DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2 DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20 -DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925 -DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1 -DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a -DIST hermit-abi-0.1.3.crate 6741 BLAKE2B 0a7edada6e7c834fdd20b804237d29558b9b413ab99b538de5647e485d36864749fba6b8f46b4a6de4c620cdaa2d711bcc6759b53f8d57438ec5c9b78da71ea8 SHA512 ca85d69192ddd2c1cf0f12d6abc7eaa70a71956df5b55aaf1d3780c6e40207c33bb188a92a5f4769478c4ce13bd93cfd6b4134a21e245781b4ab4e3cb3eabe87 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 -DIST http-0.1.19.crate 101834 BLAKE2B d3f557e34c93235353e170b472c37cc4de1c3814833205a8e8f1f747cbbe170bb94ec50bf0c62f8a539c518d5f163e34d30584e2680c5efcb94f3c70b0a75a0f SHA512 d24574664c9e6b766584b21c84df942110cdcf1afbe8a0ee242ebd030c431679b91265db76c439c4b5e931947fa507097d8df68e3b4fd9ca04139808bed25f76 DIST http-0.1.21.crate 103053 BLAKE2B 78b888c4aeb641399bdf5696b53b596041b3d7236fb9596b6d6676f98563fbe8cda4d3f6fd5837d852b4235c862c42303977be5f092adfc00df1fe3634e0e859 SHA512 edb1ef74c8f73c89dc7b0ebc83a6c5985ee6b1223001403d1b8c1b2c3ffa3556c80df7f28575620c8145a35dc3846b05a263dbeafb3c62547c0f17c3ac6c82ab DIST http-bytes-0.1.0.crate 11513 BLAKE2B 50ac2039bbecdd17ee3057850dfcedd3999bc628053338935cadd7dc4f2d8d85cbc1ac4d4bdb7caceb64e2c113746691d18b3144cd0573b2224cfa774001c257 SHA512 c800062d0a12710c6101f2d4cb6363b999613a4d092baed5ebbfcfcf0d51ee042be9b48967ac61fb4624e95fea2b4acd4b4b5fb67461fe5c06e3e388051fdbeb -DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457 -DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592 DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f DIST hyper-0.10.16.crate 113115 BLAKE2B 9276328c07d6bee7fc172d8104b6e8f30f0b0fd441937d2f4cb94e54c076a47e32db6a7c90827995c6c5c63e535d2cc6e597d52bca2bede17d117f038d971435 SHA512 22a9c31c490b002c8daf085536abec24cb01c0d63a16e6d153eb3cb165a7338d2109d6f88fa8d343942e2c6d7928d3c5ba62575a404b0dd7811f57e423eca4d9 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158 -DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST libc-0.2.105.crate 554066 BLAKE2B e8e3113ee326c02355c700ce5f16b3e037cd576cdaaa68b2b9eb1d3ab1d56083f0aa43e7ad6adfd62fb154e39de5038eae1ce43b0d283e294bd6d5454bce6077 SHA512 3e6c196dffb108c67e59bfad157e6fc2dd7e65453da562456aab68d00fea8e1ffb8c552bcbc99b6f60e74a29b3e6609747f47db6598379cdd5873d3a7c0a67ee DIST libc-0.2.133.crate 603256 BLAKE2B 00139eb8ec3921b961c20e9334e7b2fefe87d03df22c77b213491c07d93be193d991a814efa20c91cd5eab93fe392ef511ae4cec497bd5c41372d5aad1c31dde SHA512 526561652d77d5f61fa52dd9fe02a46a5f66289ec0aff5b2464311c3a90972c3ced0a84dbc901fa99a0fe35ef36af890bb7de40b9c6b7b7dce7fe8a1a738ed7b -DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40 -DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde DIST lock_api-0.3.4.crate 18750 BLAKE2B 1aa7cb716efa665df7b09ee8d95c9fe0ef7ec108d89348e413e78e3af4d6274a49530ac03d5438a503a7c6dcfe20973c1c040d79b6cf228c5a15696a1caa4a8c SHA512 1517ec7cb1f9012da78be866e026be40465cc9befbbfff4a5f644ec19653baab6b171323c3fb8ef218df4a7bc4b305e42a6b9d6849654d0542a1c2dc8fe11fd8 -DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f -DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 -DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b -DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa -DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b DIST mime-0.2.6.crate 6719 BLAKE2B e9c859193c3360dc6a779640c4323129171a3e7f0ef07007b0cf8f38e9a745ac4f252ff7d2dda5a67348a98447e25d04f1909cae289db8c8e959dde6b118dc18 SHA512 30e0cd95c8961ddce61759fa2c7273dfd37d490f96a5715d558c6c7775457560268309c3ad1222ff8150beab8f328b3a958dc05729d9550233d3efa0a1e13137 DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114 -DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c -DIST mio-named-pipes-0.1.6.crate 14766 BLAKE2B a372fc2f2393917811bd56c35cfe6616b879e59b220c7a56b92caaf1d68227ea2b388f0507b696b738c7e470041e84ec86e422066738a3cc5c52ac90c9c057ce SHA512 02e33e7b2d33eba7865ddb158bbf5e72b8eebf728e4f06831d71db431d9e444307f42ca490ea2d9a0388fab1734e1ef4dda99127036e58fabd1f7186221a3b61 DIST mio-named-pipes-0.1.7.crate 15140 BLAKE2B 5e19ee9baaac61efa0c683f46acec94dbb5a932a6012370976e444d265f71b7dc168c9de838389c5fd492c5bdb15dbc1f8e8956640b11fe5b4e3e09a5b7f12ea SHA512 bd78651d89c292c792c108ab5d199da436ad62097c0fa1563523b8fd5a3c7dc0a7a948df38a4ad05a8e97d7f30652de6ef15d9f0be9157653de11c790ed25c90 -DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04 DIST mio-uds-0.6.8.crate 11496 BLAKE2B e52d131f292c7c09fa116ec5c760d50e8389c27fd7b79a4418f0222ae124fba0e5943b5494866e9db75407ab9f6b1a9c7aa7fdf2c4d601e8c785dacd8166f6da SHA512 b6c752ae9f25c37fc7e23e06a8843089c5291d60e53a6e9093eed1d8baf64c9e0ff14bb2ea1c0c8815b00026b28fefab2aa34104bdbce7e99549786d0f507a73 -DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72 DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba -DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699 DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352 -DIST native-tls-0.2.3.crate 29087 BLAKE2B 0304db852e3b1261a791a5a8aba5dc6fd2e13bc32e6ade5ab0f58403583ea45324a4ae4359061c2a9137cc7f127404ef663702a22fe64f2489691de71eafc914 SHA512 9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09 -DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7 -DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec -DIST num_cpus-1.11.0.crate 11776 BLAKE2B 00d57b8a05807837fefc6596463d6bd3e7815833189142b361f932fc25c78c7910c6d6c37ba43a56201f4ee0f3a27ee9ade7d00f22dc05974aba683273f5e8eb SHA512 b2a04b41c3f9aced42e23fa16db872afbb0a456b22b967e98826d22b4866da066633903d4a29d6e4af810513238062846c82e38989c74aee4607255c09929468 -DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9 DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e -DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae -DIST openssl-0.10.25.crate 185164 BLAKE2B 17cc67db6e4188d111f75f52fa03da910c86ae79d8211f6fa252d04c064ec90a1008efd2d69e0c8a54719d3d547a783bb6950c9bb0525840c31efe45bfe9c7b0 SHA512 db7a8af332c8db921cd07f778bb591a5d013d98848e1772cf5b9550562a5ae55e6459047f4b3263f813dc9a0b8f0bd302ad86dc620b71339bce3136f7daed029 -DIST openssl-0.10.37.crate 207283 BLAKE2B 638eddca70c6dd94197455aff3fc089a3f6d203603efab9522759de67dd2b13c81a68fc47e4cd7b129478acc0d9290de47231c266df8024abe2a0ba159bf82d4 SHA512 bc1644215d0cba6da273fb03c9f18cb3a70af31b7db430eab2cfec630743c035c15a01e95313314b84e515502c87b4c707caf8e1f916476e703122b4d128cd4f -DIST openssl-0.10.40.crate 217120 BLAKE2B 7470af72e060a4dd087468dd8f092f7519978e49e3a9e7df78cd1ae8d33819a4a14aea078d113772528f3eb4134c019fda9458656b25b9483352b1a19259acf9 SHA512 c07b2fa47cec33ad3abfbfdfe0c8c99ce00aafed5437f864e9be1d151c8f82e52c54ba565ab710693f108429f48df2ce0d2955f54b1926d808ea56fa168afcf9 DIST openssl-0.10.41.crate 219460 BLAKE2B 363832d3d358514d6d5c97d6e7f7d56b84b33655c3df318b38e0ebaa3e19b84f94aa600347a8cd8f1682accf24a6de342c585e3449f8f8889fe5ac40cc4a5441 SHA512 2ac24fb9b29f8ec3f54944277df924925a0b9a9e4f8a604f8efb0039794520e99520bc28d53355ba4224e69484dfd93265cd174c6463159837f316aae5a9789d DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd -DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a -DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c -DIST openssl-src-111.16.0+1.1.1l.crate 5095644 BLAKE2B 5c0f1e5348d283355a61d2479dbef138de71cbc459f406bb6765923fd15b7a47e529567e1f10fddf56f3c6d9d1dd9358b671adb465b4f9dad3b7382a6c4df1c6 SHA512 de5723f7745fc3d445856a7e8afa0e1053afeb63d11a13973c772ff94eec9d09a69a593d24d1de0cba289eccd14a079683af554ce5752ea32e7e76c40fe78cf2 -DIST openssl-src-111.18.0+1.1.1n.crate 5100899 BLAKE2B 2f5e44216252b33c07876e7b7627799f882f53e3ec861ab8526a1e1027e179ffd19b55a9a979c898686d6127e2c83210cbffd2c97e9db942af5ef5baa8f9530c SHA512 e82d90e38b8d57be7494221c0aa069fce072ec545ff8956370cdc6d29a53e9c67a994b1ef0113fe0f87431a1666eaf85e45c2803266ec914156577a7480699d7 DIST openssl-src-111.22.0+1.1.1q.crate 5103224 BLAKE2B 3d437377cc0a320e852721af6baf119b8e9bb3f461b7fca45e510e2b8e76086a52809c359e2bb2ceeab789c44d8d8ee7a8eef9b521202fb96704e90c5a291e03 SHA512 edecb0d0115b8db74447bab4c347761c2ce88436fa2d17ffce938258f7d4d6533995f2029f5466ea730d833dd3ac86e637ed846736184584846411b36f7f242b -DIST openssl-sys-0.9.52.crate 45059 BLAKE2B 3c82ea9c70d9e3c7b0959bdef835f6cbfaef89cdab7128fb0cc2fa008eabd5451ffc0495f41c6f0c252364e3826d4cb9fc3f0efc687cbef39c9a7f184a5349ab SHA512 4e0f5b4905d0ee2effa0fe5f44f15496b92cdc91c2abd9ee8a05249f1c1a7a579ab292bd3eb11d279689ce74344d8cca981b41f461b8c61ae33bece1c0446e16 -DIST openssl-sys-0.9.68.crate 54900 BLAKE2B 7a42c1479b68535be636156444e69ff7422cbd8fab522120a1b86e056121a4761287a8a81b6c21bcd25d8fba04dcc40ccb99b1388836f6c79bb1a800109f24c9 SHA512 74bb8e9270bbb97e4ddb9446bc2d5825cf51b04dd7a7e30b23dd5aa01315ff6972aa48c5370822a87c871f029b247ecf34c19d75b00c954de548f51b8118e700 -DIST openssl-sys-0.9.73.crate 59581 BLAKE2B 77b56f2defb4725daf671e1651d0033909bfcdf8cb7df8ed7c942f2b2998ef17d7c5aaa335e48566d2988ee0f489545266b2fd1214c0dd5de732dbdd34201909 SHA512 b17ba906433b212587d6274def3cfc1beba2c50497f5653eb1a3ce767924dbe279f750ab58c77c216de852e2a3aea8c7cb0c2577c67dcbff1b6584c7d55866e0 DIST openssl-sys-0.9.75.crate 60028 BLAKE2B 1e4b3733d3309a1157c16a236728aeaf48b1b0ea448643416747343fbb96af86c8035ae0cf4170038b4521c88842f42a2379fd733f92fc9742e7c2d837eccecc SHA512 14985af6224bf1b6aae0fbd22c09e6b8ce7b9a6ace0970b1b45fc0e8c700e6a4bcb6b1883e3c78dbeafa02a18d4a84f537a952460d3f0baac3135d1f994af13a -DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba -DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c -DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331 -DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08 DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689 -DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00 DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df -DIST password-hash-0.4.1.crate 26074 BLAKE2B 6a6ae652ff53dc15634f753725c86ee3f29a6c800fcf7b79a4513095dd04aba7333087af6edb2856f6d30da42cc3486586b4aed4ce0db1738f5359d4a0e8893b SHA512 3ff20d860a77c0209062de961c0f3f4ac026d86bae7946089d808cd608596ccafffd9a3dee860fb7e0f11ae033477b5e3aa61a85b1a84e5881bcd2d3350f01e6 DIST password-hash-0.4.2.crate 26099 BLAKE2B 3f211d467d43960c1d767111c679d2ee7ca004a14946409e37b4e8ea46848100095bd43ac5d4e4ab31828e6fc09e67eb0b40e677dffb086f711668c4918c8bcb SHA512 f6b7da81fa172ed37229894c426965182be1a445ccaba4351b91ce43ff1ab8cacd205b321721df49dd43ba17dc6a77e9b7cccc3a0c396572aa7ad642af44926d DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9 -DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc -DIST pkg-config-0.3.22.crate 16145 BLAKE2B 346b67a2000eb91ea8867e5a861c87a7728909d6b20dd00c9b4571d89e5308a108906fc80fe3a2d014fff0411d9bb30fcde224abf8f4aaf37164107861083bdc SHA512 435b9d99a1975692db3efb3bd0e92899c43ba4003aecc4859dc71cd2175521973d5cbe1be06fc3b40af2a7bbe1b0a845be73586c0cd96dc218bc4fc7dce11107 DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8 DIST poly1305-0.7.2.crate 31868 BLAKE2B afbc7d84f3f67276d1da7d2b1b00d23de35b6b46205e8a4309aa9f1a2abc582cb09b63b28773daffe45074bd250ec77b54923ef8fd422918625179c99b7d410d SHA512 4fff82358985b564b7ee76626854d67221740b6f8540754939899ad3c773809182eaf3e4a2fb697ab382c4a6643116cfbc4756a5a2662eda240625e879e10cdd -DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74 -DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 -DIST proc-macro2-1.0.38.crate 41687 BLAKE2B 226f76a1c264d6e74b72fe1f1a10fa8ab1405b618d0412863cc7e04509f682435dcc2703bf196e4fb1628219630d882d2be64926da19903b36d052113dfa60d8 SHA512 f360b00b4b1e05df52ca1714df34c719778f7bb6ed54fab04a84811acd0a29f7c4d4871fad7d988f0c042fe0fc326d7b1fedc731c55fd32c7257dd1895203080 DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910 -DIST prometheus-0.13.0.crate 81774 BLAKE2B cbd6dd2139836327a3b1a4bc29e46b1fffa68484ed765c16d7b0f89d1e4dc8633c639830d8088e02dadd95c5a3eb70e2635a4c4435590747786b1b0879e2b298 SHA512 3259d5fae4cdb1f8d9c84a177d4b023da87ccb6cc366419f9fa08be882c11d7dcd331317ee7ad7a3dac81e69dff3bf594d543f07d761c2ae14757c4b33310440 DIST prometheus-0.13.2.crate 81623 BLAKE2B dd1411ba2521e3f0bd705bf8e164acb93e809d0850f2c7001ea0f40e24269050f5fc5107fa8b5c0613b0304f2c64a4782b2392eb3833865d0497e056d6411fa8 SHA512 9c0282fce8b053a1ee8f2253b885a843b37982a7f261f4533ec0dddd006b9439ef55c3cda1efdb3433abf9ed9d1d7584b3aaf98f67a2706730c459de214002ae DIST prometheus-metric-storage-0.5.0.crate 7129 BLAKE2B 366653e1306c0a32fbb68aefb3ee30099d700e0b92f2795b01ea4bab49e8cf60055765363124386e48597aae20138b25e15967b90e80bbd4cfec6584ece39426 SHA512 08f2479de155acf03c8f8a7e4fba7035a7652cb906aa504b56bfea168dfe70f8f3c398c489d9e92f9dc7a48c8a320b9f2ac5372019b4f32341e9b2a4b778bb87 DIST prometheus-metric-storage-derive-0.5.0.crate 3719 BLAKE2B 4ed22782a0e09ad68935a4b1bf9df82b1c151766f02a0372cbff0028c2ef747152d20ada17d3bc693b8dd0cd5db3ee8030a4c73d6f50b1c0ab8f276eefb6f540 SHA512 35d3af8a68c65c435f94f3173ad1b2d117b87df7b889fac20c49c0137120c898c6f9bfc066efa73fa8fc8f13ab6cc8e604b1d36a4ce55d984a8fdbc2c8574e2a DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e -DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 -DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c -DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b -DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 -DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf -DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f -DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 -DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5 DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 -DIST readwrite-0.1.1.crate 2307 BLAKE2B 1df2d3df987384653d75e18358aefea5ccdc975096eb2f7c8a6aaa5818f42b8ba00890b5534fe07026c09ce705e9a85e29a47b52e2d3e4ccb1f3ca36c07a1dbe SHA512 5699553f350fbcb27a7f045f2157f7a34c5cbf498f0760dbd1c54564f9dfe6a5fe05ea086a54a9e175da294c3b2729c65786d62211dc7d0dcce5477e73788dba DIST readwrite-0.1.2.crate 6872 BLAKE2B e1626076fa42000faa6e12cf32e76f9feac00aba6f88024a786945ed0549819bf402dab1cebfab5fb325f901885d39e58a942f00331a7da47ce36f893dde46fa SHA512 f043f8176e202075dbecda73782fecf644d7246b7df9ba194d6caaf42a25f93941ca3a6bca4d2870357314e2a19c7f837de682763e167756247e1a96a0e8c22f -DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184 -DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 -DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72 -DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b -DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0 DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059 -DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719 -DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST security-framework-0.3.3.crate 49844 BLAKE2B fae140b05d3ba618cc1072673913860a298e5592f4909533463083736ff75d9f1a9deecc1665732dd675fe76e8cff316c1723ad5d2dfdbd044e4c1f979b59749 SHA512 6234ab31093cacfc8d98ce91c29a030cb06eb48c2a22feb9c0e5a29824c95805ec36edd6e1c66fbf5014f70b94a66aac31e8f69c069784d25b361c7fb7c22cb3 -DIST security-framework-2.4.2.crate 64857 BLAKE2B 7ad2311ec2ab1ebe8aca0b55a5b6b1dc328ad294818896224e950cbedf39cdda3e130395c5c2dbc64ccd3fa5603d028a2c0890c38c4a18dba4a25bd22cf66380 SHA512 de4480e4bf70148cdcaaf3a9c0e52ab061cea452b3209918fbda693faa7feb8c2df56ac29139bfea74969b8f62ba3ab2b3da38654e35aedf62fdddcec420998b DIST security-framework-2.7.0.crate 72601 BLAKE2B 593b08ee9c393d49e7ba9264705d91f969f006a944a855995761c7e00d0c97b3653350f9165649b774bc3c9f9f564307298951cc1b03ff47aa4d0fae501eb513 SHA512 7bbc52a951b328ac25a65dd5d69d173b566f18ee62158a98e2d2d4fb8c51c8dc9930bd78f9cc2ad4eb2fffa1bbb4eda3941a37ef1b545b78f3a39bc480056307 -DIST security-framework-sys-0.3.3.crate 9554 BLAKE2B 851c1c7e7d972b9f74d7278fc501c3894ffa0fea31954fdd2ef5e070c28c080cce04d35acfbdec9871c4544b218ad420ebd42bf6f426142046d805ea99dadc27 SHA512 a78a9affbdff5c44e63e555970748724a4cf1fb1e47a6a5645294f70b2c0960d3ef93d3289c3695d5de31c8f7a9b093e3ffb801a1631b474b5ac68e0b68bfe22 -DIST security-framework-sys-2.4.2.crate 12821 BLAKE2B b1731747e2525aa3aad02be4da8076f6e25d33faf54b431e84c0bd072ca236c682ed492621a7aef725d0c1bd20a5f35ef01d0d518b06fa7bdfd2417b081f4cf6 SHA512 d2f35545223f1ec671f9265017c393a6219cd1ac551ec7b3bea6f90ac9e79cd9d9f7232fe7fca5f0c093b3f549925571d5a4f0b702f29a1e992e038446f48bd9 DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd -DIST signal-hook-0.1.11.crate 22255 BLAKE2B 09fe7f44808822e98c7fd1469a23e8f27da9fb2c8e17e118ce601b6b72c62398feb53e150c2916587a5b4a875e4972c5f5c3f52776cb4e3279a19faab4b3bd89 SHA512 852d2dc03ea4346a2f04ff553092e40d158e5ecf9b48b29167a0d2563bf64ae20fb56c8fee0aad963cf3aee136895d84acdc25b27d556d8babe134867f8e8d13 -DIST signal-hook-registry-1.1.1.crate 13795 BLAKE2B b87991a154d29d2bcd5ca64462eaba92edc7ed881e18ec0485fe3b6cf459da0499b236aa7daa3e8c714d45e59f7986f5e753ba1fd76ee348da2614c9c483af89 SHA512 3947e3249861ef50d2261080dd47fb400fded19d5c8555c4bc65f10ededc7102c6eb26a299de961308310a9856d2a757d7a981a24e3bafa0cec72b55b515fba7 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d -DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661 -DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521 DIST slab_typesafe-0.1.3.crate 5980 BLAKE2B 8ac675c6c313c13d2f8fc88b44c41314578c0c990335dae8f216daafc3cb0b122042cb54b65b4ca8264c0c6bdb3b6d07edac479f615f23fafc3417d7d6f4115a SHA512 f2dbece513c795f7fac857dfc060034bf61d0d51bb1891566d9c36be97308562033251c11e422020f67bc04bcd9111148f434b55051f69b9ea0d79b072cc410e -DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33 DIST smallvec-0.6.14.crate 22855 BLAKE2B 5f96c825c57ee6ab80bc13469793dc7ee780cd856e614c6cc0c747e1cd43fd5e27b589652610198e7757252bb6fb25905f616ea82fb9d8a9ffd5c8cd394b4f49 SHA512 4ba563b542922523566efbe0aac9df499c694bea9ba8ba14a74026d516e02f1fa8f542774b8044150a8e27f01a4b1c71c5280b5a82f61d5b45f022ed223f3977 -DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56 DIST smart-default-0.3.0.crate 6297 BLAKE2B b2e782a64802595b94c6e36b7365b4353ee0a16c5f9477d0222c9862991ebc6841d0f0ceb1dc671da139afe190fc15f3b1c0ece2fc62c897b4a351fee5523072 SHA512 022bfb5321d01cbcca95eb30bfe75bb80bc0f48538cd6434c5ae89252289e3f1daff0a7cd46532ad936f8714544451ac3138a0c3507e9de689dafbe396afd34d -DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c -DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4 DIST structopt-0.2.16.crate 26165 BLAKE2B 3609dffe30adc12dd30b3acf6bc1722841ad0823f3199569c616b6cf9502a3b89def471571bdeddff4dbe1722e3b595de3c5b18408b4f4f2015a2db0b51bb517 SHA512 3154f168dabdb6476989970e75d43c8d730f73b567171c0d3bedaa1549ffa13dc543c28b25174efdbb90637b972e9e857dbf2422b95fb55ed9dabbde069e191e DIST structopt-derive-0.2.16.crate 12951 BLAKE2B 7b7eddb8854a5bc47b8d91103b2bceaab9057b553c72c4ee6c995dd4392cc9594124cc00562115bc0250b87499f8b8480fb34d8be1434bc55a668a79cfda6c75 SHA512 7ede89d104af3e57e9a78eae16cc8644622b1e83f8ea852ed3cad2e03d3ccb50e5fbd0f3f73cdc32b51bab6607b9b65266012fc7294d48ca0a234875c816a301 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7 DIST syn-1.0.100.crate 236691 BLAKE2B 0e604e48b2e9498f2de290ea0c7249d03a2e7c388f920c5f671a861770c96a5d72958fb5efde45490c0fad0f5ba34a25927e5ae1a538062feee509b0d8629ebd SHA512 20fbac3fa505bb2bafebdb35e3581434240629d8554433ccdfa1ef8cc4b74e31ca0355d47abf7081e983d222b14e08c5a806922e5490a7c19d5a6bdc2ffcffde -DIST syn-1.0.94.crate 236697 BLAKE2B e3e37de7ed5fe8ec78e3e65de9e64e7328769c5352e4db9c92d00095607fbdfec0a662deba507afeeee5a173c3c1b99d101268c4692752100198cfaffdda1a64 SHA512 2bdde4584b9d95f93f629083fbedc4a7148aab702775513a602ba2d122ae57a84e6d42c38da820b15ff66743dc49624287daa0c9b6d1fcaeee102b2879ac7a1b -DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 -DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a -DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431 DIST thiserror-1.0.35.crate 18451 BLAKE2B 5ffe5fba8734291cd5304285ef327e4af2f2e2d9c7272d878ac2d3235761deeb789cfe55752b5876bb7949b02f2483ddc8749ce85f2241385249b5a4c479cf79 SHA512 2a55a0cb831cbec2529132a4d230360ba8f89f55b46d1116bb7a3461e92141d58935ff83b6d6e3c8eb99b690752f9aad2281c99dc9b3a242b3cf349d32d61912 -DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e DIST thiserror-impl-1.0.35.crate 15433 BLAKE2B af40ee4a29ae92c02bd7681ff9c3f434462056a7386b3b8d7b370d1fff2235f0b674ed9c282daf48cab760cd6232962593ddd1afdb6de2f40092a42e0fd9ff0f SHA512 8669781bc8165126274813653ec9ccbce2df18f6549415571e5db28f64b7715e11ac3f87128769e14b6b49535aaf6964db6a382e0ac482c35fe983b88f9fb1cc -DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83 -DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf -DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873 DIST tk-listen-0.2.1.crate 14268 BLAKE2B c8381e66ad43a7649da2f84170ae45a4d04ddd7a9f10e085fd537edafc3a7ab5c3697f092e8fddabd92307c6757c8b8ddf1fd33c2479c375b812d99aba9517dd SHA512 134240c0cb3255c77aceed3e88ad95d63df8a0c2df1436925579dcc78c2ae9efeb1045a5f295c09e87d5c8e8aa8a5961fda411ff345ae74b8292f58884bf7344 DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1 -DIST tokio-codec-0.1.1.crate 7617 BLAKE2B 868f45ddaa16cef0ec7143ae7d25d422fa4fd7fe59bc99a7ae4b97f700dd6418610b917a880f1fa5c939799168d8c31901d7186a0195c7b72bd130a01c787b7a SHA512 9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044 DIST tokio-codec-0.1.2.crate 7850 BLAKE2B 68e196f0cfe2742f5bd6a4074eafb7cc83d80622f51743e9cda367c8fb26bcf3a6a10772963e75f86c3ef054270f22a13e58a3455ee316145b111a2d6ad00053 SHA512 69bb3a0ea81fc8437fd57c2ee533f0674770182207576e463c8a5859956175a4619500b832863cae9ba9d0d09d76c33441c7b3e929896a61304b25c9d2dd6c94 -DIST tokio-current-thread-0.1.6.crate 19339 BLAKE2B c3fe401178089864fe59286566b84a325d8a4101b0b72dda11fefef945d5e14b5e6b6c7de7d87cf222f0ea3d1c95aa65f2c43fe37c2e766f8d70da66c7d060ec SHA512 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6 DIST tokio-current-thread-0.1.7.crate 19690 BLAKE2B 1a6ccb40e59095df2e4ece5be501027a9975297c8606cbf107e8a365529d175415d1738e6770c31b586685fa0e573b6c4eade68fc83b1e01d89c2e22a3741e28 SHA512 4458eecddf552cc63dfb877976cdaa2060f8fd82a9cb6667f8fb3507aeffef4f3db38d649de55bd784f98828a12bc066d35e96c60ca07a42cf8f16a5fd7d58ea DIST tokio-executor-0.1.10.crate 12191 BLAKE2B 9efed875a669cc842d298d2ea5ec310a008707f5ec4b796d68fbcaa3ff47c3484630306116d6d36c71f4461869e63a11dd498cb680013f5a3c2a9a46fff9763f SHA512 e2101de6130d09c1a0cf750ea49f605db2933ee4d96943e111d550816ba6a67e4d662e0ba5fb548ae62d582b665239b27b8478f2364b6c46d038dbde8cc41754 -DIST tokio-executor-0.1.8.crate 11775 BLAKE2B 0cef2a4848f624ef8c3a450b06d8530ca64be193980cf1cf6f4c1c74b6602e9e0f47ac070caded410a843938d2c3defe8696e4a27329d42d04ca9cb4f6d7811c SHA512 b6340dfa0cb67da1b00288b3250cfa4f0b55907d3448768f99a7cfcd46ebd1155c84cd35659d740501f0575e9c5b660a2f769335acc14da7dd5cea59b10b6334 DIST tokio-file-unix-0.5.1.crate 11181 BLAKE2B 42feb87903ce66953b7ff70c73ada3131342727046d0eeaaacdc46e47e2d27f59e2ec8443123e7fadef0461221cf0d922adfac10e17eeb402f235041adc5656c SHA512 7f40a8a90b26185058f13127d4361d50c9e78c78854821be79a899d45df0fa2a42f889623f9e0dee1824ea917086b42f90b84ac761f414e110413cfe65e7d766 -DIST tokio-fs-0.1.6.crate 16102 BLAKE2B 4b31d365a898ad0fb20c6ae315aa60236d6423357997e34a5069597d72b146d7528a7ab974ff2e7f62d60c46461c1bd6c4b74208f61b2452088c4d8f9bf63aaa SHA512 8a123bdee5f2a6cacbe68f25baa5810a7686fefef8262b0a6b67e217ca6594a585dca52de581d33f4b71725bf03e003dc500f75ace88dba5cda00a52ce544279 DIST tokio-fs-0.1.7.crate 20881 BLAKE2B 08d22887c990149cd3aeefc3a9aef949124a2c3cb9edb5ec2b76a01b90f85a22226417f75319f92514d812b752ff7090854188e64d2c1af8cf8c773b7a97a8e5 SHA512 3a1023dd9537164c61ba07b4759d05136165274efed6cbb7bf868ccabc311353b0e221137d2be643970f4d710bff20251104344a7542a08ac3d60ef502624d2f -DIST tokio-io-0.1.12.crate 33555 BLAKE2B 5646f1d0c226d223fdbf648d95cd690ad6f755c5dfa9a6bc4d5fe4b5df634029db6178d852d3a4c2d481d06eec763985186753088157557871e5ba6e8aa650af SHA512 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149 DIST tokio-io-0.1.13.crate 33665 BLAKE2B 4e9c6bda0d391ae685dfc89cc0137fc44b31a4a788f730ab632b73d92ab55dad871d68b03ae0899cba9f96e402f88a60d4b8be5d484947b8982a39e473e5b8ae SHA512 608341311f4bda9617634a2623033900bde1d6b9fc89ae52131838f033bdbdf8704114193d8409ea0e10bd53d6f7ab63d47e17b7abb41d3f8865ab36fd0532ef DIST tokio-named-pipes-0.1.0.crate 7055 BLAKE2B 3864a722160dc7f77c6cceb3c9cbc97f406873810163a3060419ab48d0c5e93542d6d7fdebab8ecc0d2f2169cb823d49d3c12b9537d8b0b7298f96e67a61fed0 SHA512 59726719949fbfbc9bd079ab0ffaed0b3ba570d4bbb8b1bc7fba83ef716423ac44ba43a95fd5cf7e625ea73a6da7c3723a42ccacfb530df3a06124d42926a604 -DIST tokio-process-0.2.4.crate 24856 BLAKE2B 7626c0800d53524679f36ddfaf70bb4245070ccf49e3fa5167b142258e201fd3cdef44561d24dcc0dc72e3ec5261970e58195296098f2c8675438b2bbe0f20a3 SHA512 a2018350db00f11499bbdd91a98ace58353a8363c464f11a4f517f9b63fb59113e963861bf61b34ca1f01184f31e501ed6e4133fa39852a2eb3246956cf9812f DIST tokio-process-0.2.5.crate 23688 BLAKE2B 555f3ffee5ccc574ea19a07c558af0ab735447695ed654cd94476387658c065ee8749883e716f07e11b75231aadbd28fc14ef1ec93d09b18086e9bb6398a2789 SHA512 aa22040bb26d23abab955903a7973020c596b07744d1d53c6b5ab425314dc96a03ccd0128ed5f531f0cb3202e64ab00976523b359c5bd8a863ba947f64b21d87 DIST tokio-reactor-0.1.12.crate 21058 BLAKE2B c1a1842aeccc0d3f74dc4e588c485d326f74b652b8f504bf20cdd69c42dcf937c49bbd0c149f8da428dd12f5d8a1715bd39ad76d3b71f1e414c663093a437d26 SHA512 2db454c63f8965345997685baa9e4f1e7d2fad1c0087e7d79bcbdc5bf0176703de49c50180689db5f797aff6794748e01a28877d46f58cf453d7a4fe17d3f791 -DIST tokio-reactor-0.1.9.crate 20657 BLAKE2B 433b1302ab41d1c028c1fa726b796d41484526400801df2375de04faa1699cece0d55717f8ba4fc292d33fbc7fb343f766c1d474a36e36d72947bc7572e27a24 SHA512 134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1 -DIST tokio-signal-0.2.7.crate 15122 BLAKE2B af992448564696dbbcc01d85aa88f247e6e480dc95ea9d9a720dbeb3fb7ea4aec23639f4c43f67bb0302dc0a34d21ca1245dffc72bf28753e488fcb29ada60df SHA512 60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f DIST tokio-signal-0.2.9.crate 19789 BLAKE2B b5fa30d457327031871150bc251cc1850b43b716ce650803d3a58ec130e885ed2e8ad901d955ea95af6a9dacada13321feae845374552f7ce504f09f2f7e5ffe SHA512 afdd91454c2da8f0b2fce65ffcf35dbb2f73cb5552f63fbb6e8bf1e125d9026840cf1ec895a91a4c69997ada17ab6abfa8aa43217c07d18591ab375aa49da180 DIST tokio-stdin-stdout-0.1.5.crate 6661 BLAKE2B 1279776134a9e46de5a45c0561b95154fd55b0c965e00f5422000bf7a2fff94447aa504b57318e2a80dccdacfc6f0bed3582208278384e0808e2f8454712ef37 SHA512 f37d52b667243220fd44400bfd659721559d673bfe934a717abf59da35478192732127e0fbd33863754211a45777b548e90e32d18fbb9f84b147181d39251bd2 -DIST tokio-sync-0.1.7.crate 41666 BLAKE2B 80a29da76709a7d2ca7c1c2bb1a18e25218ded0383006f5be2f518c1abdbb476974709c16111b42820050e66f75bc3498a1bb835cfcefb76be302d5977476ab3 SHA512 041803a7e6056c7c3a0218e754a7ac2104ebe2ac9953a7ad7f0dfe6fa9c8f23cdefec0941912df3bef11ed129e85a13206279e3ed0d88424b18b367c2494b973 DIST tokio-sync-0.1.8.crate 41830 BLAKE2B 20e61e5e5360f54446ad60de050a4156d3e975f4e246f51b308ea1def48c51f8f1b28fcfd81362b00e0f6f9c40382abb71a4c9e799e81cfd7b0c7b085c42cc27 SHA512 b3665476629ecc8d513d53169beebe090818c6b76ca99f0a508c730bde0ca3c49b828942fc3b9d76fa9cad1b6766237e18a329607ca2314c7ad4b343dd785371 -DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336 DIST tokio-tcp-0.1.4.crate 12745 BLAKE2B b11b76b94ac5fee26c83537d9c169fa775539c90703fd9ae2c5565c99bbb56305c474710a3b90ed2e8cc2010ac00de77023ecc04e5cb4a653d7b5e0f0e21e23d SHA512 e33168e12ab9cf448f75ccc1662f54b287db0961dd472da3a86f400d6b80159cce290b9a4b948d216b86284e5bd61c14db8750fc2d0ac16d3937418c1260d2f4 -DIST tokio-threadpool-0.1.16.crate 53347 BLAKE2B 801de9f2caa5da692eb8366bbaec870c00aa949c80ef5ea95fb651c46af22df9ebd41f2b826294b80121fa69a36695b9a47b4b66f0e61bed329254f88357ed64 SHA512 b767b2364a50d6fdba3eb049698a561f1a76b32a585dc5fe7101f8bed97145a81460a37c346a3b2e99c0a5cfe960795793cfa3ccf3f8324b2ab6b193247c55da DIST tokio-threadpool-0.1.18.crate 54825 BLAKE2B b1c202bb8aa453f3af56d82713c175dbe0b3b2c1a8efd8ba849b0afb243f48a4f76b994095e4c490b37710d6a1c33eab2f1a2dddcfe15bd9887ad8bfa9c76f8b SHA512 163aea96e536f670e5536c728b159da52585805a721a18ee42e9324320df4e93a9baa5b31072e5a12af7cfe3968bb57f0a5864e17a758f66e71e31f7f02d7b27 -DIST tokio-timer-0.2.11.crate 37578 BLAKE2B e9dd19db8bbba5edf74f7354d4d5e489780b5dbf009be095e7f00bb9e2276e10ebb643605beb6ffb035d1a7a0cfb23eede14e5ebdd228ee05ad9244ac3d1273d SHA512 2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57 DIST tokio-timer-0.2.13.crate 37873 BLAKE2B 0a1c1e07b941919dc5d1c1a425ba84d6d954b52932933e521fe5e8c76f36c9c2bef9b93eb710e79490c3082519f385f7737454ed884fc7d11ca92ca44b4fe5ca SHA512 9813e5e74cf210eb3fc29268483da32272852c79b23d4b09ad7ee012687c910848b9b8fa5638d4d71cf62d2722f29093f2324ccd4f2e65db5c111ed6f9142d04 DIST tokio-tls-0.2.1.crate 16354 BLAKE2B 120f2839ba7e4666dbd75db26b52eb5fe6498ced7f7b46708699ec0cd42624b0b504b2503a72b5ba0c75c64c1062967813c13d964ac79e7cd94f3e1cff2cf6d0 SHA512 d657d331ac14b98738fd828acfe543fc2ead7f57a6c35380de55863369a8302b55b7356b75db67baf894749a26956e05abd4499bb453708aebaba6456712ae12 -DIST tokio-udp-0.1.5.crate 11529 BLAKE2B 4782a2d75852bcc972f7049e40f3f56927052a27e912f3126903a1438ab4be8b949d223baf4d30c68ceb1c9d1f14a3a0f85d58d4f9c08236beb189cfde4a753d SHA512 24b5eba25117ba3344d90329134f15be8631d1d9bae06a94f4df7f05b1bf6e1b309b776a0f2685fff2b7567a80331450a2027cb4bd264dbd5fd202913db6055f DIST tokio-udp-0.1.6.crate 11677 BLAKE2B 6a2e871f385be1fb7bc597fc00a20f0086e7fbdb0b5fd2785e3bb3c01d5c41f0b1c46b29d9735f5a0176e1560225346a4ae394b7552d4d5668277ca7053b82b3 SHA512 404d2418c2e78c5e693514b181a782cd41d313f62b29186b9f30796d5fa48d7d223156d665dab39fded5b7ff5c2a47c0d08ae320b003063aa22112bc8857f62a -DIST tokio-uds-0.2.5.crate 11808 BLAKE2B 03f37a5f68479955176d1df673c43d6e3d77a84025620fd83bfeee6439046a1c1b62bc9606164690ac21da5fab8de12cbd534664481c3d530d0ec178ad9c4e46 SHA512 964648b9ada5e072ce90bb7a20deed48a517a0e4c6b808b1fb8440755efdc35269b5a30ad312a5e228603e8f1f8d4b8e2f19f4aab10f75ea5b569ad402bfeb61 DIST tokio-uds-0.2.7.crate 11942 BLAKE2B 5c74cf32de1c047f75175fbff9af0cadda1a74673f5b2e3b2e652ef5724f0d428b9caade0c474411c5308559103972e19344adc97822f930d1dd31edb048d1db SHA512 c06818507ebbfc53c34b7afffe5b16c682749371a9dd7db9fffb3800b5d63fdd1d7e646bdb0c84c3b86228f86c54d2b95f61942cdcf087c9f5a1491fcb764102 DIST traitobject-0.1.0.crate 1957 BLAKE2B 0ce6e870f29a7a67e8e8db7516dba85ba4a15fbeabca4c44b655778f9a012a525c671cb3d6841477642f7ec4157cf5c8ed754169b44cef708da988000549e9fc SHA512 aa23140652ecb3397ea989da0c2c58da88d22a816a2bb9fbd90db4299b773275d20a68411d8d300d2fefb2b508f561978c12b95f88d178f9401fe2230f9f795f DIST typeable-0.1.2.crate 901 BLAKE2B cf5fede9fe91f61df1b99b346ebd56145519f2121d027b72f1ccfa9cc24752c80dcc20166327d9ee751c5b344186a36d0f1a119e0b7f941de9739559557c2578 SHA512 336083ea6c8cc64fce1cf14443b1afa955a71302cc0a2023e3c52aeadbf3832c59aa8b8ae0c87d3062658cb7c98e9f79dfac9db7f5831642075ae8f9c0bbebc9 -DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea -DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288 DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac -DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e -DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5 -DIST unicode-ident-1.0.1.crate 33770 BLAKE2B e028e9f1d6c01a7a37c8f9ecd6b1d99041b45674bc7699066bb7479822cb8d5a1b4083db1117d9d44ab05096d8a37a9bd5d93dfe8cc5db6bb58950b4f5d5c8e8 SHA512 505650712a51c6f309c97bf72029de1eede33c71b84de9733f5f987859a61225e3d07d369b85a89797d870ea436f30b5b5046306f3d5fd672551a4b30c43e428 DIST unicode-ident-1.0.4.crate 35491 BLAKE2B b92d4f09ec86fe1e0b403b8cb0787989c313f29e6b24961fc2ca046ee5e3b50f43f49469a290880412dd37fc1b46cbeb9123e9636e1f39e425f722a5aa44ad08 SHA512 db41d5c3f72cfaf654b4c250e18ac0ac077a816fd582f1548ed384653f467c15f85fcfbbb4ed2f9e8182587181abf1db14059d50f3e43b60434ddf38c8f65d89 -DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c -DIST unicode-normalization-0.1.9.crate 89492 BLAKE2B 75fc4a6ba6ae3d9e72380eafd50a727ec049f986a58dedd4854a086af844966701463ef8940fa477685096ed2961e2f044d6a308fc3bccc3046bc92554b7a94f SHA512 f1a96c0687d6394fed55e400183bc37a8f0ab4dc2568eb114f86dda3f504fd9768bf58e1ac87f2ff732dc58041de2f2cb8d9b65faf767243830ddd159ae36d81 DIST unicode-segmentation-1.10.0.crate 93893 BLAKE2B f0604ca03586726b878f7884a639554037816ae01965fbb97b4998fbbd12e614f2af50065a59c834448413418a56b198b016e685ef9509513e8994a5c063da40 SHA512 e6a1baacb557a5a7ed7ff780c542c5947eb473763eb2a6018cb1e0a1abb9f4bf3f8073610e4897393f15df076f6657a0f162a5c5bb7ed5f3b3fd832e533a522c -DIST unicode-segmentation-1.5.0.crate 90262 BLAKE2B d13421cfca9e7de0d538dbbc3e44be67abcc3147b847db90d473bbccbfb813788b1cb7ada4f8acfd5646cf83c82bbc47832da893aa06313250ce5f483bffa8b0 SHA512 9f9dfaa6692fbf8dc3f2c22815f79a0eb887eb4706dda9469999826a46999942eec44a608a27858221642fad1591ea9cd5162857c0cc673b45bf648d9ea9b7c4 -DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495 DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b -DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 -DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d -DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5 DIST universal-hash-0.4.1.crate 8503 BLAKE2B 2cb981f8c1b9337f69e4b6672c69c01515009e8bbfaf5236f7db6cea4f3467938be75b4a1aac69433d18ce09361c52bbe99face153417f5105c4ffd050bb2c39 SHA512 fa582c789b462d8b9cf069fe82de47bad5e3a4d88d83d58c82a54fcfe56f44c24a6a63374e050d89162700510e8c87eb74430be30e1da9dbe4a4b6bb80a684e1 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 -DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88 -DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f -DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0 -DIST websocat-1.10.0.crate 97695 BLAKE2B 2d2f5ee284a8e3f3f423d2de0ef6078c84d8bb2374e6021d1bb3bddeacd63d474ab331c2832bf15b8f7bef75febd449f294e6a29dc17367bddcbc2c707473c16 SHA512 e733f2551b106d464ec0daf0ef2c45f4dc3cb1ca77f485441786983666a3db495a6438adc10be9bb5f606ba5dce4ac7011f4f8a618ba6f62a047b7170ca21f2e DIST websocat-1.11.0.crate 102374 BLAKE2B 29399053a7c5cf398bd83dd9b52604819d9cddf5138483362e6fc39dabc03b39f56191975ffb147e6cd5433070cbb3c98644396d34565c41b3d173e3b84355f3 SHA512 867faf0645a81c8a8924147865507485efaf7cc2ceb850a4b1e93cfbff06b4318324e1ac37b7316c52444a70f32de529bb8584626cca94411a31c4794d1cea7a -DIST websocat-1.6.0.crate 100266 BLAKE2B a96c5924c61339f4136b69346fdcbfab84a4c3fa21a9b5172434544b7b381c498938972a28bb009f0ff6d8a80eda10199cb5b089ab6911ea4bc9e5ed7f6b7d92 SHA512 6baf95e922891b8bd601768a4193dd9e219339a1a68f6f3280186c2907df54d5239413a09bf8ee48f7faba0e0d62fef6e09a3b871dd48ece831dde8f8a0111f7 -DIST websocat-1.9.0.crate 91763 BLAKE2B e728d67e86fbb2b529508a3cbdcf85a09ad7676126d8edc2b03280ae6c0ee298bc444d849caa930bc8d079b492c412be2ef258ccd4f33309e04ba14f1c6e1348 SHA512 b22955d4de2d966a9196f2ffa13566ac8b1f0a25b0fd62553a512ed572c74f7907a87e517d58bdd3f27fcf4a98c63ae7205d4d42443a2be8dbb3760affbee166 -DIST websocket-0.26.2.crate 63281 BLAKE2B 2392a1e73a932323db224240f386a739f287ea3fc085c0b1d71dbdc3bb2b3f38b3de456701a2e816623de60b8feb0b80c133e439481152c1e67caf986c7185da SHA512 eb732830ca62cb3e90e2fcce54fa00cc7ed9d85be0fc77df8caab2656ce123d35b6c4c0fe9985a18dd080121bd7bdfde82594cb80cec6f72676e4f9829455212 +DIST websocat-1.12.0-crates.tar.xz 24777476 BLAKE2B 39d3162438d4941db1de46f0a904ea0d7557c5da377679c1310215e5d6a05f062b601512f56acc9161fc6cdd306c9e41d16bd7c7db14c9da2c73fcc6fb0fd377 SHA512 c3e471b92ef7a2cd30e8627c53436c8e49ef061c7e939be1583c5fc66718580798328f9d453676e79807284309873f5c82dcc6d8b3f263f71596c57de38cb9a2 +DIST websocat-1.12.0.tar.gz 165961 BLAKE2B e83675c1bd421add00a3a2409b51e98edacb52c018b3f617cc78808e14d8a2af0a7ce9d6db1a6ebc740a6c620213e70fb3dda91c2f8a9bcd9e93d05c8043b313 SHA512 043e175d557fee92d381ed1f1aa510056e1d59d0bd25c8f1cc9bf78c3ef59e9e76c5ac283f6bf4e8c9563365cd57deaf5e6f3b0040e6d680a9e8dc80ad931610 DIST websocket-0.26.5.crate 61982 BLAKE2B 5bad2852a59a606f1202ecff500cbadd141982fb66eb51f87b91dd832335b5cf088af5608e0ec4cdea2425c53c58871532106a5d8c8a22e9702524278239fda3 SHA512 6489f639430a7c496e2b3502a110777cf275fce29b9ef1a67f083042846b767c7c1b74cd112ee604ca5e17de23033a28f3d79d56fd27ba9c1a103d2d307ce584 -DIST websocket-base-0.26.2.crate 18804 BLAKE2B c0bbd98ae3fb3cc3b3776f435ca2849edeba0a19ec9567fed83f6608fc4be033ea1a3f28cdac95ecdccb320584c3d91e40a512bb5159f057cd5da6ba97cd4481 SHA512 a4c543fcf5845e4c3191b48f888d55a3ccc8f711f50b76fc64835514604b937f311df454a588cf4ea7b79e40510e6322177dc6e3dc45de091642e03fdeef1cf1 DIST websocket-base-0.26.5.crate 19281 BLAKE2B 73ce88556b3d13a02829b97a578844545efe74cc5fabec1ad71ad9ec4f42ab2dab19117961e9354915f3ef33aebfc60d32a1c6174aa73444bd191835132d9322 SHA512 dc1ba64b54427a81debbf64bb171fca718951f3449159828c142d55d4564201b290dac83979fde530a02d274e309fcf14659b62e63dfae013ddfb37bbb3539e8 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe -DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 @@ -356,5 +208,4 @@ DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f8 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f -DIST zeroize-1.4.3.crate 15573 BLAKE2B 0ebab6e501bcf32c19ea88fdf038c97468b504c5035b2f2477372326e114231e5c959203b2bc897228a05b19ee510f1264d4fad5e33c5539b5c8bdaaff28889e SHA512 c4f3f10790176925fb90ee6325a50c710ff220bb9d37d424e28e8d8de5f801f2ef5fd687f0b720c471ac9e99e02e26011afcc4ecdd10a8229f70bc71a3815002 DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9 diff --git a/net-misc/websocat/websocat-1.10.0.ebuild b/net-misc/websocat/websocat-1.10.0.ebuild deleted file mode 100644 index 1b630fcbb054..000000000000 --- a/net-misc/websocat/websocat-1.10.0.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" -aead-0.4.3 -anymap-0.12.1 -argon2-0.4.0 -atty-0.2.14 -autocfg-0.1.7 -autocfg-1.1.0 -base64ct-1.5.0 -base64-0.9.3 -base64-0.10.1 -bitflags-1.3.2 -blake2-0.10.4 -block-buffer-0.7.3 -block-buffer-0.10.2 -block-padding-0.1.5 -byteorder-1.4.3 -bytes-0.4.12 -byte-tools-0.3.1 -cc-1.0.71 -cfg-if-0.1.10 -cfg-if-1.0.0 -chacha20poly1305-0.9.0 -chacha20-0.8.1 -cipher-0.3.0 -clap-2.33.3 -cloudabi-0.0.3 -core-foundation-0.9.2 -core-foundation-sys-0.8.3 -cpufeatures-0.2.2 -crossbeam-deque-0.7.4 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.1.2 -crossbeam-queue-0.2.3 -crossbeam-utils-0.6.6 -crossbeam-utils-0.7.2 -crypto-common-0.1.3 -derivative-1.0.4 -digest-0.8.1 -digest-0.10.3 -env_logger-0.6.2 -fake-simd-0.1.2 -fnv-1.0.7 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fuchsia-cprng-0.1.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -futures-0.1.31 -generic-array-0.12.4 -generic-array-0.14.5 -getrandom-0.2.3 -heck-0.3.3 -hermit-abi-0.1.19 -hex-0.4.3 -httparse-1.5.1 -http-0.1.21 -http-bytes-0.1.0 -hyper-0.10.16 -idna-0.1.5 -instant-0.1.12 -iovec-0.1.4 -itoa-0.4.8 -kernel32-sys-0.2.2 -language-tags-0.2.2 -lazy_static-1.4.0 -libc-0.2.105 -lock_api-0.3.4 -lock_api-0.4.7 -log-0.3.9 -log-0.4.14 -matches-0.1.9 -maybe-uninit-2.0.0 -memchr-2.5.0 -memoffset-0.5.6 -mime-0.2.6 -miow-0.2.2 -miow-0.3.7 -mio-0.6.23 -mio-named-pipes-0.1.7 -mio-uds-0.6.8 -native-tls-0.2.8 -net2-0.2.37 -num_cpus-1.13.0 -once_cell-1.8.0 -opaque-debug-0.2.3 -opaque-debug-0.3.0 -openssl-0.10.40 -openssl-macros-0.1.0 -openssl-probe-0.1.4 -openssl-src-111.18.0+1.1.1n -openssl-sys-0.9.73 -parking_lot-0.9.0 -parking_lot-0.11.2 -parking_lot_core-0.6.2 -parking_lot_core-0.8.5 -password-hash-0.4.1 -percent-encoding-1.0.1 -pkg-config-0.3.22 -poly1305-0.7.2 -ppv-lite86-0.2.15 -proc-macro2-0.4.30 -proc-macro2-1.0.38 -prometheus-0.13.0 -prometheus-metric-storage-0.5.0 -prometheus-metric-storage-derive-0.5.0 -quote-0.6.13 -quote-1.0.18 -rand-0.6.5 -rand-0.8.4 -rand_chacha-0.1.1 -rand_chacha-0.3.1 -rand_core-0.3.1 -rand_core-0.4.2 -rand_core-0.6.3 -rand_hc-0.1.0 -rand_hc-0.3.1 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rdrand-0.4.0 -readwrite-0.1.2 -redox_syscall-0.1.57 -redox_syscall-0.2.10 -remove_dir_all-0.5.3 -rustc_version-0.2.3 -safemem-0.3.3 -schannel-0.1.19 -scopeguard-1.1.0 -security-framework-2.4.2 -security-framework-sys-2.4.2 -semver-0.9.0 -semver-parser-0.7.0 -sha-1-0.8.2 -signal-hook-registry-1.4.0 -slab-0.4.5 -slab_typesafe-0.1.3 -smallvec-0.6.14 -smallvec-1.8.0 -smart-default-0.3.0 -structopt-0.2.16 -structopt-derive-0.2.16 -subtle-2.4.1 -syn-0.15.44 -syn-1.0.94 -tempfile-3.2.0 -textwrap-0.11.0 -thiserror-1.0.31 -thiserror-impl-1.0.31 -time-0.1.43 -tinyvec-1.5.0 -tinyvec_macros-0.1.0 -tk-listen-0.2.1 -tokio-0.1.22 -tokio-codec-0.1.2 -tokio-current-thread-0.1.7 -tokio-executor-0.1.10 -tokio-file-unix-0.5.1 -tokio-fs-0.1.7 -tokio-io-0.1.13 -tokio-named-pipes-0.1.0 -tokio-process-0.2.5 -tokio-reactor-0.1.12 -tokio-signal-0.2.9 -tokio-stdin-stdout-0.1.5 -tokio-sync-0.1.8 -tokio-tcp-0.1.4 -tokio-threadpool-0.1.18 -tokio-timer-0.2.13 -tokio-tls-0.2.1 -tokio-udp-0.1.6 -tokio-uds-0.2.7 -traitobject-0.1.0 -typeable-0.1.2 -typenum-1.14.0 -unicase-1.4.2 -unicode-bidi-0.3.7 -unicode-ident-1.0.1 -unicode-normalization-0.1.19 -unicode-segmentation-1.8.0 -unicode-width-0.1.9 -unicode-xid-0.1.0 -unicode-xid-0.2.3 -universal-hash-0.4.1 -url-1.7.2 -vcpkg-0.2.15 -version_check-0.1.5 -version_check-0.9.4 -wasi-0.10.2+wasi-snapshot-preview1 -websocat-1.10.0 -websocket-0.26.2 -websocket-base-0.26.2 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows-sys-0.36.1 -windows_aarch64_msvc-0.36.1 -windows_i686_gnu-0.36.1 -windows_i686_msvc-0.36.1 -windows_x86_64_gnu-0.36.1 -windows_x86_64_msvc-0.36.1 -ws2_32-sys-0.2.1 -zeroize-1.4.3 -" - -inherit cargo - -DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" -HOMEPAGE="https://github.com/vi/websocat" -SRC_URI="$(cargo_crate_uris ${CRATES})" -LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense" -SLOT="0" -KEYWORDS="~amd64" -IUSE="ssl" -RESTRICT+=" test" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND=" - ${RUST_DEPEND} - ${RDEPEND} -" -QA_FLAGS_IGNORED="/usr/bin/websocat" - -src_configure() { - local myfeatures=( - $(usex ssl ssl '') - seqpacket - signal_handler - tokio-process - unix_stdio - ) - cargo_src_configure --no-default-features -} - -src_install() { - cargo_src_install - dodoc *.md -} diff --git a/net-misc/websocat/websocat-1.12.0.ebuild b/net-misc/websocat/websocat-1.12.0.ebuild new file mode 100644 index 000000000000..52fc47b607b2 --- /dev/null +++ b/net-misc/websocat/websocat-1.12.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES="" + +inherit cargo + +DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" +HOMEPAGE="https://github.com/vi/websocat" +SRC_URI=" + https://github.com/vi/websocat/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~arthurzam/distfiles/net-misc/${PN}/${P}-crates.tar.xz + ${CARGO_CRATE_URIS}" + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT + Unicode-DFS-2016 +" +SLOT="0" +KEYWORDS="~amd64" +IUSE="ssl" +RESTRICT+=" test" + +RDEPEND=" + ssl? ( + dev-libs/openssl:0= + ) +" +DEPEND=" + ${RUST_DEPEND} + ${RDEPEND} +" +QA_FLAGS_IGNORED="/usr/bin/websocat" + +src_configure() { + local myfeatures=( + $(usex ssl ssl '') + seqpacket + signal_handler + tokio-process + unix_stdio + ) + cargo_src_configure --no-default-features +} + +src_install() { + cargo_src_install + dodoc *.md +} diff --git a/net-misc/websocat/websocat-1.6.0-r2.ebuild b/net-misc/websocat/websocat-1.6.0-r2.ebuild deleted file mode 100644 index 81f1b7eb669a..000000000000 --- a/net-misc/websocat/websocat-1.6.0-r2.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anymap-0.12.1 -arc-swap-0.4.3 -autocfg-0.1.7 -base64-0.10.1 -base64-0.9.3 -bitflags-1.2.1 -block-buffer-0.7.3 -block-padding-0.1.5 -byte-tools-0.3.1 -byteorder-1.3.2 -bytes-0.4.12 -c2-chacha-0.2.3 -cc-1.0.41 -cfg-if-0.1.9 -clap-2.33.0 -cloudabi-0.0.3 -core-foundation-0.6.4 -core-foundation-sys-0.6.2 -crossbeam-deque-0.7.2 -crossbeam-epoch-0.8.0 -crossbeam-queue-0.1.2 -crossbeam-utils-0.6.6 -crossbeam-utils-0.7.0 -derivative-1.0.3 -digest-0.8.1 -env_logger-0.6.2 -fake-simd-0.1.2 -fnv-1.0.6 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fuchsia-cprng-0.1.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -futures-0.1.29 -generic-array-0.12.3 -getrandom-0.1.13 -heck-0.3.1 -hermit-abi-0.1.3 -http-0.1.19 -http-bytes-0.1.0 -httparse-1.3.4 -hyper-0.10.16 -idna-0.1.5 -iovec-0.1.4 -itoa-0.4.4 -kernel32-sys-0.2.2 -language-tags-0.2.2 -lazy_static-1.4.0 -libc-0.2.65 -lock_api-0.1.5 -log-0.3.9 -log-0.4.8 -matches-0.1.8 -maybe-uninit-2.0.0 -memoffset-0.5.3 -mime-0.2.6 -mio-0.6.19 -mio-named-pipes-0.1.6 -mio-uds-0.6.7 -miow-0.2.1 -miow-0.3.3 -native-tls-0.2.3 -net2-0.2.33 -num_cpus-1.11.0 -opaque-debug-0.2.3 -openssl-0.10.25 -openssl-probe-0.1.2 -openssl-sys-0.9.52 -owning_ref-0.4.0 -parking_lot-0.7.1 -parking_lot_core-0.4.0 -percent-encoding-1.0.1 -pkg-config-0.3.17 -ppv-lite86-0.2.6 -proc-macro2-0.4.30 -quote-0.6.13 -rand-0.6.5 -rand-0.7.2 -rand_chacha-0.1.1 -rand_chacha-0.2.1 -rand_core-0.3.1 -rand_core-0.4.2 -rand_core-0.5.1 -rand_hc-0.1.0 -rand_hc-0.2.0 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rdrand-0.4.0 -readwrite-0.1.1 -redox_syscall-0.1.56 -remove_dir_all-0.5.2 -rustc_version-0.2.3 -safemem-0.3.3 -schannel-0.1.16 -scopeguard-0.3.3 -scopeguard-1.0.0 -security-framework-0.3.3 -security-framework-sys-0.3.3 -semver-0.9.0 -semver-parser-0.7.0 -sha-1-0.8.2 -signal-hook-0.1.11 -signal-hook-registry-1.1.1 -slab-0.4.2 -slab_typesafe-0.1.3 -smallvec-0.6.13 -smart-default-0.3.0 -socket2-0.3.11 -stable_deref_trait-1.1.1 -structopt-0.2.16 -structopt-derive-0.2.16 -syn-0.15.44 -tempfile-3.1.0 -textwrap-0.11.0 -time-0.1.42 -tk-listen-0.2.1 -tokio-0.1.22 -tokio-codec-0.1.1 -tokio-current-thread-0.1.6 -tokio-executor-0.1.8 -tokio-file-unix-0.5.1 -tokio-fs-0.1.6 -tokio-io-0.1.12 -tokio-process-0.2.4 -tokio-reactor-0.1.9 -tokio-signal-0.2.7 -tokio-stdin-stdout-0.1.5 -tokio-sync-0.1.7 -tokio-tcp-0.1.3 -tokio-threadpool-0.1.16 -tokio-timer-0.2.11 -tokio-tls-0.2.1 -tokio-udp-0.1.5 -tokio-uds-0.2.5 -traitobject-0.1.0 -typeable-0.1.2 -typenum-1.12.0 -unicase-1.4.2 -unicode-bidi-0.3.4 -unicode-normalization-0.1.9 -unicode-segmentation-1.5.0 -unicode-width-0.1.5 -unicode-xid-0.1.0 -url-1.7.2 -vcpkg-0.2.7 -version_check-0.1.5 -wasi-0.7.0 -websocat-1.6.0 -websocket-0.26.2 -websocket-base-0.26.2 -winapi-0.2.8 -winapi-0.3.8 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo - -DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" -HOMEPAGE="https://github.com/vi/websocat" -SRC_URI="$(cargo_crate_uris ${CRATES})" -LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense" -SLOT="0" -KEYWORDS="~amd64" -IUSE="ssl" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND=" - ${RUST_DEPEND} - ${RDEPEND} -" -QA_FLAGS_IGNORED="/usr/bin/websocat" - -src_configure() { - local myfeatures=( - $(usex ssl ssl '') - seqpacket - signal_handler - tokio-process - unix_stdio - ) - cargo_src_configure --no-default-features -} - -src_install() { - cargo_src_install - dodoc *.md -} diff --git a/net-misc/websocat/websocat-1.9.0.ebuild b/net-misc/websocat/websocat-1.9.0.ebuild deleted file mode 100644 index a37d8b31324f..000000000000 --- a/net-misc/websocat/websocat-1.9.0.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anymap-0.12.1 -atty-0.2.14 -autocfg-0.1.7 -autocfg-1.0.1 -base64-0.9.3 -base64-0.10.1 -bitflags-1.3.2 -block-buffer-0.7.3 -block-padding-0.1.5 -byteorder-1.4.3 -bytes-0.4.12 -byte-tools-0.3.1 -cc-1.0.71 -cfg-if-0.1.10 -cfg-if-1.0.0 -clap-2.33.3 -cloudabi-0.0.3 -core-foundation-0.9.2 -core-foundation-sys-0.8.3 -crossbeam-deque-0.7.4 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.1.2 -crossbeam-queue-0.2.3 -crossbeam-utils-0.6.6 -crossbeam-utils-0.7.2 -derivative-1.0.4 -digest-0.8.1 -env_logger-0.6.2 -fake-simd-0.1.2 -fnv-1.0.7 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fuchsia-cprng-0.1.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -futures-0.1.31 -generic-array-0.12.4 -getrandom-0.2.3 -heck-0.3.3 -hermit-abi-0.1.19 -hex-0.4.3 -httparse-1.5.1 -http-0.1.21 -http-bytes-0.1.0 -hyper-0.10.16 -idna-0.1.5 -iovec-0.1.4 -itoa-0.4.8 -kernel32-sys-0.2.2 -language-tags-0.2.2 -lazy_static-1.4.0 -libc-0.2.105 -lock_api-0.3.4 -log-0.3.9 -log-0.4.14 -matches-0.1.9 -maybe-uninit-2.0.0 -memoffset-0.5.6 -mime-0.2.6 -miow-0.2.2 -miow-0.3.7 -mio-0.6.23 -mio-named-pipes-0.1.7 -mio-uds-0.6.8 -native-tls-0.2.8 -net2-0.2.37 -num_cpus-1.13.0 -once_cell-1.8.0 -opaque-debug-0.2.3 -openssl-0.10.37 -openssl-probe-0.1.4 -openssl-src-111.16.0+1.1.1l -openssl-sys-0.9.68 -parking_lot-0.9.0 -parking_lot_core-0.6.2 -percent-encoding-1.0.1 -pkg-config-0.3.22 -ppv-lite86-0.2.15 -proc-macro2-0.4.30 -quote-0.6.13 -rand-0.6.5 -rand-0.8.4 -rand_chacha-0.1.1 -rand_chacha-0.3.1 -rand_core-0.3.1 -rand_core-0.4.2 -rand_core-0.6.3 -rand_hc-0.1.0 -rand_hc-0.3.1 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rdrand-0.4.0 -readwrite-0.1.2 -redox_syscall-0.1.57 -redox_syscall-0.2.10 -remove_dir_all-0.5.3 -rustc_version-0.2.3 -safemem-0.3.3 -schannel-0.1.19 -scopeguard-1.1.0 -security-framework-2.4.2 -security-framework-sys-2.4.2 -semver-0.9.0 -semver-parser-0.7.0 -sha-1-0.8.2 -signal-hook-registry-1.4.0 -slab-0.4.5 -slab_typesafe-0.1.3 -smallvec-0.6.14 -smart-default-0.3.0 -structopt-0.2.16 -structopt-derive-0.2.16 -syn-0.15.44 -tempfile-3.2.0 -textwrap-0.11.0 -time-0.1.43 -tinyvec-1.5.0 -tinyvec_macros-0.1.0 -tk-listen-0.2.1 -tokio-0.1.22 -tokio-codec-0.1.2 -tokio-current-thread-0.1.7 -tokio-executor-0.1.10 -tokio-file-unix-0.5.1 -tokio-fs-0.1.7 -tokio-io-0.1.13 -tokio-named-pipes-0.1.0 -tokio-process-0.2.5 -tokio-reactor-0.1.12 -tokio-signal-0.2.9 -tokio-stdin-stdout-0.1.5 -tokio-sync-0.1.8 -tokio-tcp-0.1.4 -tokio-threadpool-0.1.18 -tokio-timer-0.2.13 -tokio-tls-0.2.1 -tokio-udp-0.1.6 -tokio-uds-0.2.7 -traitobject-0.1.0 -typeable-0.1.2 -typenum-1.14.0 -unicase-1.4.2 -unicode-bidi-0.3.7 -unicode-normalization-0.1.19 -unicode-segmentation-1.8.0 -unicode-width-0.1.9 -unicode-xid-0.1.0 -url-1.7.2 -vcpkg-0.2.15 -version_check-0.1.5 -wasi-0.10.2+wasi-snapshot-preview1 -websocat-1.9.0 -websocket-0.26.2 -websocket-base-0.26.2 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo - -DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" -HOMEPAGE="https://github.com/vi/websocat" -SRC_URI="$(cargo_crate_uris ${CRATES})" -LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense" -SLOT="0" -KEYWORDS="~amd64" -IUSE="ssl" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND=" - ${RUST_DEPEND} - ${RDEPEND} -" -QA_FLAGS_IGNORED="/usr/bin/websocat" - -src_configure() { - local myfeatures=( - $(usex ssl ssl '') - seqpacket - signal_handler - tokio-process - unix_stdio - ) - cargo_src_configure --no-default-features -} - -src_install() { - cargo_src_install - dodoc *.md -} diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index f74c516e7ce5..e044038e618e 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,4 +1,4 @@ -DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718 -DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f DIST wget-1.21.4.tar.gz 5059591 BLAKE2B ced6fb9a20343d41e4d8e0c8f171c60535847504fa4c32abc81d104a1594dc7b7c97b5b301836e31dacc7a0f2155c0a2e70e42ff60dc3fa471deb1dad33ba736 SHA512 7a1539045174f6b97ab6980811c2ac1799edc20db72987b5ba9b1710cffb19669a7736813d15c8da3aa2d4a384246ff946b77ecb0baeb6fd3e12ae591f1bf6a3 DIST wget-1.21.4.tar.gz.sig 854 BLAKE2B 162c4f358e781bbfb0fa73910191c29dd411f48c9b2c8e8fe00a12741153e624955393d769aa7311b03115d04b6b946a84b636f643d7cdc8c8cd81387b9cf143 SHA512 72603493c2d799dca08700175a2010d8736fd6d3cb9bea3987db8814e9f133ab0fbd1477892115f7fbbd1a7d4d416ec370bdbff6dbe8f00d1eea84f0c4f8d84b +DIST wget-1.24.5.tar.lz 2545954 BLAKE2B 8057e5992ddaf39b3daffbde99871ddec1328c6bbafbc6b9f1d3cd294bb928b2a80f813024d4cd664c396f84477f1d93d5a21c60c6fe2932f9196d29bb9aa896 SHA512 d8972e94d9125133d115750542e0f126b85a311634d5563a69d8fe85ecf1200836dcc83528ee4285d56834c58c722be580bfe749b26436158fbe4afc566f5cc0 +DIST wget-1.24.5.tar.lz.sig 854 BLAKE2B 395e7da40e33f9a1df4978440f79e69eec951344d6c78a71e2867e4764ce552ccda3a4d34fa211b0d8abf18d87cf15dd8a0c5a8c43ffcc92e1b75c8d3bce9665 SHA512 5bc3e578fe55b7f954aec61101cb2d7f97a9464e61d5500caa47ac8b22048910c91f8ad22966fcb05c62414be76a1275805ac27ed434fa9de4d30f7a3631fd29 diff --git a/net-misc/wget/files/wget-1.21.3-hsts-type.patch b/net-misc/wget/files/wget-1.21.3-hsts-type.patch deleted file mode 100644 index bac1330ddc79..000000000000 --- a/net-misc/wget/files/wget-1.21.3-hsts-type.patch +++ /dev/null @@ -1,211 +0,0 @@ -https://bugs.gentoo.org/850676 -https://git.savannah.gnu.org/cgit/wget.git/commit/?id=cb114fbbf73eb687d28b01341c8d4266ffa96c9d - -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Sun, 20 Mar 2022 12:18:20 +0100 -Subject: Fix HSTS portability by using int64_t instead of time_t. - -* src/hsts.c: Use int64_t instead of time_t. -* src/http.c: Use int64_t for parsing Strict-Transport-Security. ---- a/src/hsts.c -+++ b/src/hsts.c -@@ -61,8 +61,8 @@ struct hsts_kh { - }; - - struct hsts_kh_info { -- time_t created; -- time_t max_age; -+ int64_t created; -+ int64_t max_age; - bool include_subdomains; - }; - -@@ -166,7 +166,7 @@ end: - static bool - hsts_new_entry_internal (hsts_store_t store, - const char *host, int port, -- time_t created, time_t max_age, -+ int64_t created, int64_t max_age, - bool include_subdomains, - bool check_validity, - bool check_expired, -@@ -216,21 +216,21 @@ bail: - static bool - hsts_add_entry (hsts_store_t store, - const char *host, int port, -- time_t max_age, bool include_subdomains) -+ int64_t max_age, bool include_subdomains) - { -- time_t t = time (NULL); -+ int64_t t = (int64_t) time (NULL); - - /* It might happen time() returned -1 */ -- return (t == (time_t)(-1) ? -+ return (t == -1) ? - false : -- hsts_new_entry_internal (store, host, port, t, max_age, include_subdomains, false, true, false)); -+ hsts_new_entry_internal (store, host, port, t, max_age, include_subdomains, false, true, false); - } - - /* Creates a new entry, unless an identical one already exists. */ - static bool - hsts_new_entry (hsts_store_t store, - const char *host, int port, -- time_t created, time_t max_age, -+ int64_t created, int64_t max_age, - bool include_subdomains) - { - return hsts_new_entry_internal (store, host, port, created, max_age, include_subdomains, true, true, true); -@@ -245,7 +245,7 @@ hsts_remove_entry (hsts_store_t store, struct hsts_kh *kh) - static bool - hsts_store_merge (hsts_store_t store, - const char *host, int port, -- time_t created, time_t max_age, -+ int64_t created, int64_t max_age, - bool include_subdomains) - { - enum hsts_kh_match match_type = NO_MATCH; -@@ -276,11 +276,11 @@ hsts_read_database (hsts_store_t store, FILE *fp, bool merge_with_existing_entri - size_t len = 0; - int items_read; - bool result = false; -- bool (*func)(hsts_store_t, const char *, int, time_t, time_t, bool); -+ bool (*func)(hsts_store_t, const char *, int, int64_t, int64_t, bool); - - char host[256]; - int port; -- time_t created, max_age; -+ int64_t created, max_age; - int include_subdomains; - - func = (merge_with_existing_entries ? hsts_store_merge : hsts_new_entry); -@@ -326,10 +326,9 @@ hsts_store_dump (hsts_store_t store, FILE *fp) - struct hsts_kh *kh = (struct hsts_kh *) it.key; - struct hsts_kh_info *khi = (struct hsts_kh_info *) it.value; - -- if (fprintf (fp, "%s\t%d\t%d\t%lu\t%lu\n", -+ if (fprintf (fp, "%s\t%d\t%d\t%" PRId64 "\t%" PRId64 "\n", - kh->host, kh->explicit_port, khi->include_subdomains, -- (unsigned long) khi->created, -- (unsigned long) khi->max_age) < 0) -+ khi->created, khi->max_age) < 0) - { - logprintf (LOG_ALWAYS, "Could not write the HSTS database correctly.\n"); - break; -@@ -439,7 +438,7 @@ hsts_match (hsts_store_t store, struct url *u) - bool - hsts_store_entry (hsts_store_t store, - enum url_scheme scheme, const char *host, int port, -- time_t max_age, bool include_subdomains) -+ int64_t max_age, bool include_subdomains) - { - bool result = false; - enum hsts_kh_match match = NO_MATCH; -@@ -464,9 +463,9 @@ hsts_store_entry (hsts_store_t store, - * 'created' field too. The RFC also states that we have to - * update the entry each time we see HSTS header. - * See also Section 11.2. */ -- time_t t = time (NULL); -+ int64_t t = (int64_t) time (NULL); - -- if (t != (time_t)(-1) && t != entry->created) -+ if (t != -1 && t != entry->created) - { - entry->created = t; - entry->max_age = max_age; -@@ -792,7 +791,7 @@ test_hsts_read_database (void) - hsts_store_t table; - char *file = NULL; - FILE *fp = NULL; -- time_t created = time(NULL) - 10; -+ int64_t created = time(NULL) - 10; - - if (opt.homedir) - { -@@ -801,9 +800,9 @@ test_hsts_read_database (void) - if (fp) - { - fputs ("# dummy comment\n", fp); -- fprintf (fp, "foo.example.com\t0\t1\t%lu\t123\n",(unsigned long) created); -- fprintf (fp, "bar.example.com\t0\t0\t%lu\t456\n", (unsigned long) created); -- fprintf (fp, "test.example.com\t8080\t0\t%lu\t789\n", (unsigned long) created); -+ fprintf (fp, "foo.example.com\t0\t1\t%" PRId64 "\t123\n", created); -+ fprintf (fp, "bar.example.com\t0\t0\t%" PRId64 "\t456\n", created); -+ fprintf (fp, "test.example.com\t8080\t0\t%" PRId64 "\t789\n", created); - fclose (fp); - - table = hsts_store_open (file); ---- a/src/hsts.h -+++ b/src/hsts.h -@@ -46,7 +46,7 @@ bool hsts_store_has_changed (hsts_store_t); - - bool hsts_store_entry (hsts_store_t, - enum url_scheme, const char *, int, -- time_t, bool); -+ int64_t, bool); - bool hsts_match (hsts_store_t, struct url *); - - #endif /* HAVE_HSTS */ ---- a/src/http.c -+++ b/src/http.c -@@ -1300,7 +1300,7 @@ parse_content_disposition (const char *hdr, char **filename) - - #ifdef HAVE_HSTS - static bool --parse_strict_transport_security (const char *header, time_t *max_age, bool *include_subdomains) -+parse_strict_transport_security (const char *header, int64_t *max_age, bool *include_subdomains) - { - param_token name, value; - const char *c_max_age = NULL; -@@ -1330,7 +1330,7 @@ parse_strict_transport_security (const char *header, time_t *max_age, bool *incl - * Also, time_t is normally defined as a long, so this should not break. - */ - if (max_age) -- *max_age = (time_t) strtol (c_max_age, NULL, 10); -+ *max_age = (int64_t) strtoll (c_max_age, NULL, 10); - if (include_subdomains) - *include_subdomains = is; - -@@ -3184,9 +3184,6 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, - #else - extern hsts_store_t hsts_store; - #endif -- const char *hsts_params; -- time_t max_age; -- bool include_subdomains; - #endif - - int sock = -1; -@@ -3674,21 +3671,24 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, - #ifdef HAVE_HSTS - if (opt.hsts && hsts_store) - { -- hsts_params = resp_header_strdup (resp, "Strict-Transport-Security"); -+ int64_t max_age; -+ const char *hsts_params = resp_header_strdup (resp, "Strict-Transport-Security"); -+ bool include_subdomains; -+ - if (parse_strict_transport_security (hsts_params, &max_age, &include_subdomains)) - { - /* process strict transport security */ - if (hsts_store_entry (hsts_store, u->scheme, u->host, u->port, max_age, include_subdomains)) -- DEBUGP(("Added new HSTS host: %s:%u (max-age: %lu, includeSubdomains: %s)\n", -+ DEBUGP(("Added new HSTS host: %s:%" PRIu32 " (max-age: %" PRId64 ", includeSubdomains: %s)\n", - u->host, -- (unsigned) u->port, -- (unsigned long) max_age, -+ (uint32_t) u->port, -+ max_age, - (include_subdomains ? "true" : "false"))); - else -- DEBUGP(("Updated HSTS host: %s:%u (max-age: %lu, includeSubdomains: %s)\n", -+ DEBUGP(("Updated HSTS host: %s:%" PRIu32 " (max-age: %" PRId64 ", includeSubdomains: %s)\n", - u->host, -- (unsigned) u->port, -- (unsigned long) max_age, -+ (uint32_t) u->port, -+ max_age, - (include_subdomains ? "true" : "false"))); - } - xfree (hsts_params); -cgit v1.1 diff --git a/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch b/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch new file mode 100644 index 000000000000..9f75dc471a16 --- /dev/null +++ b/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/930060 +https://gitlab.com/gnuwget/wget/-/issues/19 +https://gitlab.com/gnuwget/wget/-/merge_requests/39 + +From 5f0aa59239c36fc945b94d8ab91562d56e5bf776 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 16 Apr 2024 03:18:40 +0100 +Subject: [PATCH] Fix libproxy build with --disable-debug + +The definition of debug_logprintf in src/log.c is guarded by ENABLE_DEBUG +(although its prototype is unconditionally available in src/log.h). + +The uses of debug_logprintf in src/retr.c aren't guarded by ENABLE_DEBUG. + +Use the DEBUGP macro which is designed for this purpose. + +* src/retr.c (getproxy): Use DEBUGP macro. + +Fixes: https://gitlab.com/gnuwget/wget/-/issues/19 +Copyright-paperwork-exempt: Yes +--- a/src/retr.c ++++ b/src/retr.c +@@ -1498,21 +1498,21 @@ getproxy (struct url *u) + pxProxyFactory *pf = px_proxy_factory_new (); + if (!pf) + { +- debug_logprintf ("Allocating memory for libproxy failed"); ++ DEBUGP (("Allocating memory for libproxy failed")); + return NULL; + } + +- debug_logprintf ("asking libproxy about url '%s'\n", u->url); ++ DEBUGP (("asking libproxy about url '%s'\n", u->url)); + char **proxies = px_proxy_factory_get_proxies (pf, u->url); + if (proxies) + { + if (proxies[0]) + { +- debug_logprintf ("libproxy suggest to use '%s'\n", proxies[0]); ++ DEBUGP (("libproxy suggest to use '%s'\n", proxies[0])); + if (strcmp (proxies[0], "direct://") != 0) + { + proxy = xstrdup (proxies[0]); +- debug_logprintf ("libproxy setting to use '%s'\n", proxy); ++ DEBUGP (("libproxy setting to use '%s'\n", proxy)); + } + } + +-- +GitLab diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml index 07aa81b0e850..bc5cb81f4837 100644 --- a/net-misc/wget/metadata.xml +++ b/net-misc/wget/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="cookie-check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag> + <flag name="libproxy">Support for automatic proxy configuration management through <pkg>net-libs/libproxy</pkg>.</flag> <flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag> <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag> <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag> diff --git a/net-misc/wget/wget-1.21.3-r1.ebuild b/net-misc/wget/wget-1.24.5.ebuild index d24266c92258..c43abb8ec495 100644 --- a/net-misc/wget/wget-1.21.3-r1.ebuild +++ b/net-misc/wget/wget-1.24.5.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wget.asc -inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig +inherit flag-o-matic python-any-r1 toolchain-funcs unpacker verify-sig DESCRIPTION="Network utility to retrieve files from the WWW" HOMEPAGE="https://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.gz" -SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )" +SRC_URI="mirror://gnu/wget/${P}.tar.lz" +SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.lz.sig )" LICENSE="GPL-3+" 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" -IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" +IUSE="cookie-check debug gnutls idn ipv6 libproxy metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" @@ -25,6 +25,7 @@ RESTRICT="!test? ( test )" LIB_DEPEND=" cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) + libproxy? ( net-libs/libproxy ) metalink? ( app-crypt/gpgme media-libs/libmetalink @@ -43,6 +44,7 @@ DEPEND=" static? ( ${LIB_DEPEND} ) " BDEPEND=" + $(unpacker_src_uri_depends) app-arch/xz-utils dev-lang/perl sys-apps/texinfo @@ -54,19 +56,27 @@ BDEPEND=" dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) - verify-sig? ( >=sec-keys/openpgp-keys-wget-20230313 ) + verify-sig? ( >=sec-keys/openpgp-keys-wget-20240415 ) " DOCS=( AUTHORS MAILING-LIST NEWS README ) +# gnulib FPs +QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN alignof static_assert fpurge ) + PATCHES=( - "${FILESDIR}"/${P}-hsts-type.patch + "${FILESDIR}"/${PN}-1.24.5-libproxy-no-debug.patch ) pkg_setup() { use test && python-any-r1_pkg_setup } +src_unpack() { + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.lz{,.sig} + unpacker ${P}.tar.lz +} + src_prepare() { default sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die @@ -104,6 +114,7 @@ src_configure() { $(use_enable ssl opie) $(use_with cookie-check libpsl) $(use_enable idn iri) + $(use_enable libproxy) $(use_with metalink) $(use_with ssl ssl $(usex gnutls gnutls openssl)) $(use_with uuid libuuid) diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml index 536ea95dac95..42dea7a13704 100644 --- a/net-misc/wget2/metadata.xml +++ b/net-misc/wget2/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="gpgme">Build <pkg>app-crypt/gpgme</pkg> backend</flag> - <flag name="http2">Enable HTTP/2.0 support via <pkg>net-libs/nghttp2</pkg></flag> <flag name="openssl">Enable crypto support via <pkg>dev-libs/openssl</pkg></flag> <flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag> </use> diff --git a/net-misc/wget2/wget2-2.0.1-r4.ebuild b/net-misc/wget2/wget2-2.0.1-r5.ebuild index 034018c48ad3..9d777020a981 100644 --- a/net-misc/wget2/wget2-2.0.1-r4.ebuild +++ b/net-misc/wget2/wget2-2.0.1-r5.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,7 @@ RDEPEND=" ) gpgme? ( app-crypt/gpgme:= - dev-libs/libassuan + dev-libs/libassuan:= dev-libs/libgpg-error ) http2? ( net-libs/nghttp2 ) @@ -40,7 +40,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " RESTRICT="!test? ( test )" diff --git a/net-misc/wget2/wget2-2.1.0.ebuild b/net-misc/wget2/wget2-2.1.0-r1.ebuild index 6bfc1870ca07..adf3183d13a5 100644 --- a/net-misc/wget2/wget2-2.1.0.ebuild +++ b/net-misc/wget2/wget2-2.1.0-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 @@ -25,7 +25,7 @@ RDEPEND=" ) gpgme? ( app-crypt/gpgme:= - dev-libs/libassuan + dev-libs/libassuan:= dev-libs/libgpg-error ) http2? ( net-libs/nghttp2 ) @@ -40,7 +40,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " RESTRICT="!test? ( test )" diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild index 2d271b4a835e..28200b483dae 100644 --- a/net-misc/wget2/wget2-9999.ebuild +++ b/net-misc/wget2/wget2-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 @@ -27,7 +27,7 @@ RDEPEND=" ) gpgme? ( app-crypt/gpgme:= - dev-libs/libassuan + dev-libs/libassuan:= dev-libs/libgpg-error ) http2? ( net-libs/nghttp2 ) @@ -42,7 +42,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " RESTRICT="!test? ( test )" diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index f11964d2eb03..815ef1fa07e1 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -1,4 +1,3 @@ -DIST whois-5.5.19.tar.gz 109582 BLAKE2B 6812c8f19c60a20802adbda95d9e80e1ee39cb5fea6723e689d064cda6ac167408dfccc2f30bfd93a7d53bda9c355e292d3b4ee694812b3ffccc54c120aeedcd SHA512 f008f60a629f40eb5817c124ff586f2b4a359afa501a72633326341a28f47c5ff56ddeed48d327bf41035bc6bdc639959b92523ec22ff41d5bd58241b4c50487 DIST whois-5.5.20.tar.gz 109648 BLAKE2B 17b6a795ac517a81cde44530df3e835cccc020a1750ab28d50551a7bd08d132aa10768ff146b0a7943a8348cc7f3f3f7096262caf1d91fbb2d3610ae9f6473e8 SHA512 1d602ec817411a36b3d175e34f166c06186639f4eeea145751decc45372953df40fc76b57c7589d93c49ab0be1276459dffc6424a4344ddbca23f35a9f492fc7 -DIST whois_5.5.17.tar.xz 90608 BLAKE2B 82793097e421d88130d089fc64bb0bceac0c9170b39388262b45d2bf62fc2f8b7c4e393fc5351bba6be303ced00a00af1972bf73c1c8c7c86c812b19a0a6fb5a SHA512 0ed33edc2005eb51a88bda505cc3f6ebe3966095d6f12c03cfe62c12e7e575e1d008632d12de6f27b4c09b91ce5a45705d57acce88409e573bbd7b5132df7fc6 -DIST whois_5.5.18.tar.xz 90216 BLAKE2B 2098b15d36ee0f99e710fdeb10ce1650eba84da1ce770df46182439a6de07995b79746767968522200f5261490e5ffd262673705b12e1004e1ca0dd1af0b9e15 SHA512 28482a6b84d97e2ff69e7a2d01865d227d76aff41a42511a6ebd4ac636b9054643d1df800e6575fb846712e1473f7a31a211dbc08fbdfaaead443d22138266c7 +DIST whois-5.5.21.tar.gz 109621 BLAKE2B b1cf42f1a60e5009e5882f154432d5974f45c1bf89d8b36b73f6e5f55ff2dba02e8ca7900926d2824200f5422d5e9f00abde524d4e2d8a25ba37376cc2e8d04a SHA512 4f3ffbd875df89e910aa9d20616f2d04e773d3e5cd0c5d0262dca481fd6228214033b854ac4eebe078cfde14ab90429d826f24ce6c21ec14cfe8ad56e78ae6e9 +DIST whois-5.5.23.tar.gz 109709 BLAKE2B 4985c26b90d8afa678e8cdca2b25f7b5a55c300555c5ac1595ff0c35fb65e35bf6e5dc5733e0364172fecdc2071565f08d1fb38ff5b9671714792d6b7baa2a63 SHA512 6e2caf1ce28edcd561287ea7a072a069851caee42fd47850b8555e03dd353ad79a338ceae2f9b8fa98c0e06a16dbeef5a7a6d422a76d8a141c92d8e9e82aebc3 diff --git a/net-misc/whois/whois-5.5.17-r1.ebuild b/net-misc/whois/whois-5.5.17-r1.ebuild deleted file mode 100644 index 6d1a89e7302c..000000000000 --- a/net-misc/whois/whois-5.5.17-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="Improved Whois Client" -HOMEPAGE="https://github.com/rfc1036/whois" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/rfc1036/whois.git" -else - SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - #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" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="iconv idn nls xcrypt" - -RDEPEND=" - iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn2:= ) - nls? ( virtual/libintl ) - xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) - !xcrypt? ( virtual/libcrypt:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - >=dev-lang/perl-5 - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.7.2-config-file.patch - "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch - "${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch -) - -src_prepare() { - default - - if use nls ; then - sed -i -e 's:#\(.*pos\):\1:' Makefile || die - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die - - # don't generate po files when nls is disabled (bug #419889) - sed -i -e '/^all:/s/ pos//' \ - -e '/^install:/s/ install-pos//' Makefile || die - fi -} - -src_configure() { :; } # expected no-op - -src_compile() { - unset HAVE_ICONV HAVE_LIBIDN - - use iconv && export HAVE_ICONV=1 - use idn && export HAVE_LIBIDN=1 - use xcrypt && export HAVE_XCRYPT=1 - - tc-export CC - - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install - - insinto /etc - doins whois.conf - dodoc README debian/changelog -} diff --git a/net-misc/whois/whois-5.5.18-r1.ebuild b/net-misc/whois/whois-5.5.21.ebuild index 6d1a89e7302c..b5be510bfed5 100644 --- a/net-misc/whois/whois-5.5.18-r1.ebuild +++ b/net-misc/whois/whois-5.5.21.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 @@ -13,8 +13,8 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/rfc1036/whois.git" else - SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - #SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" + 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" diff --git a/net-misc/whois/whois-5.5.19.ebuild b/net-misc/whois/whois-5.5.23.ebuild index d50f25c71f08..afbc87e1ae4d 100644 --- a/net-misc/whois/whois-5.5.19.ebuild +++ b/net-misc/whois/whois-5.5.23.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 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 cf099af02f78..11c6350d5b95 100644 --- a/net-misc/xmrig/Manifest +++ b/net-misc/xmrig/Manifest @@ -1,2 +1,2 @@ -DIST xmrig-6.18.1.tar.gz 2394259 BLAKE2B 4d7ed3ce7b6c9dce9b25da7c316df4542046b014167ce090c5c2ec4dbf61607e4238ce8a8407a396f1eb47dc76cbfac08e0131835d9c4bbff8f4e5920d2f19a6 SHA512 bb297b17f820ad38f0c68aebfe1be8e82e85aede99a9e2a7692935ed57dab06a36566d13c16f850123dc6e829dfb56bc9253c46b94e6a703fe169a0126feb37b -DIST xmrig-6.21.0.tar.gz 2416452 BLAKE2B 6a8a521aa5e2e0d5d223f1f811b4624cd26c3569d06db8f9d85dff835dd8f6a49f5de32c2f390d66ea2955fa23961a2dcdeb28d9eea942a44cc5abb2ae17678b SHA512 167220ddda480a3e9f12282a555497d6f2c6d94ff265e8b1a061dc18c213f21c7033c7c8eed454dd1f2942f7c193aa164b5867798b3b77aadfd9fec61a94e183 +DIST xmrig-6.21.1.tar.gz 2416545 BLAKE2B 72ecdfc8c999aee91aef4f540211c5d5a6f1992c76211162a623e89391cedfcc2d5540f291d9915ee4180b83f58ef7f2eb1e3aff8dee49c72f41f90878d7ef62 SHA512 a9267708e61084db7116381adb2256a04c30eba0c84b571764cc73ccafc9276f55b6665529eb7b9c1785d582d0d280ced6ee7ca88a5e98f9bbdef2a9176a9794 +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 37e999606f7e..daf9832980db 100644 --- a/net-misc/xmrig/metadata.xml +++ b/net-misc/xmrig/metadata.xml @@ -2,14 +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" proxied="yes"> - <email>telans@posteo.de</email> - <name>James Beddek</name> - </maintainer> - <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> @@ -24,9 +16,6 @@ <flag name="hwloc"> Use <pkg>sys-apps/hwloc</pkg> for CPU affinity support </flag> - <flag name="opencl"> - Enable OpenCL support - </flag> </use> <upstream> <remote-id type="github">xmrig/xmrig</remote-id> diff --git a/net-misc/xmrig/xmrig-6.21.0.ebuild b/net-misc/xmrig/xmrig-6.21.1.ebuild index a36872e00718..b6cc3de16350 100644 --- a/net-misc/xmrig/xmrig-6.21.0.ebuild +++ b/net-misc/xmrig/xmrig-6.21.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 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" + KEYWORDS="amd64 arm64" fi LICENSE="Apache-2.0 GPL-3+ MIT" diff --git a/net-misc/xmrig/xmrig-6.18.1-r2.ebuild b/net-misc/xmrig/xmrig-6.21.3.ebuild index 7152c4ad7635..2061563b6ac5 100644 --- a/net-misc/xmrig/xmrig-6.18.1-r2.ebuild +++ b/net-misc/xmrig/xmrig-6.21.3.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 -inherit cmake flag-o-matic systemd toolchain-funcs +inherit cmake systemd DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig" @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64" + KEYWORDS="~amd64 ~arm64" fi LICENSE="Apache-2.0 GPL-3+ MIT" @@ -33,7 +33,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch - "${FILESDIR}"/${PN}-6.18.1-gcc-13.patch ) src_prepare() { @@ -45,13 +44,6 @@ 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) diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild index a36872e00718..2061563b6ac5 100644 --- a/net-misc/xmrig/xmrig-9999.ebuild +++ b/net-misc/xmrig/xmrig-9999.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 -inherit cmake flag-o-matic systemd toolchain-funcs +inherit cmake systemd DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig" @@ -44,13 +44,6 @@ 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) diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest index f1653a0dc033..dc515fabf298 100644 --- a/net-misc/you-get/Manifest +++ b/net-misc/you-get/Manifest @@ -1 +1,2 @@ DIST you-get-0.4.1650.tar.gz 152169 BLAKE2B c1ba09a0bfd339703f269d1c53406f70762dab2f974ea43b1bf26890ccf267d5852e298ddab2db7a9ed32a52e2aed2691851cefed73089111414056b74a10b1a SHA512 cb87f4c981631945d521b43585d291d35e67e85a17bdc567d775274700ef346c63c391b2c38f7a7e60de4ba9b5daa7aab3d6202d03147ae0d2c09b5b8c06bb3c +DIST you-get-0.4.1700.tar.gz 151767 BLAKE2B 0c732a123bd04db71f1ec9ecf380e4dda27f2ac70745a10616ddf9b955a236adffea609ffe0cab0c70030b64f965151024eb624062aededa4ea851afbd6f49f1 SHA512 93a5a519ed17f7f84c004445bafcf8c8fcded1d13596311891ee01332243493088837e0ca1342da596bc1c7ea5bbdaca5cc13d4b8ebf2d75f0aad5b084c27a05 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..9a7a13985df3 --- /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/you-get/you-get-0.4.1650.ebuild b/net-misc/you-get/you-get-0.4.1700.ebuild index 84d267e5085a..6cb14039c2a9 100644 --- a/net-misc/you-get/you-get-0.4.1650.ebuild +++ b/net-misc/you-get/you-get-0.4.1700.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} ) +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/soimort/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" RESTRICT="test" PROPERTIES="test_network" diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest index e8ac4115a402..9cbfb11d26b7 100644 --- a/net-misc/youtube-viewer/Manifest +++ b/net-misc/youtube-viewer/Manifest @@ -1 +1 @@ -DIST youtube-viewer-3.10.1.tar.gz 263735 BLAKE2B 319c0d1f3342fc4988215e70205e6a0c627cfd7f4edfa61788474621859ae72ba6e5212818c3bb95d0a15345575dec049be7240861b03d4d62b9ef95873a908a SHA512 629601ea912258873eb2c5ad4b527eb45f733847611fc2424fcb038758fda06c3bd730b14781d9e091c0b6a1d9fd637ad15a08079f68469edfe7d83124408242 +DIST youtube-viewer-3.11.2.tar.gz 268972 BLAKE2B f4312bf82ef977374abe9f0366dc38fccf0fc2571796dfb6eeb7e42fdf2ed4a879ee35fa5ec43c37d6e2bbd38ef4f8080476c57a31cfa5139cf0438f661e64cc SHA512 8640fff8bf87d00d8a7649f0ff5c602fd2513ffd28cf741b9a29b6b0292fff733cde70382ef36810c9c3f6431371f6f3ddea34aaba1ac9064782aec1b315650e diff --git a/net-misc/youtube-viewer/youtube-viewer-3.10.1.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.11.2.ebuild index ff42b9681d3b..bbdbd05ff1c1 100644 --- a/net-misc/youtube-viewer/youtube-viewer-3.10.1.ebuild +++ b/net-misc/youtube-viewer/youtube-viewer-3.11.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 diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest index e589004e0970..5f159bef3b2d 100644 --- a/net-misc/yt-dlp/Manifest +++ b/net-misc/yt-dlp/Manifest @@ -1 +1,2 @@ -DIST yt-dlp-2023.11.16.tar.gz 5568397 BLAKE2B 9747ccbb032776df3de78c22084c67cca7913af6b29de9baedb7fe9048feb3e85db1cc1e694fcc563fecb674bad094193ff0a9cab081de9cbb006bce546c8753 SHA512 0d4219d5c2c883a2f10e43b5d93a807f84121f43f781cf494b30000c37d105facce9226bb60367c563e86cf17c4cbb2550ba31cfed6c3b1abb337cd1fb39e414 +DIST yt-dlp-2024.07.16.tar.gz 5688157 BLAKE2B a1e4cd8ff7b73246aed2239298d548945c99fe8d76d41b9e3293767b7b680028f4d23f2fc116516e853be163b267a600f99525784d9b3cc16280f1b8b2d5a90a SHA512 17f5aa71ae01b6a009e5b0a4380d9329530563ee01ac268a2a6acff01732ce0c9d14181790a15b182b0de09a35b6db2f3e814acc50934d5f3e361245027926e9 +DIST yt-dlp-2024.07.25.tar.gz 5695273 BLAKE2B 95cad2c1e1c51bf67d983cca38479426e9e526e1113bcab9522c10e9b2b5421fb5931e51b2f2d59057c9ba5646864bd62d801b0f0fed31fb0d240c29176a3963 SHA512 96483979cd6c7000d6bb9a687835331ce9c894c533e5d498dc54e5b85d31d53f1c053779499e4087dc7542d89668a2b8dc977242c770422a076527da24567c77 diff --git a/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild b/net-misc/yt-dlp/yt-dlp-2024.07.16.ebuild index 59f937372adc..68214ba4c2eb 100644 --- a/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild +++ b/net-misc/yt-dlp/yt-dlp-2024.07.16.ebuild @@ -1,20 +1,23 @@ -# Copyright 1999-2023 Gentoo Authors +# 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} ) +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} ) 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" +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" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos" RDEPEND=" dev-python/pycryptodome[${PYTHON_USEDEP}] @@ -26,14 +29,16 @@ distutils_enable_tests pytest src_prepare() { distutils-r1_src_prepare - # adjust requires for pycryptodome and optional dependencies (bug #828466) - sed -ri requirements.txt \ - -e "s/^(pycryptodome)x/\1/" \ - -e "/^(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d" || die + # 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=network-sandbox + test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout # fails with FEATURES=distcc, bug #915614 test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] ) diff --git a/net-misc/yt-dlp/yt-dlp-2024.07.25.ebuild b/net-misc/yt-dlp/yt-dlp-2024.07.25.ebuild new file mode 100644 index 000000000000..68214ba4c2eb --- /dev/null +++ b/net-misc/yt-dlp/yt-dlp-2024.07.25.ebuild @@ -0,0 +1,77 @@ +# 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..13} ) +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=network-sandbox + test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout + # 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/yt-dlp/yt-dlp-9999.ebuild b/net-misc/yt-dlp/yt-dlp-9999.ebuild index 3c581e629cd6..37b84428acd0 100644 --- a/net-misc/yt-dlp/yt-dlp-9999.ebuild +++ b/net-misc/yt-dlp/yt-dlp-9999.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 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 distutils-r1 git-r3 optfeature wrapper DESCRIPTION="youtube-dl fork with additional features and fixes" @@ -17,18 +17,21 @@ IUSE="man" RDEPEND=" dev-python/pycryptodome[${PYTHON_USEDEP}] - !net-misc/youtube-dl[-yt-dlp(-)]" -BDEPEND="man? ( virtual/pandoc )" + !net-misc/youtube-dl[-yt-dlp(-)] +" +BDEPEND=" + man? ( virtual/pandoc ) +" distutils_enable_tests pytest src_prepare() { distutils-r1_src_prepare - # adjust requires for pycryptodome and optional dependencies (bug #828466) - sed -ri requirements.txt \ - -e "s/^(pycryptodome)x/\1/" \ - -e "/^(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d" || die + # 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_compile() { @@ -43,6 +46,8 @@ python_compile() { python_test() { local EPYTEST_DESELECT=( + # fails with FEATURES=network-sandbox + test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout # fails with FEATURES=distcc, bug #915614 test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] ) diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest index e2f8c0d201c3..7971dc2aff2a 100644 --- a/net-misc/ytfzf/Manifest +++ b/net-misc/ytfzf/Manifest @@ -1 +1 @@ -DIST ytfzf-2.6.1.tar.gz 3278989 BLAKE2B 85ad83d9880e3e9e02a9a22b9f15e9ce88fafb1466f1694bd05766b24ac4505ce7da61e391d18f2973695394b89f5e4581f1c9e6588a6783a6fefa7adfaf7c67 SHA512 9266065352ae797bd5b8a2c71681b15599347ca38a519a21e84b42a0e8bb102c0937a02cbd6027c736ac0bdd7a6bc67fea664ecce5698032b4fef1ef0ec92c65 +DIST ytfzf-2.6.2.tar.gz 3279051 BLAKE2B d2517915e3025bf32b5db4a17f6afe218cd1693e611a76627a87193f0403e86d021c58717f627191b5979142799e6c4d0d3f9864812d8dc3d22f9a28fe379eaf SHA512 9c2d6d6fbd6a21385531523401c113b681d8fd3e3bc0f6566730e0de55a4e70a4d86bebced7cdf472cb145cc1247b79b25ba502ec7a79aee0d89ad816ba434ef diff --git a/net-misc/ytfzf/ytfzf-2.6.1.ebuild b/net-misc/ytfzf/ytfzf-2.6.2.ebuild index 7226c6c032d9..9d4d962ea69d 100644 --- a/net-misc/ytfzf/ytfzf-2.6.1.ebuild +++ b/net-misc/ytfzf/ytfzf-2.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest index 5f63266448a4..782f9f3833f9 100644 --- a/net-misc/ytmdl/Manifest +++ b/net-misc/ytmdl/Manifest @@ -1,2 +1,2 @@ DIST ytmdl-2023.11.26.gh.tar.gz 1120208 BLAKE2B 145f8e24305f4978f1ed0655e5511c6b17b94ea23301309c31bbafaec60b2184216ef0866aed478eda95763ab4ec0cd43eac176acf849871e58c3505b09ea231 SHA512 df8ed294f0092d4078fba8b64abcd2524e0d8331a42dfee6e1869e3a418cf2d54f95d7c300d83e4392295ea4116ec989d418b0292b0895ef474bf93338a980e7 -DIST ytmdl-2023.7.27.tar.gz 53737 BLAKE2B 8f01a8cd9b666904fe29871f5f595bae8dd0d29741c5e7c77886d0444a9b23fbf99e1c0efdadb3a62fa0c37425271724327ad655bd2bfb9a53b81a3cf4705289 SHA512 b300590f1aae0378c3672df24b766c6729b034711f83102881f0bd81d7d383825f3187c6f28611c38ad634542b8eb4bbe2c4fcb8a946b7eef9be492a3bfee927 +DIST ytmdl-2024.04.14.gh.tar.gz 1120264 BLAKE2B 018942cb9fa2534d225ba66e73e6b117581ce86cdc13b9bd3a39475dcde76d57fa97731264e3bf54863e0ab613a93861d51d7f0c678d332f029446cfaaa75820 SHA512 2d8b2e2189c6f0483dd32466f98281d8f173ad5d8a717ff9d828a7b08fc7f6313f108fb11da4b18ae66336c754c1c00f14010fe823c0a182387578db01795760 diff --git a/net-misc/ytmdl/files/ytmdl-2023.11.26-data_files.patch b/net-misc/ytmdl/files/ytmdl-2023.11.26-data_files.patch new file mode 100644 index 000000000000..63568fc43739 --- /dev/null +++ b/net-misc/ytmdl/files/ytmdl-2023.11.26-data_files.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -52,7 +52,7 @@ for dirname, filename in file_map: + data_files.append((dirname, [filename])) + + params = { +- 'data_files': data_files, ++ 'data_files': [], + } + + diff --git a/net-misc/ytmdl/ytmdl-2023.11.26.ebuild b/net-misc/ytmdl/ytmdl-2023.11.26-r1.ebuild index c0d47ca80f69..0ec4e506c4fb 100644 --- a/net-misc/ytmdl/ytmdl-2023.11.26.ebuild +++ b/net-misc/ytmdl/ytmdl-2023.11.26-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 @@ -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" @@ -48,6 +48,8 @@ RDEPEND=" net-misc/downloader-cli[${PYTHON_USEDEP}] " +PATCHES=( "${FILESDIR}/${PN}-2023.11.26-data_files.patch" ) + python_compile() { distutils-r1_python_compile diff --git a/net-misc/ytmdl/ytmdl-2023.7.27.ebuild b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild index 1d767679b5f9..0d06867b5465 100644 --- a/net-misc/ytmdl/ytmdl-2023.7.27.ebuild +++ b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild @@ -1,20 +1,30 @@ -# Copyright 1999-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 distutils-r1 pypi +inherit bash-completion-r1 distutils-r1 edo DESCRIPTION="Simple app to get songs from youtube in mp3 format" HOMEPAGE="https://ytmdl.deepjyoti30.dev/ https://github.com/deepjyoti30/ytmdl/" +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/deepjyoti30/${PN}.git" +else + SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + + KEYWORDS="amd64 ~x86" +fi + LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" RDEPEND=" >=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}] @@ -38,7 +48,16 @@ RDEPEND=" net-misc/downloader-cli[${PYTHON_USEDEP}] " +PATCHES=( "${FILESDIR}/${PN}-2023.11.26-data_files.patch" ) + +python_compile() { + distutils-r1_python_compile + + edo "${EPYTHON}" ./utils/completion.py +} + src_install() { distutils-r1_src_install - newbashcomp ${PN}.bash ${PN} + + newbashcomp "${PN}.bash" "${PN}" } diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index d7ca2d4db43e..682ee60d68a0 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -1,287 +1,454 @@ DIST addr2line-0.20.0.crate 39558 BLAKE2B 1f66fcb361161599a87f874a3bf28a05614e235488d02205d4c8e207ae193280949ad957fd0eb383a49f4c1bc287569454d3c6872ed6e31c081e6fd03f8d460e SHA512 f9794772a31dd01096b168b4b4ffe311d4850c69fd77dd72c1e532a94ef7b23c31cccb9033848822521510f1fcc2ad0fdd824cf7efb9ed43828dc0165165b319 +DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c +DIST allocator-api2-0.2.16.crate 59025 BLAKE2B fda69b52435a7243eb19bc55914a1961e59dbad5ac12c40db39cccdf7a99c742da59c3ef160350808698db24b91e0ce655cd1acedbbcbe20c717604aae23ea5e SHA512 e1eb0df6b44b62115795ebf772f81e9ac0b6d273afd81659dbddb7eb6628b6e5ef6a60ea21413e79ee638afb72e6872ba83a075f6324daf93f2f1eda48daff2f 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 ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671 +DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa +DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5 +DIST async-stream-0.3.5.crate 11916 BLAKE2B d79804d7310d1f47d7848007518e0b0e0f0724f2589a20478eda3ab1a1db8775c5aea494688c69437046accd10eaec789b244451e84a19e489f071519b50d2fa SHA512 d34ab46a9e18bdf35fe0e58808fadf422dd50246cedf48110b3273be17939678d2cb5b61fae9da176bc2c2b373933821e912fc395627f7a6fed1d2c43bc66c9d +DIST async-stream-impl-0.3.5.crate 4173 BLAKE2B e7c0d2371299af6fe9983adf4f8cbb6402ceaa5f9d286f124362332a4016404069c362176dd3b71061027b0768ac1f772b3e5e38809b870411f4590126a74ca6 SHA512 3725216119cf4cc78d433e2f8a8df9bfb7a3f046e4a8346bbe76e91b23686dfcbdb7cd182765e12d606ed0e3391477c43652a025597de9120170fd0b1151d204 +DIST async-trait-0.1.78.crate 29593 BLAKE2B e46d11867e564eadfd6cccb994878c911c0c8a33caf799ea0a0900a3e9ffda91d7989c64a2c1ef4953a7f8b27a744976434a6673c131716607cc672f1ccc1333 SHA512 67c33065f1702fa4a3abe979650938d954cab93029f7e6c9b4b70b549a7f2ae3d6691a07a36cd7a64854603fa86c9eba5410bcad06881b4ea28453e38c781ef4 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST axum-0.6.20.crate 146227 BLAKE2B 24592e684de9b7c0b06b9871028dd6ed14b9a2ed259076b50b12a2376e93b8fc028831a94bc748eb6c66dce49978987d3655fc30313daccb0ddf92919fa9da00 SHA512 e0ef6bab62d465a607a49c799823133d634d93d7a389fddd2e165fc3895eeb4c544f35e044e3c8f52a21c8421e4e4880982fc0be62de613f98ee571186f55646 +DIST axum-core-0.3.4.crate 21088 BLAKE2B 323888f8dd90f27f6f14a9ca0c1b9f1d81e04336c52eab887ada22d8ff2dfaaeab191635f45706c4246c73cdb32078b3c01481a5df888db402c29279fafb0434 SHA512 e09e65e478db742c26115b417970cbcff81bbdf75b37ac3c7b5b0b99e953d21de05884a50377238ab788ae3afea40388c59daea45fd03cce8fcb861c7cabb0ef +DIST backoff-0.4.0.crate 26738 BLAKE2B 6d62814f41be3e53c83f19ef5c9dbd2bbe31460dd70300aba3cd8942a4b3fe8aae9a9882a955d10bc3140f80149750707d0ce5a048dc869cd081375f75ed650e SHA512 efb63e0a6bdd28509d8e7fe5f0acc5c8088c075a6e3c3d198ef9410edd39ece1df83db1f561d5859344d8d89f80c86d2921a8ad38c1809b7d81e39a3218012f9 DIST backtrace-0.3.68.crate 79891 BLAKE2B 38ec5881bdd8f2ee55db9da423e030603a6ad0b50edeb37e0899ca781bbc9f54fdd00e4f27f8589cc34ceaefac05f26fdcdf693cc08d9d06a2811783ba7c5c2a SHA512 4c4e5d47154e64d2192a6358d0861097e31b5a53d5863b03dd38562dccda7cbec584e006ce29563cadfd03b0031ed7a16fa43328f515cc66a296048c9a2f5d89 +DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +DIST base16ct-0.2.0.crate 10240 BLAKE2B a8097674e84bb85fa72ea752d71446fc39e695fea9acc0f98178bb4e6569180f9acb4c7a9820708359d1c4733b57af6448015cce83f8c610985e6d2f7858fc33 SHA512 efe7c810102646733cb24c5cab62bd58d797e77b117d0fa5d651c34630f77de4d768fb99c981af5968393734bc32a2c1944a719f9f1a192b5062c0af8bb3413a DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b -DIST base64-0.21.0.crate 72180 BLAKE2B c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2 SHA512 60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f DIST base64-0.21.2.crate 76389 BLAKE2B 6da080dfc31c5b2ebdbfd336be6e71373918f9388c85649133363a60ee1647b6ad67c7dfd461b6ee842c3633e40593b6ac2f313585b3e8e07dbd690739f433f9 SHA512 3f85bdf846e2f8a2e0f2335749bab58c904479a29311143580f1de42455799d04606dedbf64d355af580d77867d7b895e1078463c7cc5a5fbd9ded9d7cbf3559 +DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 +DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c -DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f +DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb -DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4 DIST bumpalo-3.13.0.crate 82114 BLAKE2B 62a930b165e853aeeb40558079f570c75ed13ff5e8436d99309dc6252aa28ae69d327c4b438913d6c7543bc156f2714f0c1e80d759ea0d44babe24ef0f268ac0 SHA512 419368d6ca37474c2867751fe5706d0c747326bebce323d571cfc07ee0f022d8e8a7ef5692091b0fa804995b081998dafc55da19a53e51135a767bc0afdb9605 +DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8 +DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000 +DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 DIST cbindgen-0.20.0.crate 183277 BLAKE2B 51529b21879e3a3212fbb951b3bdd5c8c396dce53e9dbe568bfe1e752caf3060bc784909cb4b37a6e6e80d357d5a8e2bab8d10d4470563358407bceb814bb7fc SHA512 83c2b0da580f0a2fc9a74922f3c44d0e73ce0d1de8b5a3f5819c7fcf1c481df1ff0346e84c5b4c199a9364542c85fb81ece4e1deca3a6f12231a4478f76a7c02 -DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5 DIST cc-1.0.82.crate 67879 BLAKE2B 3b06cbe1516d4fe8291e1543b09d32d39a135c2352e545b64bc69fc82a40128a9b1291f20bd4cac6a3c37d9466093f8b63cae20663ad517bd7dbc380bfa87ee7 SHA512 27810ea12401635b0122e5b3a71367a52ca7040f196cb30f709e0b8ec0e717aeb8a89ef4e891b1c7c88f7cc8a1c35e55db132b728b0c499e0b683d5b803a671f +DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78c170d153e525ff581e8298936583744b6c59769774fdb8ad433269d01ad792f967da96e6c19d33460de937f9 SHA512 697a78ee83eaf38d83011bdf2086b3149b830d3d270e8414828b98ed2426063df43ac6eb4324f2dd694662afb86e6e4f005dee6116dfdd97adaebedefffd43fa DIST chrono-0.4.26.crate 191501 BLAKE2B eae49ee247607995c28463b8c3e2119497141e69d19a756c408f2b72d94bea39397ea2d0d3cd2ccbf1348ef973dd8bae6d29a0d0590e8dd34633f365a9170adb SHA512 2b66faf4d8374cfb0485710ceb2c9c1ce63aa6f9670e405a0810af4aca01c57d8dcd198a1f4cad498d5efd89e00003ba1b4f0bab599422af4f9bd6fb74494c47 +DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8 -DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844 +DIST const-oid-0.9.6.crate 45382 BLAKE2B ac27c689784fbb1f486cec1c17502c8738ce3d7d1b579391a151cb0f0a6a0c8335e474d0a517c59230fcac74317396f20ac15d66e2f6685780be01dab197fd96 SHA512 b871d3b4326c4828b1c1d7a3e968315fa320e0b52e97081a95617ded0dc5b93d42b3f79ad26ff3b58a4835dcc442473f3965c2b60026412ad6aacc0c23e9f399 +DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072 -DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82 +DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 -DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 +DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6 DIST cpufeatures-0.2.9.crate 11895 BLAKE2B 1e369466bce2ddf7be6bbe219997628223a3a114914e5ed44b44f3fb6d6a084fbb47cc50ecb109287b074e159c675ae89356cb68cd843b41b502ebe824febca0 SHA512 88235b7d7152f4578a321ebc4f83f69070206b2acaf0e6331b52e1a6633e96edc787f9a409ac2e2799106a259166a302150fa4ddc88352b7739d50ac6ca9038f +DIST crossbeam-channel-0.5.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c +DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe +DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9 +DIST crypto-bigint-0.5.5.crate 83384 BLAKE2B f688f22331b4b3620299ae9b50aa9ba6e1b2c7a4ae55e4236f7ccb8ddee4f61950ee0332b6b67005bad505434f3be74b1a0caa426036dde94162289c6926c8d4 SHA512 04668d432b4169154934d55b8ab14f708e59f70a70704b56cd72ceaca460e15589965aa92a22bef20b32ce637a423cc6e1a8819dfba38a32353bd749f7126021 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f -DIST cxx-1.0.91.crate 195757 BLAKE2B 9e426cd0c04eb585fe40ece4bdb6a90615f1a81730e09e6b3e3f5f4ed4debf4f5dd0093f779bfe08e95580dc3c4c9ec095624ce5f40f5937a07c9d2c19b82844 SHA512 14fed0543dd81ecd5f07e20e159cd8694cda2f7ccb5fcecfd8b6ca1dada05d6f1f2b504bb3b6a1ef01cc15adf48187b08e032e668fb298e3f099cb4d49c1a3b5 -DIST cxx-build-1.0.91.crate 84433 BLAKE2B e66221929e433ac190cfae5e30ce5bfcab8ad807c183182efa001beb1a418ba39c2ccdfad09bd52aba99fce2cfc714e8878c374ddb59f040d5628a9d94b67852 SHA512 2bbc4aa8250a50887d62faafa391da366e5453ecbf0d93dd9b6769e09e996ebf00819b7631959285527cf8bc68f294a44cae35f91ac308a911f7cfaf78bcd5ca -DIST cxxbridge-flags-1.0.91.crate 5250 BLAKE2B a60a2210c411b042c8ca79c1a7cb93b0f46ad720907fb4d7958e37c092f41fd3effc404037d968c59e1ae95bdd5c6586a221590dc634d2df35be0871b0d287c4 SHA512 8f704be8ff3306d0e222dee4e3e43b78b5be40222a294004aaf02e80b27b194c0a5449c13b667a5dc4239e67600279086a08c1f081bbcb39c7e44f6ecbdb2e0f -DIST cxxbridge-macro-1.0.91.crate 59525 BLAKE2B f6d9956c1dc8fdacbefcda5aa35fd617bfbc267c68543460b3cda5bdcda26cc6194fa2ba86912da50a9640ed0f3bb9d4758e7081a6b1584e6f94a671635321f8 SHA512 820f6cdce0743d8e929f98e5b825e32b9913768c67db5c60cdbd94e681a1ed25b628abd9f3c02075753e7c4a3cce7e905e962b6bd71e392bd96dd00e6dd86aa0 +DIST curve25519-dalek-4.1.2.crate 305477 BLAKE2B 7553435f9d431739793feeb503a542619dd67178bfb0f41fd3d56907e9217f114e68ea78e6d6ad57c746b6e6a281f38023cd9b6f78e39e65725591d0295a9d5a SHA512 a6aa320a16c5a64f1a151717175978df651765d0772bfc2e06590e7656d34ff898e47fe11a5590580340a028b0d3524b1a5e150b37996e3c5774b8bf93c5f3d5 +DIST curve25519-dalek-derive-0.1.1.crate 11723 BLAKE2B 442b0e4fc519f233d3fa46c17c2e25807374360bd6576e97b4ec33e6c2cc228bc917e4e395a1d70aa19be7bae57db36d2c09c4c7d505691b53d5a624db67eb6e SHA512 60861002465d2ba12a6089b31fcd7a75f7a6d77319159d5383f29e857adea8cb7e5c9c0ab6977c8cfa34b60e1012a1a5dec57f637e6a225e60269ff49c25b29b DIST darling-0.13.4.crate 20895 BLAKE2B 76675c20937450c47c1bda80170140930fc626d27d58b7dad3db33dce2e69457e2262189853141bdabeabf257d05d954f7dc1dbfa344276e05ee6dedfc8a2dab SHA512 7392896b97b80ad24d76a985f4b950668ba351498f48ef0722c783c28d43c4a4828f5f6eba7e754ca554b6662fc419e73bcb65d4b20037285a16e345fec9ef75 +DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3 DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589c869ffc974427924605b92436ef06f21c7ea748e97d9b719aa7156b3024e788968ac0cc6144d58eeace658b62a08f SHA512 96d431ebfb9d13aaff2c50f7ad7d5ac5e95813fac851e3e1d7739d1fd5b366fda32172829af88cabadb475f83b4500199167ede54bc802ca1e52137cf6c16c0f +DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751 DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555eb4c0ac7f1000fdc8f8e9d1bc0ecfeb65b78f81438b097946aed8e37835f82028c1b16c1d466a124998139ae854df1 SHA512 908ea6459110da16e4ec6ac843659664ed4fa3fb2ea9b92274a738ff5994cf81fbb48403db609b9a70f39c3e288da4358ce369c66821122e3a6a0940473da94c +DIST darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0 +DIST dashmap-5.5.3.crate 24061 BLAKE2B 2bdd62f674e90007a81b76419dd5df1b58c3d9b80bed4324d9e0298355cd66706794c7187c74bd9a6ce119d81ba9400c47aa2729ec923979b0bc081329051e71 SHA512 15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a +DIST der-0.7.8.crate 85085 BLAKE2B 062d494ed32f3c97a6ef4999ef050ee07b26a854bc934304588c0b85b1d312478d1ad1812cd303e4e5aca967a2f4f76ef8ac7dea4ab6909e1a534a7dabcd46c4 SHA512 9cc5995cdb99c376cba473d2db476d81c824cc47c1924cf9c58d37a5508e2d01d3f10a009515d2ab456b1577af8de94e195bb315f61516029307ed860bc403dd +DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 DIST deranged-0.3.7.crate 14803 BLAKE2B cc856161cb0d1a43d95f1a0f8d15baeab1057cc477b970af8e0483ef8a8b0d06d63b89073f01616c307dd95ecb904828536152ed65df28230e5874d2481140f5 SHA512 b8b2a3154cdafe4fa0f3e2ee05ee71cd438da39a0f73b16ad90cf417148343a6b2f4463f17eeefe03a385545b9524138b679b75aa9acd5f7ee99a36f7e454df4 -DIST digest-0.10.6.crate 19527 BLAKE2B 402009105a6ac055be062769dd4f162aabb977b9afe29f451eeb3e6b5dd1a579c371c5ec996b9c1bdba3b4ded83830ed2e1934a0505480bffba1e0d16775a8f7 SHA512 21d3c1dc64e640300c51e8a009af464d6e3cd2b10aa67c87a038165c11409d6e5faad1967236724a9a4cab8fdd88826cac1db4798245fd53ac2ff1a9b2b68b76 +DIST derive_builder-0.20.0.crate 36563 BLAKE2B 753f2a7b1ad37e4b0cd94fc032109179f559352d5d754c0258a597c0b5f819e3383a30ed5c9414b24a4b12e917f41c23bc01554727d06f130f4bfceb3a952c51 SHA512 3fb085259b8219d07c88a233c1aa0e586f6c6ec31c302896c3d2900a062a2e27b4211023f544bf139df3f4f6157773f192a96d9f1e980bf1bb7bd2125d5a7605 +DIST derive_builder_core-0.20.0.crate 32579 BLAKE2B 409890428e291f60a22ee0138cdc1a80498c26607e576a93d1d23c9def454c723b2e7a21faf3261dd106d62dff83123ebd76c3de8b2a7e7ff0aa9e700720acb9 SHA512 b4564364bea1c98563c7ec8b0bd99f260cc2b382a3a8f1156d401c57383b815a4a54e3e5f2446ccb2665eae600d6528faddf31d0f65678a3e5274073c2334073 +DIST derive_builder_macro-0.20.0.crate 6308 BLAKE2B daeaf30f4548ce0796df99920515a1e6291faad80ee9aabe6849354a942650b5903c744daad5cbddb4bf8dd87542b773eaa1989783f5e19c69b4db61786edb16 SHA512 1239bccd3f752c641782aa99d14de0ee92431f46be8b98861cc416e304b03dd18ec875f592d94093189b571592d9fb10b322f7dd205f90b84574e37d38869a1c +DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c -DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e +DIST downcast-0.11.0.crate 5976 BLAKE2B 4ca0e66dbd8dbc86920d4184de8b37ab41954cb1560c7727334c990b97ad9544b098f7ce50759d10cac8b9cb955893805aed3bac5849c8b44a965e24d2ac7653 SHA512 11b037a09829e3e93eabff69f02b608725e6e348a191b1b6c8bb044b8d820a6ebf46eaea2f8bf5eb1c156f20d3e97be9b581e1b5fccebbfe76d94157d6bccd53 +DIST dyn-clone-1.0.17.crate 11848 BLAKE2B 1f90492639630036e1e877537328e46ee3fa697d85b2f87c45990d4a51cc900a6f604d077b16575015bbf0a970c26f898226e87e6e2af82d624f5fa565036617 SHA512 b51fee8c4fa3c6b0bc677e9997d4b6921bfee9a11e369eedc649d19eb5d95d7872b533b37fb1ca842c75e714b46afb1231369341c45071db94f09b53e37e03f6 +DIST ecdsa-0.16.9.crate 31406 BLAKE2B f827c0ea9f80555a1c4e37efa3509ef57bcb8c2abbefac29cfd85c3904d82495753bc5917e8e2b8659bd091d73c2d57bc2f6c8477b7d5d44ab858bd3a99229af SHA512 c69f921653a3dd47fede16aa886675c35b082c7b83486a6fea2c39cf2f98535a00263d7f0e68c5593d16b7cbee757ea913060bcaaa4c69884ca6fe2d3b149222 +DIST ed25519-2.2.3.crate 17802 BLAKE2B aff96de3343d0cfba058203e90b6fd2c6cbd24531abca3a37977a1ed2f1eff0f4d4b6decbfcd9759617f381f88eed32d78397e6fa8d310b99b98d603b809de44 SHA512 3bfbfcd7f442dbb6d49860c530525bac60182bc57f6778e4ee097c7ace9c6a9d32ce430339ec15931070a538d3bb1e1f7b1cf572537ffb782bc5551fab49b2b2 +DIST ed25519-dalek-2.1.1.crate 85736 BLAKE2B 77dd4019467da3dfbe574ceb574849ea665ffd8dc91660f6a9b2596fb886400508bc632dac10a06461f35fce5400f27b89b1270514188ab488a952288309beda SHA512 a3e3838a3d4eef726b65a38196e66456f586b7e29cc328eb243bacc5a247b50f10ce76df6259aa102a08ca921f07d0395793088445f36de33f5dc1aae5223ed9 +DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432 DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 +DIST elliptic-curve-0.13.8.crate 63198 BLAKE2B 542536886019beb276b587f906c5552d88229eb06364d93db5eb6c93f70555e9e38e4636bda14789e5ba5b54321c0c6da85aa8d584e638fccda107e296c4d8f1 SHA512 64ec7868cfd2350f5a0e9f4fa7e2225b7f5532b8514ed6d5b8a7718f252f94caba4acf51b2471ac59717783289c9f2ab35d47881210ffbdeff08a85f68ef3042 DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a -DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1 +DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc +DIST enum-iterator-2.0.0.crate 7209 BLAKE2B b6ed04b3cddbdf7bb0909c578a251f89bdf46f64461c89561c8648c93a8742cd82ae887d139647551766cb9294504244297fbabf3762ac52c6cb7b2e58c977f0 SHA512 076384a5888c5d78c3681d96438beadcd125a13729a30292630af7b2e4c4b3bdda5dd313da0965f0441f85d6b0cfd4d4f7c10dad22466710b13f5b78659dc6d6 +DIST enum-iterator-derive-1.3.0.crate 5060 BLAKE2B 25d8959179c84c7ca60fb6d77823bc35805dd62eb656903c8b525938e7a5b3e96bb2628794245f187dc65b002c8a1ae4d5b004e5c2d5265a3f98f09617934de0 SHA512 f64cbce1c05ae232d372a6ddabd4f352288d81d1667230024bbc673084bd3b13932bf4b7621d362fd0731e7df09b666b869937acdead5a3ef7c2731cf3d3d99a +DIST enum_dispatch-0.3.12.crate 22400 BLAKE2B c8a3da572bd8fcff5afe8aba87d0b40d5c759ed2c69d8391d61b43bec8de2eff02cfce0de60abbbe821dc103cda41bc4abdeb9de5a0426fcafd2382bc2403eb4 SHA512 576d682255313ea284934a1c9bf80532a1b39a85eb6201b821eefe5fe37576544b28247ed1d27e019e1e664b2e81207fd161dc9d70e2d0e10bfea1071f508dfb +DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 +DIST erased-serde-0.4.4.crate 25664 BLAKE2B 609438362f241b847e5fbbfc9f0aa9184d8f721419db4e3baa7e651608e7e8164b0ba67d3a138da7aa850aa24a69e8ee85d2302605406a6eb57d4302f5e8a962 SHA512 a3fe0c6322da59628f68ae1f8981506de2158a3d5d9175f51e8115c9cae721e68c1552d321cb19174383f00192f3eea0394058a0f857f4c500d716078ef45434 DIST errno-0.3.2.crate 10424 BLAKE2B 3061d5a5abee015bf41c11ef31dd0f38a738c51992e3bf9f9ec98f67a87b88341c97901211718a5f103b8cf021c875f8fc799fb217ad69fd27371326b5aa40e7 SHA512 b728704f11cfb2bffd421ad39e7bab79b11e548e336e9dd1cfb902bdfbb78a8afb102ae5684fbd6ac4b01b12603a1011a1faa21cfd0702bb25a300364b17ff84 +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 -DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52 DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 +DIST ff-0.13.0.crate 17688 BLAKE2B c32379ebfea6cadd162dc169e0b413577fd191620f4f2a1c7d18e50ddfbe561ca865bc3e0fee3be287f43f6c9f2982992cbc56629889689bcbbf652e512da80b SHA512 eab19938f5a2cddb0fcc78b0724efd788aab7f17f04c482e0d06acac4d1cef2bcbfc74d6e4b2d9f535f9c955bf39c2153e010bdd2fa72d6d637d44baf8bf5f63 +DIST fiat-crypto-0.2.6.crate 495387 BLAKE2B 2dacb1cb45435a1a4bf577e3ea2623250ea9c30485a934d7afb63dd81ffdd35c411b04f68e206e9747f572c730ae0f5ebbd696dd45673d3b0429ebfa395eb561 SHA512 810cfcf91d959f7fc765295982b69dee141f4a50facf72a2db1832e1216e8166886c5dc6a92b6703deee27f3a64c7e1f91f7f377ddecf0d6f0ba37f7ab1462c3 +DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a -DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11 DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104 -DIST futures-channel-0.3.26.crate 32283 BLAKE2B f963366ec1a8127fb4be28104bf9c871d51951be9036cfe52d4ca66b0ba9e94f37a9b24c11e620da035be1b9a1ad0844737f7a755516f465ff03675f8c99a7d6 SHA512 c270276fa0ba9ebfdf5b575c8b2c31c21efe0c55310738aaf548126e1db004134141639c7486f8b3d5edf2ef7d712df45ca505f0150c2ad7fbadbef07b75044c +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST fragile-2.0.0.crate 14668 BLAKE2B 2e589b312d7409a1a550a676303b9b2adf2e28b0d4cd02c7fb22b48a88d1f88a04e55c4405078e2c43b13ccada890a33bcacfe179abd12236c23f219d275c4df SHA512 a48fee7c13ad800142a9ef1f355b2200b904ad9bf97b3601e310bad2b6ad90ea235b9704964c54be1d9c415c9c95fbc5f49e8ba5d7c6ee3488573f3404912608 +DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99 -DIST futures-core-0.3.26.crate 14708 BLAKE2B d9bbd208b274efd44add6b49a3dd5344d9462e4340e646586d59adc5c33949f9d7582fb8fbb609a79546bc66258718b26615e94555f3534ed787c2f0151b6362 SHA512 0362f98019f745d2eb3bc19e504813b262342a511c403d4bfc89ff750d7488d48da476a49183c2ddc9862850c5bedcd29ff82ffdd2033d971ece68984cededcb +DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0 -DIST futures-io-0.3.26.crate 8913 BLAKE2B 68f0fa5197b006b353700f0e92c26008fbce0c0732f3c6a1b0e642f9d7c19d0b261ea80992eb33138b4d6ae3aaffacc47a70ceeca5300e8ad0a222620645550e SHA512 e3334e6ba43bf21b82ff79bd042efcc7b8004c965d3de5df1c60e98a6891c67b0b22fc82b692fb3eda0c8d6caa388ad64ecc90b1c2b58940d787f827069d7b4e +DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 +DIST futures-executor-0.3.30.crate 17744 BLAKE2B 927abec40eab31251409149179baa95a8d025f9cdb848afa83f95439c4768abbf6da8e2163291a086ea0b83b0b650d1e19cb8e15f70369b70efdc70eb3121f6b SHA512 fa65c038e5eeee695b2673cd65cf7529713bef47da373290595b554bc287267ee5cd015ddeda5a22169cc8828717987364584a91a69685cdbfc0fc779abd764f DIST futures-io-0.3.28.crate 8910 BLAKE2B 5554e9dd8548be47e7195ae8b223288cc2e765dc9feb703092972ec9e19ade825bc9d7093625a77c7dd2213df59e2c70ada84a84446b5a940c3e62daeb9dd57d SHA512 805177f2677a09d94ce5f010af9244e0e0dc285937e355a836179297c4c912a762f8d96bce57af388502810dcb67a772b7a522f5c6b21be3aa4b7ee46372d402 -DIST futures-sink-0.3.26.crate 7853 BLAKE2B 8bd044ee7bf46417b8b52be3cd688776ddb2469e4459a5f202da224a173dac6eb95dab3b93399f0b4451f1c747d9be58b7759f7c820ec6873880913b23467e69 SHA512 cf7d926ffd47abedff3b9ef9dc0a1b6e2bea9fbf435a009e48d2d453b8ddbeafd770300f009c379e88550acae1e1dd71a680e459a98be1dc21e439fe7572a0e7 +DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2 +DIST futures-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28eec9da850c47ffd9235c4baef5e5f1c72155f49573b2dc942a9cf246949b79c7d35200d04f91a13b0205cbd33d96c0 SHA512 220b5cc61c744617479d7e8ef9888785a17b9bc26c517c9c4445a39e8be21f111f77e53bfb3d143df18dfde23feccee17e349a84b897eb4d86f94d7ae4f714cc +DIST futures-retry-0.6.0.crate 16823 BLAKE2B 6cb1fed86036bbc1a71fa5cd44d3c19c87614b1a6e995ce2e2d0bf7cfb9f40d3b869f4e3a3cdd234a95b7a171c9beece96b3178e76ece44cdf104211a32478b9 SHA512 0f0d80d887858a63c7b355a0c7160a4e846a38193635e67c605435dea927c758d6ee28a24afcb8e1c4e2764a6eb989b83d12d04d4cd3dc58b7f8a8f48a036b64 DIST futures-sink-0.3.28.crate 7852 BLAKE2B 752286cb15ff37e9bf4c6cc80c8ebfeb229dbaa4e8aea6fa505f1e145e5dec99c4818c8e7ba2bd8a03898350e05bc124a5ad83e28989e282dbc132ed13e7fbf3 SHA512 e3535aaffa42215448d78adcba72f1dc3131598169dbcc8b52b82fe3e74f4b0d5631ab3dd3ac5d4315be890b94d6fd8f53de274ee4815f9abb27d40982c96c07 -DIST futures-task-0.3.26.crate 11855 BLAKE2B 1d03a9f838308948e7703a20f9e123fc49f64b31419c6d617d0e23b0f8c635d0dca4840e8e50892bcfa3560a5029fa96f971ef3e0645a624742e4c026964d136 SHA512 82ea13f96b039d0c0c209cb728c055dc81622f5f2a0a670e9e1ea409124d3c7f0e9a4eac2cf23c4e6875ee6f3a917dfd37f90326c217df136c79d8eae058e9f4 +DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3 DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82 -DIST futures-util-0.3.26.crate 156709 BLAKE2B 6fa7db7676869b9d68ae6349d7cbf70062442fb8333177b6829b1d290b426ab9efeedd9dc49a6783c3f6511b6a3efcc9479ed9b5a10c4d28b7ff57daf280f006 SHA512 7e00e4221f3864cb8d66017258e0ce284ce730c49713aa37bff4f317934fddf1def70c47c8f120a5469766004d1a774e969d99631954a813461cf41c9e2c6d13 +DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d +DIST futures-timer-3.0.3.crate 19739 BLAKE2B b7af71c761197056a6a4db03caa30f31c104de0049c09f52b18b80718ad20c95e0e64bc7a3618c29d1c9a5ef0309379044fdd9c1fee8465930d28b2c58927733 SHA512 c50388e38b45dce2a65a8d7ce56bcd9c3544ae677158c4c10c532136e861c16f0f52df5222a14c0f40ad8e4faf93fde8223affa7fd84d24e95aa6994177e7e76 DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4 -DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20 +DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b -DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5 +DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee DIST gimli-0.27.3.crate 287904 BLAKE2B 97ba399c72cde7b11f0a103598747b58b242ebb808c60c037292b992e30d8fc5e212e5620c233e485adbca61cfc433a4697de3ca76c183ed517a93cad4f75c25 SHA512 b3782d510bbfcbcfd8801b4343a6864b91cf954808e935745caaf1b7e7b3f2f94814f1543de9a36a8d4e5c29d08d69be9361aa2b31e7a261d5dc6e7b66ef4ccd -DIST h2-0.3.16.crate 162883 BLAKE2B 2465ba9f5c34313c7b07258bfb1eafd9b14f09340ab4b0d2189cd2404656088b6ae0a048ff9216adaa81bc32fbbb29f9167dfa6788021bf245850bc122dce17c SHA512 2a34cee510d39291cc8b5264a96201ae4cf78a1fa3a6f4cffbe42e0205315db5397668f7ce8a304c45c8ace51120037b567b5a40ca8451d5d2a87ad7e0fbc86e +DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25 +DIST governor-0.6.3.crate 131110 BLAKE2B 86fac0f7075a5ea52622a204c3edfad08a48d76b4057d2fa34a8145189f9774a3eb56b559cdbdc33174cf9ecd09002a015d559cc6bff57453c71c1472f7efe16 SHA512 05054fb3a820a21233aa22dfeb91c01f0c9bc92a72d330e0a429161b83982d61ecb3ac8eef52d6cf856a63deae6c6e21dfc140765c1e939d7f7fb23cfd383870 +DIST group-0.13.0.crate 16526 BLAKE2B 099ced5b8d16e6fefc331f2d89aee931ec5900a168dbe31bfbe29bd00304e8525fa5763dbcd60cb19ac6c62c8d77877f2d83e700c7ab18255b08c9b42be60d24 SHA512 359db06bee4cb51ffe799d9c408791e310e72fde3bb3fd447cf97482ebb909af07b43e9b728e3639d5497fc905b650bf00403b3a6b21515e6628c2466e0851e3 DIST h2-0.3.20.crate 165260 BLAKE2B c8bfa3a762668f981326134e7632168961679bf45ffd5e792edea1f6fc78e2fa9ea3aa93d7961b27f4a1b214583cef0169a9af5a7a5854a870bb71f36f172bb6 SHA512 179a99bf8416cc263795b5c3957c4f722d53474de66c9da1729a0f0748db38f49211f28a065c9a5de23fa4c0da3d40a4ee4f7f182d4c9f601e512c70b1eac450 +DIST h2-0.3.25.crate 167894 BLAKE2B a9937f5c67f3bd3486d7b35bd732bbbcb5dbad3e92b65898bfc79f5846c58ab39cf3ac09c2ffba0cbc99d4fb7269d1fe1d6929cd19d877aa50e83fefcc941248 SHA512 fe12fbc70b7bd5a9039205c6fe22ea106a29aa78a9d5e089768ba159fe5a40af69efd2b701b5f2706fe600b55c77d902ee59c677aae12cffdc80019afab5077c DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a -DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28 DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6 +DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045 +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 +DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b3b49f1d6a5f4407a7346e6fa1ea18303f429b23adcd23e8898ba8fbf3797f5ef9f7ab7b11499d130311d68 SHA512 a43fe20b7d14fa26b118c6eba2b84219645f65f2ff33fcca679b139ae3e96f72abc1e7a47eb8887aac5afe4e34211434a4eb5a2fdbc014666d82c4af340a4b21 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8 +DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1 +DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685fe5204bc6efa87b667d00b28f59cae667115fe45ae332d8542e7a0c2c7c42fdeb302302f89b00cb716f380 SHA512 e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58 DIST http-0.2.9.crate 100146 BLAKE2B a720a5ea6e59d1bd4e7b422fdaa30b3b9d72a7533c5e91d1c8ee2b1dcd899309b490479ec578aa3b51f1dddeb5c6510f28136e9fd1f04d2af12d2418261f6c03 SHA512 17bbc886d34f5aa4b56d82a605a54e920a244988085d06e70bc416f8e0edfa3356544f29082b3fbf3dcea18e741ade374375dd82ebe2276fd9a9508735a1e03a DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5 +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.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a -DIST hyper-0.14.24.crate 186392 BLAKE2B a68f2eae7da3445c795662d239ba7010ae70cbf725fc1909d49feafa0129dfc473be05dded91e80982cd86fcb56621ddae45a97090a36a26726d4bbf82a73b8e SHA512 666f181badd8e1d440b1e650dddc7e370eca2baf628b89f5f579702b3d8f60b5e5e9b2e03f36cd64de67a6acc3567d1b1e629a82206fb31870d5d50238fbd18a DIST hyper-0.14.27.crate 195700 BLAKE2B 4c079a6f99b1da3816c08df3935b5c9c1a3acf878111f4afffe67cbe816975aae0bd49577fa7cdc1bd55ed78dd2328cb1b0cc09064e9bf6caadde91403159912 SHA512 580f2589dc1f938d2563d3fdfd1cb2f1b11278333ac54e813e4dbe50a0e63952546385f057b20eb123516b2f74e19b62a3ed0cd546fdf868f6a5770cd95643a2 +DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7 +DIST hyper-timeout-0.4.1.crate 13805 BLAKE2B 3ef4ba5ed9f9b8187c50a3af20bd88ca2608403ad668252a9db3bf6b0dee7a13c6905c4e9172e0b1b38a72998e03ff933f991b3bf2af161e8789574f7a5b7816 SHA512 dc0b989b4be7e250ebe92856c800117b666c83b93d8217c4e92c63cc84a617b30f1bc5754a071fccc4b03fbb160b9df758f72d87abb5ad59354c6e0a2563e10f DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e -DIST iana-time-zone-0.1.53.crate 20176 BLAKE2B 842c3c2a9f5b753363668af5162edb6f2734a51fa6c6fc8bafc3981f5f287451258f5ab31d5ea6c2a1df75934233849bba8dde4ee5aa9fcc456fbafa93d8b51b SHA512 a3f899fe9ebc7501bd22e75b2df34c3b26ad5a53afbff4fa552672d0185d8a291736c48ac2fa76dab36a6621e689b5584a2d7bd0334055994bb21077765aa7cb DIST iana-time-zone-0.1.57.crate 19785 BLAKE2B 2304a63e4d3a477125ed07fccd5a84832f775c4a0fbd60a995e6f1850aaf3f5047c6f70975c9f6334f96def12770d470677e1f536e9817f8ab1df8a312622cfe SHA512 79bc0fe559dce022cd3c15ffc3b6f870c14a40de6d5a61b4a5a6ad28fe7efce82a16ac5102073a3510f3ba683843475f7fb8a4029bbafbc1cc25e48b98ce2fe8 -DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369 +DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 -DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441 DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb -DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85 +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.2.5.crate 81498 BLAKE2B 8914a50344951aad58766fbfebe8780298098e3a7c923287e3a84f6de41e2924a6a3bb3ee91ceae9b5b49654b83ddc7516a4cfa6253584b0657995d7c8f63a89 SHA512 84fbb6e61756d5ff746f6ffb2c3c8552f96d3af205075a381f06df85258c7597ce24b0d193127a797f975a3fddc1fa92110738227babc73a7fa37505331f8d78 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 -DIST io-lifetimes-1.0.5.crate 35939 BLAKE2B e52a66b90464bc799889c5fe32d8269fa125d5eddec709e2daeb9a0b5db20c5fa5b5f51dcca2b130b75b1980e42e2aa5e892e6133b9d7f8f0b3172856e6808f8 SHA512 73b884426e26c19e65e25bb44c6255f1c46178d946306d39088350151253c2b96760ac9df84a01609f50bbfc79680a58e9a2490a14f2bef2ca7d4c11f4faba2a -DIST ipnet-2.7.1.crate 26989 BLAKE2B 9f581d9e849e332af2c70eca34e85e6d40bcc46ccda3b420058aac315cdfadb90abd08dc926195cd0c4e01027c4d35868b15e4ed1f5aa9579ead012cbb81c232 SHA512 c6ee9002f0500dc1a4820d3f135018694798808354bd4f89f983fe495a27f4d14c538c95c7d8b5e4d17ae6ea1cef3f424e87d80f83f6ea6dad92039e1a3166b4 +DIST inventory-0.3.15.crate 13967 BLAKE2B 213ed4450412fd25bd74328389727e7b0c40363f677a156f6d4c1158958c1d000c8fa27b800a517b830f17579e3fe1905fa96cf8de6d384ce8592837923005c1 SHA512 1b7e229e5555e9b08edf1c1658e11831e591fe1f7c10e6160162fad076e89e4ca401b58ac59a76ce8ed4e1f9cd759a073d8d1f937f0190e2892804ce4e0c1f72 DIST ipnet-2.8.0.crate 27474 BLAKE2B 143208136453b9c97fac5f1166f395dbbf3bdb6185768fcd8e5d4bff867802bb1ae09294d4d7585e26b7726561f84f4a2ce1f6a730c8906d34a5a5c5f50ce8b4 SHA512 18773715f0acad731885e551a402432a6fb29f120575ddde380cd8af8d332acf2b5be4657d1a321ae7a6226fa0ae58feb6ac295b6e4cd255144465c2ea2c0692 +DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3 -DIST itoa-1.0.5.crate 10622 BLAKE2B 0d08db487ee791a252389e40e08e47a649d9eb90faad16bfbdfdfde46366082d2e3561fb8a62da80b122e7771052c50a0483e9618260d094820e20748d99882e SHA512 b90841e3a016a9a68cb090e4bf78959bbadecb3391cba71e0deeb5ac2723379ccd3251ec18a0bd055fba7cb6e71608ab1d7db990ad4d03cf2fd1289bd5834540 +DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8 +DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d -DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16 DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64 +DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4 DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e -DIST link-cplusplus-1.0.8.crate 7674 BLAKE2B cbb93184d9deadd4912f6e03dfb7bb9d37f01b6d8d47dc9744724c848f297adb9cafb1599c2bbaffbff336f883e9a24c3cb4f11745ec4716a9a2c8cfa05f6305 SHA512 690afe063eb9726faa03443bfd01789a559aa10ded4bb3714ef7b13095005c817ad019fcc62b5f7b286c974a81e387ca3342d238e60ed7ab237c3628383a661e -DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768 +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5 +DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62 DIST linux-raw-sys-0.4.5.crate 1274380 BLAKE2B e15ca5b63cb994e86a8161e3b6e4bd20da8f574d1a470128f9a209a729ff22c86470f4c2b2a8ccbc1e37d6284b026e0805902645ea4b742425fe34491e519638 SHA512 13c36e03cb5bdb2e9f17622e21eda608057fc9d908bc55a829fdeeb77785094769d4f4b4daf376c5509ceb3abfdb3936f668bd6d5b2fd48e21c5c28b6e597e78 -DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 +DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b +DIST lru-0.12.3.crate 15009 BLAKE2B 2b2587a602409113a7ed61d0dbc44b8b1740e44897bf9273011e6196db64a51e6973436d6bf34df7a1e534cfc0490e0bec4d83c0dcb0f53f640c80b88713974b SHA512 1768ff09e294ad7b0631a4c7cfc1773be57568329901e9c2034b1cffadaca9963180b3bf8194554bad2f9f42f6c5e67d52dc90ba7d75d929cadf31642f4a688a +DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19 +DIST matchit-0.7.3.crate 30372 BLAKE2B fe41094d3de61e12e2612f90bb25ab21a56aed1658766b23e963b7ef1e47a8ec7d3b4804936eb919ee87ed38e8b822a8381417c93330aef51082d89f1843a001 SHA512 c9f22846a23bd208e54015142b4a3aa6f2275c982d667216598b8712616b7178742da6a870c954d3340c075274818919931fc9f06f090a7d6688066629f36bbc DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa -DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c -DIST mio-0.8.6.crate 93658 BLAKE2B 32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b5104ab7a1a3b84dfd299bc7bf7f3671aaae0a2759a56120740915d380aff05af5f5f8b9e8e22fbcfa8203 SHA512 45b3d2a911b66be556dfb79d87ffcc57ee5f33a03fb30f319631796090caf8779e94cda37fc7a76685c69483f1cc7616c15440b71bfcc51239928d8879873f6e +DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432 +DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1 DIST mio-0.8.8.crate 94264 BLAKE2B f70334d3daa8794079c865c5e91d9b32fee2b90af95a6690f7cbe0765818ed9a0f5d539f3390119565c3ed47025979657e30ee2e871760a776829dcddb59783c SHA512 448a05f19a147fe119965f7f1aaf24c2a40ed816ddf2e5c95ba3bdaded5e2812314c64a50dc7baada93bb005b65159cb6597f82a407936885ea376bb128b0c9a +DIST mockall-0.12.1.crate 22845 BLAKE2B b2299c6060b609732b041c66f58437e1a52228016ecef33f9d2d6a9e017b86f35079ef69ec7bf511d4fdec309c60bb4dd9cb2570c7a3e079a37366c5c1a0877f SHA512 8681eb1b1ae2fa00bd2b73269a0b493361d0003da4080da79ff047692c75c34359621923b06906046218acddecb1fd49186fb7b4e752c70657dc9becb8f20c6f +DIST mockall_derive-0.12.1.crate 45330 BLAKE2B 6593becbb7eb3393a8f05ca4d5d6fa8ed9d0ff00c1b53a218b39889a6f8e14259e29334f36b0fa926610296d5f46f17e627284cecf8dcd3689334d589078b394 SHA512 5a99f5f9cc0bb1383edc3d2eebfabbe520436154e39cc4a4556f03826493ba888a54127f40ec70df66cf9c83262cecae3ffab03de9cbdac2716c431e7ccd39b5 +DIST multimap-0.8.3.crate 13518 BLAKE2B 7e00324be2944f3ca38bf02bfe37f47313aa501fc166ec417cd05f11059b14aa761b58f7a737792e2f9488ef5e7825fbb13cbb6ba2ce4935f4c39414fe069730 SHA512 8580982dde6624a0d181cfdf6cc2293c368762b548f32d196fb7a29fb698d1cb743bc2572ca284c6ecd107a632ea2a428fc998c05df164437f2cb470d24d23cd DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c +DIST no-std-compat-0.4.1.crate 7600 BLAKE2B 28c4c943ba5384ca9fb155a53b981803c87d3cca60e0690f1c6d0f877e7bda79dc679938e625407c7b5e953aeffb921dc7d242b19f4d0fe28a14a7866a681736 SHA512 0e264b0004b735b640e132cfa057472feb12b906ddfc08f1b95bfcb262f6e1286653e92fc6e83df5fc553c06f410cb931cbf80b9a9303ca7f21cd625b82a82e5 +DIST nonzero_ext-0.3.0.crate 15855 BLAKE2B 52d9ebbba73d03147dbfbc7c5ef03ad3865c9d1c06fc5e938df8f2d6ce752a3181b4f92372fd44b75337fb8ae43fc1ad81e8e41ddf41f0aae4ba8b4281a9e283 SHA512 448b0c936d496bf6aa2452788687d6e01db289062b89e9fbc0c4b23013f01acafd651ce260c5099aad799c684081478b2cdb292536a91315b73c8c96cf0b4257 +DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043 DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f +DIST num-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8 +DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735 -DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8 +DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae +DIST num-iter-0.1.44.crate 10249 BLAKE2B 9e70a4ee02e784c5eafb033dd321f70ee92582c2a75871688ad43970a1313ffbcd49c26a8c6787e537f041ac60fd269131e157bb61ff2bef09e5ccfa372b2a09 SHA512 f7cff4e6ceee82aa6de469b9db834a45b50a3b73cb068ea714fe237f74fe4875a33881f3421a71ed31c47dca847e3f3b7e21cdaaec52f0aafe6dfb8927f39f42 DIST num-traits-0.2.16.crate 50130 BLAKE2B 1101d28cb4dce477657684a068792b94c7008a965e655edbabfeff51cbe6f008450dc6d7e4fc5dc4fe9c3ee8623ed77a7bde83ce2f68e75d618295fe6cebe0a8 SHA512 2ef65e2f6275b1000f611cc4d019b2f4846a8964b54d9b96462da10e3ac9edbf3d1de82e40094c76f7f5205740361b0eb0ced414bcddbaba5955144f728c6f94 -DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f +DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d -DIST oauth2-4.3.0.crate 73921 BLAKE2B 3619ec21509bc7337f96910c8bff3b169990d475ac7ed50e067fb8a918f5b786904bfb2f27d4863857dc79d77f31a6074c3a315dcfe8be5e5058d654ceceec40 SHA512 0dd87b8c03f62ec50605bf47a749f01685a192e4e97fa232b73559c11d0bc1f5e84867a8fca86eaf516f144a487df4d79e29272093ee46a30d3e7e0ecf750848 DIST oauth2-4.4.1.crate 74263 BLAKE2B 81fcea881aa5495abf35f1e20ea6c3c07ee506853b8847986950cdade01e8eeb5c07aadc4ddd88b6582a70e6289f04a567840fc036f4e61a33ecd6fda9fddc0f SHA512 b546a0de65e9bef2cafc49ed8599b9053debdc7857a02c39ade4b9e330fbd762feb38663a06933fb83cb973175f40ac4c74586819677cd5591b7105f8ec915dc +DIST oauth2-4.4.2.crate 74489 BLAKE2B de597144878fa6e56b349163f01739aac50164ce454dddaf72370423d7d08a1f9d2ee20dd0f158c3ce00bf7dd800bbf91dafec9d7cf35c74cbe9e8bc56692751 SHA512 bf00eb3ab5f5fee1774d45646467c4622b2b032a7c51dc6eb09c45ca58d39888fd16dcc405d847b1ec139b2dce4758f3a3c330ccc727299ccaaf3b1700fd57fc DIST object-0.31.1.crate 272843 BLAKE2B 1f2e8ce0bfc2f428889df856bf8fcefcdc754d5c9a934a65b65903ed10c143daa1408e97a1f190996ea451541d215d4e4d7a53c5d2c8d9a6c9ffe4ac6513a56c SHA512 e9cc2eb5ba516e4a08cf3fd5f496d05bc74ddbf1846d6b6ad6fd25a689aa315652fc5710be6bc68fdd678673b7ec8d63b4ce999f1fcfd5b281154bc25a915e9c -DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904 +DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 -DIST openidconnect-2.5.0.crate 144887 BLAKE2B 6648defa9ac88bfea5ec05f8a08492df06d794fdfaded137f57de23e0b192d93ee52d71855b2c31e9712bbbf81f8a6b3e1dccc73592e57f12168e3bd7bcd17e1 SHA512 b22f47b82a4a12109abc78824eea3686d33234cf8e2a9c62b8810dd956bdfd2c0329c8cbf883d8e24e470ba329ceca9523f544e72c8e71157519e1ab09ee2d6f +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c DIST openidconnect-2.5.1.crate 144854 BLAKE2B e3f985311d22c415597fca6fe0ef2bd9f8387193cc71e40a5e4604a602e68c4226d3098c97160aa500ebcfe349133f0231031850fcc71ef1a205313a9838a9e1 SHA512 0b6519e4f33cf3511ad2a8dc7729ce6bea30af08f2c6ce33088ae9b2d94b9f31d638a894086ddf169e46331e81a253899bef7990872408d11b9db32a8adcbed2 -DIST openssl-0.10.45.crate 234763 BLAKE2B adae6de12bb2f044c091c2899dba4e45d4f329d018b09943aac5e18e5d91d6a7667e47a33ed9e20a0e41554c2a372ab1d5a4a3ab54dec343596850dac505badf SHA512 bf67effbaf5ccf576a062ebf75ca14579db3da5ca456d85b60d47415cdc52fcac0c0309dfa55a909a452cb9cbcec9f132274187596f040339239e1e15f4f98c7 +DIST openidconnect-3.5.0.crate 158713 BLAKE2B 083f98d5499154b41c803aec7c013b9d2336be603fc3cc44fb2ec2e72e840a40be867c9fbf485f8cb4b5a0e5dc900692472adccc609b66535842c151db69b83f SHA512 d5058e8747a1bcce61170a0685044b2dd9ddb3cb8cc20f45038e57844d3ef15503110e255d2e865a9afa15bdc837483715f00b5edb2ce6c2df15a9ed1f49f451 DIST openssl-0.10.56.crate 262050 BLAKE2B 4821864fc4773944c703c13a532a6813a934cfb393c73c6bfbdcc2ff6a443ddf1c2339af3a4418059bde54130b1419f6f9d26622f1358bafdcb2dd278e13f67b SHA512 6d2b1f1f2a791385a0acfd23d7c48c9600a58396e8bc44919cb8513530f6d1d6ab8b82c15f63a2ce17ce12892e910220d15565c1274f0308abece55bce531f21 -DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd +DIST openssl-0.10.64.crate 272306 BLAKE2B a8b618aa403cdb06a7f135cd966775f21c99739365c55aabde2680a6154d03c7d554bfae6c62a069841c70ed82ece6c3f0cd589da8c26022b7022c3c4d79a6d8 SHA512 a1fa9f71cfebbb37ed9d4a902360f2cc95a78f55b5da5d51eef69db38cef016fc03236485158d689ccf054e04937b8cddf88e3f0f31672997fb30c6cac73cbf6 DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c -DIST openssl-sys-0.9.80.crate 61687 BLAKE2B afe13340a51b5f7c6242085a0861c02ca20de7ec24e12efadb4eafd55b769f45d0ec4866799bf64bc383e68933277503639f148dc600f8036ecf6c325b745f5d SHA512 e141423f7a7c72d9062616b87163d2e1ded028ec165b3758c52a2e5f8519cd517fb1a89fa0ab3da27e0b47a1f5973772673d8233e98cf4ef79ded56e0363a072 +DIST openssl-sys-0.9.101.crate 68568 BLAKE2B ad80cf56a33c71d6889470e4aaa0b314e67f75ac7921a63d87a94becf9203f4980b6e17b230c0954c126ab8df3c499444ab196958fa645ac9248ea8c245fa34a SHA512 33400053919f7fb2298b84bead88d82231640da6db4efe3dd21a837d0ddb50b2bb21be5befe1734bda15107a9e23cc9f8392647413ceb77451bc36034831b684 DIST openssl-sys-0.9.91.crate 66649 BLAKE2B 9860268bfcfccb688d8bb04fd343fdb3b492afb79af711ade55eabdf32028667c3b7f6892f3167553dfe16b4a5823cea00b59daf7472d8444a9e64f2847e2f70 SHA512 f34b185e86a38156fa75f2acdb3b1d66b6dc6ec281a3ba24e3b822ec749402294d3502ed86e6306deda1e300dc0204660cda61c0af542a4b79a304cda1c420a8 +DIST opentelemetry-0.22.0.crate 67855 BLAKE2B 46e0ee0dcb0ba4f158b56d831b16d446bdb242a6d1ca388f0720a8ca3b9282a63e7981415a7bf23711987e8132b710775da6e6f3e167ec7c470ee749d0f9514a SHA512 0dc2fa9323a8e0ca01f402296ae69d2504541386bbcf0479cac09185a7f6e5568fcfccc02a9581bbd63e41d3616cd184a1bc1b59e924d0fb91f8bd51490b8dfc DIST ordered-float-2.10.0.crate 15589 BLAKE2B 76561b2ab32b61ae69bef039f5f4636a05533cb8002b894ea18ce776ada1b5911c3067af2318126f359a305d7a9d3844053be62af1cbd2c3c9c1f45443a1cc9c SHA512 cb883ddd723d1bedfe13d16c9546dcb84d17d4fb1c6dc6d632a0c385d80b0b881694b3364a406e5d7f073c5a7e9e80810f343dd1d6f22df6188322b3e89cf77f -DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68 +DIST ordered-float-2.10.1.crate 16029 BLAKE2B 7c6920160e52e377ba44ff63ac679208dcb3782c1ffb802707c54fd285ec22bebf80edd036753ee13ac3e577b0b7114241dbd9ce5f018d0d6d31ae21df1cde48 SHA512 bc659ff02660a12c4340889ca7ad99d569d8e7b9043d8e8ffae912da0a5049c1a837c7e4eb0a39e5ee3bbba9fdb498af6236e56af6da841c97c2bd4ca4c39090 +DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532 +DIST p256-0.13.2.crate 63434 BLAKE2B 8c0d6997b60299382f1da2b7caa1b0353b787352bc3de9ec7168bf224ff7ca15b2ffa28f99377eb11cb6cec3481e5d28c68042ac88c1cea27e84aa8fff5e0658 SHA512 4105c597346e2bc74ad7b7173d13b3b46cf4a1df87ea1699586cb7d09beb1b9f8d152b2bd0bc6849c69771fe4d320dc15a9e275470923b495971e9aae54b0ca9 +DIST p384-0.13.0.crate 236495 BLAKE2B 240fa9cf7cc066cba64e9c89d78ae65d0f0fff3e875b0175646114784a2eb0083cbdac9e1a17e6de6b3e9a6074b8f318e8d6abfe63b7de432c2d19dfc0fc0091 SHA512 e81451d336b2fd0c1dc3483f1e586b7d4059b3ee7cfc935edca6be1be02d23b1e380859a44d0a6cc6538fbdfbb22cc22b8d3aba11cf90c6fdfd0e8edecdfba17 +DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c +DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032 +DIST pem-rfc7468-0.7.0.crate 24159 BLAKE2B 478d355dd970b9705ebcf44d74d61ae0694db6de16b2018548fda88546f53e35b965ff72d939def399a49fe97d3c8317a10385ace94b3d552797ec64ace1eb8f SHA512 f47d3b6c7c8bf4547916acc2a3d6671f6c1308e74641419c8f1df810d8bd940aba8f94d361e4cbef3eae3b7f11587cd3996a11be3be41d19111abfcde7a9272a DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST petgraph-0.6.4.crate 185895 BLAKE2B 9ddfb2796c461d2820db8227753113b02024e5dcb694a0bb2826bc1f375f028d8b98a3bd67555485db7fab88eb86043f5b768585dbe0c60703cc655976030a2c SHA512 b5a21572526387af3151dd4f864bd95c94f65eaf0612d96f99926faf646214df205bcc652b98d3b281f2e270779a4c1fdd6a32614ed60b3612e5d594b2bf3f20 +DIST pin-project-1.1.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c035882237620fc87aa3919bfd360745b587ab84cce3cd0db24f4f15bd358a46af1cfd196c2071836f4d300be998b6bbcf7 SHA512 103e58f1779cd2d6c63053e9448d0f53edc7f08f29540fe0de2dded1dd0b7de50cd62d31ecaf6cf30b1a7f1f5e4728beb2cab3e40dacf8ad5d5a7a6254527578 +DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032 DIST pin-project-lite-0.2.12.crate 29073 BLAKE2B ab66a6dad606804eb6121fac25bfbca3ad00e8d80af2e7d1ab38add91c3f76761fd1864f0fb184cb305cd216cc92e81c2f73f0cd2e6f210ede3bde4cbdeff77c SHA512 9d2eb190169819fadece7fcf33d006863ebe2c298066ad97d97ba96ced6229892b4087ec1f364d5c6150cc80b0ded8f431d9d4285adceb5fc9ae1da8e1a6d82e -DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4 +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 pkg-config-0.3.26.crate 18662 BLAKE2B 2ad92dfdc8ac0414b12a61dd30ea4ac5f142bbb55d0555ecfa3a53e750367e1b11766a693ef11f8cbe5a2ddb978327632458b2bcf75be7aa8f973262033349ee SHA512 509c4d1494cccc20de6a62d9d037c63ff77ebee8d907747c57ba0926d177b08fcac0231ccdda14511b453deb0b76ddd10f8fbdf63ff94257d72a12a889546435 +DIST pkcs1-0.7.5.crate 35790 BLAKE2B 0cee88bc3406b60d225593b4b01a4eca11d14a916bd589843300f6130729e7926d2af32b9b7d03e98b6934775e30e5627754e7e32e1785f59c8ede36c28ea40d SHA512 a3584ce492116d6e617a733a0d3d5696404aa7b10ae95070313b4a41dbc21d0940850870b711e375ac8b54fdd179b4083d61c48e902e6efd8a3a11cb630076a3 +DIST pkcs8-0.10.2.crate 26360 BLAKE2B a62b5b7386eedba6fcbc4cff2b103b899dbf6179101445283f9076080489129543561af1ad6f09061564f68c28954262e49d0bb3e182f2ce7495e19d6f34bd5e SHA512 87127d51f0e1fe085d46b30394f2a580e857cd64f5c6fe4a3ac3b8871230aa426598dbb007e8bdfd5d729b99a9c0b4d84116f0768886605342d2ed112c51dfa8 DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a +DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d +DIST platforms-3.3.0.crate 28955 BLAKE2B 3bcccc9a8c0d46513164f4b451af56a001967a8a0e79643ef9e10e3399e77eaab2759f73a68cefce295a8256b0c88382b42756a1303fb5568922fecf7650882e SHA512 289eb7b4070d8b040445f10966cf6edf050ae740f59797476499b44f9391cce904a83f7dc43dfdac7ffd6174e5873605aa8e1e177700f28b9318703b27382156 +DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c +DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a -DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f +DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0 +DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702 +DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3 +DIST prettyplease-0.2.16.crate 57630 BLAKE2B b3548f37a41d1bf46d58e84297142e8d3addf6134e39c07b7fca809cd2f72004947c31bcf7ee2aeef548bc200dfcb9c888e090d3a96f63289bc15aebe1085075 SHA512 f542640f809de6aa77d34d92d9a4454ef2a92153dba38ab41782d9a3fb73cbae2569c3163c21938b908e666303631ca9393ea1166c7ad5e5970145f26238c79e +DIST primeorder-0.13.6.crate 21296 BLAKE2B 2ba479defa1c26d14f8711f6be5020eee9bb91a39fa7a7c14a93dedc6de920e0ef1c9f6240d308233d0e0d6bce4be9500d0e9cfb01b6c4f9902e0f77a2f97352 SHA512 fdf52b47b36403d5218220b886a3ccec7828731b5a59ea1d48a25fa85de754544fa9c94d51356d2ed904bf2d908bdb4fa87c53e597a3c9f2941d7310f70198ac DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407 -DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2 +DIST proc-macro2-1.0.79.crate 47200 BLAKE2B fff8e514d618b8ef60d6a4ca7610607641cb25701fc5e8452e0db5f942a3c38c724acbbfb0474823fe0f4864df07958c1524383e7640105266608f1d5a741368 SHA512 8bfa6fc1022556cbabe0050a37b93c5ef1056ebda9d3dd368e705a7c695df9dfb5cd5adc18ad1eadf7338631ad1d5ed6f63f0adff3616429ef8c50a930b1838f +DIST prometheus-0.13.3.crate 82457 BLAKE2B 555e72573e07a6ba48f44ba4d5c474ae000d6558aea1daf245a4797e854bb641dbf6b6a5462a409a99fc99ccd3ae5fd93a71489d19b04f577ba75f74d64ec73b SHA512 e69d52ff7ee272f86daf288cb8c54daead09cb0105ff02f144e6ccc6f5cbb83e4bc67535fd340c50e2e478b9e1ff340f6f618d62dd4b6e70414e8498217aa0c9 +DIST prost-0.12.3.crate 29461 BLAKE2B 5a0a183ae2d5981463befbd915664a3f3b334151f2d16df898c1999fc3a6470639ba7c701c4fbd02a9283406b922fbeab2558b744988d95e159fcfcde468279a SHA512 08a910897ba623e2773964a016a16f5b40b8f95037825fd6b2160912346ef83522482745ff3a17a77a634867b9dece8d5c10a22ac1cf779e632c5c7501897f24 +DIST prost-build-0.12.3.crate 39018 BLAKE2B 293a521917ab9468a59100df96c943038586097082f3ab040bcbd59a40c8349e59a192d2fe9c549f838db9569232a0d8d5cf0fdd2c555a71be2eb1f954c7c2e9 SHA512 65f69a406d71656b099c7eef8a70412aa06ef7d479aece8eee5edc8ed69a4492ca042a4752ce20f14f96282f6c9c64bff5dd3b974e9b0e88d799c87b60072fe9 +DIST prost-derive-0.12.3.crate 19603 BLAKE2B d11699beba35a1d6ef8ad5af55d97e3f321de796606e904670d394efeaf474f4540af49e2a3878da1ae31b9decd446365223442467b4580da2f5f74564ec18f6 SHA512 ec960fd57d51813f50ba7ab53ee2c67cbe405bda152cc4cbb29a37e2f571aaf97fa07eb1730ab6f338911355f3ec22b10ab17590d0bf8121b7ab48662f47604e +DIST prost-types-0.12.3.crate 42091 BLAKE2B b90a068031f7eef3eccd64eab2404ab431c4b0c731f00939983e9c1c025cfbc3abe47f89473d028b6e512a56598aa3adf1ac56d1aa02f558afcfafe004b865ad SHA512 a2551b6a4aed3801f6bea59d96eb0fc77ede7e65f622642ba6fd1aa8c56aeae41ddc73d46bc3cabea670d03ece1f79f126e5ebedaf9b8d3d51d3aac0778bbcb2 +DIST prost-wkt-0.5.0.crate 9371 BLAKE2B 6f893810902f07bcc6d1c168db12fbff92f1db131c094d56d482939939c9d345f5576babfd9c67e4674c534d8f0ae6ce84683e0f00496945fac5c4f334a103d5 SHA512 060471105440bbc3505aee238c9374369abf3dfbd837a41026802fe7249a00930c2e22f8235d1d289a0959b15be01b0821355fd78dbcc7b24e8e9837de3bc539 +DIST prost-wkt-build-0.5.0.crate 4992 BLAKE2B 1890a72fb7e88f0bf371f227feb2c5875ca04061740923b52145e26238a1751bb1a62219771955fc0afcb5742c68db4b2fb0823212f0e06f29fdd70a207b41a3 SHA512 14cfcf0fa75813623e28114086448135b220669a93ea520c8d724e2d64c39d24e8f7827043a1db4f358ca233537769957e9aa17dc13e38d726b246223771eafb +DIST prost-wkt-types-0.5.0.crate 32317 BLAKE2B 239c2ee45e6a7e2fcf0c52e52f4dc126585a99c2c5459b898c53e8cadbe037c7fc5151594669aeecdfa56f85c4985c0a7e80f21523ffb82deb05d8f3b51b120b SHA512 7cc0a03d7d797c1197e4a2c2ae124b611f4ab45e13fee099944503f896a708e1954afa068c57e500deefec03e113a89298bc6744cb97a26b511e2d68663449f9 +DIST protobuf-2.28.0.crate 167541 BLAKE2B 3db5e11d458f54fe0e121fda6ed4c1949f8fb0488148c48e512e05cdb3ca3e2fea4a0a0e4f22b312eefb75d3bdf0ef30fcf3d865ab5c06caa8d11a8b96f44b32 SHA512 14e87f5e4039eb98d473055634102e7d8f79d294de0e04e0c0423dba6e34abbb28b1f94bc2d96ab16d3e02e770fe876b4c8c3af8835a43a8448514efd0b02312 +DIST quanta-0.12.2.crate 28181 BLAKE2B 9e6b37e84a377588c4a79809ddad4440ed978086e5c66839f75062556a42368e5b16b19655b333e745a1bf34e4e558dea0c8323b64317ab1734e5a66c2b9f790 SHA512 f99b0a62e080fe212acbaa1bbaf9e54c9a321d575c2d494ac9416c85aca2a50aac4478b533e55b5194487fe7a7082450315c32945637e0ff929d46cba1839a61 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 -DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 +DIST raw-cpuid-11.0.1.crate 108872 BLAKE2B d8434edfc5cd40c82ab4542cd00cff670bee9f9b0d4a95887bed85095963c16a77e1cc5d1992c40f021c0239e0f0e99687a9c2b17a4d801010c2aff19b197fd9 SHA512 f382b4a8d04a2ee930b463915e59bd2127ab53c43629dddc522b5b42266a0155dff03d85a6d1e3d43903af42c11d6f0944f31ef2e265a2ea50a616af5d3a6668 DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde -DIST reqwest-0.11.14.crate 145216 BLAKE2B e7ae6b489acc2b8a8eff2f6d34db7817ac811998bc6c6c565f93b99746b3e03e823ae55c8867cf39844c4e6ec412c9248bcca9725bdeae91928d37f670177cd6 SHA512 b853212d8495e98295e861b900e73ce80be1135ec9904b57dd75de2102fc465c3e3dee93c70c07dc46ac67b56affbc0f88a7b65c706521564a7c1ac5f6e62115 +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d +DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f +DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1 +DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 DIST reqwest-0.11.18.crate 154387 BLAKE2B 67f59ce870c0b4797e89ce916fd86f951be3eee8dc1854e8423d1894b0f5be3b2ae3d47b69943dc171ffd43f8ccc603fe1f3968555ebac2e6ffd4025f299b502 SHA512 d92a7f1814f853c8065306bef1656a2838e8f4c98ebe2c1d29c182768d723eef7159151aebdcbee19dd4c691e0142b1ebee8771f0806e4659411c3ecc52463c3 +DIST reqwest-0.11.26.crate 162183 BLAKE2B f9ac912ba90500201b58468fafc53ffa3ddf255952afc29413330df77f4fde46fff7ecfa78b2baf302a7daf35fcfb47364bd213c8154d3163115606fb334ba55 SHA512 dd8c6f07356c54806148562a839bb5c71efbf5bf73056688c48d652f41892a90a498a3d85181cbeeec0e62128885959ee31754477e89378be572f63e8f269387 +DIST rfc6979-0.4.0.crate 9140 BLAKE2B 662d967b1d818439e972d19bd251a4e3609c65bae945b4d11c0ff4966e9fcfaecb739d0b63bd767cda6a22e77a52f3386f02cb27c5c76ce9008837c882f8df33 SHA512 fb68114f5f8c1e7b921ed175fc01813531a584b8cb2df1264b72e1925bd66b4c021714b3627fbbcf3fabc26e4d6578c4d246369a0c98049d4058dca4cbabb20f DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191 +DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358 +DIST ringbuf-0.3.3.crate 28701 BLAKE2B aec4dabef32ba018cde296a3c66d724fd89fd618ace0b25efb9d9b1df74e98f2cddd13cf39631cfc0740cc4750dd3f7b2ccc5b4985a8e89bcd1cea48be227e9b SHA512 3c148bf93d90bab35836263dfdb65c0c29e448bb3c54f3047ca2b3469688f9a5356f2de2aab9da85c50002c911013c0d785e3ef092d1f1a88fb6cde5b3d4c994 +DIST rsa-0.9.6.crate 80048 BLAKE2B 0021065c262a351c3c3e9e63984442e9ff8e739f0f60c79f0eec031fc3ecf928756a0da656a0eeb4bcb94cd6f10ced2326a83666efba3b85b8a518b0aaec3d18 SHA512 0af7737181236f0e5544a83eb41d7e780df1a488b7b782b2c97eb4eab3dd599b86d18adcdc69bb56f9aac548a24dc88806e7bdc32fbc43c33b4d7a9817cfab9c DIST rust-jwt-61a9291fdeec747c6edf14f4fa0caf235136c168.gh.tar.gz 16422 BLAKE2B 7b62140d4562b3f66ddb4ab8eeaf855f1dfab4f20044c5149a7a33959967eb719ea0f2c7155a198798a78841983e6d13f1ec9d7770e2aa7ab8c08dd82128acf5 SHA512 d67bc5a310363dc2aba1be3833b55f8f79a3def9367adb0f652d91da3a8a18d6ecfc2df705f8e193e79e06436953c05315333f6439d4e31a47b551a37b75d537 DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 -DIST rustix-0.36.8.crate 290808 BLAKE2B 62da252100523d282d6d8d2bf141f6e59f0dafcebb0a1025b6bddb78c2a100643d63edcaea4cf64ce68696219ef52706f6b49f6a7b22f99c544866643952f98b SHA512 6fd6ca326feac93145ddbf6eba65c8eff731c9a9e7ff3a6724c19e5c8bbb05236f526df27c4c916e855e7e75e65914470af2d9c98e1571692991a7bd811b5bb0 +DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db +DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 DIST rustix-0.38.8.crate 333258 BLAKE2B bea1e7ce55823650f8d3988c78d6668742230bb22e04c9f5122ef8497a9ca8c5454d48bd3d6e9765b90420ebc097b440968ce9c149d78bf201118630bc3fc17e SHA512 835d6ca0e8d3c95eb1f81f95a5edf3b12614bdffedcefe1c66ef47d6035215d2aafd7a45f12d96ecf7b1b7a0f9ba7e5445069060badbba7f1dcc036a40167c4b -DIST ryu-1.0.12.crate 47070 BLAKE2B 02b0eec6bf266b7c482aea15ff83de4bf3cd6f607f8cd6f17f1c3ffc60cc64b62b15738907b4069f5816dd81669ed4f5b00c4bbc8705abaebe3a0846f56e8e29 SHA512 070f0b2b52e47cc9a6d8f003439d257c27aec15ffb030a92481ac22d5052436156e25127ea3ea7986cc514d2a7a924f9328710d743c216d7b1379beacae79829 +DIST rustls-0.22.2.crate 332080 BLAKE2B e384541cb737c17af63b494b13533256ac15692124e64db7c3939e61c1097b5ee9ca96ab3e2336500d2554c9fcd8244e76a4f72d05e0791e16432f37ff8cdf39 SHA512 c25f71a3291420ccc33ad21f2495296d092f7d01365f1ce27c71343d9fb5f50c45024d84fdd25791d7ac9aa0dd53d6b7e25f31f35f9a7e823fac8117560ea6c1 +DIST rustls-native-certs-0.7.0.crate 25071 BLAKE2B c851127d71f5704d251bc687dd9078db0a7f32be1a2b16ed66fba906e3ef2d1767b54ba3076d9373d4aeebd03c37a673255f10c0a4499e8330f9e1fa9beeb801 SHA512 458d3739be07082c7a519e536779b844669f54bcf74353fce307ba468de26ae42e41f26295df4139b81eea9a7c8b39a58fff0f1228e521d5daed761308ed3872 +DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37 +DIST rustls-pemfile-2.1.1.crate 26161 BLAKE2B d761c8c0944b4697336ba389e379e9224471d64e61ec3499427615ba99f9eeb38a47b2bf23579bd9445c28b14811028a81fde89308d1552d805f49bda18833a0 SHA512 5acffbcfa1dc50c20f290f2546caf669334de0ade8153cdfc7f8259ec9076808d2d47ce602829ad1369d546d21347965250cd2c4e46e835f29111d11f38aafde +DIST rustls-pki-types-1.3.1.crate 21637 BLAKE2B 7734df5facdf21120d0dba9d6e2c0e30ac36d4368048e89639d53e68d6cb72a03cab08dc64e443f6d5b43c3f25020016bb2010ec8d20c329fb60d6cd93c9134b SHA512 741cf0def113336865320aecde54a56cd5bbc7f3aad6e71dd209b4e38b642f42d0244b6fabf03a55467aa42fc3d1582bfa1fd5fda6402ae2ca11191f21158939 +DIST rustls-webpki-0.102.2.crate 196881 BLAKE2B 783877064d2cfbc9078d33f081b2b1edfe43218184e60a8a3b3917ba0a3ab97a226f677d4bf4addef5d19d29ac63a8268dab5bd3cf973d64df866e3e71492f9d SHA512 697d44daa5e0a8ea2d12aa6f68026eb63a6e1c4420ee92656c9479df77e3f672ca2525442be55ab6183111fe594ac85661647150326223129ec23686792f6014 +DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b -DIST schannel-0.1.21.crate 41719 BLAKE2B 8e3ce88c460b44839a46304c5ce6c02ec518a1f094165ae8589107cd32b79553e1c7aab581cb07fed4ef5935822ae4af8141f63d70e1f898a10e75377b1a057c SHA512 7457d4accd0096c791240aa19970307c6448486a22303e3b20b7fb25c326e50edb8564781e3d81ecb4a7626796ef78233c224f9baccc0de03f0eae2086624880 +DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4 DIST schannel-0.1.22.crate 41642 BLAKE2B ccb512f6c6765e5245dcee607b7886411710aa89d317cbaed2f511f74a927a0083042653e070c9d4b976ec83a74f3f37218f3ecb621781ee367b774596227f68 SHA512 6ec962cbd25f25dcee5e31b5012e61d38b97a7e8651a5439ab4cbc8ab33a0e2ce04fa22e06a82ef8750001c6659937ffd8dccb0cbd6971f68b0c354d0075aaa0 -DIST scratch-1.0.3.crate 8198 BLAKE2B 804af80d09da85a88221c7aed7740a25a327bece99eeda0d7adceb3e5111917b70fb4a4e4e39c83b041d57baad2e3582e877356d58386e05ccd65e0a5334f86d SHA512 8fb3c0d36adbcd915e3adad108e35665ddd6e5622b252833349f89448a620bac6eaf1c212ffc172ec015e5af46e5637901c3442083b17ed29a2bdd9c0c48d595 -DIST security-framework-2.8.2.crate 77045 BLAKE2B 8581e0056fc0422aef0122e4948d6244eebdad0935c73ac1b01fe31de19f730325f11446dc3dbf5f1ec4400de099eed1d61caef5b8e318365c4dbf9dabab3be3 SHA512 6abaf2129cff62220f152786a36fd4728c72fb2b55f3f75b396ffdf4344902077c8c0784eaaf07e2a4d9311f833298b46372a968b798dd838ea495668fde1be3 +DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84 +DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb +DIST sdk-core-4840a9c570fa3388e190e20f01f61065d0b7e965.gh.tar.gz 538755 BLAKE2B 066678c0aaa1a3e80731f3c650256cff654e063a2dd1ddba84865ba79f876c00865e1512c78f125a6f399b4468708e62f29ea0f02c22753e4638243e7963d90f SHA512 8be1daeaa1447bc7ad6ef3c22526fab2bd8d469a38dd57ba3ee901fac990ecedf4c028605e86350110f9f29623313eeec48637be7448b29a73a9686fa3671a1e +DIST sec1-0.7.3.crate 17979 BLAKE2B c30d4e617f9c0c21b80f14a7df88a164ad43f4c18fbedc1ec32af41193053e67ff6ea83db54f46c8cd6389d930984120c2a1688662fd8083e0c23bd4995d510b SHA512 be646413d84b39a43a0af478854f47db3b167c2bf1bedf7a58392782c423aaaa38df3b3676f9807a98c6128152295c426edd16d67d62ae7048caa635bf39641e DIST security-framework-2.9.2.crate 79295 BLAKE2B 96be139f2d2b9bc2fec7805c9e90f19f68fb6cf3f09a879f1d5952b502951900fd6889451c6866e53394859a0f8a842b4a674c4bfa82cd71f48195c0af365475 SHA512 fdc58c1c12ff849af3acf34208411caee50f30b9d55e20ef9d3922ee37664c606abcf90c4b415e5c22498dff2116fe2b2f374a0bd382c837ae7d281cd1a0a54a -DIST security-framework-sys-2.8.0.crate 17911 BLAKE2B ed066e2cb8986930bdcf55060fcb5a34f826aa27d51ba4236f8a8e56de8fe3a2b33be8da14c64c0809f46c0dce02a20729e6863af2261a04006ac65a291ddea7 SHA512 5e670f5f5d54f2bc11e05435b975d5d26d990d6f7446613dcd5be88c3cd52baeb702931cfc663fd5018c8c99f4619c23e57f31eea60b15d3a5e7ce01a291886c DIST security-framework-sys-2.9.1.crate 18284 BLAKE2B f1484b6b691f3616192ab363c81eb3d6279ad0bae6bb7fbc4eadfd9fc6b6bcd5ce42fb8edab1eb8934f40a1d42714eeb8ca3616871e8f80c90318834901e8ca6 SHA512 3118d1e982d94c5fc6e8ad6270ba398da98a042c7a2060eafb3b78a54491091c46529bec30d4f871744431f01b828ba2a795f695cd20d008441839f3c4350462 -DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7 +DIST semver-1.0.22.crate 30446 BLAKE2B b77a951d959a3685b0373c80b9991a8567f8926d093b23b7b8fab48595b5d565acf7408fbfc8f4d58331f39e316a8068885d28bcd70c1476d1cda436a2dd88b2 SHA512 7dcf9b6a02650d71d6c9ab3c29e44fdef95af296208f26aa7be6fd6e16773e5e5e66418c303a0589d1165df6dbfd46ad6ebf9eb5b3adab25a51f340947b2d949 DIST serde-1.0.183.crate 77210 BLAKE2B 280e3d253a29b664b4e2d17f41397b17fe22af64417facca42d6ca0c839f1def745380a5402d7a87345bb16f4fdacf9a8c01966579b8c08fb06c05f097a87e68 SHA512 3a27efdff92cb1f6b50449a761efde781af91584b8410fbf5ce37b20005e7d46dc4c750fd1730e15468ea22aac7799421c4e60c74243c65ef7916d3cbadd0ef8 +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 DIST serde-value-0.7.0.crate 10249 BLAKE2B d2d3d687cf490eb0be1910bf82c09334ffe32efc485297ee228363e4dbb536b72e2c37f3d37a5f8fe61af7480fa8975c0a654f761c55e56348082e4605f2288b SHA512 6ca9a73420ca9fb5415730bac4daa30087b1722ed7966ae07f403497b8cab95e1e1da664c0581b9cd170494242d4e01be75e1d5f9b6ce19c538e7323da46bf76 -DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91 DIST serde_derive-1.0.183.crate 377265 BLAKE2B 041dff0dd5822b3be992cc65c8d789c86f8dda3a42ac77dc1a6c44cad4412c8c9fbb02f7572cc1ec4e4ca731d5f57a765d30f9357827ecf8210ae7f54c26d8f7 SHA512 c19cd2c9665b88b70a12b972c5b30d9ac6c604c77578bda5d7c6c5dbe01f097c1d6d165f1d73c204768427042b7521f43e40ee295c173e685c9ab1b4c23c8fcb +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 DIST serde_json-1.0.105.crate 146316 BLAKE2B a40b99ac4b5e9aa31a61c4f49f9f4dd9fad94946267a47ac4ba7c1bf3af7122dc410c8984235281b19a917b1fea088615c8e95b4f1aead0957c9e31f2b222599 SHA512 d4203d93ee6e8ffa0d88c21d347196b8d1496d506841273e992c9996019175ed9a965e9401ba63d48589133b13ad9cac6246b7e0143545778b5a090a48a31452 -DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e +DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436 DIST serde_path_to_error-0.1.14.crate 16553 BLAKE2B 01c7a43b675f3f4b67d428a9cae221ac85b1762f345503f0c57fe60ba0fc6900b87cdff45733113d9a84a952413dd32e7d052ca029f9cf5501d771330f9b38a9 SHA512 8f0b43d3ddb27c678602a69015ce1bc204e27f41a4b2803e0da4d7d5695390b99831a78d863a3f7283615f56e8563977513821a6581dda426a51c76aa569dfac -DIST serde_path_to_error-0.1.9.crate 16545 BLAKE2B 14e6cc3befc50c0c57bb389abe118487bb0266a5cfe921fa27b284a19caefc835277ee677f2f1e91b83892f7688ad9c1186b75ae6e7115b2b4441809a36d7744 SHA512 dc434640cd7c90635585c2a3c2d6452c558824cd8f05ba2f94230609bd98075f0af8c4546713a43b0dac0231001d79c46b98c6426b975d92d6931babb5fc1806 +DIST serde_path_to_error-0.1.16.crate 16657 BLAKE2B c9064b28677201ead32eaa91f20444251b75e7fc7f512075cd53079fcad54006f531ab4fada27ad7414f57a385441de65def5702d592143916d0106fa8e70182 SHA512 d937e2ef7eb6f58e741f0b1805431fd8cfc583d558fd5b58aa04aefcfc61694503afeca33ad62f6a09b4039555e3199c18d5912b7d5d928120ff631949cfc30e DIST serde_plain-1.0.1.crate 11135 BLAKE2B a01ffa7c6bef5fc5f9bdfbb1b0e316361a0c7632d184f1770cf0dc9985ee4921105952b56ff27eb799a199bb40e9b70b02357f805c300ad2fdf0120a3a9eb987 SHA512 49193d5fd381fbe3b0ba8dbe2375875e07d5fea9f5e0aff390d4ba54e09aff9c6f140d35e9cd0a796050ebb76efccf4eeea5b8dde4ab6bffb026cf6ae5eb0d7d +DIST serde_plain-1.0.2.crate 11183 BLAKE2B e0273be87eb2a40dfd18ea2414f21dbb4d8d87bc5328908036f5ed86c06216bd981531c546a0c7767b956617f42318a96215464f3d241d0baca2a6d1a11d5503 SHA512 9ddad515cabaaa161ddd0346e59c0b7acbe8290c24a30c1b9147d81e987f4071fb9620eaf7b3a122e8a044d586c2eaeb6fe3c33ab4e93a492a930889aa41a0e9 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 DIST serde_with-1.14.0.crate 114325 BLAKE2B 5681438f6e9ce0032a0b0bd224dd4ee9680a6b4818a93cd8e7990e2e88b1425f81540de6dfe71f5162b8ea516c44458d5f095f815e86079e3dc011880968c685 SHA512 643183189980641b904fd181a699faeebb95ce1eea4805cad8ac72f32a2d47dd4aaaf146f7489c0a062f7867076860cae1aa73e12cb96d542fb0991231a51923 +DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142 DIST serde_with_macros-1.5.2.crate 21426 BLAKE2B c20e198b3657516b30601dcc8d9a1eca54111644f42922ea18542c16ec8084a6b31bd318b1de9da3181ebe9050f58d119a95daea05b375d87ee68def69213bf4 SHA512 4619ce9f35b7659f5641eb3b3891910a7780c76911968b53cdae9fc6b03ca66643157707c67f6ac5d16f657d7f3332671430e828d111d7fc8968683523b93fba -DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c +DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0 DIST sha2-0.10.7.crate 22541 BLAKE2B 918a8f4042c57e4f8931d645ba758f6e7da911d02482c78d6ef3a12e8068e7f3a08526580824ab548628fa7e75bc64f17bb12f1ceb167861a781ab9813eafbd4 SHA512 c33d6bdecaf49d0f60276531e845231425f62d2ec18c4d53c43e49f506a2dcb2548f5866c6642806b6b64f008a481c48920b7b4fc867df7443dc31b44f297fdc +DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785 +DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb +DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1 +DIST signature-2.2.0.crate 15531 BLAKE2B c584d9ad52a1ab3cdc129c36cb2ed6dedc40a8d49f7294352a7df8121dc57de78268f15d9ff9ce076abf1dd3c56773daa26ed5ec39c83a600b6a377b51d4db37 SHA512 673a8f6229c795cc8f640fbfe02cd912b41c6359ca23c5ddeb1679f49784b84f109c6c45e6210201c9ca05e441c1be64ce6537e81ccd3589b37be6d0bf50dca7 +DIST siphasher-1.0.1.crate 10351 BLAKE2B 6653898cf0eb071fe83b7c317f93ffb73bd26ed601961173875b26ec8851632599891ec178b7e14318abb9eb98d522db8022deb852af9ad9f6bf38a5a5708e82 SHA512 d230991add51a555af95b30ef104c0e5ed7011fafb92d6ac9ba0f238c8bf4d2fbd39f4b04dbbe960453f8fdd16d3768ba39f39e4877ad453562e689ec8f24a28 DIST slab-0.4.8.crate 16928 BLAKE2B f20603e1331a767c3f55b56d58bbdb9fc126794a116db128fce6d204122c420e9a65478f9f10a26f86c045dbd55a62556862f4339f3a41419f810bcfa9fd145d SHA512 1d713a217b3816a1e6c230d4bb52c32c90f600e64520f0c339ea8255ee8aefd887d969fa23497f1bd8b2b1f7dcb4b220957889746f04dc3453240b5f28517192 -DIST socket2-0.4.7.crate 44619 BLAKE2B 9bf2560812db2c91498d12274e02d17c279efe5817d882faabc465de71b1cb8045f6eab3c8e6031f6fd18e0e77913f42daab07f01e8d83bfa5ea44cc6966466f SHA512 44487f2de30cd327cad1af31ad36aaaa0bf10c33b5c23b024ada8d7e41d064fb2adbc9edb14aa8aa1eba679d8530c373c7187fc68d9709ae736a5c1a2cf37088 +DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 +DIST slotmap-1.0.7.crate 61390 BLAKE2B 56f7ee840f848f2331bee7d7e31aa66f2185db5b57fc72694e1514b462dab8f673442c36f7b9260d5db7b68a522ca76f7748aab774246bb12c2ecfbfd3e7bb8f SHA512 f130275c506a3d648b5d66acddf7ed88274fc381d8d0101ea5b3ad931069d4ca46b856d75311e95e09a23c009af343c7a4321023bd1d065d3d516a0b4b8a3080 +DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f DIST socket2-0.5.3.crate 52588 BLAKE2B 03692b67f27530670048db0920e26da4d95373a3aaa81ffe840b09e73a5730e2cec4fa43c25e63db0a6164c67d6fe555b0fcf1c9f7ce6a231d2972f5224a4d50 SHA512 63cb78d66b057587e4b3b50b9c618db1a202102c72b52b79c2e9f9a401dc1c28fe4523a0f6483b38ca8a3d24d1e2fca0b7176d96fef6ec1b922ae7c4afacc324 +DIST socket2-0.5.6.crate 55270 BLAKE2B 10eb32486b9a2908e05ab24620ad7a79243e59c2c2db5a7793f87f32765745b21746423d5b3896ef37d3dc9e76410fba97826cc64cafb7dd45adb485900c2282 SHA512 10f14ce7bcb9fabac56f98bd34ccd6368dcf4ca245ba2df80fe0f1157e177056eeffc6fcfb1d1fea6e89c0eaafb99d8056fbd10101031d3ccabb98950ec563dc DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267 +DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee +DIST spinning_top-0.3.0.crate 52579 BLAKE2B 752f3c6a341c658f7b6486c572a2bcf294e009df8e347095a9f5bcb6cc7c2be565417c48a33a95e6e9a053f250ac9850f11e8288ac30b291a0147c795b4edb65 SHA512 53290365999d2c4d1304400d7e1b03072f87c1f2ad6efde48ba3b83a45e6d2d71720bb5ba52099b57f6bd5e823ec7727a0c2e2dd092816a46bc5f448b6f29981 +DIST spki-0.7.3.crate 16409 BLAKE2B 6b39144e4e718ce5eb454e21ee89fb936ffd31ec99554b0150fee47bca396bdfe4ef39603ec029d4af4d8c4c3ba2de7f6c549244f8c20114de9b43ff14921681 SHA512 d33a6a7844b33c37628024ccf25c1a631f7a6661595e063049b8c9a9b4edb28f0335397faefc592c6fc5e96378b870ab5dab9b0649c3387577b2370ec8210db9 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 -DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d DIST syn-2.0.29.crate 241664 BLAKE2B 5b339433249d7ee17b032cc9ecb118169957d91f438619940aeba0003ab0015b01cc6afb00656b5492539a5396325ec16c37e33764b00d6f9b8dc6b5b5e6a9f0 SHA512 a6319ee743a7690c7858da8492ffb6a963d102beba07009e82b08082d33ac8e8ea2675bdfc3ac3684392b3bc3d7f2624983dc508dd8b8f1fb9a57ec8a5b82828 -DIST tempfile-3.4.0.crate 30591 BLAKE2B 5dd7c2e28e9713751e2816e4264100b98795b26aca3d8619cbaed79de7de8af180aa3bba888babed1a1a644161a5a8ef08b4ecdc898e7c583070387cbc3fa357 SHA512 4c7f8b517282f7db295d649d038f0dbd065397abbf9546ed2d9ad19a6eccbc2a189d4601a7a93299cb412e7aa1c2d5bb409f11fe94162889a715303779ee42fc +DIST syn-2.0.53.crate 254828 BLAKE2B 4bbff9a430e12baae231eec35dca4a3130e9977c6272dcad4a25266441959461e6e2b69832492a6895948fada9152abf8630c1d011c93912356397360bfb7b8e SHA512 0c3e40e1af47910b59877246700dd695e2bf03c35e036adb99e9756f8e055c8b3421020fc43f71954aa7adfdc56712d58968f3f39ca2e93c0daedfebd8862b9b +DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8 +DIST system-configuration-0.5.1.crate 12618 BLAKE2B fa75a24f8db6eafe578bcbf162fcd110ca059c58af24916acd64959b48d8541e0aa95ce2c929a8a50c62e7e8a967de9101640d1da7805fce2f76b7c5c86c4544 SHA512 af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f +DIST system-configuration-sys-0.5.0.crate 6730 BLAKE2B e40c4b5e7897cfe30b2fb6daa9b44fe2b83eb2a12d798a1ad8908b51abc735566becb0e001f52f5f8a0d3596f62a9eec631341c3a9cbd132a4f650f988c74b93 SHA512 764168ee5efe1ba82e847ed74a14d1f5f1892735e98657c3ecaafcb4b405d4f779592dfaade252f6a577ca2cfd5cd5e467c0b6326bbdcfa573c3ab01cdc8fc34 +DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39 DIST tempfile-3.7.1.crate 31817 BLAKE2B 99b5ce19ba7712beb98ad4f2183e6ced3f5677b894a329945ec8fff1635cfec150d1311c60ac4b9c257443577be55d887c7a2cd3e2173f4cdbc9c522a43f9e21 SHA512 b3f59791c1b959eb402970840ccc75c13bdde3e35274f91dd304c2f2ff719c0a24ccfe0ca53bdc3fb8f01060920624ec50232ac2168e30c1a5efcf405989767c -DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 +DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a -DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce DIST thiserror-1.0.47.crate 18811 BLAKE2B ea2da26fdfbe3d9519942761a9fa8a7c3528a170846c290a111a33420dfbe6c3f114591e3ad101258ea2a01a756ce4710d7b46c01b40011e5ea01cabc37db189 SHA512 fdb128982f0b0a6d83221bfa6b274431a1008a9727c82d55a8cb2770bb85d18842e6b26b90885fc0f00801b157b96de61fdb0f72d98b8092c69181d8ee67cf63 -DIST thiserror-impl-1.0.38.crate 15429 BLAKE2B 96202c256e970fe23f07b461d71430889e36d9f0e83608d001c6feb4e86f4a34047ce93617b27f89c6e2a5d6ad8702b9f64ac7e59bfee221677261fdfcb06e69 SHA512 628aa28404a181b384ac6a11a433829a5481d97face5bc1704349414f36e93440738122fca716fdf878719870d10e0cf8d495df6b1d40913e985c2824cbc3aba +DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578 DIST thiserror-impl-1.0.47.crate 15080 BLAKE2B 4b8084ae885160607905333dbac2287576127992eeb58293050c46ccc2abdc1a04f85b07db35846046d9a3e7e94ffc7c8912bab37e4eb9a5290bd55df46d0d02 SHA512 b6b73e9eea058492c45d41a70d5ce491b773f4747e171b794577f996f0ed5d76562338a18105f82a6733e1e37954aced4fca78d5f66c05e6789c15bca5ebffe7 -DIST time-0.3.20.crate 111856 BLAKE2B d4fd3d3f9fb164b26317fa26788014419902147c7f17816a09565590245acf72019fb57e88d4f4ad4a399c5dc92247af9e915fc5d2168710f81673ed609a055d SHA512 689099bcd5cfea6b92d88584d92e7c15163f427f621c653026e3b3f8066a3932836de3f8be9716a41b77f1d36a9fa6c3e2a42ab011d21ca38efeb55522a39145 +DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b +DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492 DIST time-0.3.25.crate 116903 BLAKE2B c3c0a5cb6c4166fea626c3be43c1d22cb26ed03dfed3fc49bb169f0de753ddbf4fe934573e579b2f98fa0779becd54626ae9a692f66de7253a69adae76aecbfe SHA512 a6b63ffcb3d45d9eed7d9c436e9b603d6cf1ad402dfd4542807099c7566d84dbbffde3ae772b2decc90427ba96d5f0b023b1861f47de1f2868d67d3105ed695c -DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c576553b202d178a64d46396958745b00c9f2aa60a6eb609d663e48b1f9bd1f7ebe58ff6e22540e96b2b1c7f2 SHA512 f7e181a40a0052d7aedf78219a46f8876618342c710e819748a87a5bc0728e5b2fc7ba08e38ebfa6a17d6fb60382003bb35745ff1eabac1c8f8b47d186a383db +DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116 DIST time-core-0.1.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14 +DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 DIST time-macros-0.2.11.crate 23738 BLAKE2B c5ed4911259fea3154e85d8f0d39e09ba09e912d98d68718af0ad5feb14e4bdb6f9610de08a3ec5423047b8f1e20eb390b74d3cc034060b5222d73a293c56e45 SHA512 4e03d6875c2ea1dac74f8e5dc52f9e53098cfa65e50287e9a1ff423f8c84f2f617fa374ce018e47da805561410d83f6e2926ea5dc67399ea916644bb7d236467 -DIST time-macros-0.2.8.crate 24295 BLAKE2B 6b54c83b11db8c8490383764a0e6f3a2c3f17c44adab2d19e69dc3fc5b27c5a44bd57bd0e6885c54ae493bd5e2c05a6237f72be93a3a2fbf297c47c02d28c61d SHA512 4e604f926a620b1caeba90bc5de1129f6a6bb4548890d6e31306ac419c7b6d421b548b3887a929da3209fad28cba8d57b989503e52f16af243375d545b5aefde +DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c 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.26.0.crate 646327 BLAKE2B a66233eecb00bfb0a0a4adf9f7ccad3b5912ae18f4a39d4613863702da5fcc95da368edcac3674d7345e182c74801916d5d206edc7ece64ce33102473272fbf1 SHA512 cad40d89b80db193919271f46f32e64c1f5f49ef2defa658273dc27f6d0f76747bdc1ea7ebb2ef3c040ce04441cd41bfbf0176474b336c9c3c71901836b31570 DIST tokio-1.32.0.crate 725004 BLAKE2B 80dde8073cdd361c8e05a8ef3b0fed0b4ee56c915ed6c0adde4bc2db487e0dd60a3adafa55aa9a763d37ec992a27208063aeee6a95b594b2e5b02e2bf65da9a0 SHA512 c7a64e08b4584b52c98118dd07316ee3bc0c2b405278f37bce58c512072c20268df66a8ab553e4d3bd3470753899ac3b1df4b9b5411743dc0e092fbc2d9b11a2 +DIST tokio-1.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848 +DIST tokio-io-timeout-1.2.0.crate 8993 BLAKE2B 52d5c5564c55c8450eef53cb60676d671c2225b2842bcd65380d2aa544d20698f138b5498521862d726e57fde97f6914541b5edeb226a197020205c2acec8cd5 SHA512 861b8b2c7af6ace78ae223fa567f26fd347de92b3e67c788a140a7cf5bc6320926387ec633ac5bf32fc2b0b28b4f3be450b7c4cdc755eba4412eac7c390dcfd8 +DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6 DIST tokio-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914 -DIST tokio-util-0.7.7.crate 100405 BLAKE2B 97b701985cce390acf3fcfdf4bb761901e8e64ba29fa285a822b97668b4f9a56e13dde3085f7b63025ff58f9ed3726c29a0f8dc412100fa76d7ac5ba75ff24b6 SHA512 d33edfc594dff40a7f76ce84a740eb8901eaa95aa6cb6e2308aaf23b4543dae2ce7f7c8df5f027292777b65aa8b00618ef45dddb34b53b1981ccf1650c01609e +DIST tokio-rustls-0.25.0.crate 30541 BLAKE2B fc85306724dbb91efee7924340e0cbf4557cfeb149cf11dca84e37ca96e6ca54cbe774edaffdaf313da11af98ac03cca23bb7c2ff6ea551f5328a3bf3ee9aa02 SHA512 4e04669ecdd8235edd438075e6b125f6473e117adc2ae13ceaee7668705e81a87f97242253f51dea204fa1bb3b9f8f9f21b587b4edc7c2e58e375f5537ee5f95 +DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b +DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c DIST tokio-util-0.7.8.crate 101644 BLAKE2B bfd0b10b2ef7d1264262f78e406aaab07a1e060885dd7d9694b3cc34b6ae9f3d46946bbdc5aa3dbd0f6164973fc3305b20da04f37176250e874b3259860cfe51 SHA512 7b1501dd224b4a6749a5296751d83e6d57bae238a92430c32017813ab82c358086a555fd7d34537cc944c240ba73d4fb94864a5743dca05c138f834d45ee245e DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 +DIST tonic-0.11.0.crate 92841 BLAKE2B 275a8bd25115f0cc7112c315ec1225f7e24cdd56e7517e9bc756f02131a8d65b37f0cabf31e332e6ab2b0b96429f91099baf2f8837b2e53e524c490eb538cbc3 SHA512 37657fdf21a005f709c526691b2d500d9946b7faa161a93add0429d71b55b8969b76b6e8d6cb40ba1fa2aa9d7aff717db35d05b8303c0e11be9592d63bc0f694 +DIST tonic-build-0.11.0.crate 17932 BLAKE2B 772be2f64c3c1ae8f40880e0d43a658834ad5929fdf29946ec5491171f662e4e3218cabb1c023ad6def1a182a9fbb5d36f274eb9bcb01c70c740bc86a809c298 SHA512 3b74b25deb506b9da7cbd869c2f92d5443a3103b14d86b3d54234f2b256823d787a59d1aaab554e598c290b940d488251ce10d967314559ffcef263121fd52c2 +DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c +DIST tower-layer-0.3.2.crate 6023 BLAKE2B 3450211e07a40419526cf1afe063c56357dd5add53470a4146ced3d294edeb95dbd645ab46ae0e42e4877dde63b1577adb21d9cf50116c4cfe4165e115d54ea9 SHA512 d5429b40569f67937e752c2d61c39a474af32bea5ba3940dbdf5a4037fde1ef7173cbd8fcdb87d0ea15c01bf84f2d55abd51fefbab2f27aa54e656eb1748c43e DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75 -DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65 +DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 +DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0 DIST tracing-core-0.1.31.crate 61263 BLAKE2B feec046ddd3e04995bfe24defd6ae1187fd7ad78d80d69031178f67ed534e9aa6ab6aaea92dad509f57e220df5f6f025ab8f96bbc957834126f53dcad36580c3 SHA512 66fcd0b4f32de3816b1dcbeda1af26fae0a79d088894637984dc6a0ca65b609f5f166cea376601f6a75f8e3a281da6d4450dc796aa0a7177ad615330237e2bed +DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 +DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285 +DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1 DIST try-lock-0.2.4.crate 4467 BLAKE2B 7afbe36d02ccf31351c7c7ca4415578383bb4d0fbf89ba2c5c7835dbf410326fb0f6cb302baf7c1edccc4b193a2ab8079545fd67f26a74457d116204f3c6e745 SHA512 fbd989589eb0a1fb226de65537d51eceab632603e69710b37708d6109ed09c07333189675d5e560e35cc836e5cd211c726d8ce247186b5ea4529328d46c22632 +DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08 DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2 -DIST unicode-bidi-0.3.10.crate 43530 BLAKE2B 2bd5ffea133793ed7588ea95b0848adea16e79fc3ce9a159c33c73929a1af90e0578c44980fe114aeec1d6424d294552bcbf4089e3c196c2ed3d0751d992c216 SHA512 70f81dcf3fb3ada1eb503cfda548e083cae6e7001dc445c0a481b8f467025f17dc26ac14e487edcdc2aba8b67f94a35eb4b5083a62d5b954dafca7b734edd3e3 +DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 +DIST typetag-0.2.16.crate 27793 BLAKE2B b177a4c73bd0f61f94ed98195e2e118fd07479d9e13e0feca403c122bbbe6643e505cd49f366c898b8f01790b68d36fbd98dda811253a884923879aa1f1a44f6 SHA512 a62e792dfa09bcb98711f246e7dd8c4a457e1114092199c6f75323ab8c45690479ab5a370ccf0a71fdcf0c6d5c58e884691d3faf852d7d0d67a8f13a0edf78e4 +DIST typetag-impl-0.2.16.crate 9086 BLAKE2B a32f947452001820527f5c60f05cfccfdd96525190779857db19b434bd6d8a9412217a230343736af6131efe7f1af70a1a2b5198e4126efa2f3de4f5ad87c472 SHA512 52a1036f82cc0193b74b16aa43d59d72f259eb669101e3e3a694f509932f706c93d5402bbfc47cff1359ee860af0728a25124ee215c375025c798b9bb4174940 DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 +DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8 DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df -DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86 +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-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5 DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b +DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b +DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0 -DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d +DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416 DIST url-2.4.0.crate 75670 BLAKE2B 8cfff1d8ae0b7353ab4f539e2df1f15dde3c75f347c36bc5c4c8ea45a0cfcb31950b073b50acb34a14cd3d7a11b665c3a73a3d070cc590ce740c561f0e6e92d2 SHA512 acef524d2c00d2fd68ec6385ca2a44b740f60724256750d8b0ea609dec7f9d59303069f315f04a5205925a27274ec7709f3818a2237ea0023845e9a12905694c +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 +DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac +DIST uuid-1.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5 +DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 -DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404 DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f -DIST wasm-bindgen-0.2.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705 -DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058 +DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5 DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94 -DIST wasm-bindgen-futures-0.4.34.crate 15117 BLAKE2B 7a6a70d07e021680dad6ae9d4b800d153baa0ff51a2bb7bec59b4c7878335ec3dd9cd4bec1cb7826683e3d91d115671274d45da5148979623dd9e1736a1c7d1c SHA512 6b822fadaadd4b0edd2c9ca264bbc611f67e6d3eccce7034c3ed1a960dc673c591ef1f8407e58ae740dd173a1f1f82d206840f35a10b1f088630b79bcd0dff74 +DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa DIST wasm-bindgen-futures-0.4.37.crate 15193 BLAKE2B 06844bb1ef1b492461e245ac16ed13024c7f3acedd0355aeab11b8e8f32d8b607c5642ac5a41432e72a7d3fc84b6c842929a6609b8e77d7482e273a561506ef8 SHA512 144d321ac7c9f55d94e8a0a6803c2994be763141a757f33c27513fac45b0193d4e4429c899bf1fad25039d56054a0fa381f0171df09c06260532cb06d5407448 -DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43 +DIST wasm-bindgen-futures-0.4.42.crate 15380 BLAKE2B a20ba9f2bc814d7aac031f1cbaec90289f63893b76c60b536a65af85379771e102d6c3d949a8528328587ac776d7a3b684c12a217f9e186bf10046a1fcb34652 SHA512 0a77203499381b6bc4e9258480d7ef499d9c26b195baf38d0b7b228872f844d24c827cd57c8e2b0176927fd5957428084f53fe80cf60b35b7ba02d02b27a4682 DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6 -DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5 +DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462 DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33 -DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010 +DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7 DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008 -DIST web-sys-0.3.61.crate 706333 BLAKE2B f57cb14032e2ea01b5e0ffcef0988ee3e8227c1da7d27ef8799583f64cddb4bcfbbb145f5ea1889006fc9ff61d42b1c02d4b278d67371c9d914827113f5e4128 SHA512 dd8c93a92295a9cd94a4a4cac4a81d9fa41c2c0bc885c1861eae5cc317a0d55e1a9d34b97b91999bf617a071f7f8acc39bb0d4a684b40543519f0cad6b82a25c +DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07 DIST web-sys-0.3.64.crate 725584 BLAKE2B f650eecc22ca53b75fff06c4117439d8fe9efa486701cb16a0daf76865cd017a9e25ed8c7ae1fc65fa2dd94a12c14bc2e6f9e837b70b47b4ca468bef65a29f82 SHA512 b02b0bc3f1354842b364d2f062ea4f5025edb6e615046750b56a6e2fcacef7e0b46a190eb45e14e590cf297e3ec1a813a81612ac5acfc12d744fe16c5ce041a4 +DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b +DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5 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.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c -DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354 -DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47 +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-targets-0.42.1.crate 5524 BLAKE2B 755cb6184733417763bb650fb0bd84bc757503aacbf0d91b811d42e9e8efda05434bbe5518006a88937a82a2a607605a9b609df4f34eb58674d09564667d95f3 SHA512 940c85f6214aa4da17787d3bbfe8d6107a9a7fe4f2e2fcf2b1634facf4619620ac2a7a835ebdd0f57970c992c459ba0a780e64e89945005b240c92563c42711a +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_aarch64_gnullvm-0.42.1.crate 362795 BLAKE2B 722b45789bcd1d973803b327d44072fbf9c904d448e29ae9e56d2f9d1a3e9b64e06883e4bf5ebf141f1e924235858fd1472e07a744cc5b16a0a3a4fc8ec8f6d4 SHA512 51eb9fa7ea441a9fef590c12576a8bbef74932d40fafde8f9e3a28f2734ce5aee6dd5fa478fb3847443241c8c392bb4abbc6014c71260bf924431779f7184f73 +DIST windows-targets-0.52.4.crate 6310 BLAKE2B 0393bf3e7f8823edc455055e9977798bd6cdc1e523127cf840ee1b9e36febe40e01dcad9875a06aea283dd55443d02f643d42752103a5ec1de933285fe410b17 SHA512 4b2c26468df54b9801e6badd120dcffc15429fc78a614f45efa16d5fed1a36983198fbb621cc3beb4a4f9f0161ef8ddeca3a5c6a6ac48b5589681936f4d2bf50 DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 -DIST windows_aarch64_msvc-0.42.1.crate 664655 BLAKE2B f4a060b802016a6d77a8ea6ac44c35dfec384acef9c45f932e2b6aca9d3ac48ae031f99e5b58f270d6020b8796e9dd06f7e8ffa7cc5610ea3f69181c2be7adc8 SHA512 f6412bae4b041201ef94e5a159ce90fd6b09816350204d4f573c1afdfb0a6d62d7887fbc2e416b40ec1d4478db521be492edf4703d87482d6d0006a51b827538 +DIST windows_aarch64_gnullvm-0.52.4.crate 433373 BLAKE2B 5678cf2371e4c566b7ff0dd1fabcae92d12ce9f97670524c93fd8c34bf6b09d054e7de2f852302b8d994f52c81015b7cc8a74f529490c7bdd17a3b5d2c88a12e SHA512 dbb914a866873892a8cffecd4ed4977fe6c3fc48a58bb9f88655d86e7f8969cc27e6f5bb7d40eee41ae7d78f6f4be65d46650719321a7697c7b5b99a0f07a5dd DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff -DIST windows_i686_gnu-0.42.1.crate 733428 BLAKE2B c1ca24973aca06b255d9317735cca7a13f7f69293da52dad41df43a5cdf48aac3d40d8b6765cf564905fb71cb548308d757f01167efe7a61da7bd2e2a7080f0a SHA512 61c3271b07df1d4585c875d27cf1686c8f595dcbb79626e8d15ff47228f7b7a4556d3d994566ccceee0d6795a4c76767f85f4579282fc9eed731e04c7e193a57 +DIST windows_aarch64_msvc-0.52.4.crate 828055 BLAKE2B 3088f2f66fc91ad698906315eae7e6c0dd7da5414c28cfa25b24e138fc4a7da40535be09129cd37b8e331d8d6e8c41d0106fba1ef9e5b4ac561140653e9ded4d SHA512 dcc538d0a9c276e7ec415575ec1392bf476219348984d9567f56d5cc7af0f9beeac523a9a6651f763dd4f50f89535a3ea2275d5321ec022c2ee8814e4e84e95b DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a -DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360dab647a1fe525f0ae4b44e6842d93c5674d9f202e8bbca99a0d30ecf7d138af0c48eec8e69e08bf285db51e32bcf83a2c54 SHA512 8afa4f92cb7bd96d4fdbefbd8e7bcaa37dee52224d5d8b950c5a537d3bb805bf9781097b8bd44d96e8b62b1290e3a3020557502fa3b357a53df6fea36b318932 +DIST windows_i686_gnu-0.52.4.crate 875736 BLAKE2B 31ee3017a6db246b0d5fc02e10cdb517a69ceac3dbbc9d41b4051f5dfa1196e4a46e7b3f5f90935560c03bb139b897e5dce69989a3698d9c88ebae923e24ef30 SHA512 9d57260744607eb63453040c532bf3693cf3d8d93c56543ee00aa66adf3a71919e72bdef7811f287167403ade893248f189b797a5d2dcb24ef4e6f3d915a88c6 DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e -DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892 +DIST windows_i686_msvc-0.52.4.crate 895530 BLAKE2B 87ec4628472beec8697317662fd599a8ea0ba5a11a0cad6b23f2481f39b3a4e0546d37fade4d715ad06a4798cf7faa6435bafa1e5054105c064cb560468b6025 SHA512 0d5526b21bfb96ab352b5181dcf84ff31007ce338245a374b3b413805239359a689b1a21de56ae998cc13444e40867bc30c4200454b84ef9ffa7117318baef1e DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 -DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05 +DIST windows_x86_64_gnu-0.52.4.crate 831627 BLAKE2B 64d29f6e0837be822d89cc8aaea2514382d2c03b33deb5684df1d6b81573b3817add39d99f66181a762fae7c155e60a8c070affe43a0f2e247fb0c5ddcc7afd9 SHA512 96c673fb330af597fc3c71b53b9b66cacc9f3f64f05dc7cfe4a77447b7545280f065df22b7d91a6b7cf681a442d8b71c9d2dd128e76580664d8598c481cbb95e DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa -DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2 +DIST windows_x86_64_gnullvm-0.52.4.crate 433358 BLAKE2B ffd55fba15ef713bd48caec5ed5f32936e05ac4897b721bd2b041229bc8c7beeca77ca018c3258dcdb09495629aa359d1dadaaf5112d38e7ea54670309d0ddf4 SHA512 f153d86b01e47f17ef08271b69becf7883bab92f96d40cdb1d74432f2bc6a7a65aa4ed931d8f6f4c2679e360bbd8d12037dc2a74a6a444fcaec5e4c784c54c74 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c -DIST zerotier-1.10.1.tar.gz 84019609 BLAKE2B 317177c3f64818a78aed3f24e0d5fa8f164bb3778fcf123f222983b784aa8ed4a5bfd842857b3da7bca39e09e74a99b88c541921f2d1ed7633282cc9bae19bd2 SHA512 6a4c9c30b4aad389a60bd72b154f2a0c34303925a5c0efb815b4651db0db5e7b79740b5cfc4f2825bda7c158d374fff277b2f5ba57cd2cf5c740168198e7bbbd -DIST zerotier-1.10.6.tar.gz 15259391 BLAKE2B 48a47744502f976584c622f0f117ae2b7f73addd69bdb19c0829b1c0b99fa387618b2cd7203eb4f8838cb59c85ec658792066f55c650f2d9d9774029779d267c SHA512 e22982e0898d5db4748ca009480cc6ea07b13e1cf3dcb2c78fbba5036519c0d08afe8bdad20766669f52fef03679ff228414337e2478990fd5ba5d3dbece1972 +DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787 +DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82 +DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d +DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756 DIST zerotier-1.12.2.tar.gz 12431815 BLAKE2B c67889ce1f2479553382f43d581631686060218d187913931d92da751606246b72763a537fa936d462cdc7b6641ee2d2f4a753cd46398a1a4e6e8ac6a2e19f11 SHA512 75a698dc3755f18a9a8909a231f6d9667edfeb3140e3e4925ebe2e01d2172bd1ac8d1498439e0e9959343a4258bc7f3862d8e6a6eb4f03ebc77e02ef7c074e73 +DIST zerotier-1.14.0.tar.gz 12453099 BLAKE2B 63c7118bdc0cbb1d43fab38a8955067b1587e0a71ad2b25b70186c2636f119b5bc67e5f8e1c8aba95b5926a3e96bf278bb94e05632005176ce5fc8315b90b982 SHA512 ba268dd9773a07c0b0e2346a6316b69b3ba4c346bb3d36b20f0a491591f711d5ac40383c03b72c39b523c087348956deadde51406dd996c1418e12d996a25f7d diff --git a/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch new file mode 100644 index 000000000000..12e00b598975 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch @@ -0,0 +1,24 @@ +https://github.com/zerotier/ZeroTierOne/pull/2162 + +From 55485ad51e5de6a344f7dc7f352df1876fa747ea Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Sun, 29 Oct 2023 14:11:13 +0200 +Subject: [PATCH 1/2] Respect user LDFLAGS + +* Respect user LDFLAGS instead of replacing them. + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/make-linux.mk ++++ b/make-linux.mk +@@ -71,7 +71,7 @@ else + override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) + CXXFLAGS?=-O3 -fstack-protector + override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) +- LDFLAGS=-pie -Wl,-z,relro,-z,now ++ LDFLAGS?=-pie -Wl,-z,relro,-z,now + ZT_CARGO_FLAGS=--release + endif + +-- +2.45.1 + diff --git a/net-misc/zerotier/zerotier-1.10.1.ebuild b/net-misc/zerotier/zerotier-1.10.1.ebuild deleted file mode 100644 index 2e74f67d3f82..000000000000 --- a/net-misc/zerotier/zerotier-1.10.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="A software-based managed Ethernet switch for planet Earth" -HOMEPAGE="https://www.zerotier.com/" -SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/ZeroTierOne-${PV} - -LICENSE="BUSL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -IUSE="cpu_flags_arm_neon" - -RDEPEND=" - dev-libs/json-glib - net-libs/libnatpmp - >=net-libs/miniupnpc-2:= -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.10.1-respect-ldflags.patch - "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch -) - -DOCS=( README.md AUTHORS.md ) - -src_configure() { - tc-export CXX CC - - append-ldflags -Wl,-z,noexecstack - - use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 -} - -src_compile() { - myemakeargs=( - CXX="${CXX}" - STRIP=: - - # Needs Rust and fails to build as of 1.10.1 - ZT_SSO_SUPPORTED=0 - ) - - emake "${myemakeargs[@]}" one -} - -src_test() { - emake "${myemakeargs[@]}" selftest - ./zerotier-selftest || die -} - -src_install() { - default - - # Remove pre-zipped man pages - rm "${ED}"/usr/share/man/{man1,man8}/* || die - - newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" - systemd_dounit "${FILESDIR}/${PN}".service - - doman doc/zerotier-{cli.1,idtool.1,one.8} -} diff --git a/net-misc/zerotier/zerotier-1.10.6.ebuild b/net-misc/zerotier/zerotier-1.10.6.ebuild deleted file mode 100644 index cae03fbe000e..000000000000 --- a/net-misc/zerotier/zerotier-1.10.6.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CARGO_OPTIONAL=1 - -CRATES=" - android_system_properties@0.1.5 - ansi_term@0.12.1 - atty@0.2.14 - autocfg@1.1.0 - base64@0.13.1 - base64@0.21.0 - bitflags@1.3.2 - block-buffer@0.10.3 - bumpalo@3.12.0 - bytes@1.4.0 - cbindgen@0.20.0 - cc@1.0.79 - cfg-if@1.0.0 - chrono@0.4.23 - clap@2.34.0 - codespan-reporting@0.11.1 - core-foundation-sys@0.8.3 - core-foundation@0.9.3 - cpufeatures@0.2.5 - crypto-common@0.1.6 - cxx-build@1.0.91 - cxx@1.0.91 - cxxbridge-flags@1.0.91 - cxxbridge-macro@1.0.91 - darling@0.13.4 - darling_core@0.13.4 - darling_macro@0.13.4 - digest@0.10.6 - either@1.8.1 - encoding_rs@0.8.32 - errno-dragonfly@0.1.2 - errno@0.2.8 - fastrand@1.9.0 - fnv@1.0.7 - foreign-types-shared@0.1.1 - foreign-types@0.3.2 - form_urlencoded@1.1.0 - futures-channel@0.3.26 - futures-core@0.3.26 - futures-io@0.3.26 - futures-sink@0.3.26 - futures-task@0.3.26 - futures-util@0.3.26 - generic-array@0.14.6 - getrandom@0.2.8 - h2@0.3.16 - hashbrown@0.12.3 - heck@0.3.3 - hermit-abi@0.1.19 - hermit-abi@0.2.6 - hmac@0.12.1 - http-body@0.4.5 - http@0.2.9 - httparse@1.8.0 - httpdate@1.0.2 - hyper-tls@0.5.0 - hyper@0.14.24 - iana-time-zone-haiku@0.1.1 - iana-time-zone@0.1.53 - ident_case@1.0.1 - idna@0.3.0 - indexmap@1.9.2 - instant@0.1.12 - io-lifetimes@1.0.5 - ipnet@2.7.1 - itertools@0.10.5 - itoa@1.0.5 - js-sys@0.3.61 - lazy_static@1.4.0 - libc@0.2.139 - link-cplusplus@1.0.8 - linux-raw-sys@0.1.4 - log@0.4.17 - memchr@2.5.0 - mime@0.3.16 - mio@0.8.6 - native-tls@0.2.11 - num-bigint@0.4.3 - num-integer@0.1.45 - num-traits@0.2.15 - num_cpus@1.15.0 - oauth2@4.3.0 - once_cell@1.17.1 - openidconnect@2.5.0 - openssl-macros@0.1.0 - openssl-probe@0.1.5 - openssl-sys@0.9.80 - openssl@0.10.45 - ordered-float@2.10.0 - percent-encoding@2.2.0 - pin-project-lite@0.2.9 - pin-utils@0.1.0 - pkg-config@0.3.26 - ppv-lite86@0.2.17 - proc-macro2@1.0.51 - quote@1.0.23 - rand@0.8.5 - rand_chacha@0.3.1 - rand_core@0.6.4 - redox_syscall@0.2.16 - reqwest@0.11.14 - ring@0.16.20 - rustix@0.36.8 - ryu@1.0.12 - schannel@0.1.21 - scratch@1.0.3 - security-framework-sys@2.8.0 - security-framework@2.8.2 - serde-value@0.7.0 - serde@1.0.152 - serde_derive@1.0.152 - serde_json@1.0.93 - serde_path_to_error@0.1.9 - serde_plain@1.0.1 - serde_urlencoded@0.7.1 - serde_with@1.14.0 - serde_with_macros@1.5.2 - sha2@0.10.6 - slab@0.4.8 - socket2@0.4.7 - spin@0.5.2 - strsim@0.10.0 - strsim@0.8.0 - subtle@2.4.1 - syn@1.0.109 - tempfile@3.4.0 - termcolor@1.2.0 - textwrap@0.11.0 - thiserror-impl@1.0.38 - thiserror@1.0.38 - time-core@0.1.0 - time-macros@0.2.8 - time@0.3.20 - tinyvec@1.6.0 - tinyvec_macros@0.1.1 - tokio-native-tls@0.3.1 - tokio-util@0.7.7 - tokio@1.26.0 - toml@0.5.11 - tower-service@0.3.2 - tracing-core@0.1.30 - tracing@0.1.37 - try-lock@0.2.4 - typenum@1.16.0 - unicode-bidi@0.3.10 - unicode-ident@1.0.6 - unicode-normalization@0.1.22 - unicode-segmentation@1.10.1 - unicode-width@0.1.10 - untrusted@0.7.1 - url@2.3.1 - vcpkg@0.2.15 - vec_map@0.8.2 - version_check@0.9.4 - want@0.3.0 - wasi@0.11.0+wasi-snapshot-preview1 - wasm-bindgen-backend@0.2.84 - wasm-bindgen-futures@0.4.34 - wasm-bindgen-macro-support@0.2.84 - wasm-bindgen-macro@0.2.84 - wasm-bindgen-shared@0.2.84 - wasm-bindgen@0.2.84 - web-sys@0.3.61 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-util@0.1.5 - winapi-x86_64-pc-windows-gnu@0.4.0 - winapi@0.3.9 - windows-sys@0.42.0 - windows-sys@0.45.0 - windows-targets@0.42.1 - windows_aarch64_gnullvm@0.42.1 - windows_aarch64_msvc@0.42.1 - windows_i686_gnu@0.42.1 - windows_i686_msvc@0.42.1 - windows_x86_64_gnu@0.42.1 - windows_x86_64_gnullvm@0.42.1 - windows_x86_64_msvc@0.42.1 - winreg@0.10.1 -" - -declare -A GIT_CRATES=( - [jwt]='https://github.com/glimberg/rust-jwt;61a9291fdeec747c6edf14f4fa0caf235136c168;rust-jwt-%commit%' -) - -inherit cargo flag-o-matic systemd toolchain-funcs - -DESCRIPTION="A software-based managed Ethernet switch for planet Earth" -HOMEPAGE="https://www.zerotier.com/" -SRC_URI=" - https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz - sso? ( - ${CARGO_CRATE_URIS} - ) -" -S="${WORKDIR}"/ZeroTierOne-${PV} - -LICENSE="BUSL-1.1" -# Crate licenses -LICENSE+=" sso? ( Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -IUSE="cpu_flags_arm_neon debug sso" - -RDEPEND=" - dev-libs/openssl:= - net-libs/libnatpmp - >=net-libs/miniupnpc-2:= -" -DEPEND="${RDEPEND}" -BDEPEND=" - sso? ( - virtual/rust - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.10.1-respect-ldflags.patch - "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch -) - -DOCS=( README.md AUTHORS.md ) - -src_unpack() { - unpack ${P}.tar.gz - use sso && cargo_src_unpack -} - -src_prepare() { - default - - #1. Dont call cargo, we'll run it with cargo eclass functions - #2. Remove man page compression and install, we'll handle it with ebuild functions - sed -i \ - -e '/ifeq ($(ZT_SSO_SUPPORTED)/,/endif/ { /cargo build/d }' \ - -e '/install:/,/^$/ { /man[0-9]/d }' \ - make-linux.mk || die -} - -src_configure() { - tc-export CXX CC - - # Several assembler files without GNU-stack markings - # https://github.com/zerotier/ZeroTierOne/issues/1179 - append-ldflags -Wl,-z,noexecstack - - use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 - - use sso && cargo_src_configure -} - -src_compile() { - myemakeargs=( - CXX="${CXX}" - STRIP=: - - # Debug doesnt do more than add preprocessor arguments normally, - # but when rust is used it sets the correct rust directory to link against. - # It would be added by cargo eclass eitherway, so instead of adding REQUIRED_USE - # and patching the makefile its just easier to have it. - ZT_DEBUG="$(usex debug 1 0)" - ZT_SSO_SUPPORTED="$(usex sso 1 0)" - ) - - pushd zeroidc > /dev/null || die - use sso && cargo_src_compile - popd > /dev/null || die - - emake "${myemakeargs[@]}" one -} - -src_test() { - emake "${myemakeargs[@]}" selftest - ./zerotier-selftest || die -} - -src_install() { - default - - newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" - systemd_dounit "${FILESDIR}/${PN}".service - - doman doc/zerotier-{cli.1,idtool.1,one.8} -} diff --git a/net-misc/zerotier/zerotier-1.14.0.ebuild b/net-misc/zerotier/zerotier-1.14.0.ebuild new file mode 100644 index 000000000000..8a00c6b94532 --- /dev/null +++ b/net-misc/zerotier/zerotier-1.14.0.ebuild @@ -0,0 +1,463 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CARGO_OPTIONAL=1 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + ahash@0.8.11 + aho-corasick@1.1.2 + allocator-api2@0.2.16 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + ansi_term@0.12.1 + anstyle@1.0.6 + anyhow@1.0.81 + async-stream-impl@0.3.5 + async-stream@0.3.5 + async-trait@0.1.78 + atty@0.2.14 + autocfg@1.1.0 + axum-core@0.3.4 + axum@0.6.20 + backoff@0.4.0 + backtrace@0.3.69 + base16ct@0.2.0 + base64@0.13.1 + base64@0.21.7 + base64ct@1.6.0 + bitflags@1.3.2 + bitflags@2.5.0 + block-buffer@0.10.4 + bumpalo@3.15.4 + byteorder@1.5.0 + bytes@1.5.0 + cbindgen@0.20.0 + cc@1.0.90 + cfg-if@1.0.0 + chrono@0.4.35 + clap@2.34.0 + const-oid@0.9.6 + convert_case@0.4.0 + core-foundation-sys@0.8.6 + core-foundation@0.9.4 + cpufeatures@0.2.12 + crossbeam-channel@0.5.12 + crossbeam-queue@0.3.11 + crossbeam-utils@0.8.19 + crypto-bigint@0.5.5 + crypto-common@0.1.6 + curve25519-dalek-derive@0.1.1 + curve25519-dalek@4.1.2 + darling@0.20.8 + darling_core@0.20.8 + darling_macro@0.20.8 + dashmap@5.5.3 + der@0.7.8 + deranged@0.3.11 + derive_builder@0.20.0 + derive_builder_core@0.20.0 + derive_builder_macro@0.20.0 + derive_more@0.99.17 + digest@0.10.7 + downcast@0.11.0 + dyn-clone@1.0.17 + ecdsa@0.16.9 + ed25519-dalek@2.1.1 + ed25519@2.2.3 + either@1.10.0 + elliptic-curve@0.13.8 + encoding_rs@0.8.33 + enum-iterator-derive@1.3.0 + enum-iterator@2.0.0 + enum_dispatch@0.3.12 + equivalent@1.0.1 + erased-serde@0.4.4 + errno@0.3.8 + fastrand@2.0.1 + ff@0.13.0 + fiat-crypto@0.2.6 + fixedbitset@0.4.2 + fnv@1.0.7 + foreign-types-shared@0.1.1 + foreign-types@0.3.2 + form_urlencoded@1.2.1 + fragile@2.0.0 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-executor@0.3.30 + futures-io@0.3.30 + futures-macro@0.3.30 + futures-retry@0.6.0 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-timer@3.0.3 + futures-util@0.3.30 + futures@0.3.30 + generic-array@0.14.7 + getrandom@0.2.12 + gimli@0.28.1 + governor@0.6.3 + group@0.13.0 + h2@0.3.25 + hashbrown@0.12.3 + hashbrown@0.14.3 + heck@0.3.3 + heck@0.4.1 + hermit-abi@0.1.19 + hermit-abi@0.3.9 + hex@0.4.3 + hkdf@0.12.4 + hmac@0.12.1 + home@0.5.9 + http-body@0.4.6 + http@0.2.12 + httparse@1.8.0 + httpdate@1.0.3 + hyper-timeout@0.4.1 + hyper-tls@0.5.0 + hyper@0.14.28 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.60 + ident_case@1.0.1 + idna@0.5.0 + indexmap@1.9.3 + indexmap@2.2.5 + instant@0.1.12 + inventory@0.3.15 + ipnet@2.9.0 + itertools@0.10.5 + itertools@0.11.0 + itertools@0.12.1 + itoa@1.0.10 + js-sys@0.3.69 + lazy_static@1.4.0 + libc@0.2.153 + libm@0.2.8 + linux-raw-sys@0.4.13 + lock_api@0.4.11 + log@0.4.21 + lru@0.12.3 + matchers@0.1.0 + matchit@0.7.3 + memchr@2.7.1 + mime@0.3.17 + miniz_oxide@0.7.2 + mio@0.8.11 + mockall@0.12.1 + mockall_derive@0.12.1 + multimap@0.8.3 + native-tls@0.2.11 + no-std-compat@0.4.1 + nonzero_ext@0.3.0 + nu-ansi-term@0.46.0 + num-bigint-dig@0.8.4 + num-conv@0.1.0 + num-integer@0.1.46 + num-iter@0.1.44 + num-traits@0.2.18 + num_cpus@1.16.0 + oauth2@4.4.2 + object@0.32.2 + once_cell@1.19.0 + openidconnect@3.5.0 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.101 + openssl@0.10.64 + opentelemetry@0.22.0 + ordered-float@2.10.1 + overload@0.1.1 + p256@0.13.2 + p384@0.13.0 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + pem-rfc7468@0.7.0 + percent-encoding@2.3.1 + petgraph@0.6.4 + pin-project-internal@1.1.5 + pin-project-lite@0.2.13 + pin-project@1.1.5 + pin-utils@0.1.0 + pkcs1@0.7.5 + pkcs8@0.10.2 + pkg-config@0.3.30 + platforms@3.3.0 + portable-atomic@1.6.0 + powerfmt@0.2.0 + ppv-lite86@0.2.17 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@3.1.0 + prettyplease@0.2.16 + primeorder@0.13.6 + proc-macro2@1.0.79 + prometheus@0.13.3 + prost-build@0.12.3 + prost-derive@0.12.3 + prost-types@0.12.3 + prost-wkt-build@0.5.0 + prost-wkt-types@0.5.0 + prost-wkt@0.5.0 + prost@0.12.3 + protobuf@2.28.0 + quanta@0.12.2 + quote@1.0.35 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + raw-cpuid@11.0.1 + redox_syscall@0.4.1 + regex-automata@0.1.10 + regex-automata@0.4.6 + regex-syntax@0.6.29 + regex-syntax@0.8.2 + regex@1.10.3 + reqwest@0.11.26 + rfc6979@0.4.0 + ring@0.17.8 + ringbuf@0.3.3 + rsa@0.9.6 + rustc-demangle@0.1.23 + rustc_version@0.4.0 + rustix@0.38.31 + rustls-native-certs@0.7.0 + rustls-pemfile@1.0.4 + rustls-pemfile@2.1.1 + rustls-pki-types@1.3.1 + rustls-webpki@0.102.2 + rustls@0.22.2 + rustversion@1.0.14 + ryu@1.0.17 + schannel@0.1.23 + scopeguard@1.2.0 + sec1@0.7.3 + security-framework-sys@2.9.1 + security-framework@2.9.2 + semver@1.0.22 + serde-value@0.7.0 + serde@1.0.197 + serde_derive@1.0.197 + serde_json@1.0.114 + serde_path_to_error@0.1.16 + serde_plain@1.0.2 + serde_urlencoded@0.7.1 + serde_with@3.7.0 + serde_with_macros@3.7.0 + sha2@0.10.8 + sharded-slab@0.1.7 + signal-hook-registry@1.4.1 + signature@2.2.0 + siphasher@1.0.1 + slab@0.4.9 + slotmap@1.0.7 + smallvec@1.13.1 + socket2@0.5.6 + spin@0.5.2 + spin@0.9.8 + spinning_top@0.3.0 + spki@0.7.3 + strsim@0.10.0 + strsim@0.8.0 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.53 + sync_wrapper@0.1.2 + system-configuration-sys@0.5.0 + system-configuration@0.5.1 + tempfile@3.10.1 + termtree@0.4.1 + textwrap@0.11.0 + thiserror-impl@1.0.58 + thiserror@1.0.58 + thread_local@1.1.8 + time-core@0.1.2 + time-macros@0.2.17 + time@0.3.34 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-io-timeout@1.2.0 + tokio-macros@2.2.0 + tokio-native-tls@0.3.1 + tokio-rustls@0.25.0 + tokio-stream@0.1.15 + tokio-util@0.7.10 + tokio@1.36.0 + toml@0.5.11 + tonic-build@0.11.0 + tonic@0.11.0 + tower-layer@0.3.2 + tower-service@0.3.2 + tower@0.4.13 + tracing-attributes@0.1.27 + tracing-core@0.1.32 + tracing-log@0.2.0 + tracing-subscriber@0.3.18 + tracing@0.1.40 + try-lock@0.2.5 + typenum@1.17.0 + typetag-impl@0.2.16 + typetag@0.2.16 + unicode-bidi@0.3.15 + unicode-ident@1.0.12 + unicode-normalization@0.1.23 + unicode-segmentation@1.11.0 + unicode-width@0.1.11 + untrusted@0.9.0 + url@2.5.0 + urlencoding@2.1.3 + uuid@1.8.0 + valuable@0.1.0 + vcpkg@0.2.15 + vec_map@0.8.2 + version_check@0.9.4 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.92 + wasm-bindgen-futures@0.4.42 + wasm-bindgen-macro-support@0.2.92 + wasm-bindgen-macro@0.2.92 + wasm-bindgen-shared@0.2.92 + wasm-bindgen@0.2.92 + web-sys@0.3.69 + which@4.4.2 + winapi-i686-pc-windows-gnu@0.4.0 + 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.4 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.4 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.4 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.4 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.4 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.4 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.4 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.4 + winreg@0.50.0 + zerocopy-derive@0.7.32 + zerocopy@0.7.32 + zeroize@1.7.0 +" + +declare -A GIT_CRATES=( + [jwt]='https://github.com/glimberg/rust-jwt;61a9291fdeec747c6edf14f4fa0caf235136c168;rust-jwt-%commit%' + [rustfsm]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/fsm' + [rustfsm_procmacro]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/fsm/rustfsm_procmacro' + [rustfsm_trait]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/fsm/rustfsm_trait' + [temporal-client]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/client' + [temporal-sdk-core-api]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/core-api' + [temporal-sdk-core-protos]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/sdk-core-protos' + [temporal-sdk-core]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/core' + [temporal-sdk]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/sdk' +) + +inherit cargo systemd toolchain-funcs + +DESCRIPTION="A software-based managed Ethernet switch for planet Earth" +HOMEPAGE="https://www.zerotier.com/" +SRC_URI=" + https://github.com/zerotier/ZeroTierOne/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + sso? ( + ${CARGO_CRATE_URIS} + ) +" +S="${WORKDIR}"/ZeroTierOne-${PV} + +LICENSE="BUSL-1.1" +# Crate licenses +LICENSE+=" sso? ( Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="cpu_flags_arm_neon debug sso" + +RDEPEND=" + dev-libs/openssl:= + net-libs/libnatpmp + >=net-libs/miniupnpc-2:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sso? ( + virtual/rust + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.14.0-respect-ldflags.patch + "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch + "${FILESDIR}"/${PN}-1.12.2-noexecstack.patch +) + +DOCS=( README.md AUTHORS.md ) + +src_unpack() { + unpack ${P}.tar.gz + use sso && cargo_src_unpack +} + +src_prepare() { + default + + #1. Dont call cargo, we'll run it with cargo eclass functions + #2. Remove man page compression and install, we'll handle it with ebuild functions + sed -i \ + -e '/ifeq ($(ZT_SSO_SUPPORTED)/,/endif/ { /cargo build/d }' \ + -e '/install:/,/^$/ { /man[0-9]/d }' \ + make-linux.mk || die +} + +src_configure() { + tc-export CXX CC + + use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 + + use sso && cargo_src_configure +} + +src_compile() { + #TODO: New rusty bit smeeclient isnt built + myemakeargs=( + CXX="${CXX}" + STRIP=: + + # Debug doesnt do more than add preprocessor arguments normally, + # but when rust is used it sets the correct rust directory to link against. + # It would be added by cargo eclass eitherway, so instead of adding REQUIRED_USE + # and patching the makefile its just easier to have it. + ZT_DEBUG="$(usex debug 1 0)" + ZT_SSO_SUPPORTED="$(usex sso 1 0)" + ) + + pushd rustybits/zeroidc > /dev/null || die + use sso && cargo_src_compile + popd > /dev/null || die + + emake "${myemakeargs[@]}" one +} + +src_test() { + emake "${myemakeargs[@]}" selftest + ./zerotier-selftest || die +} + +src_install() { + default + + newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + + doman doc/zerotier-{cli.1,idtool.1,one.8} +} 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" |