diff options
Diffstat (limited to 'net-misc')
491 files changed, 14262 insertions, 5359 deletions
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest index 60ff7c07658a..f0a2cd9b4276 100644 --- a/net-misc/anydesk/Manifest +++ b/net-misc/anydesk/Manifest @@ -1 +1,2 @@ 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 diff --git a/net-misc/anydesk/anydesk-6.3.0.ebuild b/net-misc/anydesk/anydesk-6.3.0.ebuild new file mode 100644 index 000000000000..77d78ee0f0c6 --- /dev/null +++ b/net-misc/anydesk/anydesk-6.3.0.ebuild @@ -0,0 +1,102 @@ +# 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/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 93003c161282..3f1113b4af76 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 @@ -15,7 +15,7 @@ SRC_URI="https://salsa.debian.org/blade/${PN}/-/archive/debian/${MY_PV}/${MY_P}. LICENSE="BSD-4 ZLIB public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="doc fuse systemd tcpd" DEPEND="acct-user/apt-cacher-ng diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest index 1fcb359d651b..eab5c84fe4d4 100644 --- a/net-misc/aria2/Manifest +++ b/net-misc/aria2/Manifest @@ -1 +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.37.0.ebuild index 3b2ecbe4c67d..39236f9eb903 100644 --- a/net-misc/aria2/aria2-1.36.0-r1.ebuild +++ b/net-misc/aria2/aria2-1.37.0.ebuild @@ -10,7 +10,7 @@ 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 ~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 diff --git a/net-misc/asterisk-base/asterisk-base-1.ebuild b/net-misc/asterisk-base/asterisk-base-1.ebuild new file mode 100644 index 000000000000..f1eb0c168d4c --- /dev/null +++ b/net-misc/asterisk-base/asterisk-base-1.ebuild @@ -0,0 +1,40 @@ +# Copyright 2023 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://www.gentoo.org/wiki/No_homepage" +# Need to set S due to PMS saying we need it existing, but no SRC_URI +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 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 "${FILESDIR}/initd-1" asterisk + newconfd "${FILESDIR}/confd-1" asterisk + newsbin "${FILESDIR}/asterisk_wrapper-1" asterisk_wrapper + + systemd_newunit "${FILESDIR}/asterisk.service-1" asterisk.service + systemd_install_serviced "${FILESDIR}/asterisk.service-1.conf" asterisk.service + + newtmpfiles "${FILESDIR}/tmpfiles-1.conf" asterisk.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate-1" asterisk +} + +pkg_postinst() { + tmpfiles_process asterisk.conf +} diff --git a/net-misc/asterisk-base/asterisk-base-2.ebuild b/net-misc/asterisk-base/asterisk-base-2.ebuild new file mode 100644 index 000000000000..7d89202ca56f --- /dev/null +++ b/net-misc/asterisk-base/asterisk-base-2.ebuild @@ -0,0 +1,40 @@ +# Copyright 2023 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://www.gentoo.org/wiki/No_homepage" +# Need to set S due to PMS saying we need it existing, but no SRC_URI +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 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 "${FILESDIR}/initd-1" asterisk + newconfd "${FILESDIR}/confd-1" asterisk + newsbin "${FILESDIR}/asterisk_wrapper-2" asterisk_wrapper + + systemd_newunit "${FILESDIR}/asterisk.service-1" asterisk.service + systemd_install_serviced "${FILESDIR}/asterisk.service-1.conf" asterisk.service + + newtmpfiles "${FILESDIR}/tmpfiles-1.conf" asterisk.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate-1" asterisk +} + +pkg_postinst() { + tmpfiles_process asterisk.conf +} diff --git a/net-misc/asterisk-base/files/asterisk.service-1 b/net-misc/asterisk-base/files/asterisk.service-1 new file mode 100644 index 000000000000..08245d9fe87f --- /dev/null +++ b/net-misc/asterisk-base/files/asterisk.service-1 @@ -0,0 +1,23 @@ +[Unit] +Description=Asterisk PBX and telephony daemon. +After=network.target + +[Service] +Type=simple +WorkingDirectory=/var/lib/asterisk +User=asterisk +Group=asterisk +ExecStart=/usr/sbin/asterisk -f -C /etc/asterisk/asterisk.conf +ExecStop=/usr/sbin/asterisk -rx 'core stop now' +ExecReload=/usr/sbin/asterisk -rx 'core reload' + +LimitNOFILE=4096 +ProtectSystem=full +ProtectHome=yes +PrivateTmp=yes + +Restart=always +RestartSec=5 + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/asterisk-base/files/asterisk.service-1.conf b/net-misc/asterisk-base/files/asterisk.service-1.conf new file mode 100644 index 000000000000..d94a08d78190 --- /dev/null +++ b/net-misc/asterisk-base/files/asterisk.service-1.conf @@ -0,0 +1,10 @@ +# Uncomment the following 7 lines to start asterisk with a console on tty7 +# +# Warning! Use only for debugging, this is a potential security issue! +# +# [Service] +# ExecStart=/usr/sbin/asterisk -f -c -C /etc/asterisk/asterisk.conf +# TTYPath=/dev/tty7 +# StandardInput=tty +# StandardOutput=tty +# StandardError=tty diff --git a/net-misc/asterisk-base/files/asterisk_wrapper-1 b/net-misc/asterisk-base/files/asterisk_wrapper-1 new file mode 100644 index 000000000000..1a85eccf9b25 --- /dev/null +++ b/net-misc/asterisk-base/files/asterisk_wrapper-1 @@ -0,0 +1,227 @@ +#! /bin/sh +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +progname="$(basename "$0")" + +T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")" +eval set -- "${T}" + +# bash builtins are special ... +echo_e="$([ "${SHELL}" = "/bin/bash" ] && echo "echo -e" || echo echo)" + +rundir=/run/asterisk +restartdelay=5 +nicelevel=0 +maxfd=4096 +dumpcore=0 +unset tty instance syslog corecompress corerename crashemail + +usage() { + cat <<USAGE +USAGE: $progname [options] -- asterisk options" +OPTIONS: + -h|--help + Output this text and exit. + --corecompress[=tool] + asterisk's address space can get quite large, compressing the core dumps can + save significant space, especially if asterisk core dumps frequently. + --corerename pattern + It's assumed core files (if enabled) will go into PWD, this specifies a + rename pattern. The following % codes are recognised: + %h - hostname + %D - date in format YYYYMMDD + %T - time in format HHMMSS + It must be mentioned that if kernel.core_pattern (sysctl) is modified + from the default 'core' value this option is unlikely to work. + --crashemail email@address + This will send an email whenver asterisk crashes (does not terminate + cleanly with a zero exit code). You need a working sendmail binary. + --dumpcore sizelimit + Maximum size of core limit, or the word unlimited. Default is disabled + (sizelimit of 0). + --instance name + Updated label for sylog logger. + --maxfd maxfd + Sets the maximum number of file descriptors (default 4096). + --nicelevel nicelevel + Will set the asterisk nice level to the specified value. + --restartdelay delay_in_seconds + Number of seconds to wait before attempting to restart asterisk. This helps + to avoid tight-loop crashes. Defaults to 5s. Minimum 1. + --rundir path + Where to store the asterisk asterisk_wrapper.pid file. In order to terminate the + wrapper (when asterisk next terminates), remove this file. + --syslog + Pass to redirect output to syslog rather than using stdout and stderr. + --tty tty + If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8. + Use of this is not recommended in general. + +NOTE: There are some quirks with bash getopt shunting non-options prior to -- + to asterisk options, so be careful of this. Typically stuff will break. +USAGE +} + +matchreg() { + local v=$1 + shift + echo "$v" | grep -q "$@" +} + +while [ "$1" != "--" ]; do + case "$1" in + --corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty) + eval "${1#--}=\"\${2}\"" + shift 2 + ;; + --syslog) + eval "${1#--}=1" + shift + ;; + --help|-h) + usage + exit 0 + ;; + *) + echo "BUG: Don't know how to process option $1." >&2 + usage >&2 + exit 1 + ;; + esac +done +shift # -- + +if ! matchreg "${restartdelay}" "^[1-9][0-9]*$"; then + echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2 + restartdelay=5 +fi + +if ! matchreg "${maxfd}" "^[1-9][0-9]*$"; then + echo "Invalid --maxfd value, resetting to 4096." >&2 + maxfd=4096 +fi + +if [ $maxfd -lt 1024 ]; then + echo "maxfd is guaranteed too low, bumping to at least 1024" >&2 + maxfd=1024 +fi + +if [ -n "${nicelevel}" ] && ! matchreg "${nicelevel}" -E "^-?[0-9]+$"; then + echo "Invalid --nicelevel which much be a valid integer (values from -20 to 20 makes sense)." + exit 1 +fi + +if [ -n "${corecompress}" -a ! -x "${corecompress}" ]; then + corecompress=$(which "${corecompress}" 2>/dev/null) + [ -z "${corecompress}" ] && echo "Error locating core compression tool, disabling core compression." >&2 +fi + +# Before here will still be output (potentially munged, to the terminal). +if [ -n "${syslog}" ]; then + tdir="$(mktemp -d)" + tfifo="${tdir}/asterisk_wrapper.logger.fifo" + mkfifo "${tfifo}" + logger -t "asterisk_wrapper${instance:+:}${instance}" --id=$$ >/dev/null 2>&1 <"${tfifo}" & + exec 1>"${tfifo}" + exec 2>&1 + + rm "${tfifo}" + rmdir "${tdir}" +fi + +echo "Initializing ${progname}" + +cleanup(){ + # There is a tiny race here, if this gets replaced inbetween the read and the rm. + # To fix this is quite complex in that we need to keep an fd, compare inode numbers + # and manage flock's. + [ -r "${rundir}/${progname}.pid" ] && \ + [ "$(cat "${rundir}/${progname}.pid")" = $$ ] && \ + rm "${rundir}/${progname}.pid" +} +trap cleanup EXIT + +# We could be clobbering an old version's pid, in which case it'll just terminate on +# it's next iteration. Towards this end, if asterisk.pid exists, attempt to find it's +# config file and request a core stop when convenient so that we can take over. +echo $$ > "${rundir}/${progname}.pid" +if [ -r "${rundir}/asterisk.pid" ]; then + ast_pid="$(cat "${rundir}/asterisk.pid")" + [ -r "/proc/${ast_pid}/cmdline" ] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient" + # We may hit a few (depending on how busy the server is a great many number) loop failures still ... +fi + +prlimit --core=${dumpcore} --pid=$$ +prlimit --nofile=${maxfd} --pid=$$ + +ast_cmd=/usr/sbin/asterisk +if [ -n "${nicelevel}" ]; then + ast_cmd="nice -n ${nicelevel} ${ast_cmd}" +fi + +while [ -r "${rundir}/${progname}.pid" ]; do + # Another instance is looking to replace us, so terminate. + if [ "$(cat "${rundir}/${progname}.pid")" != $$ ]; then + break + fi + + echo "Starting asterisk with ${ast_cmd} $*" + if [ -n "${tty+yes}" ]; then + /bin/stty -F "${tty}" sane + ${ast_cmd} "$@" >"${tty}" 2>&1 <"${tty}" + result=$? + else + # Purposefully leave stderr alone, this will under certain odd cases (like exceptions, + # and other odd cases logged from glibc) result in those logs at least being captured + # in syslog. + ${ast_cmd} "$@" </dev/null >/dev/null + result=$? + fi + + if [ "$result" -eq 0 ]; then + echo "Asterisk terminated normally." + break + fi + + if [ "$result" -gt 128 ]; then + signal="$(( result - 128 ))" + signame="$(kill -l $signal 2>/dev/null)" + MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})" + + # TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using + # that, chances are they're already dealing with what we want here. + if [ -r core ]; then + if [ -n "${corerename+yes}" ]; then + core_target="$(echo "${core_pattern}" | sed -e "s/%h/$(hostname)/" \ + -e "s/%D/$(date +%Y%m%d)/" -e "s/%T/$(date +%H%M%S)/")" + mv core "${core_target}" + core_target=$(readlink -f "${core_target}") + else + core_target=$(readlink -f core) + fi + + if [ -n "${corecompress}" && -x "${corecompress}" ]; then + "${corecompress}" "${core_target}" + fi + + MSG="${MSG}\r\nCore dumped: ${core_target}" + fi + else + MSG="Asterisk terminated with return code: $result" + fi + + [ -n "${tty+yes}" ] \ + && echo "${MSG}" >"${tty}" \ + || echo "${MSG}" + + if [ -n "${crashemail+yes}" && -x /usr/sbin/sendmail ]; then + $echo_e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ + /usr/sbin/sendmail "${crashemail}" + fi + echo "Restarting asterisk after ${restartdelay}s ..." + sleep "${restartdelay}" +done + +echo "Terminating $progname." +exit 0 diff --git a/net-misc/asterisk-base/files/asterisk_wrapper-2 b/net-misc/asterisk-base/files/asterisk_wrapper-2 new file mode 100644 index 000000000000..cd7d5ff6504e --- /dev/null +++ b/net-misc/asterisk-base/files/asterisk_wrapper-2 @@ -0,0 +1,227 @@ +#! /bin/sh +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +progname="$(basename "$0")" + +T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")" +eval set -- "${T}" + +# bash builtins are special ... +echo_e="$([ "${SHELL}" = "/bin/bash" ] && echo "echo -e" || echo echo)" + +rundir=/run/asterisk +restartdelay=5 +nicelevel=0 +maxfd=4096 +dumpcore=0 +unset tty instance syslog corecompress corerename crashemail + +usage() { + cat <<USAGE +USAGE: $progname [options] -- asterisk options" +OPTIONS: + -h|--help + Output this text and exit. + --corecompress[=tool] + asterisk's address space can get quite large, compressing the core dumps can + save significant space, especially if asterisk core dumps frequently. + --corerename pattern + It's assumed core files (if enabled) will go into PWD, this specifies a + rename pattern. The following % codes are recognised: + %h - hostname + %D - date in format YYYYMMDD + %T - time in format HHMMSS + It must be mentioned that if kernel.core_pattern (sysctl) is modified + from the default 'core' value this option is unlikely to work. + --crashemail email@address + This will send an email whenver asterisk crashes (does not terminate + cleanly with a zero exit code). You need a working sendmail binary. + --dumpcore sizelimit + Maximum size of core limit, or the word unlimited. Default is disabled + (sizelimit of 0). + --instance name + Updated label for sylog logger. + --maxfd maxfd + Sets the maximum number of file descriptors (default 4096). + --nicelevel nicelevel + Will set the asterisk nice level to the specified value. + --restartdelay delay_in_seconds + Number of seconds to wait before attempting to restart asterisk. This helps + to avoid tight-loop crashes. Defaults to 5s. Minimum 1. + --rundir path + Where to store the asterisk asterisk_wrapper.pid file. In order to terminate the + wrapper (when asterisk next terminates), remove this file. + --syslog + Pass to redirect output to syslog rather than using stdout and stderr. + --tty tty + If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8. + Use of this is not recommended in general. + +NOTE: There are some quirks with bash getopt shunting non-options prior to -- + to asterisk options, so be careful of this. Typically stuff will break. +USAGE +} + +matchreg() { + local v=$1 + shift + echo "$v" | grep -q "$@" +} + +while [ "$1" != "--" ]; do + case "$1" in + --corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty) + eval "${1#--}=\"\${2}\"" + shift 2 + ;; + --syslog) + eval "${1#--}=1" + shift + ;; + --help|-h) + usage + exit 0 + ;; + *) + echo "BUG: Don't know how to process option $1." >&2 + usage >&2 + exit 1 + ;; + esac +done +shift # -- + +if ! matchreg "${restartdelay}" "^[1-9][0-9]*$"; then + echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2 + restartdelay=5 +fi + +if ! matchreg "${maxfd}" "^[1-9][0-9]*$"; then + echo "Invalid --maxfd value, resetting to 4096." >&2 + maxfd=4096 +fi + +if [ $maxfd -lt 1024 ]; then + echo "maxfd is guaranteed too low, bumping to at least 1024" >&2 + maxfd=1024 +fi + +if [ -n "${nicelevel}" ] && ! matchreg "${nicelevel}" -E "^-?[0-9]+$"; then + echo "Invalid --nicelevel which much be a valid integer (values from -20 to 20 makes sense)." + exit 1 +fi + +if [ -n "${corecompress}" -a ! -x "${corecompress}" ]; then + corecompress=$(which "${corecompress}" 2>/dev/null) + [ -z "${corecompress}" ] && echo "Error locating core compression tool, disabling core compression." >&2 +fi + +# Before here will still be output (potentially munged, to the terminal). +if [ -n "${syslog}" ]; then + tdir="$(mktemp -d)" + tfifo="${tdir}/asterisk_wrapper.logger.fifo" + mkfifo "${tfifo}" + logger -t "asterisk_wrapper${instance:+:}${instance}" --id=$$ >/dev/null 2>&1 <"${tfifo}" & + exec 1>"${tfifo}" + exec 2>&1 + + rm "${tfifo}" + rmdir "${tdir}" +fi + +echo "Initializing ${progname}" + +cleanup(){ + # There is a tiny race here, if this gets replaced inbetween the read and the rm. + # To fix this is quite complex in that we need to keep an fd, compare inode numbers + # and manage flock's. + [ -r "${rundir}/${progname}.pid" ] && \ + [ "$(cat "${rundir}/${progname}.pid")" = $$ ] && \ + rm "${rundir}/${progname}.pid" +} +trap cleanup EXIT + +# We could be clobbering an old version's pid, in which case it'll just terminate on +# it's next iteration. Towards this end, if asterisk.pid exists, attempt to find it's +# config file and request a core stop when convenient so that we can take over. +echo $$ > "${rundir}/${progname}.pid" +if [ -r "${rundir}/asterisk.pid" ]; then + ast_pid="$(cat "${rundir}/asterisk.pid")" + [ -r "/proc/${ast_pid}/cmdline" ] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient" + # We may hit a few (depending on how busy the server is a great many number) loop failures still ... +fi + +prlimit --core=${dumpcore} --pid=$$ +prlimit --nofile=${maxfd} --pid=$$ + +ast_cmd=/usr/sbin/asterisk +if [ -n "${nicelevel}" ]; then + ast_cmd="nice -n ${nicelevel} ${ast_cmd}" +fi + +while [ -r "${rundir}/${progname}.pid" ]; do + # Another instance is looking to replace us, so terminate. + if [ "$(cat "${rundir}/${progname}.pid")" != $$ ]; then + break + fi + + echo "Starting asterisk with ${ast_cmd} $*" + if [ -n "${tty+yes}" ]; then + /bin/stty -F "${tty}" sane + ${ast_cmd} "$@" >"${tty}" 2>&1 <"${tty}" + result=$? + else + # Purposefully leave stderr alone, this will under certain odd cases (like exceptions, + # and other odd cases logged from glibc) result in those logs at least being captured + # in syslog. + ${ast_cmd} "$@" </dev/null >/dev/null + result=$? + fi + + if [ "$result" -eq 0 ]; then + echo "Asterisk terminated normally." + break + fi + + if [ "$result" -gt 128 ]; then + signal="$(( result - 128 ))" + signame="$(kill -l $signal 2>/dev/null)" + MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})" + + # TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using + # that, chances are they're already dealing with what we want here. + if [ -r core ]; then + if [ -n "${corerename+yes}" ]; then + core_target="$(echo "${corerename}" | sed -e "s/%h/$(hostname)/" \ + -e "s/%D/$(date +%Y%m%d)/" -e "s/%T/$(date +%H%M%S)/")" + mv core "${core_target}" + core_target=$(readlink -f "${core_target}") + else + core_target=$(readlink -f core) + fi + + if [ -n "${corecompress}" ] && [ -x "${corecompress}" ]; then + "${corecompress}" "${core_target}" + fi + + MSG="${MSG}, Core dumped: ${core_target}" + fi + else + MSG="Asterisk terminated with return code: $result" + fi + + [ -n "${tty+yes}" ] \ + && echo "${MSG}" >"${tty}" \ + || echo "${MSG}" + + if [ -n "${crashemail+yes}" ] && [ -x /usr/sbin/sendmail ]; then + $echo_e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ + /usr/sbin/sendmail "${crashemail}" + fi + echo "Restarting asterisk after ${restartdelay}s ..." + sleep "${restartdelay}" +done + +echo "Terminating $progname." +exit 0 diff --git a/net-misc/asterisk-base/files/confd-1 b/net-misc/asterisk-base/files/confd-1 new file mode 100644 index 000000000000..c350b7e9161d --- /dev/null +++ b/net-misc/asterisk-base/files/confd-1 @@ -0,0 +1,169 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# +# Additional options for asterisk +# +# see "asterisk -h" for a list of options +# +# No default. +# +#ASTERISK_OPTS="" + +# +# User and group to run asterisk as +# +# Value: double-colon separated list of user and group, or empty to run as root: +# +# +# "asterisk:asterisk" to run as user "asterisk" and group "asterisk" +# "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of +# ":asterisk" to run as user "root" and group "asterisk" +# +# Default: asterisk +# +#ASTERISK_USER="asterisk" + +# +# Nicelevel +# +# Set the priority of the asterisk process +# +# Value: (highest) -20..19 (lowest) +# +# No default (leave scheduling to be system default). +# +#ASTERISK_NICE="19" + +# Send crash notifications emails to this address +# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp)) +# +# Value: Email address or empty to disable +# +# No default. +# +#ASTERISK_NOTIFY_EMAIL="root" + +# +# Send asterisk's output to this terminal +# +# Value: Full path to device node or a number +# +# No default. +# +#ASTERISK_TTY="/dev/tty9" + +# +# Start an asterisk console on the terminal specified by ASTERISK_TTY +# +# Warning! Use only for debugging, this is a potential security issue! +# +# Value: yes/no +# +# Default: no +# +#ASTERISK_CONSOLE="no" + +# +# Maximum size of core files. +# +# Value: Size in bytes, unlimited for no limit or empty to disable. +# +# Default: do not generate core dumps +# +#ASTERISK_CORE_SIZE="unlimited" + +# +# ASTERISK_CORE_DIR +# +# Value: Directory (will be created if non-existant). +# +# Default: /tmp +# +#ASTERISK_CORE_DIR="/var/lib/asterisk/core" + +# +# Max number of filedescriptors. asterisk can trivially run out of +# descriptors. In most (SIP) cases it uses at least four descriptors per call, +# and this is a conservative value. +# +# Value: Number of descriptors +# +# Default: leave system default in place. +# +ASTERISK_MAX_FD="4096" + +# +# Delay time before restarting asterisk after a crash. +# +# Value: Number of seconds to sleep after a crash before restarting. +# +# Default: 5 +# +#ASTERISK_RESTART_DELAY=5 + +# +# The stop mechanism to use. Asterisk can do gracefully, when convenient or now. +# By default we expect you to want to stop as soon as possible, so we default +# +# Default: gracefully +# +#ASTERISK_STOP_METHOD="when convenient" + +# +# By default the init script waits two minutes for asterisk to stop. This allows +# you to change that, or even completely disable and go into wait for ever mode (-1). +# The value here is in seconds. +# +# Default: 120 +# +#ASTERISK_STOP_TIMEOUT=-1 + +# +# ASTERISK_CONFDIR +# +# If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used +# (typically /etc/asterisk) to be used for configuration. +# +# Default: /etc/${RC_SVCNAME} +# +#ASTERISK_CONFDIR="/etc/foo/bar" + +# ASTERISK_CACHEDIR +# +# Value: Directory to which astcachedir in asterisk.conf is set. +# +# Default: /var/cache/asterisk +# +#ASTERISK_CACHEDIR="/var/cache/asterisk" + + +# +# Normally the init script will not wait for asterisk to fully boot. With this +# setting set to yes/true/1 it will issue a "core waitfullybooted" directly +# after starting asterisk, and wait for asterisk to start up completely. This +# is useful in certain conditions where other software requires asterisk to be +# properly started before they themselves can be started. +# +# Default: no +# +#ASTERISK_WAITBOOTED=yes + +# +# When core-dumping, the default was to generate core-$(date +%Y%m%d-%H%M%S). +# In certain highly unusual configurations it's helpful to also get the +# hostname into this filename. By enabling this option the wrapper loop will +# adjust the core file to be named core-$(hostname)-$(date ...). +# +# Default: no +# +#ASTERISK_CORE_USEHOSTNAME=yes + +# +# When core-dumping, the default is to not compress these files. However, as it turns +# out, compressing these core files can save significant amount of space, so if you +# want them compressed, specify the tool to use here. +# +# Default: do not compress +# +#ASTERISK_CORE_COMPRESS=bzip2 diff --git a/net-misc/asterisk-base/files/initd-1 b/net-misc/asterisk-base/files/initd-1 new file mode 100644 index 000000000000..7d48b36456bf --- /dev/null +++ b/net-misc/asterisk-base/files/initd-1 @@ -0,0 +1,311 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="forcestop reload" + +depend() { + need net + use nscd dns dahdi mysql postgresql slapd capi +} + +is_running() { + [ -r "${ast_rundir}/asterisk.pid" ] || return 1 + PID="$(cat "${ast_rundir}/asterisk.pid")" + [ -d "/proc/${PID}" ] || return 1 + EXE="$(readlink -f /proc/${PID}/exe)" + EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one. + [ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process. + + # PID reported in pidfile is active, and is still an asterisk instance. + return 0 +} + +# Sets up a few variables for us for use +# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo. +# ast_rundir: directory to be used as run folder (pid and ctl files). +setup_svc_variables() +{ + local t + + ast_instancename=asterisk + ast_rundir=/run/${RC_SVCNAME} + ast_logdir=/var/log/${RC_SVCNAME} + ast_confdir=/etc/${RC_SVCNAME} + ast_cachedir=/var/cache/asterisk + ast_stop_timeout=120 + ast_stop_method="gracefully" + + if [ "${RC_SVCNAME}" != "asterisk" ]; then + t="${RC_SVCNAME#asterisk.}" + if [ "${RC_SVCNAME}" = "${t}" ]; then + eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name." + return 1 + fi + ast_instancename="${ast_instancename}(${t})" + fi + + [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}" + [ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}" + [ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}" + [ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}" + [ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}" + case "${ASTERISK_STOP_METHOD}" in + gracefully|when\ convenient|now) + ast_stop_method="${ASTERISK_STOP_METHOD}" + ;; + esac + ast_group= + if [ -n "${ASTERISK_USER}" ]; then + ast_user="${ASTERISK_USER%%:*}" + if [ "${ast_user}" != "${ASTERISK_USER}" ]; then + ast_group="${ASTERISK_USER#*:}" + ast_group="${ast_group%%:*}" + fi + fi + + [ -z "${ast_user}" ] && ast_user=asterisk + + ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')" + + return 0 +} + +start() { + local OPTS PID + local tmp x + + local OPTS ARGS WRAPPER_OPTS + + setup_svc_variables || return $? + + ebegin "Starting ${ast_instancename} PBX" + + eindent + + # filter (redundant) arguments + OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")" + + # default options + OPTS="${OPTS}${OPTS:+ }-C ${ast_confdir}/asterisk.conf -f" # don't fork / detach breaks wrapper script... + + WRAPPER_OPTS="--syslog" + if [ "${RC_SVCNAME}" != "asterisk" ]; then + WRAPPER_OPTS="${WRAPPER_OPTS} --instance ${RC_SVCNAME#asterisk.}" + fi + WRAPPER_OPTS="${WRAPPER_OPTS} --rundir ${ast_rundir}" + + # ensure that ASTERISK_RESTART_DELAY is integer. + ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')" + [ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5 + WRAPPER_OPTS="${WRAPPER_OPTS} --restartdelay ${ASTERISK_RESTART_DELAY}" + + if [ -n "${ASTERISK_CORE_SIZE}" ] && + [ "${ASTERISK_CORE_SIZE}" != "0" ]; then + WRAPPER_OPTS="${WRAPPER_OPTS} --dumpcore ${ASTERISK_CORE_SIZE}" + OPTS="${OPTS} -g" + + if [ -n "${ASTERISK_CORE_DIR}" ] && \ + [ ! -d "${ASTERISK_CORE_DIR}" ] + then + checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}" + fi + ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}" + + cd "${ASTERISK_CORE_DIR}" + einfo "Core dump size : ${ASTERISK_CORE_SIZE}" + einfo "Core dump location : ${ASTERISK_CORE_DIR}" + + if [ -n "${ASTERISK_CORE_COMPRESS}" ]; then + einfo "Core compression tool : ${ASTERISK_CORE_COMPRESS}" + WRAPPER_OPTS="${WRAPPER_OPTS} --corecompress ${ASTERISK_CORE_COMPRESS}" + fi + + if yesno "${ASTERISK_CORE_USEHOSTNAME}"; then + WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%H-%D-%T" + else + WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%D-%T" + fi + else + cd / + fi + + if [ -n "${ASTERISK_MAX_FD}" ]; then + WRAPPER_OPTS="${WRAPPER_OPTS} --maxfd ${ASTERISK_MAX_FD}" + einfo "Max open filedescriptors : ${ASTERISK_MAX_FD}" + fi + + if [ -n "${ASTERISK_NICE}" ]; then + if [ ${ASTERISK_NICE} -ge -20 ] && \ + [ ${ASTERISK_NICE} -le 19 ]; then + einfo "Nice level : ${ASTERISK_NICE}" + WRAPPER_OPTS="${WRAPPER_OPTS} --nicelevel ${ASTERISK_NICE}" + else + eerror "Nice value must be between -20 and 19" + return 1 + fi + fi + + if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then + if [ -x /usr/sbin/sendmail ]; then + einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}" + WRAPPER_OPTS="${WRAPPER_OPTS} --crashemail ${ASTERISK_NOTIFY_EMAIL}" + else + ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!" + fi + fi + + if [ -n "${ASTERISK_TTY}" ]; then + for x in "${ASTERISK_TTY}" \ + "/dev/tty${ASTERISK_TTY}" \ + "/dev/vc/${ASTERISK_TTY}" + do + if [ -c "${x}" ]; then + TTY="${x}" + fi + done + if [ -n "${TTY}" ]; then + einfo "Messages are sent to : ${TTY}" + WRAPPER_OPTS="${WRAPPER_OPTS} --tty ${TTY}" + else + ewarn "ASTERISK_TTY=${TTY} ignored, not valid." + fi + fi + + if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then + einfo "Starting Asterisk console : Yes" + OPTS="${OPTS} -c" + fi + + if ! getent passwd "${ast_user}" >/dev/null 2>&1; then + eerror "Requested to run asterisk as ${ast_user}, which doesn't exist." + return 1 + fi + OPTS="${OPTS} -U ${ast_user}" + + if [ -n "${ast_group}" ] && ! getent group "${ast_group}" >/dev/null 2>&1; then + eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist." + return 1 + fi + [ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}" + + if [ "${ast_user}" = root ]; then + ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)." + elif [ "${ast_group}" = root ]; then + ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)." + fi + + checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}" + checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}" + + einfo "Starting asterisk as : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}" + einfo "Wrapper options : ${WRAPPER_OPTS}" + einfo "Asterisk options : ${OPTS}" + + /usr/sbin/asterisk_wrapper ${WRAPPER_OPTS} -- ${OPTS} & + result=$? + + if [ $result -eq 0 ]; then + # 2 seconds should be enough for asterisk to start + sleep 2 + is_running + result=$? + + [ $result -eq 0 ] || wrapperstop + fi + + eoutdent + eend $result + + if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then + if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then + # asterisk can crash during startup ... + ebegin "Waiting for ctl file to appear" + while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do + sleep 1 + done + is_running + result=$? + eend $result + fi + if [ $result -eq 0 ]; then + ebegin "Waiting for ${ast_instancename} to fully boot" + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" >/dev/null 2>&1 + eend $? + fi + fi + + return $result +} + +wrapperstop() { + # Older path. + if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + ebegin "Signalling ${ast_instancename} wrapper script to terminate" + rm "${ast_rundir}/wrapper_loop.running" + eend $? + fi + + if [ -r "${ast_rundir}/asterisk_wrapper.pid" ]; then + ebegin "Signalling ${ast_instancename} wrapper script to terminate" + rm "${ast_rundir}/asterisk_wrapper.pid" + eend $? + fi + + return 0 +} + +forcestop() { + setup_svc_variables || return $? + + # Just to be sure - when we want to forcestop we should make it all tear down. + wrapperstop + + ebegin "Stopping ${ast_instancename} PBX" + start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid + eend $? +} + +stop() { + setup_svc_variables || return $? + + wrapperstop + + if ! is_running; then + eerror "${ast_instancename} is not running!" + return 0 + fi + + ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}" + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" >/dev/null 2>&1 + # Now we have to wait until asterisk has _really_ stopped. + sleep 1 + if is_running; then + einfon "Waiting for ${ast_instancename} to shutdown ." + local cnt=0 + while is_running; do + cnt="$(expr $cnt + 2)" + if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then + echo + eend 1 "Failed waiting for ${ast_instancename} to stop." + return 1 + fi + sleep 2 + printf "." + done + echo + fi + eend 0 +} + +reload() { + setup_svc_variables || return $? + + if is_running; then + ebegin "Requesting ${ast_instancename} to reload configuration" + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" >/dev/null 2>&1 + eend $? + else + eerror "${ast_instancename} is not running!" + fi +} diff --git a/net-misc/asterisk-base/files/logrotate-1 b/net-misc/asterisk-base/files/logrotate-1 new file mode 100644 index 000000000000..2286efc1e7e9 --- /dev/null +++ b/net-misc/asterisk-base/files/logrotate-1 @@ -0,0 +1,27 @@ +/var/log/asterisk/messages { + missingok + notifempty + + postrotate + test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true + test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true + endscript +} + +/var/log/asterisk/debug /var/log/asterisk/full { + missingok + notifempty + daily + + postrotate + test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true + test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true + endscript +} + +/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv /var/log/asterisk/queue_log { + missingok + notifempty + weekly + rotate 52 +} diff --git a/net-misc/asterisk-base/files/tmpfiles-1.conf b/net-misc/asterisk-base/files/tmpfiles-1.conf new file mode 100644 index 000000000000..224d060a3c92 --- /dev/null +++ b/net-misc/asterisk-base/files/tmpfiles-1.conf @@ -0,0 +1,2 @@ +d /run/asterisk 0750 asterisk asterisk +d /var/cache/asterisk 0750 asterisk asterisk diff --git a/net-misc/asterisk-base/metadata.xml b/net-misc/asterisk-base/metadata.xml new file mode 100644 index 000000000000..6aebbc46f559 --- /dev/null +++ b/net-misc/asterisk-base/metadata.xml @@ -0,0 +1,12 @@ +<?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> +</pkgmetadata> diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 87da52766fd2..ae3e82f39208 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -1,7 +1,7 @@ -DIST asterisk-16.29.1.tar.gz 28104161 BLAKE2B 030d0c2ce296db9c38ebd45b69b8a57f368e97f6121aca77c5b1dd4eeaa9f274f4d0e404bbae1317c1c02497e155ca9fef06b82d003987621d2c46984e5f5d2c SHA512 5ae5c22b48ea0ff83a655d64a0122923e736e84d612b7936d157614b01ed1f12da76a8adb10c045023a9464dce26563c8458fcea80af3f26176ed1fcbe4e5376 DIST asterisk-16.30.0.tar.gz 28131110 BLAKE2B f230155a6347e891b531e54fe2821f1d477ed83699dd4a90c67b3307965430dbcdd04bd0ced49803776d349e29846492a6ef96e19ad3665dc610623be8de25cc SHA512 59cfbc1463dbad6ae7c6307d96b1a220fb02b3e398f96708654e58db788d57f2ca7aac8d4a290ed04f333b5c82c514ec9b95681125e3bdddc237e6c778fd2aec -DIST asterisk-18.15.1.tar.gz 28216621 BLAKE2B f354a49111b22fe37caf72ba552d8ecc3dec17605771d153d05b01d7e3017c6a50087309c37078d32b6dc375bbb14dfee89356eb46355f47374a08d5427179a1 SHA512 c8bee50023b137d95b02ce770c9983fc3d8cfc10f7d714ab658fb118813ccf29d97b0ada64bfd2795ce3a0f9ecfe82bd85ab3abefe9c8cc83454cd50ff8e5cf5 +DIST asterisk-16.30.1.tar.gz 28234979 BLAKE2B a9cd732feb00408876f90328d7f14dbfe426829e607f9b8e812ff25823c8dc1facab1ecd423e1d4f33c1623f3769197fa3b1fe3181efad0b231c96c0afb1dd16 SHA512 1624d207e80351f976c084344d09d67fe37b526a42970da007f5407be006d107e951093209415a68c891e2bd9cb142421e7acd1ac9fba2c1b1c064aee2224cb6 DIST asterisk-18.17.0.tar.gz 28293243 BLAKE2B 8a162d7cac92df2b6dd430fedc1446a302b1b9c1061ddd4a236fd5797e8be17d53d7179d23a7c8bd4260c73d34dea2db2b9ebffd4eebb2ed714a286838bc5ddf SHA512 1a5dd9715811a8b699d49b057ef42f68ddc88cc22a568836a6a778f6ff22d3923f81840aef425819bb59f28bb27e321154ef9e1d3deba5ed7d39c7eca562e40e -DIST asterisk-18.17.1.tar.gz 28284281 BLAKE2B ab60d993f18ff7fec6a58358862e3477488a62f55b72a6c60ade87503818ee6db5a1a0eeed906abf1050517e0487461f619a671ca37a54a7867f98d4b62419cc SHA512 75311693a090c001a323ad673d0df7befbed87bf1250ff836eded552b0329a38a019c6ad9f9ed8fcd58e09798900ebb3c5546f2a571d601adf63d34559242151 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-20.3.0.tar.gz 28176546 BLAKE2B 488cfe449c040c282afe438847d14f6cc20d1fb034fbb33555f8e43803b481d3f2b890ac01cc7d43278b41040093f8cedfc609c025cfab73fd8b9d23a0f67016 SHA512 332c24c089abca7059d80794b37a4f5dc34f0468a07f5534b0df26c5103e0508c9c5f3f35a02826ed6b33973c26503be2829fd51fa23a8056a58fa2b50b17730 +DIST asterisk-20.3.1.tar.gz 28176262 BLAKE2B 9ee75ee297dc4df37f51f75444d46af083b794cb444ae77b601f17308889db22240939edf04761eb3d41e74e2a67a3329d427861a5a5d34fec6016d6660793bd SHA512 4e34de731211aebe916d19948c41aff370187bfadc1202837a96ebc7f218e5bd7c3936b5b4e34ba6e79c079f77eb5ed038239c903800d5a56ceda2f342218613 diff --git a/net-misc/asterisk/asterisk-16.29.1.ebuild b/net-misc/asterisk/asterisk-16.30.1.ebuild index a684412a9be4..b2a0d086ac1e 100644 --- a/net-misc/asterisk/asterisk-16.29.1.ebuild +++ b/net-misc/asterisk/asterisk-16.30.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles +inherit autotools linux-info lua-single toolchain-funcs DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="https://www.asterisk.org/" @@ -101,6 +101,7 @@ RDEPEND="${DEPEND} 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" @@ -313,14 +314,6 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper - newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk - newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - # Reset diropts else dodoc uses it for doc installations. diropts -m0755 @@ -330,11 +323,6 @@ src_install() { # install extra documentation use doc && dodoc doc/*.{txt,pdf} - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - # Asterisk installs a few folders that's empty by design, # but still required. This finds them, and marks them for # portage. @@ -344,8 +332,6 @@ src_install() { } pkg_postinst() { - tmpfiles_process asterisk.conf - if [ -z "${REPLACING_VERSIONS}" ]; then elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" diff --git a/net-misc/asterisk/asterisk-18.17.1.ebuild b/net-misc/asterisk/asterisk-18.18.1.ebuild index b2e2fa41bd6b..3f4247463485 100644 --- a/net-misc/asterisk/asterisk-18.17.1.ebuild +++ b/net-misc/asterisk/asterisk-18.18.1.ebuild @@ -5,14 +5,14 @@ EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles +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" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc @@ -99,6 +99,7 @@ RDEPEND="${DEPEND} 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" @@ -312,14 +313,6 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newsbin "${FILESDIR}/asterisk_wrapper-18.17.1-20.2.1" asterisk_wrapper - newinitd "${FILESDIR}"/initd-18.17.1-20.2.1 asterisk - newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - # Reset diropts else dodoc uses it for doc installations. diropts -m0755 @@ -329,11 +322,6 @@ src_install() { # install extra documentation use doc && dodoc doc/*.{txt,pdf} - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - # Asterisk installs a few folders that's empty by design, # but still required. This finds them, and marks them for # portage. @@ -343,8 +331,6 @@ src_install() { } pkg_postinst() { - tmpfiles_process asterisk.conf - if [ -z "${REPLACING_VERSIONS}" ]; then elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" diff --git a/net-misc/asterisk/asterisk-18.15.1.ebuild b/net-misc/asterisk/asterisk-20.3.1.ebuild index cefe69e90f87..080afa1dc8ea 100644 --- a/net-misc/asterisk/asterisk-18.15.1.ebuild +++ b/net-misc/asterisk/asterisk-20.3.1.ebuild @@ -5,20 +5,20 @@ EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles +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" +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="${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} ) @@ -27,7 +27,7 @@ REQUIRED_USE="gtalk? ( xmpp ) 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-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch" ) DEPEND="acct-user/asterisk @@ -97,8 +97,8 @@ 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 )" + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" BDEPEND="dev-libs/libxml2:2 virtual/pkgconfig" @@ -115,6 +115,7 @@ _make_args=( "DESTDIR=${D}" "CONFIG_SRC=configs/samples" "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" ) pkg_pretend() { @@ -202,7 +203,6 @@ src_configure() { _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) @@ -235,8 +235,8 @@ src_configure() { _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 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 @@ -244,9 +244,8 @@ src_configure() { _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 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 @@ -255,7 +254,6 @@ src_configure() { _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 @@ -311,14 +309,6 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper - newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk - newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - # Reset diropts else dodoc uses it for doc installations. diropts -m0755 @@ -328,11 +318,6 @@ src_install() { # install extra documentation use doc && dodoc doc/*.{txt,pdf} - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - # Asterisk installs a few folders that's empty by design, # but still required. This finds them, and marks them for # portage. @@ -342,8 +327,6 @@ src_install() { } pkg_postinst() { - tmpfiles_process asterisk.conf - if [ -z "${REPLACING_VERSIONS}" ]; then elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest index a4867c6f689b..22dd4987aa40 100644 --- a/net-misc/babeld/Manifest +++ b/net-misc/babeld/Manifest @@ -1,2 +1 @@ -DIST babeld-1.8.2.tar.gz 92852 BLAKE2B ddf64558ebe2c96812e0b68382cda118539a1221fa15df7ee5d6aa67cdb5e1da556e4518371580bfb9df61780f559892787057605a02b8870c0a8e1f2018fc5d SHA512 08ef0747a672e7a3f2e06d4082da0d021378cea94633fdddf7de38178552bc5a587852fdb5c8bfdeeb6897ba4fd61c78e6ee4d19523a6c3e60d0e3c150418319 DIST babeld-1.9.1.tar.gz 94668 BLAKE2B 169932e8d37d683bfa7e945e313d17c3ee633d11031d940ef3f5be3e0a9fbaffb28d47cf9f6d6ef6b25130af9a485ac4a629d0009485021d6f2fe19ec5382788 SHA512 433a9a2da02c56e93f5fc5f9399320f7f4dbac8d87eff9a539300d5740269eeda6be1302a2cf4a4b9c524780b286d9eb7898585fc530129a1f84341faf1e6fd0 diff --git a/net-misc/babeld/babeld-1.8.2.ebuild b/net-misc/babeld/babeld-1.8.2.ebuild deleted file mode 100644 index a0e8e1da80bc..000000000000 --- a/net-misc/babeld/babeld-1.8.2.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/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild index d668c78e802c..268d8c30760e 100644 --- a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,10 +6,10 @@ EAPI=7 inherit autotools linux-info toolchain-funcs DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" -HOMEPAGE="http://bridge.sourceforge.net/" +HOMEPAGE="https://bridge.sourceforge.net/" SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="selinux" diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild index bfde1b35807a..3e16a2565334 100644 --- a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild +++ b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild @@ -1,21 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2" -HOMEPAGE="https://www.sourceforge.net/projects/cbqinit/" +HOMEPAGE="https://sourceforge.net/projects/cbqinit/" SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV} -> ${P}" +S="${WORKDIR}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc sparc x86" -IUSE="" RDEPEND="sys-apps/iproute2" -DEPEND="" - -S=${WORKDIR} src_unpack() { cp "${DISTDIR}"/${P} "${S}"/cbqinit || die diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest index 0b93518fa795..85898ad78bcb 100644 --- a/net-misc/chrome-remote-desktop/Manifest +++ b/net-misc/chrome-remote-desktop/Manifest @@ -1 +1 @@ -DIST chrome-remote-desktop_110.0.5481.14_amd64.deb 17742536 BLAKE2B 3a010b73f786e013aa4bf358811ab306e87681860c1db12b5e915c80b653da0a7e190ff36c78c91fa7a68a8873c7f66a23bb6bdb98630fd881b30c33f12559f7 SHA512 66a374f04664c26e15c5c42b2dbd942dd9cdbc23127733f2f1c136deff868509db80c17028b5f9cae48a460b22443f39af337313dfd865705134737d72372600 +DIST chrome-remote-desktop_118.0.5993.9_amd64.deb 17677480 BLAKE2B 1f29d8a8d90f12515afbea857e5f4b7ec0ca56a3051e14e7f67c38c906d743c74ca274a00342a8a9745effeb0023a7e88615c886dcbdcbe68bbcafe317b8902d SHA512 ffa0fb28cb7842a13df3228b5ca6e83c2e9d3967c5013b3613cefec7f86f56e6df069f33e65c3a979ce15d971906cb4488b90a4dffc4b95cd5d65346b4a08f87 diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-110.0.5481.14.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild index b2cfe976dea1..98867942b1eb 100644 --- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-110.0.5481.14.ebuild +++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild @@ -15,7 +15,7 @@ EAPI="7" -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW" inherit unpacker python-single-r1 optfeature plocale @@ -43,7 +43,10 @@ RDEPEND+=" dev-libs/glib:2 dev-libs/nspr dev-libs/nss - $(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]') + $(python_gen_cond_dep ' + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ') media-libs/fontconfig media-libs/freetype:2 sys-apps/dbus diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index c7c58771f45d..74d76950aa23 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,2 +1,2 @@ -DIST chrony-4.3.tar.gz 593560 BLAKE2B 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f SHA512 1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df -DIST chrony-4.3.tar.gz.asc 833 BLAKE2B 12399205da4ee5c442207bfdf936ac88552a49b21b0db8c15b09118b579e2076f7cfec6ad916b08b41edc4f9f8e03b13d7758ed08e116bee54d0f0f9cd68a505 SHA512 300b06f253ac3727edb86a1b7c337f9529ee752bbb471b266217b6a8ac5183e827264177a3210d436425d746673bf11fbdc41da145673213e28165197c6c76b7 +DIST chrony-4.4.tar.gz 612094 BLAKE2B 470c3d4ab9aa5949df1c10d0ecbd556fba3ce9b05e9dc4a5475795c174fca48a624975df68552f78927a19b72cb6b4f136ed4e5fa04a833dbd8139d0be144e4f SHA512 45e060eb0c5892552f28dc436429e5823409cc93533127af27b64d08ff9c769fdc72694272232114f5ca1884c2bc8b5e842fae7956dc457358e937bcd3dda4d7 +DIST chrony-4.4.tar.gz.asc 833 BLAKE2B 07f863381d37e30435c3796c7ff4ac628dd81b248e76fe1b9ce6dff07f9f2bd9423a013c7d0a09f2bfe251a8e176b04731e1cb60829f1dc83a7321274d3f6992 SHA512 bb795b428567434937cbf3a12c559b549b89abe65010d04eed0fbdcfde35e7266771ea01c2c5581f3e5fae993f1782fff5a62c5ae09259d2b65dab9473d756a3 diff --git a/net-misc/chrony/chrony-4.3-r2.ebuild b/net-misc/chrony/chrony-4.3-r2.ebuild deleted file mode 100644 index 858662d459ce..000000000000 --- a/net-misc/chrony/chrony-4.3-r2.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo systemd tmpfiles toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/mlichvar.asc - inherit verify-sig - - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" - - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86" - fi -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux" -# nettle > nss > libtomcrypt in configure -REQUIRED_USE=" - sechash? ( || ( nettle nss libtomcrypt ) ) - nettle? ( !nss ) - nss? ( !nettle ) - libtomcrypt? ( !nettle !nss ) - !sechash? ( !nss ) - !sechash? ( !nts? ( !nettle ) ) -" - -DEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - sys-libs/libcap - ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss:= ) - nts? ( net-libs/gnutls:= ) - pps? ( net-misc/pps-tools ) - readline? ( dev-libs/libedit ) - seccomp? ( sys-libs/libseccomp ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" -# bison dep only for 4.3-r1 for ${P}-strict-prototypes-clang16.patch -BDEPEND=" - sys-devel/bison - html? ( dev-ruby/asciidoctor ) - nts? ( virtual/pkgconfig ) - sechash? ( - nettle? ( virtual/pkgconfig ) - nss? ( virtual/pkgconfig ) - ) -" - -if [[ ${PV} == 9999 ]] ; then - # Needed for doc generation in 9999 - REQUIRED_USE+=" html" - BDEPEND+=" - sys-devel/bison - virtual/w3m - " -else - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch - "${FILESDIR}"/${P}-strict-prototypes-clang16.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ - doc/* examples/* || die - - cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die -} - -src_configure() { - if ! use caps ; then - sed -i \ - -e 's/ -u ntp//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - if ! use seccomp ; then - sed -i \ - -e 's/ -F 2//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - tc-export CC PKG_CONFIG - - # Update from time to time with output from "date +%s" - # on a system that is time-synced. - export SOURCE_DATE_EPOCH=1607976314 - - # Not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - - $(usev !caps '--disable-linuxcaps') - $(usev !cmdmon '--disable-cmdmon') - $(usev debug '--enable-debug') - $(usev !ipv6 '--disable-ipv6') - - # USE=readline here means "readline-like functionality" - # chrony only supports libedit in terms of the library providing - # it. - $(usev !readline '--without-editline --disable-readline') - - $(usev !libtomcrypt '--without-tomcrypt') - $(usev !nettle '--without-nettle') - $(usev !nss '--without-nss') - $(usev !ntp '--disable-ntp') - $(usev !nts '--disable-nts') - $(usev !nts '--without-gnutls') - $(usev !phc '--disable-phc') - $(usev !pps '--disable-pps') - $(usev !refclock '--disable-refclock') - $(usev !rtc '--disable-rtc') - $(usev samba '--enable-ntp-signd') - $(usev !sechash '--disable-sechash') - - --chronysockdir="${EPREFIX}/run/chrony" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --mandir="${EPREFIX}/usr/share/man" - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc/chrony" - --with-hwclockfile="${EPREFIX}/etc/adjtime" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - - ${EXTRA_ECONF} - ) - - # Print the ./configure call - edo ./configure "${myconf[@]}" || die -} - -src_compile() { - if [[ ${PV} == 9999 ]] ; then - # Uses w3m - emake -C doc man txt - fi - - emake all docs $(usev !html 'ADOC=true') -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${T}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - - if use html ; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - if use caps ; then - # Prepare a directory for the chrony.drift file (a la ntpsec) - # Ensures the environment is sane on new installs - # bug #711058 - fowners -R ntp:ntp /var/{lib,log}/chrony - fperms -R 770 /var/lib/chrony - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit examples/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_preinst() { - HAD_CAPS=0 - HAD_SECCOMP=0 - HAD_PRE_NEW_SECCOMP_LEVEL=0 - - # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 - # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand - if has_version 'net-misc/chrony[caps]' ; then - HAD_CAPS=1 - fi - - if has_version 'net-misc/chrony[seccomp]' ; then - HAD_SECCOMP=1 - fi - - if has_version '>=net-misc/chrony-4.1[seccomp]' ; then - # This version introduced a new filter level: -F 2 - # It's a limited set of seccomp filters designed to be 'bare minimum' - HAD_PRE_NEW_SECCOMP_LEVEL=1 - fi -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then - # bug #719876 - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" - ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" - ewarn "This is necessary for chrony to drop privileges" - elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" - fi - fi - - # See bug #783915 for general discussion on enabling seccomp filtering - # by default. - local show_seccomp_enable_msg=0 - - # Was seccomp disabled before and now enabled? - if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then - show_seccomp_enable_msg=1 - fi - - # Are we coming from an old version without the new 'minimal' filter? - # (-F 2) - if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then - show_seccomp_enable_msg=1 - fi - - if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then - elog "To enable seccomp in a stricter mode, please modify:" - elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC" - elog "- systemctl edit chronyd for systemd" - elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" - elog "By default, we now use -F 2 which is a baseline/minimal filter." - fi -} diff --git a/net-misc/chrony/chrony-4.3-r5.ebuild b/net-misc/chrony/chrony-4.4.ebuild index e75ccff37048..356e5cbcd424 100644 --- a/net-misc/chrony/chrony-4.3-r5.ebuild +++ b/net-misc/chrony/chrony-4.4.ebuild @@ -6,20 +6,20 @@ EAPI=8 inherit edo systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" +HOMEPAGE="https://chrony-project.org/" if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git" inherit git-r3 else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/mlichvar.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc inherit verify-sig - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz" + 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 ~m68k ~mips ppc ppc64 ~riscv sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86" fi fi @@ -56,9 +56,7 @@ RDEPEND=" ${DEPEND} selinux? ( sec-policy/selinux-chronyd ) " -# bison dep only for 4.3-r1 for ${P}-strict-prototypes-clang16.patch BDEPEND=" - sys-devel/bison html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( @@ -81,7 +79,6 @@ fi PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch - "${FILESDIR}"/${P}-strict-prototypes-clang16.patch ) src_prepare() { diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index f4810f848040..0141d909d34a 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -6,20 +6,20 @@ EAPI=8 inherit edo systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" +HOMEPAGE="https://chrony-project.org/" if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git" inherit git-r3 else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/mlichvar.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc inherit verify-sig - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz" + 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -79,7 +79,6 @@ fi PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch - "${FILESDIR}"/${P}-strict-prototypes-clang16.patch ) src_prepare() { diff --git a/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch b/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch deleted file mode 100644 index fb89a1eb3fef..000000000000 --- a/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://git.tuxfamily.org/chrony/chrony.git/commit/?id=7b97668319f9449b4adb1a978bb1fe9b0fb22e4d -https://bugs.gentoo.org/880519 - -From 7b97668319f9449b4adb1a978bb1fe9b0fb22e4d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com> -Date: Wed, 9 Nov 2022 09:17:14 +0100 -Subject: getdate: fix various warnings which will be errors with clang-16 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These were found by Gentoo's QA while rebuilding the world with -clang-16: https://bugs.gentoo.org/880519 - -Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> - ---- a/getdate.y -+++ b/getdate.y -@@ -448,9 +448,9 @@ o_merid : /* NULL */ - the same signature as the function definition does. */ - #include "getdate.h" - --extern struct tm *gmtime (); --extern struct tm *localtime (); --extern time_t mktime (); -+extern struct tm *gmtime (const time_t *timep); -+extern struct tm *localtime (const time_t *timep); -+extern time_t mktime (struct tm *tm); - - /* Month and day table. */ - static TABLE const MonthDayTable[] = { -@@ -641,16 +641,13 @@ static TABLE const MilitaryTable[] = { - - /* ARGSUSED */ - static int --yyerror (s) -- char *s ATTRIBUTE_UNUSED; -+yyerror (char *s ATTRIBUTE_UNUSED) - { - return 0; - } - - static int --ToHour (Hours, Meridian) -- int Hours; -- MERIDIAN Meridian; -+ToHour (int Hours, MERIDIAN Meridian) - { - switch (Meridian) - { -@@ -677,8 +674,7 @@ ToHour (Hours, Meridian) - } - - static int --ToYear (Year) -- int Year; -+ToYear (int Year) - { - if (Year < 0) - Year = -Year; -@@ -694,8 +690,7 @@ ToYear (Year) - } - - static int --LookupWord (buff) -- char *buff; -+LookupWord (char *buff) - { - register char *p; - register char *q; -cgit v0.10.2 diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml index dc25a0f1c6a2..33ac8a4febda 100644 --- a/net-misc/chrony/metadata.xml +++ b/net-misc/chrony/metadata.xml @@ -39,5 +39,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id> + <remote-id type="gitlab">chrony/chrony</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index 0990fde8834d..f6e7c659594f 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -1,2 +1 @@ -DIST connman-24180d1243bf005c721be6f9d8d6da67bb669c55.tar.gz 744924 BLAKE2B 87b1b1dc09c483fb69d75c5c43b89492b32d0e0357fb25208c369a446f85641e5e364ce3bd21f0e43c95e06a8578f28dea4b26decb8a0ebf591bf4c44616645f SHA512 dd6eb7684aeac7a07c504de018b6efda2ceab4ff3b66e4942bf8d8a37e1feee609a63a5b9fa73ce3b3582b6949ea3399f8740bcb7dc39885d239610d3b280d0c -DIST connman-9971144ae862e83f1f5d8cb84c0b62f2542dcdec.tar.gz 743500 BLAKE2B 513380639f02c103f4e9aca73571e00edc42894e612712c20319c3ee9b8845bff41ce05b17016b52b7d34f09c8f74f877a639fd21455b13a5a2ef1554eb0b093 SHA512 bc37dabb13b76e3fa0efd811d664f321b47118d378285dfa06710ec227822c409ed0c60c2f42c00ae081e47ec879ec1b19f784e9fc2346d1d57f6e87550dda22 +DIST connman-1.42.tar.gz 743965 BLAKE2B 1d9eeb4c917978df502de684128a3464bbc7f3960878842a3ac27295dc5d049641cd5218a9542055b5d9ab2b6114fb773fc8a173f54dca3afe37109ab58bde35 SHA512 98ede28854e5948c8b67c5ba03b156ed9966e9fcda2d39168062873b194a192d12af885c63d9a2cb0b7b5b882b69fdbb0e09c4eb0c6772a76db06de7b9e363d7 diff --git a/net-misc/connman/connman-1.42_pre20230411.ebuild b/net-misc/connman/connman-1.42.ebuild index f30ba8c349dd..55a168136695 100644 --- a/net-misc/connman/connman-1.42_pre20230411.ebuild +++ b/net-misc/connman/connman-1.42.ebuild @@ -4,13 +4,11 @@ EAPI="8" inherit autotools systemd tmpfiles -COMMIT=24180d1243bf005c721be6f9d8d6da67bb669c55 - if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" else - SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz" + SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/${P}.tar.gz" KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi diff --git a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild deleted file mode 100644 index 9d426a8103da..000000000000 --- a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -inherit autotools systemd tmpfiles - -COMMIT=9971144ae862e83f1f5d8cb84c0b62f2542dcdec - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" -else - SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/" - -LICENSE="GPL-2" -SLOT="0" - -IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager -+nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard -wispr" - -REQUIRED_USE="^^ ( iptables nftables )" -BDEPEND="virtual/pkgconfig" -COMMON_DEPEND=">=dev-libs/glib-2.16 - net-libs/gnutls - >=sys-apps/dbus-1.2.24 - sys-libs/readline:0= - nftables? ( - >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= - ) - openconnect? ( net-vpn/openconnect ) - openvpn? ( net-vpn/openvpn ) - pptp? ( net-dialup/pptpclient ) - vpnc? ( net-vpn/vpnc ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= )" -RDEPEND="${COMMON_DEPEND} - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - l2tp? ( net-dialup/xl2tpd ) - ofono? ( net-misc/ofono ) - policykit? ( sys-auth/polkit ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - )" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-2.6.39" - -PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" ) - -if [ ! -z ${COMMIT} ]; then - S=${WORKDIR}/${PN}-${COMMIT} -fi - -src_prepare() { - default - eautoreconf - - cp "${FILESDIR}"/connman.initd2 "${T}" - if use iwd; then - sed -i \ - -e "s/need dbus/need dbus iwd/" \ - -e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \ - "${T}"/connman.initd2 || die - sed -i \ - -e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \ - src/connman.service.in || die - fi -} - -src_configure() { - local myeconfargs=( - --localstatedir=/var \ - --runstatedir=/run \ - --with-systemdunitdir=$(systemd_get_systemunitdir) \ - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --enable-client \ - --enable-datafiles \ - --enable-loopback=builtin \ - $(use_enable bluetooth bluetooth builtin) \ - $(use_enable debug) \ - $(use_enable ethernet ethernet builtin) \ - $(use_enable examples test) \ - $(use_enable l2tp l2tp builtin) \ - $(use_enable networkmanager nmcompat) \ - $(use_enable ofono ofono builtin) \ - $(use_enable openconnect openconnect builtin) \ - $(use_enable openvpn openvpn builtin) \ - $(use_enable policykit polkit builtin) \ - $(use_enable pptp pptp builtin) \ - $(use_enable tools) \ - $(use_enable vpnc vpnc builtin) \ - $(use_enable wireguard) \ - $(use_enable wispr wispr builtin) \ - --with-firewall=$(usex iptables "iptables" "nftables" ) \ - --disable-iospm \ - --disable-hh2serial-gps - ) - # wifi USE logic to match networkmanager ebuild behavior - if use wifi; then - if use iwd; then - myeconfargs+=( --enable-iwd --disable-wifi ) - else - myeconfargs+=( --disable-iwd --enable-wifi=builtin ) - fi - else - myeconfargs+=( --disable-iwd --disable-wifi ) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - dobin client/connmanctl - - if use doc; then - dodoc doc/*.txt - fi - keepdir /usr/lib/${PN}/scripts - keepdir /var/lib/${PN} - newinitd "${T}"/${PN}.initd2 ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} - -pkg_postinst() { - tmpfiles_process connman_resolvconf.conf -} diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest index 073698ddc28e..a9c654a82144 100644 --- a/net-misc/croc/Manifest +++ b/net-misc/croc/Manifest @@ -1,3 +1,4 @@ -DIST croc-9.6.0.tar.gz 2858439 BLAKE2B fb1edc8a7c926894e7402892e029940be63a947ad692ea3f634f07c1c7c56ef687a5a0d6aab8c2814d09e9dc1324ba234f278525e93031ae0a2c889630dd04c1 SHA512 df0ebb71ac1e897864b5a01531a4d9fd20e1f56eb4fb11f8aed25456d6571acf5703d6415669446d239add59ec5510751358768b0ef890b6fded2ac03160d84b 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 diff --git a/net-misc/croc/croc-9.6.0.ebuild b/net-misc/croc/croc-9.6.4.ebuild index 03dce788293d..a3b14bea8b93 100644 --- a/net-misc/croc/croc-9.6.0.ebuild +++ b/net-misc/croc/croc-9.6.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,8 +7,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/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz" +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" LICENSE="Apache-2.0 BSD BSD-2 MIT" SLOT="0" diff --git a/net-misc/croc/metadata.xml b/net-misc/croc/metadata.xml index b17cf663fb79..b14d4f0b4014 100644 --- a/net-misc/croc/metadata.xml +++ b/net-misc/croc/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>sultan@gentoo.org</email> - <name>Stephan Hartmann</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">schollz/croc</remote-id> </upstream> diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 11654edee63b..0f6e4d3f8566 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,8 +1,4 @@ -DIST curl-8.0.1.tar.xz 2575544 BLAKE2B 67d82e9d71f0a351b5c2ed3ad5eab02e367ded872658a295179b935729d5105015f8c29569c396e11cd14036656af894ded85c8838cba260d9f6f1a8dcb5e22b SHA512 3bb777982659ed697ae90f113ff7b65d6ce8ba9fe6a8984cfd6769d2f051a72ba953c911abe234c204ec2cc5a35d68b4d033037fad7fba31bb92a52543f8d13d -DIST curl-8.0.1.tar.xz.asc 488 BLAKE2B 452e1bebe1028e7621bbf8829e50cf56e254cd63a8cf2a4c0332176b9f18fb2821304ae556a203996d273c986bddbd04db2218c18fd34dee66e9155861ba50ce SHA512 92c6a0570e9a8a708fe2f717b8b37a68dcb9cd4520ca50c9baafec5891bda103bce2d2dcb67f1387bf11bd7e51e0e64ccd52d196e61d58b598ad3aa1960386cf -DIST curl-8.1.0.tar.xz 2612568 BLAKE2B 768a824b8f5f6ddaa073599c4106f07a8134bcbe0e0d666390be1bce16ba25386d85930853bb47bc90b2c8a499a0b2abb9c685042563801e0fe58b9c315ac6cc SHA512 b99926f372ddd715cd1d2b54d8fb96b26b085e6501715e25aa57b6c6a7f8452473506ddb284e2f280f8afdb301b7f0c3bfde7ad7ed393b12c022430a9301096d -DIST curl-8.1.0.tar.xz.asc 488 BLAKE2B c1a8e50eddc7dd140af2af29736eb486e96a6d3b67a9161244daa86558f65522527380c92597a5f10e5dad187f0bda6ac5b9cadc29386bef4492bc047c77b423 SHA512 191a74c7a6b6aa78b7f36e1535fda0701bde8b333a61c90343e1f1b2d65cc5097b5febc5fa42b2f373795ef1b34078790deaaa71c8aaa45eed1c753729a45f3d -DIST curl-8.1.1.tar.xz 2613348 BLAKE2B 465a3237335e73665086ac43f5c66cfbab7e9b163e1ae0e2345da82f9c736d87fccf4d76369cc069abc29621f10db7ddbf22d0337db9ca85042bb12438d4aaed SHA512 d034b1ab9c00e8a0acf7ba6c6344734945d45666b4f38394f5456fcd9b22623146a897270861b7411412ca25c912e1bbf24eb139a6dfc1a8c00d098b3b925399 -DIST curl-8.1.1.tar.xz.asc 488 BLAKE2B c92017d0fe4933d6c27d833944c231967263607a7871a658e0cbb9de46f7df8dfbec141e269296caf17ced004fb2b237b8311ec9f7bf98f03fb405b5755950fc SHA512 6a71c18d67de8c340b5d80c7452a82c00f7ef466f690eec12edcd6123aee6866e8a0e757e1cc6c9af87a63fdeaafbc9fc1b1a4e2e0fd8a75b5952d4738fd0b27 -DIST curl-8.1.2.tar.xz 2612652 BLAKE2B 66d0828912bb9971dac99025aa8b5c1c2fac1f8b568f2a8a97bd9f66986bdb164b603b539ec3e123cd6a26ea65829e58c90fc9852be88b42074cf40c89c566d1 SHA512 532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4 -DIST curl-8.1.2.tar.xz.asc 488 BLAKE2B 304dbdb51aa113c0b70b2662e29b1be3294b04f5f00264ce60703756363999cd567dcd0301e27b294d1d53f16ecc016ba429fcbea240949b372750f7e6e7375a SHA512 d120299a2d59259aeb19ae0fa3a3e181e25b6927677187037c61a0901879956177ce8dda10764073a47848f81dcbbcb94e0b6008742994042b6b8fd194e169c3 +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 diff --git a/net-misc/curl/curl-8.0.1.ebuild b/net-misc/curl/curl-8.0.1.ebuild deleted file mode 100644 index 4f21364a91e4..000000000000 --- a/net-misc/curl/curl-8.0.1.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc -inherit autotools multilib-minimal prefix verify-sig - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.se/" -SRC_URI=" - https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) -" - -LICENSE="curl" -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="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" -IUSE+=" nghttp3" -RESTRICT="!test? ( test )" - -# Only one default ssl provider can be enabled -REQUIRED_USE=" - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_rustls - ) - ) -" - -RDEPEND=" - sys-libs/zlib[${MULTILIB_USEDEP}] - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:=[${MULTILIB_USEDEP}] - ) - mbedtls? ( - app-misc/ca-certificates - net-libs/mbedtls:=[${MULTILIB_USEDEP}] - ) - nss? ( - app-misc/ca-certificates - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/nss-pem - ) - openssl? ( - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - rustls? ( - net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] - ) - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - http2? ( net-libs/nghttp2:=[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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-prefix.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch - - # Backports - "${FILESDIR}"/${PN}-8.0.1-onion-resolution.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 ) - #myconf+=( --without-default-ssl-backend ) - if use ssl ; then - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) - - if use gnutls || use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls ) - fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi - if use openssl || use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use rustls || use curl_ssl_rustls; then - einfo "SSL provided by rustls" - myconf+=( --with-rustls ) - fi - if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) - elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_rustls; then - einfo "Default SSL provided by rustls" - myconf+=( --with-default-ssl-backend=rustls ) - else - eerror "We can't be here because of REQUIRED_USE." - 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-crypto-auth - --enable-dict - --disable-ech - --enable-file - $(use_enable ftp) - $(use_enable gopher) - $(use_enable hsts) - --enable-http - $(use_enable imap) - $(use_enable ldap) - $(use_enable ldap ldaps) - --enable-ntlm - --disable-ntlm-wb - $(use_enable pop3) - --enable-rt - --enable-rtsp - $(use_enable samba smb) - $(use_with ssh libssh2) - $(use_enable smtp) - $(use_enable telnet) - $(use_enable tftp) - --enable-tls-srp - $(use_enable adns ares) - --enable-cookies - --enable-dateparse - --enable-dnsshuffle - --enable-doh - --enable-symbol-hiding - --enable-http-auth - --enable-ipv6 - --enable-largefile - --enable-manual - --enable-mime - --enable-netrc - $(use_enable progress-meter) - --enable-proxy - --enable-socketpair - --disable-sspi - $(use_enable static-libs static) - --enable-pthreads - --enable-threaded-resolver - --disable-versioned-symbols - --without-amissl - --without-bearssl - $(use_with brotli) - --without-fish-functions-dir - $(use_with http2 nghttp2) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - --without-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) - ) - - if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then - myconf+=( - --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" - ) - 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_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. - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" -} - -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.1.0-r1.ebuild b/net-misc/curl/curl-8.1.0-r1.ebuild deleted file mode 100644 index cf964b638bcd..000000000000 --- a/net-misc/curl/curl-8.1.0-r1.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc -inherit autotools multilib-minimal prefix verify-sig - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.se/" -SRC_URI=" - https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) -" - -LICENSE="curl" -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="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" -IUSE+=" nghttp3" -RESTRICT="!test? ( test )" - -# Only one default ssl provider can be enabled -REQUIRED_USE=" - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_rustls - ) - ) -" - -RDEPEND=" - sys-libs/zlib[${MULTILIB_USEDEP}] - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:=[${MULTILIB_USEDEP}] - ) - mbedtls? ( - app-misc/ca-certificates - net-libs/mbedtls:=[${MULTILIB_USEDEP}] - ) - nss? ( - app-misc/ca-certificates - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/nss-pem - ) - openssl? ( - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - rustls? ( - net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] - ) - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - http2? ( net-libs/nghttp2:=[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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-prefix.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch - ### Backports - "${FILESDIR}"/${P}-numeric-hostname.patch - "${FILESDIR}"/${P}-header-length.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 ) - #myconf+=( --without-default-ssl-backend ) - if use ssl ; then - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) - - if use gnutls || use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls ) - fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi - if use openssl || use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use rustls || use curl_ssl_rustls; then - einfo "SSL provided by rustls" - myconf+=( --with-rustls ) - fi - if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) - elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_rustls; then - einfo "Default SSL provided by rustls" - myconf+=( --with-default-ssl-backend=rustls ) - else - eerror "We can't be here because of REQUIRED_USE." - 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-crypto-auth - --enable-dict - --disable-ech - --enable-file - $(use_enable ftp) - $(use_enable gopher) - $(use_enable hsts) - --enable-http - $(use_enable imap) - $(use_enable ldap) - $(use_enable ldap ldaps) - --enable-ntlm - --disable-ntlm-wb - $(use_enable pop3) - --enable-rt - --enable-rtsp - $(use_enable samba smb) - $(use_with ssh libssh2) - $(use_enable smtp) - $(use_enable telnet) - $(use_enable tftp) - --enable-tls-srp - $(use_enable adns ares) - --enable-cookies - --enable-dateparse - --enable-dnsshuffle - --enable-doh - --enable-symbol-hiding - --enable-http-auth - --enable-ipv6 - --enable-largefile - --enable-manual - --enable-mime - --enable-netrc - $(use_enable progress-meter) - --enable-proxy - --enable-socketpair - --disable-sspi - $(use_enable static-libs static) - --enable-pthreads - --enable-threaded-resolver - --disable-versioned-symbols - --without-amissl - --without-bearssl - $(use_with brotli) - --without-fish-functions-dir - $(use_with http2 nghttp2) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - --without-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) - ) - - if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then - myconf+=( - --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" - ) - 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_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. Prefix the test number in TFLAGS - # with a '!'. For example, to skip test 241 and 1083, use '!241 !1083'. - # See https://github.com/curl/curl/tree/master/tests#run for advanced test selection. - # 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 !241 !1083" -} - -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.1.2.ebuild b/net-misc/curl/curl-8.3.0-r2.ebuild index 550db16e60df..350d4acf5b7c 100644 --- a/net-misc/curl/curl-8.1.2.ebuild +++ b/net-misc/curl/curl-8.3.0-r2.ebuild @@ -3,8 +3,8 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc -inherit autotools multilib-minimal prefix verify-sig +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/" @@ -17,47 +17,54 @@ 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="curl" +LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +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 +openssl +pop3 +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_nss +curl_ssl_openssl curl_ssl_rustls" +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 # 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_nss curl_ssl_openssl curl_ssl_rustls ) ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) - curl_ssl_nss? ( nss ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) + nghttp3? ( !openssl ) " +# 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 +# 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}] adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - http2? ( net-libs/nghttp2:=[${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:=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) @@ -71,11 +78,6 @@ RDEPEND=" app-misc/ca-certificates net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) - nss? ( - app-misc/ca-certificates - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/nss-pem - ) openssl? ( dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) @@ -85,13 +87,15 @@ RDEPEND=" ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) " + DEPEND="${RDEPEND}" + BDEPEND=" dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils - http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) @@ -121,6 +125,9 @@ QA_CONFIG_IMPL_DECL_SKIP=( 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 ) src_prepare() { @@ -137,8 +144,8 @@ multilib_src_configure() { 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-nss --without-rustls ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) if use gnutls; then multilib_is_native_abi && einfo "SSL provided by gnutls" @@ -148,10 +155,6 @@ multilib_src_configure() { multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi - if use nss; then - multilib_is_native_abi && einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi if use openssl; then multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) @@ -166,9 +169,6 @@ multilib_src_configure() { 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_nss; then - multilib_is_native_abi && einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) elif use curl_ssl_openssl; then multilib_is_native_abi && einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) @@ -177,6 +177,7 @@ multilib_src_configure() { 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 @@ -196,7 +197,12 @@ multilib_src_configure() { myconf+=( $(use_enable alt-svc) - --enable-crypto-auth + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws --enable-dict --disable-ech --enable-file @@ -241,7 +247,7 @@ multilib_src_configure() { --without-amissl --without-bearssl $(use_with brotli) - --without-fish-functions-dir + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d $(use_with http2 nghttp2) --without-hyper $(use_with idn libidn2) @@ -263,6 +269,7 @@ multilib_src_configure() { --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 @@ -271,6 +278,12 @@ multilib_src_configure() { ) fi + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + ECONF_SOURCE="${S}" econf "${myconf[@]}" if ! multilib_is_native_abi; then @@ -305,6 +318,15 @@ multilib_src_configure() { 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() { @@ -318,9 +340,20 @@ multilib_src_test() { # 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 !241 !1083" + 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() { diff --git a/net-misc/curl/curl-8.1.1.ebuild b/net-misc/curl/curl-8.4.0.ebuild index e59f768b090d..2635b9c9be42 100644 --- a/net-misc/curl/curl-8.1.1.ebuild +++ b/net-misc/curl/curl-8.4.0.ebuild @@ -3,8 +3,8 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc -inherit autotools multilib-minimal prefix verify-sig +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/" @@ -17,67 +17,72 @@ 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="curl" +LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +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+=" +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_nss +curl_ssl_openssl curl_ssl_rustls" -IUSE+=" nghttp3" +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_nss curl_ssl_openssl curl_ssl_rustls ) ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) - curl_ssl_nss? ( nss ) 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[${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:=[${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:=[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${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? ( app-misc/ca-certificates net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) - nss? ( - app-misc/ca-certificates - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/nss-pem - ) 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}] @@ -85,13 +90,15 @@ RDEPEND=" ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) " + DEPEND="${RDEPEND}" + BDEPEND=" dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils - http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) @@ -121,10 +128,6 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch - - ### Backports - "${FILESDIR}"/${P}-hanging-http2.patch - "${FILESDIR}"/${P}-configure-compiler.patch ) src_prepare() { @@ -141,46 +144,40 @@ multilib_src_configure() { 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-nss --without-rustls ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) if use gnutls; then - einfo "SSL provided by gnutls" + multilib_is_native_abi && einfo "SSL provided by gnutls" myconf+=( --with-gnutls ) fi if use mbedtls; then - einfo "SSL provided by mbedtls" + multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi - if use nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi if use openssl; then - einfo "SSL provided by openssl" + multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi if use rustls; then - einfo "SSL provided by rustls" + multilib_is_native_abi && einfo "SSL provided by rustls" myconf+=( --with-rustls ) fi if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" + multilib_is_native_abi && einfo "Default SSL provided by gnutls" myconf+=( --with-default-ssl-backend=gnutls ) elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" + multilib_is_native_abi && einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) elif use curl_ssl_rustls; then - einfo "Default SSL provided by rustls" + 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 @@ -200,7 +197,12 @@ multilib_src_configure() { myconf+=( $(use_enable alt-svc) - --enable-crypto-auth + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws --enable-dict --disable-ech --enable-file @@ -245,7 +247,7 @@ multilib_src_configure() { --without-amissl --without-bearssl $(use_with brotli) - --without-fish-functions-dir + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d $(use_with http2 nghttp2) --without-hyper $(use_with idn libidn2) @@ -267,6 +269,7 @@ multilib_src_configure() { --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 @@ -275,6 +278,12 @@ multilib_src_configure() { ) fi + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + ECONF_SOURCE="${S}" econf "${myconf[@]}" if ! multilib_is_native_abi; then @@ -309,6 +318,17 @@ multilib_src_configure() { 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) @@ -320,9 +340,20 @@ multilib_src_test() { # 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 !241 !1083" + 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() { diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild index bd074d803563..7d87477bc1f1 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-9999.ebuild @@ -3,8 +3,8 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc -inherit autotools multilib-minimal prefix verify-sig +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/" @@ -20,64 +20,69 @@ else 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="curl" +LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +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+=" +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_nss +curl_ssl_openssl curl_ssl_rustls" -IUSE+=" nghttp3" +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_nss curl_ssl_openssl curl_ssl_rustls ) ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) - curl_ssl_nss? ( nss ) 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[${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:=[${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:=[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${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? ( app-misc/ca-certificates net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) - nss? ( - app-misc/ca-certificates - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/nss-pem - ) 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}] @@ -85,13 +90,15 @@ RDEPEND=" ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) " + DEPEND="${RDEPEND}" + BDEPEND=" dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils - http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) @@ -137,8 +144,8 @@ multilib_src_configure() { 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-nss --without-rustls ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) if use gnutls; then multilib_is_native_abi && einfo "SSL provided by gnutls" @@ -148,10 +155,6 @@ multilib_src_configure() { multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi - if use nss; then - multilib_is_native_abi && einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi if use openssl; then multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) @@ -166,9 +169,6 @@ multilib_src_configure() { 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_nss; then - multilib_is_native_abi && einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) elif use curl_ssl_openssl; then multilib_is_native_abi && einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) @@ -177,6 +177,7 @@ multilib_src_configure() { 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 @@ -196,7 +197,12 @@ multilib_src_configure() { myconf+=( $(use_enable alt-svc) - --enable-crypto-auth + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws --enable-dict --disable-ech --enable-file @@ -241,7 +247,7 @@ multilib_src_configure() { --without-amissl --without-bearssl $(use_with brotli) - --without-fish-functions-dir + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d $(use_with http2 nghttp2) --without-hyper $(use_with idn libidn2) @@ -263,6 +269,7 @@ multilib_src_configure() { --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 @@ -271,6 +278,12 @@ multilib_src_configure() { ) fi + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + ECONF_SOURCE="${S}" econf "${myconf[@]}" if ! multilib_is_native_abi; then @@ -305,6 +318,15 @@ multilib_src_configure() { 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() { @@ -318,7 +340,20 @@ multilib_src_test() { # 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. - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" + # 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() { diff --git a/net-misc/curl/files/curl-8.0.1-onion-resolution.patch b/net-misc/curl/files/curl-8.0.1-onion-resolution.patch deleted file mode 100644 index 65b486529c1f..000000000000 --- a/net-misc/curl/files/curl-8.0.1-onion-resolution.patch +++ /dev/null @@ -1,158 +0,0 @@ -https://bugs.gentoo.org/887287 -https://github.com/curl/curl/pull/10705 - -From e2bbd1adc22ec5033e2292b780e1790db93c3cb4 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <Matt.Jolly@footclan.ninja> -Date: Wed, 8 Mar 2023 02:16:45 +1100 -Subject: [PATCH] Refuse to resolve the .onion TLD. - -RFC 7686 states that: - -> Applications that do not implement the Tor -> protocol SHOULD generate an error upon the use of .onion and -> SHOULD NOT perform a DNS lookup. - -Let's do that. - -See curl/curl#543 -https://www.rfc-editor.org/rfc/rfc7686#section-2 ---- a/docs/KNOWN_BUGS -+++ b/docs/KNOWN_BUGS -@@ -80,7 +80,6 @@ problems may have been fixed or changed somewhat since this was written. - 10.3 FTPS over SOCKS - - 11. Internals -- 11.1 Curl leaks .onion hostnames in DNS - 11.2 error buffer not set if connection to multiple addresses fails - 11.4 HTTP test server 'connection-monitor' problems - 11.5 Connection information when using TCP Fast Open -@@ -525,14 +524,6 @@ problems may have been fixed or changed somewhat since this was written. - - 11. Internals - --11.1 Curl leaks .onion hostnames in DNS -- -- Curl sends DNS requests for hostnames with a .onion TLD. This leaks -- information about what the user is attempting to access, and violates this -- requirement of RFC7686: https://datatracker.ietf.org/doc/html/rfc7686 -- -- Issue: https://github.com/curl/curl/issues/543 -- - 11.2 error buffer not set if connection to multiple addresses fails - - If you ask libcurl to resolve a hostname like example.com to IPv6 addresses ---- a/lib/hostip.c -+++ b/lib/hostip.c -@@ -652,6 +652,14 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, - CURLcode result; - enum resolve_t rc = CURLRESOLV_ERROR; /* default to failure */ - struct connectdata *conn = data->conn; -+ /* We should intentionally error and not resolve .onion TLDs */ -+ size_t hostname_len = strlen(hostname); -+ if(hostname_len >= 7 && -+ (curl_strequal(&hostname[hostname_len-6], ".onion") || -+ curl_strequal(&hostname[hostname_len-7], ".onion."))) { -+ failf(data, "Not resolving .onion address (RFC 7686)"); -+ return CURLRESOLV_ERROR; -+ } - *entry = NULL; - #ifndef CURL_DISABLE_DOH - conn->bits.doh = FALSE; /* default is not */ ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -186,8 +186,8 @@ test1432 test1433 test1434 test1435 test1436 test1437 test1438 test1439 \ - test1440 test1441 test1442 test1443 test1444 test1445 test1446 test1447 \ - test1448 test1449 test1450 test1451 test1452 test1453 test1454 test1455 \ - test1456 test1457 test1458 test1459 test1460 test1461 test1462 test1463 \ --test1464 test1465 test1466 test1467 test1468 test1469 test1470 \ --\ -+test1464 test1465 test1466 test1467 test1468 test1469 test1470 test1471 \ -+test1472 \ - test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ - test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ - test1516 test1517 test1518 test1519 test1520 test1521 test1522 test1523 \ ---- /dev/null -+++ b/tests/data/test1471 -@@ -0,0 +1,39 @@ -+<testcase> -+<info> -+<keywords> -+Onion -+Tor -+FAILURE -+</keywords> -+</info> -+# -+# Server-side -+<reply> -+</reply> -+ -+# -+# Client-side -+<client> -+<server> -+none -+</server> -+<name> -+Fail to resolve .onion TLD -+</name> -+<command> -+red.onion -+</command> -+</client> -+ -+# -+# Verify data after the test has been "shot" -+<verify> -+# Couldn't resolve host name -+<errorcode> -+6 -+</errorcode> -+<stderr mode="text"> -+curl: (6) Not resolving .onion address (RFC 7686) -+</stderr> -+</verify> -+</testcase> ---- /dev/null -+++ b/tests/data/test1472 -@@ -0,0 +1,39 @@ -+<testcase> -+<info> -+<keywords> -+Onion -+Tor -+FAILURE -+</keywords> -+</info> -+# -+# Server-side -+<reply> -+</reply> -+ -+# -+# Client-side -+<client> -+<server> -+none -+</server> -+<name> -+Fail to resolve .onion. TLD -+</name> -+<command> -+tasty.onion. -+</command> -+</client> -+ -+# -+# Verify data after the test has been "shot" -+<verify> -+# Couldn't resolve host name -+<errorcode> -+6 -+</errorcode> -+<stderr mode="text"> -+curl: (6) Not resolving .onion address (RFC 7686) -+</stderr> -+</verify> -+</testcase> - diff --git a/net-misc/curl/files/curl-8.1.0-header-length.patch b/net-misc/curl/files/curl-8.1.0-header-length.patch deleted file mode 100644 index 6229fd817f2a..000000000000 --- a/net-misc/curl/files/curl-8.1.0-header-length.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://github.com/curl/curl/commit/77c9a9845bbee66f3aff158b8452dc8cd963cbd5.patch -From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> -Date: Thu, 18 May 2023 18:22:57 +0200 -Subject: [PATCH] http2: double http request parser max line length - -This works around #11138, by doubling the limit, and should be a -relatively safe fix. - -Ideally the buffer would grow as needed and there would be no need for a -limit? But that might be follow-up material. - -Fixes #11138 -Closes #11139 ---- - lib/http1.h | 2 ++ - lib/http2.c | 2 +- - lib/vquic/curl_msh3.c | 2 +- - lib/vquic/curl_ngtcp2.c | 2 +- - lib/vquic/curl_quiche.c | 2 +- - 5 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/lib/http1.h b/lib/http1.h -index c2d107587a6f8..8acb9db401a95 100644 ---- a/lib/http1.h -+++ b/lib/http1.h -@@ -33,6 +33,8 @@ - #define H1_PARSE_OPT_NONE (0) - #define H1_PARSE_OPT_STRICT (1 << 0) - -+#define H1_PARSE_DEFAULT_MAX_LINE_LEN (8 * 1024) -+ - struct h1_req_parser { - struct http_req *req; - struct bufq scratch; -diff --git a/lib/http2.c b/lib/http2.c -index 47e6f71393156..4e3b182b8d815 100644 ---- a/lib/http2.c -+++ b/lib/http2.c -@@ -1860,7 +1860,7 @@ static ssize_t h2_submit(struct stream_ctx **pstream, - nghttp2_priority_spec pri_spec; - ssize_t nwritten; - -- Curl_h1_req_parse_init(&h1, (4*1024)); -+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); - Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); - - *err = http2_data_setup(cf, data, &stream); -diff --git a/lib/vquic/curl_msh3.c b/lib/vquic/curl_msh3.c -index 40e89379fc402..173886739b6dc 100644 ---- a/lib/vquic/curl_msh3.c -+++ b/lib/vquic/curl_msh3.c -@@ -575,7 +575,7 @@ static ssize_t cf_msh3_send(struct Curl_cfilter *cf, struct Curl_easy *data, - - CF_DATA_SAVE(save, cf, data); - -- Curl_h1_req_parse_init(&h1, (4*1024)); -+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); - Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); - - /* Sizes must match for cast below to work" */ -diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c -index 05f960afdffa1..7794f148c6ec9 100644 ---- a/lib/vquic/curl_ngtcp2.c -+++ b/lib/vquic/curl_ngtcp2.c -@@ -1550,7 +1550,7 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf, - nghttp3_data_reader reader; - nghttp3_data_reader *preader = NULL; - -- Curl_h1_req_parse_init(&h1, (4*1024)); -+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); - Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); - - *err = h3_data_setup(cf, data); -diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c -index 392b9beb83c59..c63e8e10a22e0 100644 ---- a/lib/vquic/curl_quiche.c -+++ b/lib/vquic/curl_quiche.c -@@ -913,7 +913,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf, - DEBUGASSERT(stream); - } - -- Curl_h1_req_parse_init(&h1, (4*1024)); -+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); - Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); - - DEBUGASSERT(stream); diff --git a/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch b/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch deleted file mode 100644 index 6a0dd1382d62..000000000000 --- a/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch +++ /dev/null @@ -1,227 +0,0 @@ -https://github.com/curl/curl/commit/92772e6d395bbdda0e7822d980caf86e8c4aa51c.patch -From: Daniel Stenberg <daniel@haxx.se> -Date: Thu, 18 May 2023 00:31:17 +0200 -Subject: [PATCH] urlapi: allow numerical parts in the host name - -It can only be an IPv4 address if all parts are all digits and no more than -four parts, otherwise it is a host name. Even slightly wrong IPv4 will now be -passed through as a host name. - -Regression from 17a15d88467 shipped in 8.1.0 - -Extended test 1560 accordingly. - -Reported-by: Pavel Kalyugin -Fixes #11129 -Closes #11131 ---- a/lib/urlapi.c -+++ b/lib/urlapi.c -@@ -34,6 +34,7 @@ - #include "inet_ntop.h" - #include "strdup.h" - #include "idn.h" -+#include "curl_memrchr.h" - - /* The last 3 #include files should be in this order */ - #include "curl_printf.h" -@@ -643,8 +644,8 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname, - * Handle partial IPv4 numerical addresses and different bases, like - * '16843009', '0x7f', '0x7f.1' '0177.1.1.1' etc. - * -- * If the given input string is syntactically wrong or any part for example is -- * too big, this function returns FALSE and doesn't create any output. -+ * If the given input string is syntactically wrong IPv4 or any part for -+ * example is too big, this function returns HOST_NAME. - * - * Output the "normalized" version of that input string in plain quad decimal - * integers. -@@ -675,7 +676,7 @@ static int ipv4_normalize(struct dynbuf *host) - unsigned long l; - if(!ISDIGIT(*c)) - /* most importantly this doesn't allow a leading plus or minus */ -- return n ? HOST_BAD : HOST_NAME; -+ return HOST_NAME; - l = strtoul(c, &endp, 0); - - parts[n] = l; -@@ -684,7 +685,7 @@ static int ipv4_normalize(struct dynbuf *host) - switch(*c) { - case '.': - if(n == 3) -- return HOST_BAD; -+ return HOST_NAME; - n++; - c++; - break; -@@ -694,39 +695,40 @@ static int ipv4_normalize(struct dynbuf *host) - break; - - default: -- return n ? HOST_BAD : HOST_NAME; -+ return HOST_NAME; - } - - /* overflow */ - if((l == ULONG_MAX) && (errno == ERANGE)) -- return HOST_BAD; -+ return HOST_NAME; - - #if SIZEOF_LONG > 4 - /* a value larger than 32 bits */ - if(l > UINT_MAX) -- return HOST_BAD; -+ return HOST_NAME; - #endif - } - -- /* this is a valid IPv4 numerical address */ -- Curl_dyn_reset(host); -- - switch(n) { - case 0: /* a -- 32 bits */ -+ Curl_dyn_reset(host); -+ - result = Curl_dyn_addf(host, "%u.%u.%u.%u", - parts[0] >> 24, (parts[0] >> 16) & 0xff, - (parts[0] >> 8) & 0xff, parts[0] & 0xff); - break; - case 1: /* a.b -- 8.24 bits */ - if((parts[0] > 0xff) || (parts[1] > 0xffffff)) -- return HOST_BAD; -+ return HOST_NAME; -+ Curl_dyn_reset(host); - result = Curl_dyn_addf(host, "%u.%u.%u.%u", - parts[0], (parts[1] >> 16) & 0xff, - (parts[1] >> 8) & 0xff, parts[1] & 0xff); - break; - case 2: /* a.b.c -- 8.8.16 bits */ - if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xffff)) -- return HOST_BAD; -+ return HOST_NAME; -+ Curl_dyn_reset(host); - result = Curl_dyn_addf(host, "%u.%u.%u.%u", - parts[0], parts[1], (parts[2] >> 8) & 0xff, - parts[2] & 0xff); -@@ -734,7 +736,8 @@ static int ipv4_normalize(struct dynbuf *host) - case 3: /* a.b.c.d -- 8.8.8.8 bits */ - if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff) || - (parts[3] > 0xff)) -- return HOST_BAD; -+ return HOST_NAME; -+ Curl_dyn_reset(host); - result = Curl_dyn_addf(host, "%u.%u.%u.%u", - parts[0], parts[1], parts[2], parts[3]); - break; -@@ -796,6 +799,9 @@ static CURLUcode parse_authority(struct Curl_URL *u, - if(result) - goto out; - -+ if(!Curl_dyn_len(host)) -+ return CURLUE_NO_HOST; -+ - switch(ipv4_normalize(host)) { - case HOST_IPV4: - break; ---- a/tests/libtest/lib1560.c -+++ b/tests/libtest/lib1560.c -@@ -474,6 +474,13 @@ static const struct testcase get_parts_list[] ={ - }; - - static const struct urltestcase get_url_list[] = { -+ {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_OK}, -+ {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, -+ {"https://1.2.3.256.com", "https://1.2.3.256.com/", 0, 0, CURLUE_OK}, -+ {"https://10.com", "https://10.com/", 0, 0, CURLUE_OK}, -+ {"https://1.2.com", "https://1.2.com/", 0, 0, CURLUE_OK}, -+ {"https://1.2.3.com", "https://1.2.3.com/", 0, 0, CURLUE_OK}, -+ {"https://1.2.com.99", "https://1.2.com.99/", 0, 0, CURLUE_OK}, - {"https://[fe80::0000:20c:29ff:fe9c:409b]:80/moo", - "https://[fe80::20c:29ff:fe9c:409b]:80/moo", - 0, 0, CURLUE_OK}, -@@ -522,22 +529,24 @@ static const struct urltestcase get_url_list[] = { - - /* IPv4 trickeries */ - {"https://16843009", "https://1.1.1.1/", 0, 0, CURLUE_OK}, -- {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, - {"https://0177.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, - {"https://0111.02.0x3", "https://73.2.0.3/", 0, 0, CURLUE_OK}, -+ {"https://0111.02.0x3.", "https://0111.02.0x3./", 0, 0, CURLUE_OK}, -+ {"https://0111.02.030", "https://73.2.0.24/", 0, 0, CURLUE_OK}, -+ {"https://0111.02.030.", "https://0111.02.030./", 0, 0, CURLUE_OK}, - {"https://0xff.0xff.0377.255", "https://255.255.255.255/", 0, 0, CURLUE_OK}, - {"https://1.0xffffff", "https://1.255.255.255/", 0, 0, CURLUE_OK}, - /* IPv4 numerical overflows or syntax errors will not normalize */ - {"https://a127.0.0.1", "https://a127.0.0.1/", 0, 0, CURLUE_OK}, - {"https://\xff.127.0.0.1", "https://%FF.127.0.0.1/", 0, CURLU_URLENCODE, - CURLUE_OK}, -- {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_BAD_HOSTNAME}, -+ {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_OK}, - {"https://127.0. 1", "https://127.0.0.1/", 0, 0, CURLUE_MALFORMED_INPUT}, -- {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_BAD_HOSTNAME}, -- {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_BAD_HOSTNAME}, -- {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_BAD_HOSTNAME}, -- {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_BAD_HOSTNAME}, -- {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_BAD_HOSTNAME}, -+ {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_OK}, -+ {"https://1.2.3.256.", "https://1.2.3.256./", 0, 0, CURLUE_OK}, -+ {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_OK}, -+ {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_OK}, -+ {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_OK}, - {"https://123host", "https://123host/", 0, 0, CURLUE_OK}, - /* 40 bytes scheme is the max allowed */ - {"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA://hostname/path", -@@ -599,20 +608,11 @@ static const struct urltestcase get_url_list[] = { - 0, 0, CURLUE_OK}, - /* here the password has the semicolon */ - {"http://user:pass;word@host/file", -- "http://user:pass;word@host/file", -- 0, 0, CURLUE_OK}, -- {"file:///file.txt#moo", -- "file:///file.txt#moo", -- 0, 0, CURLUE_OK}, -- {"file:////file.txt", -- "file:////file.txt", -- 0, 0, CURLUE_OK}, -- {"file:///file.txt", -- "file:///file.txt", -- 0, 0, CURLUE_OK}, -- {"file:./", -- "file://", -- 0, 0, CURLUE_BAD_SCHEME}, -+ "http://user:pass;word@host/file", 0, 0, CURLUE_OK}, -+ {"file:///file.txt#moo", "file:///file.txt#moo", 0, 0, CURLUE_OK}, -+ {"file:////file.txt", "file:////file.txt", 0, 0, CURLUE_OK}, -+ {"file:///file.txt", "file:///file.txt", 0, 0, CURLUE_OK}, -+ {"file:./", "file://", 0, 0, CURLUE_OK}, - {"http://example.com/hello/../here", - "http://example.com/hello/../here", - CURLU_PATH_AS_IS, 0, CURLUE_OK}, -@@ -1124,7 +1124,7 @@ static int get_url(void) - } - curl_free(url); - } -- else if(rc != get_url_list[i].ucode) { -+ if(rc != get_url_list[i].ucode) { - fprintf(stderr, "Get URL\nin: %s\nreturned %d (expected %d)\n", - get_url_list[i].in, (int)rc, get_url_list[i].ucode); - error++; -@@ -1515,6 +1515,9 @@ int test(char *URL) - { - (void)URL; /* not used */ - -+ if(get_url()) -+ return 3; -+ - if(huge()) - return 9; - -@@ -1533,9 +1536,6 @@ int test(char *URL) - if(set_parts()) - return 2; - -- if(get_url()) -- return 3; -- - if(get_parts()) - return 4; - diff --git a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch b/net-misc/curl/files/curl-8.1.1-configure-compiler.patch deleted file mode 100644 index f769b35880cf..000000000000 --- a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch +++ /dev/null @@ -1,73 +0,0 @@ -The check for "basic compiler options" hangs otherwise. - -https://github.com/curl/curl/commit/471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 -https://github.com/curl/curl/commit/c4a019603b82a08c3572591a9393df0818ee02f6 - -From 471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <mail@eworm.de> -Date: Tue, 23 May 2023 09:40:18 +0200 -Subject: [PATCH] configure: quote the assignments for run-compiler - -Building for multilib failed, as the compiler command contains an -extra argument. That needs quoting. - -Regression from b78ca50cb3dda361f9c1 - -Fixes #11179 -Closes #11180 ---- a/configure.ac -+++ b/configure.ac -@@ -193,8 +193,8 @@ dnl something different but only have that affect the execution of the results - dnl of the compile, not change the libraries for the compiler itself. - dnl - compilersh="run-compiler" --echo "CC=$CC" > $compilersh --echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $compilersh -+echo "CC=\"$CC\"" > $compilersh -+echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh - echo 'exec $CC $@' >> $compilersh - - dnl ********************************************************************** - -From c4a019603b82a08c3572591a9393df0818ee02f6 Mon Sep 17 00:00:00 2001 -From: Emanuele Torre <torreemanuele6@gmail.com> -Date: Tue, 23 May 2023 11:59:59 +0200 -Subject: [PATCH] configure: fix build with arbitrary CC and LD_LIBRARY_PATH - -Since ./configure and processes that inherit its environment variables -are the only callers of the run-compiler script, we can just save the -current value of the LD_LIBRARY_PATH and CC variables to another pair of -environment variables, and make run-compiler a static script that -simply restores CC and LD_LIBRARY_PATH to the saved value, and before -running the compiler. - -This avoids having to inject the values of the variables in the script, -possibly causing problems if they contains spaces, quotes, and other -special characters. - -Also add exports in the script just in case LD_LIBRARY_PATH and CC are -not already in the environment. - -follow-up from 471dab2 - -Closes #11182 ---- a/configure.ac -+++ b/configure.ac -@@ -193,9 +193,13 @@ dnl something different but only have that affect the execution of the results - dnl of the compile, not change the libraries for the compiler itself. - dnl - compilersh="run-compiler" --echo "CC=\"$CC\"" > $compilersh --echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh --echo 'exec $CC $@' >> $compilersh -+export "CURL_SAVED_CC=$CC" -+export "CURL_SAVED_LD_LIBRARY_PATH=$LD_LIBRARY_PATH" -+cat <<\EOF > "$compilersh" -+export "CC=$CURL_SAVED_CC" -+export "LD_LIBRARY_PATH=$CURL_SAVED_LD_LIBRARY_PATH" -+exec $CC "$@" -+EOF - - dnl ********************************************************************** - dnl See which TLS backend(s) that are requested. Just do all the - diff --git a/net-misc/curl/files/curl-8.1.1-hanging-http2.patch b/net-misc/curl/files/curl-8.1.1-hanging-http2.patch deleted file mode 100644 index 4777c4dd35ed..000000000000 --- a/net-misc/curl/files/curl-8.1.1-hanging-http2.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/curl/curl/commit/5c58cb0212bcf63cce33a974906bf9905948b4bb -From: Stefan Eissing <stefan@eissing.org> -Date: Wed, 24 May 2023 18:48:16 +0200 -Subject: [PATCH] http2: fix EOF handling on uploads with auth negotiation - -- doing a POST with `--digest` does an override on the initial request - with `Content-Length: 0`, but the http2 filter was unaware of that - and expected the originally request body. It did therefore not - send a final DATA frame with EOF flag to the server. -- The fix overrides any initial notion of post size when the `done_send` - event is triggered by the transfer loop, leading to the EOF that - is necessary. -- refs #11194. The fault did not happen in testing, as Apache httpd - never tries to read the request body of the initial request, - sends the 401 reply and closes the stream. The server used in the - reported issue however tried to read the EOF and timed out on the - request. - -Reported-by: Aleksander Mazur -Fixes #11194 -Cloes #11200 ---- a/lib/http2.c -+++ b/lib/http2.c -@@ -1527,10 +1527,8 @@ static CURLcode http2_data_done_send(struct Curl_cfilter *cf, - if(!stream->send_closed) { - stream->send_closed = TRUE; - if(stream->upload_left) { -- /* If we operated with unknown length, we now know that everything -- * that is buffered is all we have to send. */ -- if(stream->upload_left == -1) -- stream->upload_left = Curl_bufq_len(&stream->sendbuf); -+ /* we now know that everything that is buffered is all there is. */ -+ stream->upload_left = Curl_bufq_len(&stream->sendbuf); - /* resume sending here to trigger the callback to get called again so - that it can signal EOF to nghttp2 */ - (void)nghttp2_session_resume_data(ctx->h2, stream->id); 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 new file mode 100644 index 000000000000..04603a8c01dc --- /dev/null +++ b/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch @@ -0,0 +1,136 @@ +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 new file mode 100644 index 000000000000..615ab26cb2a8 --- /dev/null +++ b/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch @@ -0,0 +1,131 @@ +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 new file mode 100644 index 000000000000..e07c13a04766 --- /dev/null +++ b/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch @@ -0,0 +1,115 @@ +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/metadata.xml b/net-misc/curl/metadata.xml index 10ae7d7198e0..7f3ef922ed92 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -11,7 +11,6 @@ </maintainer> <use> <flag name="alt-svc">Enable alt-svc support</flag> - <flag name="brotli">Enable brotli compression support</flag> <flag name="ftp">Enable FTP support</flag> <flag name="gnutls">Enable gnutls ssl backend</flag> <flag name="gopher">Enable Gopher protocol support</flag> @@ -20,7 +19,6 @@ <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="nss">Enable nss ssl backend</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> @@ -33,7 +31,6 @@ <flag name="telnet">Enable Telnet protocol support</flag> <flag name="tftp">Enable TFTP support</flag> <flag name="websockets">Enable websockets support</flag> - <flag name="zstd">Enable zstd compression</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:curl:curl</remote-id> diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild index 4140099005c0..d8539208aefd 100644 --- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -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" IUSE="+client ipv6 ldap selinux +server ssl vim-syntax" BDEPEND=" @@ -174,9 +174,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 diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest index e8b0b7cd46dd..833a02dd0790 100644 --- a/net-misc/dhcpcd-ui/Manifest +++ b/net-misc/dhcpcd-ui/Manifest @@ -1 +1,2 @@ DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4 +DIST dhcpcd-ui-0.7.9.tar.xz 104100 BLAKE2B 7e2bbbb9ad657deccc16296a0c7191f35fa15dbc84f1f8ac4f8ac5de4c56e5948da457398409527774ffc62e58659cac2dd37aa66842179f710db04a9791ab9e SHA512 fe0c9ff2f777e7b97438eb50507fce765b8e18b1a71883d76e9b6570a18e6f13414f8e64d8034f9c3352496775c283a0540e331ec449d6fbe48ddc8d64e14691 diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild new file mode 100644 index 000000000000..b29581f35d00 --- /dev/null +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils systemd toolchain-funcs xdg + +DESCRIPTION="Desktop notification and configuration for dhcpcd" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd-ui https://roy.marples.name/projects/dhcpcd-ui/" +SRC_URI="https://github.com/NetworkConfiguration/dhcpcd-ui/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug gtk libnotify ncurses qt5" + +# Qt handles notifications separately, no need for libnotify there +REQUIRED_USE=" + libnotify? ( gtk ) +" + +BDEPEND=" + media-gfx/cairosvg + virtual/libintl +" +DEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + ) + libnotify? ( x11-libs/libnotify ) + ncurses? ( sys-libs/ncurses:= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + media-libs/mesa + ) +" +RDEPEND=" + ${DEPEND} + >=net-misc/dhcpcd-6.4.4 +" + +src_configure() { + local myeconfargs=( + --without-qt + --without-qt5 + $(use_enable debug) + $(use_enable libnotify notification) + $(use_with gtk gtk 'gtk+-3.0') + $(use_with ncurses curses) + ) + + tc-export AR CC CXX + + econf "${myeconfargs[@]}" + + if use qt5 ; then + cd src/dhcpcd-qt || die + eqmake5 PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" + fi +} + +src_compile() { + default + + use qt5 && emake -C src/dhcpcd-qt +} + +src_install() { + emake DESTDIR="${D}" INSTALL_ROOT="${D}" install + use qt5 && emake -C src/dhcpcd-qt DESTDIR="${D}" INSTALL_ROOT="${D}" install + systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 5f0772f9a823..1cc1689a8ca7 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,4 +1,4 @@ -DIST dhcpcd-10.0.0.tar.gz 356168 BLAKE2B a471f44f547754af8975af13d0645b90938a1b93a09d5b45b302e82aa9d70dca2bff4e39b6fc67918967526ff25a8bb6cf32140939c60a4fc5d18dec7404bf99 SHA512 3b7096a2b3fac070443b6b08dffd38a5fd388a0f2c2581598452fa20445574d7ab3d1239601d3c9ed03fcfff6c8b740c88c337be94a5397a6b292ab9a474be7f -DIST dhcpcd-10.0.1.tar.xz 263564 BLAKE2B f1e93285d040b98bede86bb2e87e372afc0d1d124e7a6580c23d8d228a34ee17001fc3c2d9091b16fb082fe2f2ad7ba50c0dd7b0db2b2237ab1cff9ca152100a SHA512 31b0ac780b8592d3d40437837fd759a357b0200dbdc7fd8c62287a4fedc052f324fb8006daff84455906c82d5a4cb6a04916b94a0ad9b17899532f83daf51d3d -DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 -DIST dhcpcd-9.5.0.tar.gz 348645 BLAKE2B bb04391b669dd88cab448a0f98a75ecdc2e865549c75afc6732d3c70272898cdf603c97b79b38e276badcc4254703bb6b0a27f35fbb7da83aeaf2d53341c1593 SHA512 02943769ce24c1073f2634a1e2e0db74f5f95322f7690d40df49589b131ce46aeddc9b8505b8d185070b95bbd3d34284c19998bbb89e059b0ad67cd07fe98932 +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-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee diff --git a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild index b7d172155d9c..f311304756fa 100644 --- a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild @@ -1,33 +1,33 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd toolchain-funcs -if [[ ${PV} == "9999" ]]; then +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://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + 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" +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" -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" +DEPEND="udev? ( virtual/udev )" RDEPEND=" - ${COMMON_DEPEND} + ${DEPEND} privsep? ( acct-group/dhcpcd acct-user/dhcpcd diff --git a/net-misc/dhcpcd/dhcpcd-10.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild index 1ea2577fd47a..a320e843768a 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild @@ -21,7 +21,7 @@ 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" +LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" diff --git a/net-misc/dhcpcd/dhcpcd-9.5.0.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild index a04b080f5bbd..437899bb6d47 100644 --- a/net-misc/dhcpcd/dhcpcd-9.5.0.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild @@ -12,8 +12,8 @@ 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/archive/refs/tags/${MY_P}.tar.gz" - S="${WORKDIR}/${PN}-${MY_P}" + 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 @@ -21,7 +21,7 @@ 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" +LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" @@ -34,6 +34,10 @@ RDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/10.0.5 +) + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpcd/dhcpcd-10.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild index a04b080f5bbd..a320e843768a 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.0.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild @@ -12,8 +12,8 @@ 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/archive/refs/tags/${MY_P}.tar.gz" - S="${WORKDIR}/${PN}-${MY_P}" + 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 @@ -21,7 +21,7 @@ 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" +LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" diff --git a/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild new file mode 100644 index 000000000000..f32fbc9d2b4e --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild @@ -0,0 +1,153 @@ +# 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}/${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="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" +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-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 1ea2577fd47a..a320e843768a 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -21,7 +21,7 @@ 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" +LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" 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 new file mode 100644 index 000000000000..632cf402fc94 --- /dev/null +++ b/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 000000000000..44de6a83f843 --- /dev/null +++ b/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch @@ -0,0 +1,69 @@ +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 new file mode 100644 index 000000000000..de4ee353ccf3 --- /dev/null +++ b/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch @@ -0,0 +1,105 @@ +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 new file mode 100644 index 000000000000..331f60e739a1 --- /dev/null +++ b/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch @@ -0,0 +1,286 @@ +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 new file mode 100644 index 000000000000..bafabfcb0275 --- /dev/null +++ b/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000000..9672dc5b9570 --- /dev/null +++ b/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch @@ -0,0 +1,37 @@ +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/dibbler/dibbler-1.0.1-r4.ebuild b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild new file mode 100644 index 000000000000..b6fa854d515d --- /dev/null +++ b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic readme.gentoo-r1 systemd + +DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)" +HOMEPAGE="http://klub.com.pl/dhcpv6/" +SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86" +IUSE="doc resolvconf" + +RDEPEND="resolvconf? ( virtual/resolvconf )" +DEPEND="${RDEPEND} + doc? ( dev-texlive/texlive-latexextra )" + +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-gnu-ism.patch + "${FILESDIR}"/${P}-clang-16-musl-fix.patch +) + +DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf +to suit your needs. They are stored in /etc/dibbler" + +src_configure() { + # ODR violations, bug #861611 + filter-lto + + # Uses removed 'register' keyword + append-cxxflags -std=c++14 + + econf $(use_enable resolvconf) +} + +src_compile() { + default + # devel documentation is broken and users should consult the online version + # http://klub.com.pl/dhcpv6/doxygen/ + use doc && emake -C doc/ user +} + +src_install() { + default + readme.gentoo_create_doc + + dosbin dibbler-{client,relay,server} + doman doc/man/*.8 + + insinto /etc/dibbler + doins doc/examples/*.conf + keepdir /var/lib/dibbler + + dodoc AUTHORS CHANGELOG RELNOTES TODO + use doc && dodoc doc/dibbler-user.pdf + + doinitd "${FILESDIR}"/dibbler-{client,relay,server} + systemd_dounit "${FILESDIR}"/dibbler-client.service +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-misc/dibbler/files/dibbler-1.0.1-clang-16-musl-fix.patch b/net-misc/dibbler/files/dibbler-1.0.1-clang-16-musl-fix.patch new file mode 100644 index 000000000000..99fdc342b229 --- /dev/null +++ b/net-misc/dibbler/files/dibbler-1.0.1-clang-16-musl-fix.patch @@ -0,0 +1,74 @@ +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Wed, 31 May 2023 06:27:08 +0000 +Subject: [PATCH] Fix build with clang 16 + +Especially on musl libc. + +On musl libc with clang-16, the function pthread_kill can't be found, as its +only available if the FTM is enabled. Hence defining _GNU_SOURCE makes thie +function available. + +Other than that this patch also renames the variable lock, to fix the following +error: ./Port-linux/dibbler-client.cpp:48:27: error: reference to 'lock' is +ambiguous. I'm exactly not sure what the errors are, but I'm guessing it's +related to CPP namespaces. Not sure either why its not reproducable under glibc +llvm. + +Bug: https://bugs.gentoo.org/897944 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/Port-linux/dibbler-client.cpp ++++ b/Port-linux/dibbler-client.cpp +@@ -26,7 +26,7 @@ using namespace std; + + #define IF_RECONNECTED_DETECTED -1 + +-extern pthread_mutex_t lock; ++extern pthread_mutex_t plock; + + TDHCPClient* ptr = 0; + +@@ -44,8 +44,8 @@ void signal_handler(int n) { + #ifdef MOD_CLNT_CONFIRM + void signal_handler_of_linkstate_change(int n) { + Log(Notice) << "Network switch off event detected. initiating CONFIRM." << LogEnd; +- pthread_mutex_lock(&lock); +- pthread_mutex_unlock(&lock); ++ pthread_mutex_lock(&plock); ++ pthread_mutex_unlock(&plock); + } + #endif + +--- a/Port-linux/lowlevel-linux-link-state.c ++++ b/Port-linux/lowlevel-linux-link-state.c +@@ -10,6 +10,7 @@ + #ifdef MOD_CLNT_CONFIRM + + #define __USE_UNIX98 ++#define _GNU_SOURCE + + #include <stdio.h> + #include <signal.h> +@@ -34,7 +35,7 @@ volatile int * notifier = 0; + int isDone = 0; + pthread_t parent_id; + pthread_t ntid; +-pthread_mutex_t lock; ++pthread_mutex_t plock; + + struct state { + int id; +@@ -86,9 +87,9 @@ void link_state_changed(int ifindex) + { + if (changed_links->cnt<16) + changed_links->ifindex[changed_links->cnt++] = ifindex; +- pthread_mutex_lock(&lock); ++ pthread_mutex_lock(&plock); + *notifier = 1; /* notify that change has occured */ +- pthread_mutex_unlock(&lock); ++ pthread_mutex_unlock(&plock); + pthread_kill(parent_id,SIGUSR1); + } else + { +-- +2.40.1 + diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest deleted file mode 100644 index 5ec8546fcc49..000000000000 --- a/net-misc/dleyna-server/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dleyna-server-0.7.2.tar.gz 105415 BLAKE2B 3a38b97f45c04be1e48f87a1653d5ca4776eaa4763d8ce8639f77f5f0512c2331ccbbfe09a5493152c35655989652de071ba9658735af8ab137d77b0b28ec054 SHA512 c6a4dc66c2ae745a3c5d7eb70d7fc97adecc73b80ad5fb4ada710c0aa6f8bd5d3a1abb14acfe0a77d3e148e2159868acf1250599c43379c3d1c1337581de1536 diff --git a/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild deleted file mode 100644 index d94c132858d8..000000000000 --- a/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)" -HOMEPAGE="https://github.com/phako/dleyna-server" -SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" - -RDEPEND=" - >=dev-libs/glib-2.36:2 - >=net-libs/gssdp-1.2:0= - >=net-libs/gupnp-1.2:0= - >=net-libs/gupnp-av-0.12.9:= - >=media-libs/gupnp-dlna-0.9.4:2.0= - >=net-libs/libsoup-2.42.0:2.4 - >=net-libs/dleyna-core-0.6.0:1.0= -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" diff --git a/net-misc/downloader-cli/Manifest b/net-misc/downloader-cli/Manifest index f5314b2648e3..68d573893923 100644 --- a/net-misc/downloader-cli/Manifest +++ b/net-misc/downloader-cli/Manifest @@ -1 +1,2 @@ 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.4.ebuild b/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild new file mode 100644 index 000000000000..d380311907f1 --- /dev/null +++ b/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild @@ -0,0 +1,21 @@ +# 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_{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/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]" diff --git a/net-misc/drive/Manifest b/net-misc/drive/Manifest deleted file mode 100644 index d71c85bab7f9..000000000000 --- a/net-misc/drive/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST drive-0.4.0_p20210208-deps.tar.xz 61397376 BLAKE2B ac6352f97e312b71aab714406b0a62e62dc6cdfa66c262cf9c7b2cbaa8027f5b62aabc5d9706e5447199f06fb586257c2efa79c6bbf66e7cb5ac15bf5eb6a4aa SHA512 d65553ba6e6562aa28630020b924149ea6656164b102ff6e4dea0b0d3b89fbd11cb75ce47f5e9d04b5818c407485872828c29981b56176cdebf1c09d6f1fa6cd -DIST drive-0.4.0_p20210208.tar.gz 353706 BLAKE2B 67af7651e7024109e3b4a64104d89c8ff349ad5cb28e51ccc30cce9c4c4591527c153779cef726522999c9308d461c9fa4340137aa8811ca04501dc80f129434 SHA512 ed34f88ff6fe2c77efe06c53102282bbdcb33fe3a95f275d1755e33172f3cc262a180aa57d50ee5b1a465fa8bcb3e37d34e00aa92a422c8c3e7226c1d3d27774 diff --git a/net-misc/drive/drive-0.4.0_p20210208.ebuild b/net-misc/drive/drive-0.4.0_p20210208.ebuild deleted file mode 100644 index 8430cba30ee6..000000000000 --- a/net-misc/drive/drive-0.4.0_p20210208.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module - -DESCRIPTION="Google Drive client for the commandline" -HOMEPAGE="https://github.com/odeke-em/drive" -EGIT_COMMIT="bede608f250a9333d55c43396fc5e72827e806fd" -SRC_URI="https://github.com/odeke-em/drive/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" - -KEYWORDS="amd64" -LICENSE="Apache-2.0 BSD MIT" -SLOT="0" -IUSE="" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} - -src_prepare() { - sed -e "s|qrcode.Encode(uri,|\0 qrcode.Medium,|" -i drive-server/main.go || die - default -} - -src_compile() { - CGO_ENABLED=0 go build -o ./bin/drive ./cmd/drive || die - CGO_ENABLED=0 go build -o ./bin/drive-server ./drive-server || die -} - -src_install() { - dodoc "README.md" - dobin bin/drive bin/drive-server -} diff --git a/net-misc/drive/metadata.xml b/net-misc/drive/metadata.xml deleted file mode 100644 index 83bc837931b9..000000000000 --- a/net-misc/drive/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 type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <upstream> - <remote-id type="github">odeke-em/drive</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/dropbear/dropbear-2022.83.ebuild b/net-misc/dropbear/dropbear-2022.83.ebuild index ff8635e996a4..94e79a2f42d8 100644 --- a/net-misc/dropbear/dropbear-2022.83.ebuild +++ b/net-misc/dropbear/dropbear-2022.83.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{9..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/dropbear.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc inherit savedconfig pam python-any-r1 verify-sig DESCRIPTION="Small SSH 2 client/server designed for small memory environments" diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest index c4b387a6832e..bf534b1fdbb6 100644 --- a/net-misc/dropbox-cli/Manifest +++ b/net-misc/dropbox-cli/Manifest @@ -1,2 +1 @@ -DIST dropbox-cli-2022.py.xz 14288 BLAKE2B a90d347efcce5917179853afef346a6679dddbb33e146a936786c226ad519601f503d73eeb1d1e205be8bd11792aeedb90ff7046c770f079a47e75dea80efd99 SHA512 59bfbf3544a8407bbc232d87e57d8b27d4bbc108483af52e58c0badddde6ce2dfde2203403a8c5e8c95421fe8c4b73e75cec64def2699ae9bac31be965e98974 DIST dropbox-cli-2023.py.xz 14308 BLAKE2B e0e1f28c911e5744f26bc3854e1283884f7daa57c247f0a13cd5f571124edca1f11e61ea487bccae294b34c4ce30884758662f95d0438efd1e0e3e64ead6a819 SHA512 c11928de24c6ab10c142eedfa244a903795b37bb75e7e805dbf28fe5b18f524db210eb432bf43eb3c99d67b0caca51c85bbe533b3d7d877cfdc7595925483294 diff --git a/net-misc/dropbox-cli/dropbox-cli-2022.ebuild b/net-misc/dropbox-cli/dropbox-cli-2022.ebuild deleted file mode 100644 index 8574366ccb44..000000000000 --- a/net-misc/dropbox-cli/dropbox-cli-2022.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit python-r1 bash-completion-r1 - -DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox" -HOMEPAGE="https://www.dropbox.com/" -SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz" - -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}]" - -S=${WORKDIR} - -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 419cb0d5c054..97b1190d72af 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-173.4.6706.tar.gz 110412404 BLAKE2B 644066ba8a55dea4e00a7db600e9456958e98ab40884a678d452c2425c20c72b44511894f3ce1881c1c5c55370909381fce26f76c451069b4f4e38e478de7800 SHA512 48debab42a0047051bfacd232257e1b64ae50b1927224c5aaa4b015b9617eb2546affbcd69a2d56742f843438ea20e74d0d45a6f684687fa8907e41174dd213b -DIST dropbox-lnx.x86-174.4.5852.tar.gz 111210525 BLAKE2B b020b82b5bd67ac37de65e86183b284806cefd8198df63c24b432b9f3ef05306bd73ffec1a752444e5eb1e76e404c4d4b08653deeef5e9bb154307d30d797171 SHA512 6a9b963dd7318eca5854060aa36d911d59ad1d36f6b88a54be7a45ccc5d5c77b68a61fd737c5dc13b647d31a2f70b89ea809d38ba6248827796d6c4c31311b12 -DIST dropbox-lnx.x86_64-173.4.6706.tar.gz 112095704 BLAKE2B 8b6ce644bfe38bde1cbb70ae37b963c286c39a2b528673cc076b1e537b3407b72e0e29b4cd3e310bffeb2d87190c1f2a7f989276f498f66062fc846a6d262523 SHA512 fb9cc436024a99bbb600e04bf9bd25bc2689ec6a8f5dd70def3f4018c4e76f32d9f5e47704739d4ee9b9775e3d9873d2a49df58b2b8b922279fa738475c74804 -DIST dropbox-lnx.x86_64-174.4.5852.tar.gz 112763122 BLAKE2B f4448bbed890dde5a88e4563f335a3906e5cb55b412039d9e673e5f66ba096de609e23e0483a3c72dceb285469e81628b142bddff4809b25beffa694614a8d38 SHA512 2112833ce9189d7dc7d8d2baee586e693710305c6eb86b7ba1b89f528fb615532ce2f73f71f464ef6a5cb57122dd3e0aeea0046f3536116b19b785574f308868 +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 diff --git a/net-misc/dropbox/dropbox-173.4.6706.ebuild b/net-misc/dropbox/dropbox-186.4.6207.ebuild index b0b4cee9bbeb..b0b4cee9bbeb 100644 --- a/net-misc/dropbox/dropbox-173.4.6706.ebuild +++ b/net-misc/dropbox/dropbox-186.4.6207.ebuild diff --git a/net-misc/dropbox/dropbox-174.4.5852.ebuild b/net-misc/dropbox/dropbox-187.4.5691.ebuild index e1949fb60f88..e1949fb60f88 100644 --- a/net-misc/dropbox/dropbox-174.4.5852.ebuild +++ b/net-misc/dropbox/dropbox-187.4.5691.ebuild diff --git a/net-misc/econnman/econnman-1.1_p20160305.ebuild b/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild index f3e4206dcd16..8b5bc55fe2dc 100644 --- a/net-misc/econnman/econnman-1.1_p20160305.ebuild +++ b/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools python-single-r1 diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 9d43c6ed3568..37e638aaaf9c 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1,5 +1 @@ -DIST electrum-4.3.4.gh.tar.gz 5512701 BLAKE2B a57e3ffddacfd5c63dc7f5cb59bbfe06323e7c8ab708d49e1301356fdcc0204e8126894c3c4b6dd790bd8e64cabc84a410592ea94b361cc553d4dcaa5921f50e SHA512 dc821cbda2e95853627b141292da5a07d8a672cfaabb0b160c67b3020442416593136984b42bf021f815e22671fbded67e6d2dee95e4e46f63e5c9a8fe01ebc9 -DIST electrum-4.4.0.gh.tar.gz 5627801 BLAKE2B 27ed9fff7586f9efe18a76f3cfa6d0cc4df4d5bc542b68ce9cd78ac5d6b033114b9caea23edbbd2a531d6f877a8891a02fc321741d8ecf4eb473894f1d9c94a6 SHA512 dfa5020a2609b8faa21c1ae97e152b89cd235151c18bb2b6a0bb4b9cd5217697e3c6515d832c8f04291fb10e062c3a4d9a92c48874687ef99adfd7cf04f363f8 -DIST electrum-4.4.1.gh.tar.gz 5631256 BLAKE2B cefa27c7b770429004a221143f4291285f2ad6f3ca6f1f58c5c98ce6b6efbc316ea6b857a6abf8ed899cf5feac1f3505fd83189849aab72f144af9e7ce4d546d SHA512 075253fc89063d8fa6adcdc9d3e4c7cbd5caa27efe9f5dca8ddf5ef3863ca25690f2a4280a4999d6d3da7d32ece10dd9faf2ba560d2b13a0c9887237daa6382e -DIST electrum-4.4.2.gh.tar.gz 5635869 BLAKE2B 7ba1941a59e5db7578d2b7fe26997c9bda92467362422fc3b3741eefc5c52b872cbb0c9c5caf7454ae4b6136a37b498ba2afd1b0f19ace0f566de68a9e40b3bb SHA512 50509a7890a9697dfb59ec6d8cb3f2d5243b37acbff2c322cb7a6f4b350dd18fc5a963a30af6cd4e918ea02306df4da7252158ddf268fc87762ff598e2eb33e8 -DIST electrum-4.4.3.gh.tar.gz 5629690 BLAKE2B 56f1bf2500500eb9fcd3b0397adee2f46865ab628004c62b2ffc36b7a019b1bd94b7c84576b35afda70116fb290476432fb1363eeb511d8cd4e6342c3a920975 SHA512 077742c404cce57fbf330b28a36c277dc22c10027c8f412ea192a7f7b917b37b22bbb85dc6cdc654daaacc28f98659dac406879a183448b20b0377a86697f486 +DIST electrum-4.4.6.gh.tar.gz 5637532 BLAKE2B c6b7667c7699f9eb11013c446e203ac4205df1d78e2fb8d44309bd6340c85bd9b4f6aef364f9bf9da4f262b58c74a7830c290c0659cd388b4a50863926dffa67 SHA512 e643a7119a8746d0f9ae02888bcdcf5ab4216ea19483113cf270b2cf23c8c615f0013a2aaf2c5f488655bf52cd190ab76761fa54f4b851039bc7add0c05ad320 diff --git a/net-misc/electrum/electrum-4.3.4-r1.ebuild b/net-misc/electrum/electrum-4.3.4-r1.ebuild deleted file mode 100644 index fe4eb6f62155..000000000000 --- a/net-misc/electrum/electrum-4.3.4-r1.ebuild +++ /dev/null @@ -1,112 +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="ncurses?" - -inherit distutils-r1 xdg-utils - -DESCRIPTION="User friendly Bitcoin client" -HOMEPAGE=" - https://electrum.org/ - https://github.com/spesmilo/electrum/ -" -SRC_URI=" - https://github.com/spesmilo/electrum/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="cli ncurses qrcode +qt5" -REQUIRED_USE="|| ( cli ncurses qt5 )" - -RDEPEND=" - ${PYTHON_DEPS} - <dev-libs/libsecp256k1-0.2 - >=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/cryptography[${PYTHON_USEDEP}] - >=dev-python/dnspython-2[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( $(python_gen_impl_dep 'ncurses') ) -" -BDEPEND=" - test? ( - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # use backwards-compatible cryptodome API - sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die - - # make qdarkstyle dep optional - sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die - - # remove upper bounds from deps - sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die - - eapply_user - - xdg_environment_reset - distutils-r1_src_prepare -} - -src_install() { - dodoc RELEASE-NOTES - distutils-r1_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - - local v - for v in ${REPLACING_VERSIONS}; do - ver_test "${v}" -ge 4.3.4 && return - done - - ewarn "If you are new to BitCoin, please be aware that:" - ewarn "1. Cryptocurrencies are volatile. BTC has been subject to rapid" - ewarn " changes of value in the past." - ewarn "2. Cryptocurrency ownership is determined solely by the access to" - ewarn " the private key. If the key is lost or stolen, BTC are unrevocably" - ewarn " lost." - ewarn "3. Proof-of-work based cryptocurrencies have negative environmental" - ewarn " impact. BTC mining is consuming huge amounts of electricity." -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum/electrum-4.4.0.ebuild b/net-misc/electrum/electrum-4.4.0.ebuild deleted file mode 100644 index ac6a564b7be2..000000000000 --- a/net-misc/electrum/electrum-4.4.0.ebuild +++ /dev/null @@ -1,112 +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="ncurses?" - -inherit distutils-r1 xdg-utils - -DESCRIPTION="User friendly Bitcoin client" -HOMEPAGE=" - https://electrum.org/ - https://github.com/spesmilo/electrum/ -" -SRC_URI=" - https://github.com/spesmilo/electrum/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cli ncurses qrcode +qt5" -REQUIRED_USE="|| ( cli ncurses qt5 )" - -RDEPEND=" - ${PYTHON_DEPS} - <dev-libs/libsecp256k1-0.2 - >=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/cryptography[${PYTHON_USEDEP}] - >=dev-python/dnspython-2[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( $(python_gen_impl_dep 'ncurses') ) -" -BDEPEND=" - test? ( - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # use backwards-compatible cryptodome API - sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die - - # make qdarkstyle dep optional - sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die - - # remove upper bounds from deps - sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die - - eapply_user - - xdg_environment_reset - distutils-r1_src_prepare -} - -src_install() { - dodoc RELEASE-NOTES - distutils-r1_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - - local v - for v in ${REPLACING_VERSIONS}; do - ver_test "${v}" -ge 4.3.4 && return - done - - ewarn "If you are new to BitCoin, please be aware that:" - ewarn "1. Cryptocurrencies are volatile. BTC has been subject to rapid" - ewarn " changes of value in the past." - ewarn "2. Cryptocurrency ownership is determined solely by the access to" - ewarn " the private key. If the key is lost or stolen, BTC are unrevocably" - ewarn " lost." - ewarn "3. Proof-of-work based cryptocurrencies have negative environmental" - ewarn " impact. BTC mining is consuming huge amounts of electricity." -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum/electrum-4.4.1.ebuild b/net-misc/electrum/electrum-4.4.1.ebuild deleted file mode 100644 index ac6a564b7be2..000000000000 --- a/net-misc/electrum/electrum-4.4.1.ebuild +++ /dev/null @@ -1,112 +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="ncurses?" - -inherit distutils-r1 xdg-utils - -DESCRIPTION="User friendly Bitcoin client" -HOMEPAGE=" - https://electrum.org/ - https://github.com/spesmilo/electrum/ -" -SRC_URI=" - https://github.com/spesmilo/electrum/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cli ncurses qrcode +qt5" -REQUIRED_USE="|| ( cli ncurses qt5 )" - -RDEPEND=" - ${PYTHON_DEPS} - <dev-libs/libsecp256k1-0.2 - >=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/cryptography[${PYTHON_USEDEP}] - >=dev-python/dnspython-2[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( $(python_gen_impl_dep 'ncurses') ) -" -BDEPEND=" - test? ( - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # use backwards-compatible cryptodome API - sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die - - # make qdarkstyle dep optional - sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die - - # remove upper bounds from deps - sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die - - eapply_user - - xdg_environment_reset - distutils-r1_src_prepare -} - -src_install() { - dodoc RELEASE-NOTES - distutils-r1_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - - local v - for v in ${REPLACING_VERSIONS}; do - ver_test "${v}" -ge 4.3.4 && return - done - - ewarn "If you are new to BitCoin, please be aware that:" - ewarn "1. Cryptocurrencies are volatile. BTC has been subject to rapid" - ewarn " changes of value in the past." - ewarn "2. Cryptocurrency ownership is determined solely by the access to" - ewarn " the private key. If the key is lost or stolen, BTC are unrevocably" - ewarn " lost." - ewarn "3. Proof-of-work based cryptocurrencies have negative environmental" - ewarn " impact. BTC mining is consuming huge amounts of electricity." -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum/electrum-4.4.2-r1.ebuild b/net-misc/electrum/electrum-4.4.2-r1.ebuild deleted file mode 100644 index 151ffd5e2cfe..000000000000 --- a/net-misc/electrum/electrum-4.4.2-r1.ebuild +++ /dev/null @@ -1,112 +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="ncurses?" - -inherit distutils-r1 xdg-utils - -DESCRIPTION="User friendly Bitcoin client" -HOMEPAGE=" - https://electrum.org/ - https://github.com/spesmilo/electrum/ -" -SRC_URI=" - https://github.com/spesmilo/electrum/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cli ncurses qrcode +qt5" -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/cryptography[${PYTHON_USEDEP}] - >=dev-python/dnspython-2[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( $(python_gen_impl_dep 'ncurses') ) -" -BDEPEND=" - test? ( - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # use backwards-compatible cryptodome API - sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die - - # make qdarkstyle dep optional - sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die - - # remove upper bounds from deps - sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die - - eapply_user - - xdg_environment_reset - distutils-r1_src_prepare -} - -src_install() { - dodoc RELEASE-NOTES - distutils-r1_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - - local v - for v in ${REPLACING_VERSIONS}; do - ver_test "${v}" -ge 4.3.4 && return - done - - ewarn "If you are new to BitCoin, please be aware that:" - ewarn "1. Cryptocurrencies are volatile. BTC has been subject to rapid" - ewarn " changes of value in the past." - ewarn "2. Cryptocurrency ownership is determined solely by the access to" - ewarn " the private key. If the key is lost or stolen, BTC are unrevocably" - ewarn " lost." - ewarn "3. Proof-of-work based cryptocurrencies have negative environmental" - ewarn " impact. BTC mining is consuming huge amounts of electricity." -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum/electrum-4.4.3.ebuild b/net-misc/electrum/electrum-4.4.6.ebuild index 151ffd5e2cfe..78458a0ccfd1 100644 --- a/net-misc/electrum/electrum-4.4.3.ebuild +++ b/net-misc/electrum/electrum-4.4.6.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="ncurses?" inherit distutils-r1 xdg-utils @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="cli ncurses qrcode +qt5" REQUIRED_USE="|| ( cli ncurses qt5 )" @@ -35,6 +35,7 @@ RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] >=dev-python/dnspython-2[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] + dev-python/pyperclip[${PYTHON_USEDEP}] dev-python/PySocks[${PYTHON_USEDEP}] dev-python/qrcode[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest index 814a17d562df..f851044c8b40 100644 --- a/net-misc/ena-driver/Manifest +++ b/net-misc/ena-driver/Manifest @@ -1,2 +1,4 @@ -DIST ena-driver-2.6.1-linux.tar.gz 542085 BLAKE2B 1509d3a22478d648426c788e8343ca121883a2d5fc241a8dbd95836ae48160795ae953a2327ea31190caaf8eaa69d72331a1cf250b56fe8af2fcfd98e3ecd313 SHA512 a24c2c062cd66cbfa8fb9b1fa7093650eda1061bd502a3e57bfdbf3b5b36064f457860e4d5cb045f11de6437e03ad2cfb3390be8876a0ee7a474be1d5cdd8f40 -DIST ena-driver-2.8.7-linux.tar.gz 1205104 BLAKE2B 4014f36aebfe5a42b4a3c3689d9ea52145189dffc9c258b1dfd1245a31a966219e0b91ab97c5acee5b7a10c8e905dc2f80a8e87e5fa2da17c05c178e61d550e8 SHA512 d3b6e284ab923a1492f0ee4073cb538b6ac19d63596cb31b80418791af81a71fe454d092eb8b39e46081129b8105c551694e73a89f8128e9f6291dbaab047010 +DIST ena-driver-2.10.0-linux.tar.gz 1215248 BLAKE2B 625be1635ef5bd8094d277f196187126bf7cf2900002eca2dc5d292befd38ed0577fc0978ef699654584e01f9e03e3ef6055aecaada61401d5fe819fc3f48934 SHA512 0a4b40a7989bed2435124da854a47c4bad8ae079058d49b4140a8fb581fc58481be912907df2ec33e4d788eaf61eb92521aced0113cc19a1bb545e01d64bb533 +DIST ena-driver-2.11.0-linux.tar.gz 1432922 BLAKE2B b6638be5723ccbd00dfa1767a96547a31a8f82cf79bc64c0b879e4895c0bbf6386822013c84ba886e474bb2fca72aa7eaa7772bf8ca76cda70cd78c772a1cbdc SHA512 238f00a250b95916595c50f8b4794fd4fc6be428e40bd4b887cf0b257c14a3e88d7ba55854842c091fa7c735b3f5fcc80a6609d1cf2c5c6f6652debdb4350318 +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 diff --git a/net-misc/ena-driver/ena-driver-2.8.7.ebuild b/net-misc/ena-driver/ena-driver-2.10.0.ebuild index 7c93be223a28..eb8ed9525827 100644 --- a/net-misc/ena-driver/ena-driver-2.8.7.ebuild +++ b/net-misc/ena-driver/ena-driver-2.10.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit linux-mod +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" @@ -17,24 +17,15 @@ BDEPEND="app-arch/unzip" S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" -MODULE_NAMES="ena(net:${S}:${S})" -BUILD_TARGETS="all" - CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}" -} - -src_prepare() { - default - - sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \ - "Makefile" || die "Unable to fix Makefile" -} - -src_install() { - linux-mod_src_install - dodoc README.rst RELEASENOTES.md +DOCS=( + README.rst + RELEASENOTES.md + ENA_Linux_Best_Practices.rst +) + +src_compile() { + local modlist=( ena=net ) + local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" ) + linux-mod-r1_src_compile } diff --git a/net-misc/ena-driver/ena-driver-2.6.1.ebuild b/net-misc/ena-driver/ena-driver-2.11.0.ebuild index ec4ec56c1689..eb8ed9525827 100644 --- a/net-misc/ena-driver/ena-driver-2.6.1.ebuild +++ b/net-misc/ena-driver/ena-driver-2.11.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit linux-info linux-mod +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" @@ -11,30 +11,21 @@ SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" BDEPEND="app-arch/unzip" S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" -MODULE_NAMES="ena(net:${S}:${S})" -BUILD_TARGETS="all" - CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}" -} - -src_prepare() { - default - - sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \ - "Makefile" || die "Unable to fix Makefile" -} - -src_install() { - linux-mod_src_install - dodoc README RELEASENOTES.md +DOCS=( + README.rst + RELEASENOTES.md + ENA_Linux_Best_Practices.rst +) + +src_compile() { + local modlist=( ena=net ) + local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" ) + linux-mod-r1_src_compile } diff --git a/net-misc/ena-driver/ena-driver-2.8.9.ebuild b/net-misc/ena-driver/ena-driver-2.8.9.ebuild new file mode 100644 index 000000000000..e7f73db785b4 --- /dev/null +++ b/net-misc/ena-driver/ena-driver-2.8.9.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2" +SLOT="0" +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 +) + +src_compile() { + local modlist=( ena=net ) + local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" ) + linux-mod-r1_src_compile +} diff --git a/net-misc/ena-driver/ena-driver-2.9.1.ebuild b/net-misc/ena-driver/ena-driver-2.9.1.ebuild new file mode 100644 index 000000000000..eb8ed9525827 --- /dev/null +++ b/net-misc/ena-driver/ena-driver-2.9.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2" +SLOT="0" +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() { + local modlist=( ena=net ) + local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" ) + linux-mod-r1_src_compile +} diff --git a/net-misc/ena-driver/metadata.xml b/net-misc/ena-driver/metadata.xml index c5f10b85aa4b..018f626e73b8 100644 --- a/net-misc/ena-driver/metadata.xml +++ b/net-misc/ena-driver/metadata.xml @@ -5,6 +5,10 @@ <email>dilfridge@gentoo.org</email> <name>Andreas K. Huettel</name> </maintainer> + <maintainer type="person"> + <email>eras@gentoo.org</email> + <name>Eray Aslan</name> + </maintainer> <upstream> <remote-id type="github">amzn/amzn-drivers</remote-id> </upstream> diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild deleted file mode 100644 index 60a4cd2633ee..000000000000 --- a/net-misc/endlessh/endlessh-9999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -DESCRIPTION="SSH tarpit that slowly sends and endless banner" -HOMEPAGE="https://github.com/skeeto/endlessh" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/skeeto/${PN}.git" -else - SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" -fi - -LICENSE="Unlicense" -SLOT="0" - -src_prepare() { - default - - tc-export CC - - sed -i \ - -e 's/^CC/CC?/' \ - -e 's/^CFLAGS =/CFLAGS +=/' \ - -e 's/ -Os//' \ - -e 's/^LDFLAGS/LDFLAGS?/' \ - -e 's/^PREFIX/PREFIX?/' \ - Makefile || die - - sed -i -e "/^ExecStart=/ s:=/usr/local:=${EPREFIX}/usr:" \ - -e /InaccessiblePaths/d util/endlessh.service || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - einstalldocs - - newinitd "${FILESDIR}"/endlessh.initd endlessh - newconfd "${FILESDIR}"/endlessh.confd endlessh - - systemd_dounit util/endlessh.service - - insinto /usr/share/${PN} - doins util/{pivot.py,schema.sql} -} - -pkg_postinst() { - elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}" - elog "Install dev-python/pyrfc3339 if you are going to use it" -} diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest index 68ee6c94bb4a..c7fbadd8f952 100644 --- a/net-misc/eventd/Manifest +++ b/net-misc/eventd/Manifest @@ -1,2 +1 @@ -DIST eventd-0.27.0.tar.xz 188000 BLAKE2B 06779168e9049714aabc051f8a85a5e5764509c3deceddd300c103f4831b6679f082748858bebb9629dcd47fa0b570158c6cf2b665167ab8e20a7dc0f12cc00f SHA512 586fdf36742cfda5a3c5e4cf4600307b8d699701fdf32eec25a7b294c815ded6e7e41210e65c706c34c5f2d911cadec89b677f082dad183f486fb7d1a55a2302 DIST eventd-0.29.0.tar.xz 196276 BLAKE2B 5d9fd352df65a8bb00e6bf1f7600dadc1bf3d3c98ed02eb3ad3cb6148dc8370dd2bc2ecda7e2b8f60d90b7adebb2187490bb6c934bc0bf8b5d0cd38bb26a8c36 SHA512 32407049df0abba68eb6310a86f8c6ec42774bd55934e5927d92f9eb75fc11f32e790904641a0113d8668c66591a0a82246b3240ba1a9517b243301bb96227b8 diff --git a/net-misc/eventd/eventd-0.27.0-r2.ebuild b/net-misc/eventd/eventd-0.27.0-r2.ebuild deleted file mode 100644 index 562deb09c326..000000000000 --- a/net-misc/eventd/eventd-0.27.0-r2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info meson systemd - -DESCRIPTION="A small daemon to act on remote or local events" -HOMEPAGE="https://www.eventd.org/" -SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz" - -LICENSE="GPL-3+ LGPL-3+ ISC MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification - pulseaudio purple speech systemd test upnp webhook websocket +X zeroconf" - -RESTRICT="!test? ( test )" -REQUIRED_USE=" - X? ( notification ) - fbcon? ( notification ) - notification? ( || ( X fbcon ) ) - test? ( websocket ) -" - -COMMON_DEPEND=" - dev-libs/glib:2 - sys-apps/util-linux - x11-libs/libxkbcommon - introspection? ( dev-libs/gobject-introspection ) - libcanberra? ( media-libs/libcanberra ) - libnotify? ( x11-libs/gdk-pixbuf:2 ) - notification? ( - gnome-base/librsvg - x11-libs/cairo - x11-libs/pango - x11-libs/gdk-pixbuf:2 - X? ( - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb:=[xkb(+)] - x11-libs/xcb-util - x11-libs/xcb-util-wm - ) - ) - pulseaudio? ( - media-libs/libsndfile - media-sound/pulseaudio - ) - purple? ( net-im/pidgin ) - speech? ( app-accessibility/speech-dispatcher ) - systemd? ( sys-apps/systemd:= ) - upnp? ( >=net-libs/gssdp-1.2:0= ) - webhook? ( net-libs/libsoup:2.4 ) - websocket? ( net-libs/libsoup:2.4 ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - fbcon? ( virtual/os-headers ) -" -RDEPEND="${COMMON_DEPEND} - net-libs/glib-networking[ssl] -" -BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}"/${PN}-0.27.0-fno-common.patch -) - -pkg_setup() { - if use ipv6; then - CONFIG_CHECK=$(usex test 'IPV6' '~IPV6') - linux-info_pkg_setup - fi -} - -src_configure() { - # wayland disabled due to missing dep in ::gentoo, wayland-wall - local emesonargs=( - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - -Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" - -Dnd-wayland=false - $(meson_feature websocket) - $(meson_feature zeroconf dns-sd) - $(meson_feature upnp ssdp) - $(meson_use ipv6) - $(meson_use systemd) - $(meson_use notification notification-daemon) - $(meson_use X nd-xcb) - $(meson_use fbcon nd-fbdev) - $(meson_use purple im) - $(meson_use pulseaudio sound) - $(meson_use speech tts) - $(meson_use webhook) - $(meson_use libnotify) - $(meson_use libcanberra) - $(meson_use introspection gobject-introspection) - $(meson_use debug debug-output) - ) - - meson_src_configure -} - -src_test() { - EVENTD_TESTS_TMP_DIR="${T}" meson_src_test -} diff --git a/net-misc/eventd/eventd-0.29.0.ebuild b/net-misc/eventd/eventd-0.29.0-r2.ebuild index b475370e4e82..0c6729f4ee5b 100644 --- a/net-misc/eventd/eventd-0.29.0.ebuild +++ b/net-misc/eventd/eventd-0.29.0-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz" LICENSE="GPL-3+ LGPL-3+ ISC MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification +IUSE="debug fbcon +introspection libcanberra libnotify +notification pulseaudio purple speech systemd test upnp webhook websocket +X zeroconf" RESTRICT="!test? ( test )" @@ -43,13 +43,13 @@ COMMON_DEPEND=" ) ) pulseaudio? ( + media-libs/libpulse media-libs/libsndfile - media-sound/pulseaudio ) purple? ( net-im/pidgin ) speech? ( app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd:= ) - upnp? ( >=net-libs/gssdp-1.2:0= ) + upnp? ( net-libs/gssdp:1.6= ) webhook? ( net-libs/libsoup:3.0 ) websocket? ( net-libs/libsoup:3.0 ) zeroconf? ( net-dns/avahi[dbus] ) @@ -69,13 +69,6 @@ BDEPEND=" virtual/pkgconfig " -pkg_setup() { - if use ipv6; then - CONFIG_CHECK=$(usex test 'IPV6' '~IPV6') - linux-info_pkg_setup - fi -} - src_configure() { # wayland disabled due to missing dep in ::gentoo, wayland-wall local emesonargs=( @@ -87,7 +80,7 @@ src_configure() { $(meson_feature websocket) $(meson_feature zeroconf dns-sd) $(meson_feature upnp ssdp) - $(meson_use ipv6) + -Dipv6=true $(meson_use systemd) $(meson_use notification notification-daemon) $(meson_use X nd-xcb) diff --git a/net-misc/eventd/files/eventd-0.27.0-fno-common.patch b/net-misc/eventd/files/eventd-0.27.0-fno-common.patch deleted file mode 100644 index 5f731666738c..000000000000 --- a/net-misc/eventd/files/eventd-0.27.0-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugins/nd/src/backend.h -+++ b/plugins/nd/src/backend.h -@@ -37,7 +37,7 @@ - _EVENTD_ND_BACKENDS_SIZE - } EventdNdBackends; - --const gchar *eventd_nd_backends_names[_EVENTD_ND_BACKENDS_SIZE]; -+extern const gchar *eventd_nd_backends_names[_EVENTD_ND_BACKENDS_SIZE]; - - typedef struct { - EventdNdContext *context; diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 3a7995e1186a..6190d97c3e83 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,2 +1,5 @@ DIST freerdp-2.10.0.tar.gz 7321489 BLAKE2B 92b4b45670a5ed3b41713d1e036d41a9ef5714ddf9273a4b88fadf5c8435a467a53144f42bd969a44e641995a7f94b6c7b43b85f0ede738b1a1213e3bada9788 SHA512 a5749e3140d74c66d51869b405852bdaa776ca7d82e50a1e3ed19ccf56ed91a4ad9c3ce2c8ee6ff0abbb29d915c2e7278a1fcea04d73fd5ba4014f6590484477 -DIST freerdp-2.9.0.tar.gz 7319428 BLAKE2B 358fcd14bd42b51d4d50e86cc71f9759179c82b466dd78a2f6996db84f3dd90495047f9c0da9a683edf894fdc96f4945237ad2fbeade12b173bac82f7be722b3 SHA512 de593640d4418c9395455b84c463e4cac8e51e9fd186ed5bce28132170ebc3c7338651582e0cc00272b530ea6e7c2664e802d748b3f6eba5fbe534dcf59d406a +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 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 new file mode 100644 index 000000000000..586ae641b58e --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch @@ -0,0 +1,37 @@ +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/freerdp-2.10.0-r2.ebuild b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild index f812a1150e13..ca7d9504ea65 100644 --- a/net-misc/freerdp/freerdp-2.10.0-r2.ebuild +++ b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild @@ -19,7 +19,7 @@ else fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" +HOMEPAGE="https://www.freerdp.com/" LICENSE="Apache-2.0" SLOT="0/2" @@ -92,6 +92,10 @@ BDEPEND=" ) ) " +PATCHES=( + "${FILESDIR}"/${P}-ffmpeg-6.patch +) + src_configure() { # bug #881695 filter-lto diff --git a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild b/net-misc/freerdp/freerdp-2.11.0-r1.ebuild new file mode 100644 index 000000000000..2a906f8c6a0d --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.0-r1.ebuild @@ -0,0 +1,137 @@ +# 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.9.0-r1.ebuild b/net-misc/freerdp/freerdp-2.11.1.ebuild index 85a2e5f54e5c..c02216b06c7b 100644 --- a/net-misc/freerdp/freerdp-2.9.0-r1.ebuild +++ b/net-misc/freerdp/freerdp-2.11.1.ebuild @@ -15,15 +15,15 @@ else MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" +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 wayland X xinerama xv" +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=" @@ -54,10 +54,11 @@ RDEPEND=" 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-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) server? ( X? ( x11-libs/libXcursor @@ -80,7 +81,10 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-util/valgrind ) +" BDEPEND=" virtual/pkgconfig X? ( doc? ( @@ -94,6 +98,7 @@ src_configure() { filter-lto local mycmakeargs=( + -Wno-dev -DBUILD_TESTING=$(usex test ON OFF) -DCHANNEL_URBDRC=$(usex usb ON OFF) -DWITH_ALSA=$(usex alsa ON OFF) @@ -106,14 +111,17 @@ src_configure() { -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) diff --git a/net-misc/freerdp/freerdp-2.11.2.ebuild b/net-misc/freerdp/freerdp-2.11.2.ebuild new file mode 100644 index 000000000000..2a906f8c6a0d --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.2.ebuild @@ -0,0 +1,137 @@ +# 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.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 04d9059dea56..2a906f8c6a0d 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -19,11 +19,11 @@ else fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" +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" +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=" @@ -54,6 +54,7 @@ RDEPEND=" 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= ) @@ -97,6 +98,7 @@ src_configure() { filter-lto local mycmakeargs=( + -Wno-dev -DBUILD_TESTING=$(usex test ON OFF) -DCHANNEL_URBDRC=$(usex usb ON OFF) -DWITH_ALSA=$(usex alsa ON OFF) @@ -109,10 +111,12 @@ src_configure() { -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) diff --git a/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild b/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild new file mode 100644 index 000000000000..f5fc7c8b622a --- /dev/null +++ b/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild @@ -0,0 +1,149 @@ +# 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-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index c580e3f72696..ba1f26353110 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -19,16 +19,17 @@ else fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" +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" +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" 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? ( @@ -49,15 +50,21 @@ RDEPEND=" !ffmpeg? ( x11-libs/cairo:0= ) + fuse? ( sys-fs/fuse:3 ) 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 @@ -69,7 +76,10 @@ RDEPEND=" xinerama? ( x11-libs/libXinerama ) ) ) - smartcard? ( sys-apps/pcsc-lite ) + smartcard? ( + dev-libs/pkcs11-helper + sys-apps/pcsc-lite + ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland @@ -97,10 +107,13 @@ src_configure() { 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) @@ -108,20 +121,25 @@ src_configure() { -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_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_PCSC=$(usex smartcard 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 } diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml index cdc60d1ae1df..0fc989abd6dc 100644 --- a/net-misc/freerdp/metadata.xml +++ b/net-misc/freerdp/metadata.xml @@ -6,6 +6,8 @@ <name>Mike Gilbert</name> </maintainer> <use> + <flag name="aad">Enable login via Azure AD</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> </use> diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest index ee1284097b5f..d91332d2ffe3 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -1,2 +1,2 @@ -DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac SHA512 1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7 -DIST frr-8.5.tar.gz 10068379 BLAKE2B ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4 SHA512 13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f +DIST frr-9.0.1.tar.gz 10334150 BLAKE2B c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b SHA512 fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9 +DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25 diff --git a/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch b/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch deleted file mode 100644 index 3c9374aefd6d..000000000000 --- a/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/FRRouting/frr/pull/12741 - -From def86a45a473a45bf8ac39ac4b82be3d09ae9cae Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 4 Feb 2023 23:29:59 +0000 -Subject: [PATCH] pceplib: add <time.h> include for time_t - -Fixes build on musl. Used for time_t in the header. - -Bug: https://bugs.gentoo.org/862558 ---- a/pceplib/pcep_utils_counters.h -+++ b/pceplib/pcep_utils_counters.h -@@ -30,6 +30,7 @@ - - #include <stdbool.h> - #include <stdint.h> -+#include <time.h> - - #ifdef __cplusplus - extern "C" { - diff --git a/net-misc/frr/files/frr-openrc-v1 b/net-misc/frr/files/frr-openrc-v2 index 3f9da62e2a18..24e326ed84a7 100644 --- a/net-misc/frr/files/frr-openrc-v1 +++ b/net-misc/frr/files/frr-openrc-v2 @@ -106,7 +106,7 @@ _frr_start() { # Apply MAX_FDS configuration if set. if [ ! -z $MAX_FDS ]; then veinfo " Setting maximum file descriptors to ${MAX_FDS}" - ulimit -n $MAX_FDS >/dev/null 2>/dev/null + prlimit -n $MAX_FDS >/dev/null 2>/dev/null fi # Save started daemons to state database. diff --git a/net-misc/frr/frr-8.5.ebuild b/net-misc/frr/frr-9.0.1.ebuild index dedac1e7cf84..3e71c240c475 100644 --- a/net-misc/frr/frr-8.5.ebuild +++ b/net-misc/frr/frr-9.0.1.ebuild @@ -23,7 +23,9 @@ COMMON_DEPEND=" ${PYTHON_DEPS} acct-user/frr dev-libs/json-c:0= + dev-libs/protobuf-c:0= >=net-libs/libyang-2.0.0 + <net-libs/libyang-2.1.111 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= @@ -142,7 +144,7 @@ src_install() { # Install init scripts systemd_dounit tools/frr.service - newinitd "${FILESDIR}"/frr-openrc-v1 frr + newinitd "${FILESDIR}"/frr-openrc-v2 frr # Conflict files, installed by net-libs/libsmi, bug #758383 rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die diff --git a/net-misc/frr/frr-8.4.2.ebuild b/net-misc/frr/frr-9.0.ebuild index b0ae3ed58713..73df8c4dd6f6 100644 --- a/net-misc/frr/frr-8.4.2.ebuild +++ b/net-misc/frr/frr-9.0.ebuild @@ -23,7 +23,9 @@ COMMON_DEPEND=" ${PYTHON_DEPS} acct-user/frr dev-libs/json-c:0= + dev-libs/protobuf-c:0= >=net-libs/libyang-2.0.0 + <net-libs/libyang-2.1.111 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= @@ -53,7 +55,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch "${FILESDIR}"/${PN}-8.4.1-logrotate.patch - "${FILESDIR}"/${PN}-8.4.2-musl-gcc12.patch ) src_prepare() { @@ -143,7 +144,7 @@ src_install() { # Install init scripts systemd_dounit tools/frr.service - newinitd "${FILESDIR}"/frr-openrc-v1 frr + newinitd "${FILESDIR}"/frr-openrc-v2 frr # Conflict files, installed by net-libs/libsmi, bug #758383 rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml index ddcddee54aea..872896f7668c 100644 --- a/net-misc/frr/metadata.xml +++ b/net-misc/frr/metadata.xml @@ -1,10 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <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> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="grpc">Enable gRPC plugin</flag> <flag name="nhrp">Build Next Hop Resolution Protocol daemon</flag> diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index 1d4ce4e2e34a..2a6057d69bc5 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,4 +1,3 @@ -DIST gallery-dl-1.25.1.gh.tar.gz 543977 BLAKE2B ab6437ebb4f840fb3fac27a3f0d2536215dc02376b0129d9b7d4c9420cc64405edf5961c0155d7fb9d7001028bf218a299bfd44bbf2ef2b60f567e51050e504e SHA512 96f929af5cf70c7a89eca2ac8380cd7ba36ed806d062a6e339238ebfec2387aa4806d432cd28599b37382a69d7cdb33306069d41954e1421dff2523e2ae6a8df -DIST gallery-dl-1.25.2.gh.tar.gz 546468 BLAKE2B ee40766e581afa8ab1119d656131a1e467fc1b6b5d92491ee384428ee4a02fd2b0b261657f175cb6d6bc8e79a622a14b7308ccb0e129535e7718503a6828ae53 SHA512 99bc319427c067f039df7f34988b44da2db028afc33188454879c46abbacfaac6fb8a5d0d0aec1fd4d7ba97862b100675cab55094b9d8979a5240f516fe4b855 -DIST gallery-dl-1.25.4.gh.tar.gz 555479 BLAKE2B c209d494014db2978722e70ad6442244ddd283c0e7169a90256eaf6ddaf6ffbe2a85129369d5207eb31512ca13298fe290b3f5fa41e9949db402ee6637ff139c SHA512 163033515925f13b8d19c98a45ef50e316be92cbaf439322a47d074a783519c389a685005b7f33a9d384791315d53cb2d59af030ab96ff8eaed7caa31f0e8e17 -DIST gallery-dl-1.25.5.gh.tar.gz 563928 BLAKE2B d8308233fc4e59da466825f5063556bffb31f8f710a75dca23b710244c1702569ffc46f41d0721e6bdcfd1ce5471d30872f8f931388db82a7ce918564d84ae75 SHA512 ed2e18a9220eb68bd93009b12212c4052893277cb585ded8b5c513c764d3efec348c0340360b5ccac6f98527fb0a9ddb93167e942e3151419169a4ad7353157f +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 diff --git a/net-misc/gallery-dl/gallery-dl-1.25.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.25.5.ebuild deleted file mode 100644 index b3da2a9c870f..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.25.5.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.25.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.1.ebuild index e83e798733f1..e83e798733f1 100644 --- a/net-misc/gallery-dl/gallery-dl-1.25.1.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.26.1.ebuild diff --git a/net-misc/gallery-dl/gallery-dl-1.25.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.2.ebuild index b3da2a9c870f..b3da2a9c870f 100644 --- a/net-misc/gallery-dl/gallery-dl-1.25.2.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.26.2.ebuild diff --git a/net-misc/gallery-dl/gallery-dl-1.25.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.3.ebuild index b3da2a9c870f..b3da2a9c870f 100644 --- a/net-misc/gallery-dl/gallery-dl-1.25.4.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.26.3.ebuild diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml index a84cb7bedb41..175585149331 100644 --- a/net-misc/gallery-dl/metadata.xml +++ b/net-misc/gallery-dl/metadata.xml @@ -11,6 +11,7 @@ <remote-id type="github">mikf/gallery-dl</remote-id> <remote-id type="pypi">gallery-dl</remote-id> </upstream> + <stabilize-allarches/> <longdescription> gallery-dl is a command-line program to download image-galleries and -collections from several image hosting sites. diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index 8daa9e8bdf4b..2906a9477455 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -1,4 +1,2 @@ -DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1 -DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f DIST geoipupdate-4.9.0-deps.tar.xz 2894004 BLAKE2B 2995d4f2f8632d232b156294cca8bd76f40373c948df9ca5b4813bf630923168063eb094de52582af5221950343b998afb50c97bfe9077cf952951b00e5b3349 SHA512 c83c05cd5063199b21b8eb621a80da8679ddac2881da53b6914a7cb1419a1a6ef8cabd62562722d61b7e5d05d93f430a707d4e082e126514bfad27537f4e3ff7 DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c diff --git a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild deleted file mode 100644 index 7d7efeb504fe..000000000000 --- a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" -HOMEPAGE="https://github.com/maxmind/geoipupdate" -SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" - -DEPEND=" - net-misc/curl - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - !<dev-libs/geoip-1.6.0 -" - -src_install() { - default - keepdir /usr/share/GeoIP -} diff --git a/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild b/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild deleted file mode 100644 index b80672ca8484..000000000000 --- a/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" -HOMEPAGE="https://github.com/maxmind/geoipupdate" -SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" - -DEPEND=" - net-misc/curl - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - !<dev-libs/geoip-1.6.0 -" - -src_install() { - default - keepdir /usr/share/GeoIP -} diff --git a/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch new file mode 100644 index 000000000000..9e84f53b3ef4 --- /dev/null +++ b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch @@ -0,0 +1,81 @@ +From 07f78866608c8f1094696615932e2d8382e5fd8c Mon Sep 17 00:00:00 2001 +From: Kostadin Shishmanov <kocelfc@tutanota.com> +Date: Thu, 16 Nov 2023 21:17:34 +0200 +Subject: [PATCH] Add #include <algorithm> to fix building with gcc 14 + +Gentoo bug: https://bugs.gentoo.org/917136 + +Upstream PR: https://github.com/gerbera/gerbera/pull/2899 + +Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com> +--- + src/cds/cds_objects.h | 1 + + src/iohandler/io_handler_buffer_helper.cc | 2 ++ + src/iohandler/mem_io_handler.cc | 2 ++ + src/util/tools.h | 1 + + src/util/upnp_clients.cc | 2 ++ + 5 files changed, 8 insertions(+) + +diff --git a/src/cds/cds_objects.h b/src/cds/cds_objects.h +index 4283a3af5..a4b9c1d01 100644 +--- a/src/cds/cds_objects.h ++++ b/src/cds/cds_objects.h +@@ -34,6 +34,7 @@ + #ifndef __CDS_OBJECTS_H__ + #define __CDS_OBJECTS_H__ + ++#include <algorithm> + #include <map> + #include <memory> + #include <vector> +diff --git a/src/iohandler/io_handler_buffer_helper.cc b/src/iohandler/io_handler_buffer_helper.cc +index ee1de602e..49afd3c8c 100644 +--- a/src/iohandler/io_handler_buffer_helper.cc ++++ b/src/iohandler/io_handler_buffer_helper.cc +@@ -36,6 +36,8 @@ + + #include "config/config_manager.h" + ++#include <algorithm> ++ + IOHandlerBufferHelper::IOHandlerBufferHelper(std::shared_ptr<Config> config, std::size_t bufSize, std::size_t initialFillSize) + : config(std::move(config)) + , bufSize(bufSize) +diff --git a/src/iohandler/mem_io_handler.cc b/src/iohandler/mem_io_handler.cc +index 534c452da..230f4aa85 100644 +--- a/src/iohandler/mem_io_handler.cc ++++ b/src/iohandler/mem_io_handler.cc +@@ -34,6 +34,8 @@ + + #include "mem_io_handler.h" // API + ++#include <algorithm> ++ + MemIOHandler::MemIOHandler(const void* buffer, int length) + : buffer(new char[length]) + , length(length) +diff --git a/src/util/tools.h b/src/util/tools.h +index 177f09900..de2481c87 100644 +--- a/src/util/tools.h ++++ b/src/util/tools.h +@@ -33,6 +33,7 @@ + #ifndef __TOOLS_H__ + #define __TOOLS_H__ + ++#include <algorithm> + #include <map> + #include <optional> + #include <vector> +diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc +index e07fb4508..d95f426fb 100644 +--- a/src/util/upnp_clients.cc ++++ b/src/util/upnp_clients.cc +@@ -33,6 +33,8 @@ + + #include <upnp.h> + ++#include <algorithm> ++ + std::shared_ptr<ClientStatusDetail> ClientStatusDetail::clone() const + { + return std::make_shared<ClientStatusDetail>(group, itemId, playCount, lastPlayed.count(), lastPlayedPosition.count(), bookMarkPos.count()); diff --git a/net-misc/gerbera/gerbera-1.12.1.ebuild b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild index 00f14f51b749..c7fbd27a2fa3 100644 --- a/net-misc/gerbera/gerbera-1.12.1.ebuild +++ b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then 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" + KEYWORDS="amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" fi @@ -34,7 +34,7 @@ RDEPEND=" virtual/libiconv curl? ( net-misc/curl ) exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) + exiv2? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) javascript? ( dev-lang/duktape:= ) @@ -48,6 +48,10 @@ DEPEND="${RDEPEND}" CONFIG_CHECK="~INOTIFY_USER" +PATCHES=( + "${FILESDIR}/${PN}-1.12.1-gcc14.patch" +) + src_configure() { local mycmakeargs=( -DWITH_AVCODEC=$(usex ffmpeg) diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 00f14f51b749..2691f65a7c4f 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -34,7 +34,7 @@ RDEPEND=" virtual/libiconv curl? ( net-misc/curl ) exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) + exiv2? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) javascript? ( dev-lang/duktape:= ) diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest index 8a9bbdc30766..98e1e21d1893 100644 --- a/net-misc/gnome-connections/Manifest +++ b/net-misc/gnome-connections/Manifest @@ -1 +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 diff --git a/net-misc/gnome-connections/gnome-connections-45.0.ebuild b/net-misc/gnome-connections/gnome-connections-45.0.ebuild new file mode 100644 index 000000000000..b6330f5a7f91 --- /dev/null +++ b/net-misc/gnome-connections/gnome-connections-45.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson vala xdg + +DESCRIPTION="A remote desktop client for the GNOME desktop environment" +HOMEPAGE="https://gitlab.gnome.org/GNOME/connections" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~loong" +IUSE="test" +RESTRICT="!test? ( test )" + +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= +" +RDEPEND="${DEPEND}" +BDEPEND=" + $(vala_depend) + dev-libs/glib + dev-util/glib-utils + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + + test? ( + dev-libs/appstream-glib + dev-util/desktop-file-utils + ) +" + +src_prepare() { + default + vala_setup +} + +src_configure() { + local emesonargs=( + -Dprofile=default + ) + 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/Manifest b/net-misc/gnome-remote-desktop/Manifest index d3a365db04e5..fbb24933da9c 100644 --- a/net-misc/gnome-remote-desktop/Manifest +++ b/net-misc/gnome-remote-desktop/Manifest @@ -1,2 +1,3 @@ -DIST gnome-remote-desktop-44.1.tar.xz 199428 BLAKE2B 6a44a616f3581b3bff1123a432cf55591a3a00c3d0f06f6f3510ef3dc69e752a4cce54c4967ef6692f49d730a1545a7b73ca2c3b1c699e64342601fc51c8ee9f SHA512 bb1d8a9ee7868309beb84d01c35e17c92bd26ac855df00caaa780796fe403842ee00462c4c222bf16cd3b98752106d34bfca55c98d634e712a5b561c7ace5285 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 diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild index 595e4cdbee2a..d7c4a7f43cf6 100644 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.1.ebuild +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild @@ -20,6 +20,7 @@ DEPEND=" x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 + >=dev-libs/libei-1.0.901 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= @@ -42,6 +43,7 @@ RDEPEND="${DEPEND} x11-wm/mutter[screencast] " BDEPEND=" + dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig @@ -58,6 +60,7 @@ src_configure() { $(meson_use vnc) $(meson_use systemd) -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" + -Dtests=false # Tests run xvfb-run directly ) meson_src_configure } 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.ebuild new file mode 100644 index 000000000000..d7c4a7f43cf6 --- /dev/null +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1.ebuild @@ -0,0 +1,76 @@ +# 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 + >=dev-libs/libei-1.0.901 + 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-libs/glib + 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)" + -Dtests=false # Tests run xvfb-run directly + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 14d1072ed90b..3b2dece1b459 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,2 +1,2 @@ -DIST gns3-gui-2.2.37.tar.gz 5048202 BLAKE2B bfc26350b60f7f790ab603bcc27ca4432bb4b19d92a3bcd766aa6739a332599afb5f710ff209b708a71fb4a4f515ce3f215434c025418989410d3dfa3a80c294 SHA512 800d746ba90be06260fac8f2a9db471da47aff66f10b94cfa46053d93820ba3e06b8e7146829de1bf7e8b09f83f4a57965bc044e0683f210a5cb3faadf9d4dd4 -DIST gns3-gui-2.2.38.tar.gz 5048241 BLAKE2B 975e0cf324afcc37a23e8bdccbb7bfc5e4a70b754a145a4948440e9fa2ba13fee4ce712ac18c0fce07c337946198f45b2555113f23073c5d91eed2356a7397a2 SHA512 a4ab6683864ac16cab34c695e5dbb9c21f9644ab048f4fd1bab902c7a24531d1f6046ea6b83e4fd9258f5db481f9b30ef600e66e7f0502ab09b66b15f6562f14 +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 diff --git a/net-misc/gns3-gui/gns3-gui-2.2.37.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.37.ebuild deleted file mode 100644 index 650a3b5a099a..000000000000 --- a/net-misc/gns3-gui/gns3-gui-2.2.37.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 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 virtualx xdg - -DESCRIPTION="Graphical Network Simulator" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui" -SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -#net-misc/gns3-server version should always match gns3-gui version -RDEPEND=" - >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.4[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}] - ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -src_prepare() { - default - - # newer python packages are fine - sed -i -e 's/[<>=].*//' requirements.txt || die -} - -src_test() { - virtx distutils-r1_src_test -} diff --git a/net-misc/gns3-gui/gns3-gui-2.2.38-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild index 812f7e8df59d..5834bf62b463 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.38-r1.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild @@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 virtualx xdg DESCRIPTION="Graphical Network Simulator" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-gui" SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" @@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86" #net-misc/gns3-server version should always match gns3-gui version RDEPEND=" - >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.4[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.29.2[${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.38.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.43.ebuild index f2230dc15190..0dfa014133d2 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.38.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.43.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_11 ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 virtualx xdg DESCRIPTION="Graphical Network Simulator" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-gui" SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" @@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86" #net-misc/gns3-server version should always match gns3-gui version RDEPEND=" - >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.4[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.31.0[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] " diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index ac28ff7fb13a..1d056bc4280b 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,2 +1,2 @@ -DIST gns3-server-2.2.37.tar.gz 9690092 BLAKE2B 9cc7dabde818996ea87494cb4a61a4ba5f9ad2dfe028a4ca9d45e9bd8f6dd4a17b4845275a87386ad068be4f354f932e6cada8d2b8eafd54230ea82fae3f5571 SHA512 f56d1f130e3179fe250b12e9459d8b66745c780c94380cce0ed60206918458f4aab119faa77b23ef7c58115bee11ff2ef6630539b5f184ab2d36b936564de1b7 -DIST gns3-server-2.2.38.tar.gz 9693834 BLAKE2B a7a442142bda19bcdb9c9501963bacc275105221f141a59f125d6ec37ada6b357885f76a8cd68b5daef1eb82a3d01b49a99a9c5d4383b728c5c156f92ecdd0bc SHA512 c116dee5836d76be03e5eb7be402b67f8f22273a9a6270220c77ca57324a991c1d2bbfba4457616b11dd2ce14c17206864ec46bd8d4ecc905ab9b20ad137d1a6 +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 diff --git a/net-misc/gns3-server/gns3-server-2.2.38.ebuild b/net-misc/gns3-server/gns3-server-2.2.38.ebuild deleted file mode 100644 index d399b6d9463f..000000000000 --- a/net-misc/gns3-server/gns3-server-2.2.38.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 optfeature systemd - -DESCRIPTION="GNS3 server to asynchronously manage emulators" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" -SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - acct-group/gns3 - acct-user/gns3 - app-emulation/dynamips - >=dev-python/aiofiles-22.1.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.3[${PYTHON_USEDEP}] - >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] - >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}] - >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] - >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] - >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.4[${PYTHON_USEDEP}] - >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}] - net-misc/ubridge - sys-apps/busybox[static] -" -BDEPEND=" - test? ( - dev-python/pytest-aiohttp[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - default - - # newer python packages are fine - sed -i -e 's/[<>=].*//' requirements.txt || die -} - -python_install() { - distutils-r1_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() { - elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality." - elog "" - optfeature "QEMU Support" "app-emulation/qemu" - optfeature "Virtualbox Support" "app-emulation/virtualbox" - optfeature "Docker Support" "app-containers/docker" - optfeature "Wireshark Support" "net-analyzer/wireshark" - elog "" - elog "The following packages are currently unsupported:" - elog "iouyap and vpcs" -} diff --git a/net-misc/gns3-server/gns3-server-2.2.38-r1.ebuild b/net-misc/gns3-server/gns3-server-2.2.42.ebuild index f32f72430221..de2185845ca4 100644 --- a/net-misc/gns3-server/gns3-server-2.2.38-r1.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.42.ebuild @@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature systemd DESCRIPTION="GNS3 server to asynchronously manage emulators" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-server" SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" @@ -20,16 +20,16 @@ RDEPEND=" acct-group/gns3 acct-user/gns3 app-emulation/dynamips - >=dev-python/aiofiles-22.1.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.3[${PYTHON_USEDEP}] + >=dev-python/aiofiles-23.1.0[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}] >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}] - >=dev-python/distro-1.7.0[${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.4[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}] net-misc/ubridge sys-apps/busybox[static] " diff --git a/net-misc/gns3-server/gns3-server-2.2.37.ebuild b/net-misc/gns3-server/gns3-server-2.2.43.ebuild index d399b6d9463f..c76329a46375 100644 --- a/net-misc/gns3-server/gns3-server-2.2.37.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.43.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_11 ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature systemd DESCRIPTION="GNS3 server to asynchronously manage emulators" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-server" SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" @@ -20,16 +20,16 @@ RDEPEND=" acct-group/gns3 acct-user/gns3 app-emulation/dynamips - >=dev-python/aiofiles-22.1.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.3[${PYTHON_USEDEP}] + >=dev-python/aiofiles-23.2.1[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.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.7.0[${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.4[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.31.0[${PYTHON_USEDEP}] net-misc/ubridge sys-apps/busybox[static] " diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest index 6bb762f904cb..351b1bc20a53 100644 --- a/net-misc/gupnp-tools/Manifest +++ b/net-misc/gupnp-tools/Manifest @@ -1 +1 @@ -DIST gupnp-tools-0.12.0.tar.xz 181736 BLAKE2B aa33ab97ece72f9baebda4db20a0f72d995017ff45abf0e2da0ae4644d6ede6309b7aa2172c75607a4caf4fbcc65b5e88d1766a8819af96ffe054c83ef87ec77 SHA512 e9c4882f910adee6021433904b78bad89abf4a0d978e24b61cc1c07736e27f0d7e79592e18bbbae8fa13a65f86e72cb8bd7783d74140c6f5d3c65fea4f57da30 +DIST gupnp-tools-0.12.1.tar.xz 183488 BLAKE2B e54d4468c2f3fb6cb98a4cd8c7c43d2816dc0fcaf9b3b0ce612ee431a5a3e337b5202c31ce9513cff5784513b6a605f7b923acf9ddca6283b65064f1f7ee91e8 SHA512 9b07e16c92c5d71fe268c4af4ea36ef950046b076ae345cd548c2619530a43b271548ffdb67503e736fa43fa0303de16fc4f07b13e8c7569625251e2d81d1365 diff --git a/net-misc/gupnp-tools/gupnp-tools-0.12.0-r1.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.12.1.ebuild index 09fce1d8fbe4..5ac85ab5e5d2 100644 --- a/net-misc/gupnp-tools/gupnp-tools-0.12.0-r1.ebuild +++ b/net-misc/gupnp-tools/gupnp-tools-0.12.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" RDEPEND=" - >=net-libs/gssdp-1.6.0:1.6= + >=net-libs/gssdp-1.6.2:1.6= >=net-libs/gupnp-1.6.0:1.6= >=net-libs/libsoup-3.0:3.0 >=net-libs/gupnp-av-0.5.5:0= @@ -27,6 +27,13 @@ BDEPEND=" virtual/pkgconfig " +src_prepare() { + default + + # This makes sense for upstream but not for us downstream, bug #907384. + sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die +} + src_configure() { local emesonargs=( -Dav-tools=true diff --git a/net-misc/haeredes/haeredes-0.5.3.ebuild b/net-misc/haeredes/haeredes-0.5.3.ebuild index 86cbf147e42f..15a105ba5401 100644 --- a/net-misc/haeredes/haeredes-0.5.3.ebuild +++ b/net-misc/haeredes/haeredes-0.5.3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CABAL_FEATURES="test-suite" inherit haskell-cabal DESCRIPTION="Confirm delegation of NS and MX records" -HOMEPAGE="http://michael.orlitzky.com/code/haeredes.xhtml" +HOMEPAGE="https://michael.orlitzky.com/code/haeredes.xhtml" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="AGPL-3" diff --git a/net-misc/hath/hath-0.5.7.ebuild b/net-misc/hath/hath-0.5.7.ebuild index 0caf16f0a2a6..fca6453aa95e 100644 --- a/net-misc/hath/hath-0.5.7.ebuild +++ b/net-misc/hath/hath-0.5.7.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # ebuild generated by hackport 0.6 @@ -9,7 +9,7 @@ CABAL_FEATURES="test-suite" inherit haskell-cabal DESCRIPTION="Hath manipulates network blocks in CIDR notation" -HOMEPAGE="http://michael.orlitzky.com/code/hath.xhtml" +HOMEPAGE="https://michael.orlitzky.com/code/hath.xhtml" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="AGPL-3" diff --git a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch index f45b5c073493..438ba7d83962 100644 --- a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch +++ b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch @@ -1,8 +1,8 @@ --- a/htb.init +++ b/htb.init @@ -240,6 +240,10 @@ - # Maximum packet size HTB creates rate maps for. The default should - # be sufficient for most cases, it certainly is for Ethernet. + # Maximum packet size HTB creates rate maps for. The default should + # be sufficient for most cases, it certainly is for Ethernet. # +# TOS=<number> optional, default "none" +# @@ -11,7 +11,7 @@ ### SFQ qdisc parameters # # The SFQ queueing discipline is a cheap way to fairly share class bandwidth -@@ -435,6 +435,7 @@ +@@ -435,6 +439,7 @@ HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU" HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM" HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB" @@ -19,7 +19,7 @@ ############################################################################# -@@ -646,7 +647,7 @@ +@@ -646,7 +651,7 @@ ### Set defaults & load class MTU=""; LEAF=none; PERTURB=10 RATE=""; BURST=""; CEIL=""; CBURST="" @@ -28,7 +28,7 @@ PRIO_RULE=$PRIO_RULE_DEFAULT PRIO_MARK=$PRIO_MARK_DEFAULT -@@ -868,12 +869,19 @@ +@@ -868,12 +873,19 @@ u32_d="${DPORT:+match ip dport $DPORT $DMASK}" u32_d="${DADDR:+match ip dst $DADDR} $u32_d" diff --git a/net-misc/htbinit/files/htb.init_find_fix.patch b/net-misc/htbinit/files/htb.init_find_fix.patch index 27fce89ef2da..200fcfbfb411 100644 --- a/net-misc/htbinit/files/htb.init_find_fix.patch +++ b/net-misc/htbinit/files/htb.init_find_fix.patch @@ -1,6 +1,6 @@ --- a/htb.init +++ b/htb.init -@@ -468,8 +468,8 @@ +@@ -473,8 +473,8 @@ ### List of classes in $HTB_PATH htb_class_list () { for dev in `htb_device_list`; do @@ -11,7 +11,7 @@ -printf "%f\n"| sort done } # htb_class_list -@@ -483,8 +483,8 @@ +@@ -488,8 +488,8 @@ ### Validate cache against config files htb_valid_cache () { for dev in `htb_device_list`; do @@ -22,7 +22,7 @@ wc -l` -gt 0 ] && VALID=0 [ $VALID -ne 1 ] && break done -@@ -493,7 +493,7 @@ +@@ -498,7 +498,7 @@ ### Find class config for device $1, which is newer than cache htb_cache_older () { diff --git a/net-misc/htbinit/files/htb_0.8.5_esfq.patch b/net-misc/htbinit/files/htb_0.8.5_esfq.patch index 506c505f8e47..fc7c92ddb4cb 100644 --- a/net-misc/htbinit/files/htb_0.8.5_esfq.patch +++ b/net-misc/htbinit/files/htb_0.8.5_esfq.patch @@ -9,7 +9,7 @@ # # Tells the script to attach specified leaf queueing discipline to HTB # class. By default, no leaf qdisc is used. -@@ -261,6 +261,15 @@ +@@ -265,6 +265,15 @@ # will never take place which is what you probably don't want. The # default value of 10 seconds is probably a good value. # @@ -25,7 +25,7 @@ ### PFIFO/BFIFO qdisc parameters # # Those are simple FIFO queueing disciplines. They only have one parameter -@@ -427,14 +445,14 @@ +@@ -440,14 +449,14 @@ ### Modules to probe for. Uncomment the last HTB_PROBE ### line if you have QoS support compiled into kernel @@ -42,7 +42,7 @@ HTB_CLASS="$HTB_CLASS\|TOS" -@@ -801,6 +819,8 @@ +@@ -815,6 +824,8 @@ LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM}" elif [ "$LEAF" = "pfifo" -o "$LEAF" = "bfifo" ]; then LEAFPARM="${LIMIT:+limit $LIMIT}" diff --git a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch index 6e99319f2c62..526e7fcb85c5 100644 --- a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch +++ b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch @@ -1,6 +1,6 @@ --- a/htb.init +++ b/htb.init -@@ -275,6 +284,7 @@ +@@ -279,6 +279,7 @@ ### Filtering parameters # # RULE=[[saddr[/prefix]][:port[/mask]],][daddr[/prefix]][:port[/mask]] @@ -8,7 +8,7 @@ # # These parameters make up "u32" filter rules that select traffic for # each of the classes. You can use multiple RULE fields per config. -@@ -300,9 +310,13 @@ +@@ -304,9 +305,13 @@ # RULE=10.5.5.5:80, # selects traffic going from port 80 of single host 10.5.5.5 # @@ -22,7 +22,7 @@ # # These parameters make up "route" filter rules that classify traffic # according to packet source/destination realms. For information about -@@ -327,6 +341,7 @@ +@@ -331,6 +336,7 @@ # # # MARK=<mark> @@ -30,7 +30,7 @@ # # These parameters make up "fw" filter rules that select traffic for # each of the classes accoring to firewall "mark". Mark is a decimal -@@ -414,6 +429,9 @@ +@@ -418,6 +424,9 @@ PRIO_RULE_DEFAULT=${PRIO_RULE:-100} PRIO_MARK_DEFAULT=${PRIO_MARK:-200} PRIO_REALM_DEFAULT=${PRIO_REALM:-300} @@ -40,7 +40,7 @@ ### Default HTB_PATH & HTB_CACHE settings HTB_PATH=${HTB_PATH:-/etc/sysconfig/htb} -@@ -818,6 +838,13 @@ +@@ -823,6 +832,13 @@ prio $PRIO_MARK handle $mark fw classid 1:$CLASS done ### mark @@ -54,7 +54,7 @@ ### Create route filter for REALM fields for realm in `htb_cfile_rules REALM`; do ### Split realm into source & destination realms -@@ -833,6 +860,21 @@ +@@ -838,6 +854,21 @@ ${DREALM:+to $DREALM} classid 1:$CLASS done ### realm @@ -76,8 +76,8 @@ ### Create u32 filter for RULE fields for rule in `htb_cfile_rules RULE`; do ### Split rule into source & destination -@@ -876,6 +918,49 @@ - prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS +@@ -888,6 +919,49 @@ + prio $PRIO_RULE u32 $u32_s $u32_d $u32_tos classid 1:$CLASS done ### rule + ### Create u32 filter for RULEIPv6 fields diff --git a/net-misc/htbinit/files/prio_rule.patch b/net-misc/htbinit/files/prio_rule.patch index 429a1bed0ad1..9a73840e234d 100644 --- a/net-misc/htbinit/files/prio_rule.patch +++ b/net-misc/htbinit/files/prio_rule.patch @@ -1,6 +1,6 @@ --- a/htb.init +++ b/htb.init -@@ -453,7 +457,7 @@ +@@ -458,7 +458,7 @@ ### Load & filter file $HTB_PATH/$1 htb_filter_file () { sed -n "s/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g; \ @@ -9,7 +9,7 @@ } # htb_filter_file -@@ -517,7 +521,7 @@ +@@ -522,7 +522,7 @@ htb_filter_file () { sed 's/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g' $HTB_PATH/$1 \ diff --git a/net-misc/htbinit/files/timecheck_fix.patch b/net-misc/htbinit/files/timecheck_fix.patch index 4797ea6fd0ab..e39ea9333d1b 100644 --- a/net-misc/htbinit/files/timecheck_fix.patch +++ b/net-misc/htbinit/files/timecheck_fix.patch @@ -1,6 +1,6 @@ --- a/htb.init +++ b/htb.init -@@ -891,7 +895,6 @@ +@@ -903,7 +903,6 @@ TIME_TMP=`date +%w/%k:%M` TIME_DOW=${TIME_TMP%%/*} TIME_NOW=${TIME_TMP##*/} @@ -8,7 +8,7 @@ ### Check all classes (if configured) for classfile in `htb_class_list`; do -@@ -914,6 +917,7 @@ +@@ -926,6 +925,7 @@ ### Compute interval boundaries BEG_ABS=`htb_time2abs $BEG_TIME` END_ABS=`htb_time2abs $END_TIME` @@ -16,7 +16,7 @@ ### Midnight wrap fixup if [ $BEG_ABS -gt $END_ABS ]; then -@@ -926,6 +930,23 @@ +@@ -938,6 +938,23 @@ ### If time period matches, remember params and set MATCH flag if [ $TIME_ABS -ge $BEG_ABS -a $TIME_ABS -lt $END_ABS ]; then RATESPEC=${PARAMS%%,*}; CEILSPEC=${PARAMS##*,} diff --git a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild index 1ae14a2d6a5b..3ac43d29785a 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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,11 +6,11 @@ EAPI=7 inherit linux-info DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2" -HOMEPAGE="https://www.sourceforge.net/projects/htbinit/" +HOMEPAGE="https://sourceforge.net/projects/htbinit/" SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}" S="${WORKDIR}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="esfq ipv6" diff --git a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild new file mode 100644 index 000000000000..438692db1db6 --- /dev/null +++ b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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}" +S="${WORKDIR}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="esfq" + +DEPEND="sys-apps/iproute2" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/htb.init-v0.8.5_tos.patch + "${FILESDIR}"/prio_rule.patch + "${FILESDIR}"/timecheck_fix.patch + "${FILESDIR}"/htb.init_find_fix.patch + "${FILESDIR}"/htb_0.8.5_ipv6.patch +) + +pkg_setup() { + local i + for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE4 ; do + CONFIG_CHECK="${CONFIG_CHECK} ~${i}" + done + + use esfq && CONFIG_CHECK="${CONFIG_CHECK} ~NET_SCH_ESFQ" + linux-info_pkg_setup +} + +src_unpack() { + cp "${DISTDIR}"/htb.init-v${PV} "${S}"/htb.init || die +} + +src_prepare() { + default + + sed -i 's|/etc/sysconfig/htb|/etc/htb|g' "${S}"/htb.init || die + + use esfq && eapply "${FILESDIR}"/htb_0.8.5_esfq.patch + + # bug #474700 + sed -i -e 's:/sbin/ip:/bin/ip:g' "${S}"/htb.init || die +} + +src_compile() { + : +} + +src_install() { + dosbin htb.init + + newinitd "${FILESDIR}"/htbinit.rc htbinit + + keepdir /etc/htb +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + elog 'Run "rc-update add htbinit default" to run htb.init at startup.' + elog 'Please, read carefully the htb.init documentation.' + elog 'New directory to store configuration is /etc/htb.' + fi +} diff --git a/net-misc/httpie/httpie-3.2.1-r1.ebuild b/net-misc/httpie/httpie-3.2.1-r1.ebuild index 44e9d64d568c..8408d5324ea8 100644 --- a/net-misc/httpie/httpie-3.2.1-r1.ebuild +++ b/net-misc/httpie/httpie-3.2.1-r1.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="amd64 x86" RDEPEND=" - dev-python/charset_normalizer[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] dev-python/defusedxml[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/multidict[${PYTHON_USEDEP}] diff --git a/net-misc/httpie/httpie-3.2.1-r2.ebuild b/net-misc/httpie/httpie-3.2.1-r2.ebuild index c28c9e703420..217a2307a2d1 100644 --- a/net-misc/httpie/httpie-3.2.1-r2.ebuild +++ b/net-misc/httpie/httpie-3.2.1-r2.ebuild @@ -15,10 +15,10 @@ SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.gh.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" - dev-python/charset_normalizer[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] dev-python/defusedxml[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/multidict[${PYTHON_USEDEP}] diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml index 73d29e0ff649..cba10e14d2cc 100644 --- a/net-misc/httpie/metadata.xml +++ b/net-misc/httpie/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>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> HTTPie (pronounced aitch-tee-tee-pie) is a command line HTTP client. Its goal is to make CLI interaction with web services as diff --git a/net-misc/hurl/Manifest b/net-misc/hurl/Manifest new file mode 100644 index 000000000000..05bf449df2aa --- /dev/null +++ b/net-misc/hurl/Manifest @@ -0,0 +1,155 @@ +DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 +DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e +DIST aho-corasick-1.1.1.crate 182812 BLAKE2B df74c2cfa0ae392a8d466e370ba761c4cd37c65773affba9a3cdcf7f5797b34b4a25e1646be3de5081644b34db2dce273609edb4f18a1ce7fdbf31ac28a10b88 SHA512 a894e1cefbb63a3b7b78a3676874d0b7a507c27970f48cdfbda1e5deefbf6b20ed4271b660a12eea77b318cd2fa0f80850a0b1ddfe0d0731ffa326c0fc295692 +DIST alloc-no-stdlib-2.0.4.crate 10105 BLAKE2B afa0bfeb7df1d742edb412dca4c22957fc21c2a1be21c64c58503d4b943c06e3163d0f3c90525b25323b8dc38e6c64136ec4f9608758c5c6f3bd07c2c033ee74 SHA512 6518856fa524ee0fe8e04cf133c11028efcf2f6a28f3a70e401566a4eb343c954dba34aec2a02c0d0359757dfb5dcf48279610646215eea190d699708d838904 +DIST alloc-stdlib-0.2.2.crate 6693 BLAKE2B a22faf3482e416664f2e104f5f45c4e6d116a42b890216b80102e266f7a3a3accd2933aeca71650a4c4626e3d9da76b6488ffc9ea2ae4229cdfbf1ce9ca6c7cf SHA512 9c4169052ad460af2be6f2a128056661b2f26da0122877f13fcd4f4f3e2e9537783cb2b2bec47af43569629639aa8ad507ab010833982e5d942f5b26cfd46c14 +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 anstream-0.5.0.crate 19646 BLAKE2B 770dc99092e1c48ad5c1658e83abff3b8c9e0915e360048bfe0fe04faf61991e01e88ca4adca23533bf11fe078066e351778661128d69381756688341022f29d SHA512 8e285cc8f92708cf9482e7b4dc84dd891e5ec0bd8c57894c6bb368eede1127b7b903adb4c40b37287e3644535cc60c92662951c2c8fb5b92e10f49ff5374d359 +DIST anstyle-1.0.3.crate 13986 BLAKE2B 9e9fa894da78a6c0933c423524827ead33aa4e384e04771ccccaa179f1e8a6459a5094db7f61714457b919d2e713d09df4429b83793d807821bfdb226ff115a5 SHA512 f1ac506814e1ce1df537ea8a88ed75f3f897aa9e559ba7eb5a8acfd043641dada12953669153d1f719da28f935a9651a07b5ae1e351139f0f03b58a67bc28477 +DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176 +DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a +DIST anstyle-wincon-2.1.0.crate 11757 BLAKE2B b7c1071da1ab24accc33d7af70f09ace8edb2dcbb53936ed5ac13552c6082c0f16ce501f041d2c1792cee7dd9cc3877d29505e12a65022bec44285f13e1f422f SHA512 6c379c46f791b6b1367f3d6f3531dcd16589cc2e12f6f5ce52a3fa32d42e62b719d2277699d1bc8526099a6f791f2e7d5b1068e1295cbcd2997841f0eafc4eeb +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST base64-0.21.4.crate 77029 BLAKE2B 4380440305c8a293218bb1fdba5c257b2a088af2f74f2936937cd0f0b3462248b572bdbfe5e2a82af1f2cf04267267317b1c2b74972fa9976795e9c174d2352f SHA512 33fba19be1e7c3e74b57ae0487fda904258f31457c005467caf2e44eb55e271e0d2e3f2d4b80b667b05fc625878e0b136a07984dc88335a2099278672b3c4b0f +DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6 +DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8 +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.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb +DIST brotli-3.3.4.crate 1369026 BLAKE2B b46085e324a6fb90ef4f6198154e2f45d58b91302f07b0e7ec3394183e1981d8e25c2d617425bb656756988cac57fdee15d6de3510e6e0b3ea1fe450ff06b8df SHA512 e312842abd713b5dd750ae92dbac297136291bef22b95572b52141c7d991f9d8bc84dc605f30c062a9cdd42d610ba5eb2f8e1ce3a8489f4ba816fca5eca7e5d8 +DIST brotli-decompressor-2.3.4.crate 192085 BLAKE2B 8ae8a47410215cbae102bbf19aa87f05e8739d6fe31e8eaff25948b1b4138ffed36e699947be30faf0b48891a010c10aafa835065cbd9a31f0c2628564a02359 SHA512 2698f1d9fc33ae37efc4587a448255320c864d1bba498ead93c5e28167ef696bcb5ddec9d4292b5fde93c3acddb7e99b453d6507780d0034e325bd20e5222c62 +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa +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.4.crate 54812 BLAKE2B 62c4de57d222fa41305b0459ab152e85c1a0aa3b9f72c97a87b0e4d3ee30b762fee7dec2831c74ed192b7620bdeb28f8722fa0efc6edaeae51e0d7395c8ecd4e SHA512 92d70ecc3a3d3800edfcbfa6d7767d06027790c4bfa88d0205a62665366511961b5e45630abd1eb53abd121563196ef1171c20b9df18b6fc2e0c6a375b24b770 +DIST clap_builder-4.4.4.crate 162344 BLAKE2B 7c6f4ced18655caea97b52d43bdf28e6b65e952336dddaac83d26ce8166ed17b3c8b67f7612010858624bdc8913b8bae12eb69364f77392426973e8b17c3bda3 SHA512 a74b68fe67ca50177ef79539278f97d2adb872885b5e8babdb486c50fffdec87c42cab9fb4112ad1449d8c22e5fece765d0190654c0d36cf21ad866284bee204 +DIST clap_lex-0.5.1.crate 11793 BLAKE2B 8e3d2dc120401fdd0cf0bf069119c8b7eafa13e5f682c56499062fc09acc05f443caafa6fca791ea53e693a83de69e98fd0488726a4170db037c37118ce0edf1 SHA512 ea5e49e9a8536093f7de89be30add7c3d880b232b0ce393b0429fd4402db2518036998689817bdfd472b6400224fd3c42fec1b5f8538dc433c31dadeb6281e80 +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST colored-2.0.4.crate 23654 BLAKE2B 41303ea33785c060415a955383ba2f22ac8e4afe9f1345b9f41dea9817348298f8715c4bfdc60cf4960315c3a7dfabf148f2fdf62e0e0a5ca77e34c57dfca307 SHA512 38e664d23546d77c81da6f5eca6ee8113d6ce20107bf7325255de2c59d532e662ee1f751420bba8ccbbe468b8cb13f743050e4145d0e1f1e37087a1f3a65ada0 +DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 +DIST core2-0.4.0.crate 37075 BLAKE2B 89ad26bf5eb5ee48dff32d3b6b11e0a84b68e4f29c39fb9db79c64f3c445fde248b33b1ba9d1410673c3fe823ecca25dea637237c384b7cb419de9bceab8a570 SHA512 53c9d2599d87c37d8b6fc8b2293fc16928a97754240e35af770f7e969e4d91ffffe3afbb4e04312de828d1d43ca6c9b734e0725ac5ac9d74f252449ce296ab7b +DIST cpufeatures-0.2.9.crate 11895 BLAKE2B 1e369466bce2ddf7be6bbe219997628223a3a114914e5ed44b44f3fb6d6a084fbb47cc50ecb109287b074e159c675ae89356cb68cd843b41b502ebe824febca0 SHA512 88235b7d7152f4578a321ebc4f83f69070206b2acaf0e6331b52e1a6633e96edc787f9a409ac2e2799106a259166a302150fa4ddc88352b7739d50ac6ca9038f +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f +DIST curl-0.4.44.crate 91415 BLAKE2B 0193d51d0ebca5a9ac87a3a2537d573a15d8f0c47e0dba5ad3c0401dfe4a96e63c43a1be054433eb782f90ec61dbc60a12ba035e4fdb033eefe53860d41c3494 SHA512 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5 +DIST curl-sys-0.4.66+curl-8.3.0.crate 3205987 BLAKE2B 8e3ca4789d714d8cb05effa65541c8c69f516a6361449808e1d813c02455ef015de2f83452de024199395f23b60b0c41a57dc24478542add5d8f9a112e4f9d4e SHA512 2b13381ac0a88e46e0ec009bc5cc7e1ea71c94ea4156d002952e6ecb990e29ddcdb2947b2b7e21fb280823318cb93a8eceeb6e9de438917e65d91a0aa5d297ce +DIST dary_heap-0.3.6.crate 23683 BLAKE2B dad2fc57dc12fb6e8c7f15fe4b1c6ed292c1057274423d9985149a843e82040dedbbe6f76a74888735fd294de9af5af80969593213521b7ade19320f2f027be6 SHA512 76ab17e04f79f8d52f88db3bbb7cb6b6dab1191f1363ebdd6487407e68d716446d043a9e8f43dbc06ed91e1e9d3e0d077f3fb246bb2cc83e831a1553c09cff65 +DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c +DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e +DIST encoding-index-japanese-1.20141219.5.crate 91495 BLAKE2B 4deb91b0b2dd1b33bc4b43ac2ec31df0552344b1177c9e504481d62a706b1c187eb3f4e8dd78c62871aa58c86ab6e309494b1b7937843de6056f3d1a0120160c SHA512 879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2 +DIST encoding-index-korean-1.20141219.5.crate 103230 BLAKE2B f3acdd4375ddda1f6b3c070566f1a52dbbbe2384bc6be79150e4e55b88740858791d66f95040ad9f637bf13e381b9f316b14bb5617a8949bab4040b91d0d18bd SHA512 0e79eb9b01fe0354532dc7a8ca55e6332add19827905340560ef9b0e4725becda68ffedd5d18b9ac9d0c4a1b64fb337a9a31de5891b9e6469478fc974e5f9884 +DIST encoding-index-simpchinese-1.20141219.5.crate 130962 BLAKE2B 3c1e498c170edaf2a954439e50b3ccc31560806063a11610c4563975810a65c64e547168674ef778beb1d1d603cd508145f3153a03748d5e8c7e79690af6e3bd SHA512 caffc2a9b77545c2cc22bfcb38c886fba21e765ef49a3cfcfff88ebd76064432638bb432cd57a7ecd23bf2ea074c400c1f043a0589e5aa28024ed3ae0f59be75 +DIST encoding-index-singlebyte-1.20141219.5.crate 14950 BLAKE2B 89faf849452f0fe78b82616614f43bffaf658dd81063ae5d130ad6eb64d38e0ee8a26ab078f8c992f0c7f3e1db768e73920482f5e3bd56b0d7370c72fc93755f SHA512 648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a +DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bdec20dfeda482fad4235ca3ded489a002c27d0c26cbb9f37ea81f93f7e46ee4750dfcd7385dfc8bc55669a0a21b3acdba2a1fe91b855edd2decb SHA512 3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d +DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6 +DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a8111aca9a2e914beee5784b64c946e143cd8031335ac9cb51069e51dbc9a6b61073a2ccfd3ff60612a20b619 SHA512 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e +DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 +DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc +DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8 +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104 +DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.13.2.crate 105265 BLAKE2B e9ff7e6e753166ab3051a834df6f2da81a19ac6997ba269ab13a65e0abb9ce00839311785aefb451553284ad5ef3a0cda925dc2bc188d2a138a78578e530969c SHA512 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70 +DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1 +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 +DIST hex-literal-0.4.1.crate 8559 BLAKE2B ca88420383532a2f2c09e188bc0950cedf74e8335c1e5b3f640dc80607d57bab0aa6967a536a458d149a074f8bc1025a3de99a9081787e7ac80dd8308fa0e5e6 SHA512 8894e48485be7e1d7a16d2e061086c524b039a1be24a4c20126d3f175e12aa87d6d65ae295da6dea88f19708f3f3a051c3c3e334196c094ace68a249ad57fbb6 +DIST hurl-4.1.0.tar.gz 5189715 BLAKE2B ab47cf262c28dff9bc81404ce5fa9dc929c7a5ca86a5420f37e344a6d14a664a4fe2eb2c8ac1080e9bb50788ee4bf85de18eb281004c197e7bcab0d3dafdbd20 SHA512 6d84b770435ee935851c57a51d2eb1bfe2ba390e8e3ff05a808b541ce068984f127c359abdc7769723bc5c2d530d4bc3d3cd9cc3853e62e4d4ffa8363838be1f +DIST iana-time-zone-0.1.57.crate 19785 BLAKE2B 2304a63e4d3a477125ed07fccd5a84832f775c4a0fbd60a995e6f1850aaf3f5047c6f70975c9f6334f96def12770d470677e1f536e9817f8ab1df8a312622cfe SHA512 79bc0fe559dce022cd3c15ffc3b6f870c14a40de6d5a61b4a5a6ad28fe7efce82a16ac5102073a3510f3ba683843475f7fb8a4029bbafbc1cc25e48b98ce2fe8 +DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 +DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST is-terminal-0.4.9.crate 8109 BLAKE2B 0fa495da123f6fe5e3ba5f643f1ee097fc4f8e8aa54d9525b6108855a6a2e58556534a5e8dbfe7b5f8e2f1932003ac63f6aa3384317de7b385cf724bee294468 SHA512 0803ea53945715333d9b5fb18feec7230a49cb1a5f7308e2ea8d06a650e376794dd372be111e85622fd21320228706dd589423510dd010cd6ea112f185c46966 +DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d +DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64 +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.148.crate 690988 BLAKE2B 41dd38cfff1431cd8184220745697d794a66f6badec750be3910ddc4a6ddcf964692b5b28a5a9714592c5579da26248092facb9407920330b55aaef38501420c SHA512 1dec9ec8f4c610c08f62bc2b45dd32f1e4528a045161d848b5c4f0382be1158a690f4d7760203d7d2347a80422671f43b07531871cf44990887eaaed35d924d4 +DIST libflate-2.0.0.crate 42505 BLAKE2B 2ded808b1aed0ce708ce85754359abe470a481eb8aac6572d1b5a525cd68d452da76c2e29d57f40f0568aafb451b9f3989ac16a805486f153a2564e995cbc192 SHA512 62f1222ec0f439ae6c51b89ae2eac7977ad0eb4fe125de21f5decce98cb2f05ee74b4da9b877005b783275ed7eee1e99de386eb927f86bd75d50369820b40441 +DIST libflate_lz77-2.0.0.crate 5893 BLAKE2B 5340b47195ad0af44011906224664d561e6c74145b921656a008f0227fc5d79814c6b189d68f1b5783b167b71b41d1a81fb2eda2035b066c2407435f7bc73498 SHA512 507d24d0e808ac6f3afb9615d325451fe1d02954a48d057c5a04d2cc2416f22b88d0290000379d250ce578ac752b04abaf8c191e97350f0c44b0a839d282cff9 +DIST libm-0.2.7.crate 115688 BLAKE2B e180347d10847c40a88e43d321e08561df053e6fea0cea2cac480c4162c2f31d8697b4572a384edae323d43781d3c6462b2d77220dd71b2fd0da3a2757487db1 SHA512 b7adbf657be812451fc50cd5e5f92b7a71d43b4e48761bd2738d65498c9abad851f8e86d3be06ae75cf39c7798c23cafe767bc5fd40f596774e858f69fcb46d9 +DIST libxml-0.3.3.crate 124388 BLAKE2B 3115c461f1418675ae40f60092be34c1e4f9f2ac1544cdcafc136c6f35b7fd689a7f307db3f46f16c2b69b8cf7d1c73bb6b62ee62df5752005fc43cee344a2ab SHA512 0b4fbb03342485be52812f6684ca3e9e0ee7de87ede15e2b8c363e1c918ebecec95bf63ca285e494e63c4bb41f2cbce96dec8c95df7162e410bfc7e8b027e10e +DIST libz-sys-1.1.12.crate 3030648 BLAKE2B ab8cb974481f86f7ef40eb27ee08ee5535cb914cb76608683b53b57e89d7c92ee4d0831d6d0977ec76476036fdb8c6374ebdf3daa639cfb627e0153d40ca752a SHA512 03daeb5f03193887b692cbe8d631c83ac632f3e92fca4f10e881058fea38d85e11c090de04be9d70d52a22dec669474a0044a3d45d4adeb3a0f39e3398cdac11 +DIST linux-raw-sys-0.4.7.crate 1350647 BLAKE2B 7489b530d59c2b1c32dfa77b260fa9892ec3ce9b15bbac90b0b7565806798d7580145321e0a2206d7a1f50b6cb7684dcd85f30a11dc330f071aa2f6042f941bc SHA512 df36f3f188767080f118aac32138233209a1f0cd11682425fc101cb054e138cf0582ad044d0f326a20ce517f425665ea1ad9ac5eda147712a994884101974d48 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST md5-0.7.0.crate 6671 BLAKE2B a1c8132cb4d7497ab3f4550e6fffdea6b118ad99a31128c068ea3243b5f76c4b059042da376a0be32fb74e866571348a581c2ca727d6acf855d823ce15f593b5 SHA512 569c992eafe25986a1328666a428b2335ecc5cb7a5ba142c34d7abb1247f6768c0bb3dce790121686d4ebf1b4a1832d65315136552163dfba5f799f99551544a +DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc +DIST num-traits-0.2.16.crate 50130 BLAKE2B 1101d28cb4dce477657684a068792b94c7008a965e655edbabfeff51cbe6f008450dc6d7e4fc5dc4fe9c3ee8623ed77a7bde83ce2f68e75d618295fe6cebe0a8 SHA512 2ef65e2f6275b1000f611cc4d019b2f4846a8964b54d9b96462da10e3ac9edbf3d1de82e40094c76f7f5205740361b0eb0ced414bcddbaba5955144f728c6f94 +DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c +DIST openssl-src-300.1.5+3.1.3.crate 8829668 BLAKE2B e8119164d82a1b54215f0b346fe9716dd9db45950c5b92c8a548012c5b98ed21c191254fb94aec8091e658e0b1f682d59952ab775bd499c4b7d6043f4098298d SHA512 addf52dd9af0e9a7fe66a64d1830ee820af2624fb8f9167b61176baa45f529371f47f4db03f54426b95e6f260193177fbd1bf8dcb0d7dd1cf63b986f5ff348e0 +DIST openssl-sys-0.9.93.crate 66922 BLAKE2B 570bfb78704657a89f2e363b96bef65d8cf617f1bb625c271f4728b4cf6011c11369ca1396e01470934fb596528b358a7240520ea706be64e9ce79d83a98b06a SHA512 173a8e28aeda81220a35d3a0b3c09586a235aafa4aceb65dddeccd3b94729e841ceab29b1defbfa1d959d82185c0fe13b0d998e115a098432fbd2a993ef582f0 +DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd +DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a +DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a +DIST proc-macro2-1.0.67.crate 43683 BLAKE2B a7f485d058ffb654c22ad01088756d8050780e559d86f96590e284c3babf1bb59ce347400c1681b296c6f58e2d42ed67d3e458483368399c22d7810685adcbc6 SHA512 3827f5f698aaecc168a03643e330e03aca7b0de98bd57dc97507c1bd53b6ec64752a1f4dee4c8a12ab02f410775a11f5ce7b0d36ec0e1fbbec197e3d7e199eab +DIST proptest-1.2.0.crate 194884 BLAKE2B dc217485d84af76365170252690d18b0abd472addcf1ebda60db79255d17d48a0f56897b93bbb01d84f20c9c1f53da854bbfd3091c8685229c4dfaa51c673e3f SHA512 b0786ba104849dc45bf1cb970cd7bd8fa645f0bfe1fbd37f1c2535d28d2f7773cc99af67838ebcb546d900f421bb6145c1a70639d5fa2ff0d25b45a2ab176e9e +DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9 +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +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 rand_xorshift-0.3.0.crate 9121 BLAKE2B 56c29e159c0beb9c751429130e84e4666f9031b6f70e180544f9cc8f8e85d98676b861b588dbda46f2cdbd254fb908c02c6ba640d53422e6bfa1ae4e48ca5a33 SHA512 256e410e5bc08c56496c53c3d53936f3b1cfed41458b0ee8879d7aa8b95375055746ca49e29000ef847b37f01e9237f569cd000c4b281f6c78ddfc78ce439a49 +DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 +DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde +DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1 +DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e +DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac +DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e +DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd +DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a +DIST rustix-0.38.14.crate 344026 BLAKE2B a0c023600d26163e9ecbcfcd200e01fead329b003879e6cd1459a5b55fe2a08fbd24f5b08e6b2082c502f89cddf9c65b16c95aa9768b79864771bb3dc289107c SHA512 d0f6dcf2cf7e6ad0937ee4c8978e3df16c3f9fe0f23292289eb35debca2ef532a0126dd71ca3382eaf2ed385a1a9f1454f2262bd3582eea014eba41ebf68dc3d +DIST rusty-fork-0.3.0.crate 19881 BLAKE2B 01bae755c66d7e4f72789b7140de35573d82961adadcc9febb841e332fc2730b405d4f1dc8aff1db6eba3ca03ee24d5dcd9a9c9a914fd2a94428c796dc9bfcd0 SHA512 8e41e12971c36ae1d4439943e55204e32fb4e62717355a2bf79152825eef7dac305c2fe22468957cb3b7af0b27004ceb18eee2d2fa0a6f8822b28b711f64ccd7 +DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b +DIST schannel-0.1.22.crate 41642 BLAKE2B ccb512f6c6765e5245dcee607b7886411710aa89d317cbaed2f511f74a927a0083042653e070c9d4b976ec83a74f3f37218f3ecb621781ee367b774596227f68 SHA512 6ec962cbd25f25dcee5e31b5012e61d38b97a7e8651a5439ab4cbc8ab33a0e2ce04fa22e06a82ef8750001c6659937ffd8dccb0cbd6971f68b0c354d0075aaa0 +DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2 +DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0 +DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc +DIST sha2-0.10.7.crate 22541 BLAKE2B 918a8f4042c57e4f8931d645ba758f6e7da911d02482c78d6ef3a12e8068e7f3a08526580824ab548628fa7e75bc64f17bb12f1ceb167861a781ab9813eafbd4 SHA512 c33d6bdecaf49d0f60276531e845231425f62d2ec18c4d53c43e49f506a2dcb2548f5866c6642806b6b64f008a481c48920b7b4fc867df7443dc31b44f297fdc +DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.37.crate 243250 BLAKE2B b81750ed52bf75bf944542c373a88f5a54421c230c86f23d0ed3e5680d85bb454251bf43e0ad7bd3e2464e6df579550cca1e17e8b044ba62a27a25f3940ff20b SHA512 5cc8f2a17f891477a9b2078580bcb4c5dec0b540fdc4d2c0b8dd51972c734ff4519e891166c1c5f6d35b73bfb564ac747836f7487481a2ea26fb7d8405835023 +DIST tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f +DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681 +DIST termion-2.0.1.crate 23405 BLAKE2B 457b7d939e8002cbccb8cf151bc33ad6189ac0a684f262909ba391cd6c54403edace919cc53dafb9514b108f0382b7c4e603b25f02e69d1d032d5597d09f9c82 SHA512 4e46fe6ad0e3e3047796253e5064f044f9feb34f9341d478a0548ef32e46a7a6c0fe86ec0ae2e8b700d5b3ac85d0ccb8aec63064ba40cadfcc8714a5a10225df +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 +DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 +DIST unarray-0.1.4.crate 12895 BLAKE2B 20fab4ce218941bad9ae341d24e92469b01f46523adf9d6c80cf2418b79dc529011f357e3c96a66ad96bf822358581a150f75c4d3ca67043e01814c59f1a9bd1 SHA512 373d16e9688938762c61cc9056a50badfde417f64385de1949678333cf9465cc496a357707989da83ee5e4ab041a89688fcd3ab9dfb9c6ec66446c9f5b56b630 +DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 +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 url-2.4.1.crate 78228 BLAKE2B 6e324237af50605e9285889d967e6a66e258982c5e78ec99b2df68cbcc555574c0b0d650724ecb015e1065c737c88e3c04205973c35b0afcd63f222e91dde3f9 SHA512 ff2aed100e405f4474e17dcc01d59b63460e7a8babeb7cdcf9df6c1c65216c425e24d557f76c7097702b2befc381656107bef755ce929089b52a3901c46aa185 +DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 +DIST uuid-1.4.1.crate 55291 BLAKE2B 36a1d7abe0a695f6fa3a8ad3a0c8a078bc61b17396a317b01226d9b35a3544a8a74305ade1166dfee7a9028e6d4a1e6b0956dc0975ea58a86ec6052fb869c577 SHA512 95914b62948941e9dcda7b66b932088b328a23286d163449a72961874f4a856db6db1d60a125e56cd1d7b1c00391485a45520852ea49bd8e5a7b8cae8ecf8b96 +DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705 +DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94 +DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6 +DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33 +DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008 +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-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.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST winres-0.1.12.crate 19772 BLAKE2B 645fc16e49061cd98c77217b991cb774151f7f8bd6df44cee622bcba121d2645aaf775d56c3e85de6278b193ea6a36256821799c33ba081f931d87ffa0e038f1 SHA512 9f61edafb4a262b56d130e48ac6bba94f5a432bf0a8c20243e6c8fa98c3f9e0d2ab00a77b35a2e49dd63585a272af597e236e089641b5f488760ac42d22f5a67 +DIST xml-rs-0.8.18.crate 54004 BLAKE2B 5aab6a45279d063a47ef177f97ad3543ebea2ce2b80f49a504a81c04de3a2577898ede96a801c16f6cc690d977253f971ba453bdc06af2d8943bda3c45e89d17 SHA512 d6b84d9e5704a30f97a56bc5b917f4df46b6ff6bb18d93442bab3362e8c12b9bfa2bedc1fc77026ad66e686082ad4fa51fa63ba9ab8cda935f05e809cc7a359c +DIST xmltree-0.10.3.crate 9219 BLAKE2B 82f888788e7001caa39dc32f5233b41e52fc247e0dc59f9297fb4e104d45de9ffcc5859cf3f7d8ef81562b16e88275ec14d245abad95f6d2bdb019850eff9f21 SHA512 e5a1f349fddb13fdfb56c65ea7a77cf28108cddfca0164a858b314942949309a0cc95d824d4c535339f75f7a16a744fb7679739d4fa64fe6c2dc64e71604cdd7 diff --git a/net-misc/hurl/hurl-4.1.0.ebuild b/net-misc/hurl/hurl-4.1.0.ebuild new file mode 100644 index 000000000000..f2d88a3a70e6 --- /dev/null +++ b/net-misc/hurl/hurl-4.1.0.ebuild @@ -0,0 +1,202 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.10 + +EAPI=8 + +CRATES=" + adler32@1.2.0 + ahash@0.8.3 + aho-corasick@1.1.1 + alloc-no-stdlib@2.0.4 + alloc-stdlib@0.2.2 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstream@0.5.0 + anstyle-parse@0.2.1 + anstyle-query@1.0.0 + anstyle-wincon@2.1.0 + anstyle@1.0.3 + autocfg@1.1.0 + base64@0.21.4 + bit-set@0.5.3 + bit-vec@0.6.3 + bitflags@1.3.2 + bitflags@2.4.0 + block-buffer@0.10.4 + brotli-decompressor@2.3.4 + brotli@3.3.4 + bumpalo@3.14.0 + byteorder@1.4.3 + cc@1.0.83 + cfg-if@1.0.0 + chrono@0.4.31 + clap@4.4.4 + clap_builder@4.4.4 + clap_lex@0.5.1 + colorchoice@1.0.0 + colored@2.0.4 + core-foundation-sys@0.8.4 + core2@0.4.0 + cpufeatures@0.2.9 + crc32fast@1.3.2 + crypto-common@0.1.6 + curl-sys@0.4.66+curl-8.3.0 + curl@0.4.44 + dary_heap@0.3.6 + digest@0.10.7 + encoding-index-japanese@1.20141219.5 + encoding-index-korean@1.20141219.5 + encoding-index-simpchinese@1.20141219.5 + encoding-index-singlebyte@1.20141219.5 + encoding-index-tradchinese@1.20141219.5 + encoding@0.2.33 + encoding_index_tests@0.1.4 + errno-dragonfly@0.1.2 + errno@0.3.3 + fastrand@2.0.0 + float-cmp@0.9.0 + fnv@1.0.7 + form_urlencoded@1.2.0 + generic-array@0.14.7 + getrandom@0.2.10 + glob@0.3.1 + hashbrown@0.12.3 + hashbrown@0.13.2 + hermit-abi@0.3.3 + hex-literal@0.4.1 + hex@0.4.3 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.57 + idna@0.4.0 + indexmap@1.9.3 + is-terminal@0.4.9 + itoa@1.0.9 + js-sys@0.3.64 + lazy_static@1.4.0 + libc@0.2.148 + libflate@2.0.0 + libflate_lz77@2.0.0 + libm@0.2.7 + libxml@0.3.3 + libz-sys@1.1.12 + linux-raw-sys@0.4.7 + log@0.4.20 + md5@0.7.0 + memchr@2.6.3 + num-traits@0.2.16 + numtoa@0.1.0 + once_cell@1.18.0 + openssl-probe@0.1.5 + openssl-src@300.1.5+3.1.3 + openssl-sys@0.9.93 + percent-encoding@2.3.0 + pkg-config@0.3.27 + ppv-lite86@0.2.17 + proc-macro2@1.0.67 + proptest@1.2.0 + quick-error@1.2.3 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + rand_xorshift@0.3.0 + redox_syscall@0.2.16 + redox_syscall@0.3.5 + redox_termios@0.1.2 + regex-automata@0.3.8 + regex-syntax@0.6.29 + regex-syntax@0.7.5 + regex@1.9.5 + rle-decode-fast@1.0.3 + rustix@0.38.14 + rusty-fork@0.3.0 + ryu@1.0.15 + schannel@0.1.22 + serde@1.0.188 + serde_derive@1.0.188 + serde_json@1.0.107 + sha2@0.10.7 + socket2@0.4.9 + strsim@0.10.0 + syn@2.0.37 + tempfile@3.8.0 + terminal_size@0.3.0 + termion@2.0.1 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + toml@0.5.11 + typenum@1.17.0 + unarray@0.1.4 + unicode-bidi@0.3.13 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + url@2.4.1 + utf8parse@0.2.1 + uuid@1.4.1 + vcpkg@0.2.15 + version_check@0.9.4 + wait-timeout@0.2.0 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.87 + wasm-bindgen-macro-support@0.2.87 + wasm-bindgen-macro@0.2.87 + wasm-bindgen-shared@0.2.87 + wasm-bindgen@0.2.87 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows@0.48.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + winres@0.1.12 + xml-rs@0.8.18 + xmltree@0.10.3 +" + +inherit cargo + +DESCRIPTION="Hurl, run and test HTTP requests" +HOMEPAGE="https://hurl.dev" +SRC_URI=" + https://github.com/Orange-OpenSource/${PN}/archive/refs/tags/${PV}.tar.gz -> ${PN}-${PV}.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="Apache-2.0" +# Dependent crate licenses +LICENSE+=" + BSD CC0-1.0 MIT MPL-2.0 Unicode-DFS-2016 ZLIB + || ( Apache-2.0 Boost-1.0 ) +" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + net-misc/curl + dev-libs/libxml2 +" +DEPEND="${RDEPEND}" + +# Rust. +QA_FLAGS_IGNORED=( + /usr/bin/hurl + /usr/bin/hurlfmt +) + +QA_PRESTRIPPED="${QA_FLAGS_IGNORED[*]}" + +src_install() { + dobin target/release/hurl{,fmt} + doman docs/manual/hurl{,fmt}.1 + + dodoc CHANGELOG.md README.md LICENSE +} diff --git a/net-misc/dleyna-server/metadata.xml b/net-misc/hurl/metadata.xml index f5c82f790bf7..cb7dbfdc6787 100644 --- a/net-misc/dleyna-server/metadata.xml +++ b/net-misc/hurl/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> + <maintainer type="person"> + <email>arsen@gentoo.org</email> + <description>Arsen Arsenović</description> </maintainer> <upstream> - <remote-id type="github">phako/dleyna-server</remote-id> + <remote-id type="github">Orange-OpenSource/hurl</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r4.ebuild index 41b92caf95e1..785abcca90b6 100644 --- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild +++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r4.ebuild @@ -20,9 +20,10 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="html jbig lcms ldap mgetty pam" +# <tiff-4.6: https://sourceforge.net/p/hylafax/mailman/message/38259441/ DEPEND=" app-text/ghostscript-gpl - media-libs/tiff:=[jbig?] + <media-libs/tiff-4.6:=[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 app-alternatives/awk diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest index 9da55026418a..e17a04187a42 100644 --- a/net-misc/icaclient/Manifest +++ b/net-misc/icaclient/Manifest @@ -1,4 +1,4 @@ -DIST linuxx64-23.2.0.10.tar.gz 165430863 BLAKE2B 92e3eb397691c938768c4893ebbbef48cccbaf120de40956f3883fff76ac770fe55f3e99b397634776626d76962a18a8ce0a4814f5b8a52f39a3910e4cc764ae SHA512 9eaff591e14df82a05d5c8aa4b1ec763495671a5b46476b0d722ec0893939be99d99cf820432f27293b5d8c482544397562f8ab5be210b648d278a73cc65fb0a -DIST linuxx64-23.3.0.32.tar.gz 281196971 BLAKE2B bcdf0303ba9e354e6359b3b50f2cbd74381a4976cc80abf7caa40e4da764775a89c83a73454351bc31f2e20cfe823fb5efaa15d0554fbdb72d6aa298f5b9f590 SHA512 ab75d9c959613584e05fff629db8951cd9777480ba1dc52f78ef99ff376dc563075d137454c9f8dacdfcb497abc59bce0d7e72541a690ce8df891e50696bf830 -DIST linuxx86-23.2.0.10.tar.gz 147975174 BLAKE2B 20ef9c6059b39c79deb5098c4f8ba02bb82fee9c4eb06eab8fb5f49c450a87a1374febc044b8130a8cd5112b4bbdaa45dabb8e14fe009be4016cdbf5864b2803 SHA512 f2cebaeaadd53e0431de0455b24a0dc6063eea3586cf1b696c33849ee51623a11add431c11b9bf91b8228ecf4c49d157781643debd1248cf6cd88b974844201a -DIST linuxx86-23.3.0.32.tar.gz 239477961 BLAKE2B e0d4518ea99b95e67f94fd810c70da1509fe511c5248417925034b48f77a5a9088556d57904d73930daad2960622f22851bd4e3ed3cd6c1524b5c59bab83367c SHA512 948634578fcfefa36957fba2240c0ebf6ddc4288d3308dc0234f7d816a2b20e080bf6e3a688b105b4593fc1833dd3846cce30a561c364d6ed0a9495f8f03f7b0 +DIST linuxx64-23.5.0.58.tar.gz 449048746 BLAKE2B d0a70dbb29addc5da8f4ca32582eb210ef56cbbab21efa61ea19ae45ae12fcc59b080f0f30fdc5d1ed02169b5084a49ca265f7bfa9dde813809847f06b319046 SHA512 f695a4fed73b6bff30eb16f8c159799c7a7b4c17f088959f24c17fc4a51208c1354c19df1e22b9b975f8fcb13f6775ea1dca15dd149ea186d8aeee47f3830441 +DIST linuxx64-23.7.0.17.tar.gz 363012535 BLAKE2B 77e1fa1fb71d98840ebeebb444e86797a5514597dd1059cf19ed0a6240c05a68c13019350e26e6b52f96802a3eba4cb1a42ba20e85756aebed80e7e235a76089 SHA512 e25665ae8937c4a03382473df8f92b0227d6f07cad663ce71d4a90430014cc6630fb5593d688e6b59b7c65eaafeb3e258fc2f04f0d80573938dcb9d173a4ccab +DIST linuxx86-23.5.0.58.tar.gz 152642143 BLAKE2B 8ea722aecfb7e6588701646ed5dec1d1591a8c36986fda25c85ece50313cd1eddefb22ae58be8f1ea2edbfdf9fa725e73182f0745b0494df890008d65065ed08 SHA512 8cad203451b26920d66fb3b1bb794d74f8ab76dd24d76408f51d60278786b59fe2d83f0e6c4a2eb6741a4e1d534b9739513224e0f27ba903a9266f81e439a51f +DIST linuxx86-23.7.0.17.tar.gz 66184043 BLAKE2B 8e408ce26d75172cdd80d7bd9e1ef7aa8b855a7028673f00fd0aef6a42ca57ec8f11f894ecafb76a4e7b69c6cea922551ca9d4615aea436348ae2dbabc92e127 SHA512 e91a6205bb59e2d41075a5b5e0898cc0710a84ed7582ed2f053a3a83345daba1f437864c6e8111e80aabf19bc5b5d82b0fb6096948c166027a0f9fea183b883a diff --git a/net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild b/net-misc/icaclient/icaclient-23.5.0.58.ebuild index 67ffc799b202..03db22459332 100644 --- a/net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild +++ b/net-misc/icaclient/icaclient-23.5.0.58.ebuild @@ -57,20 +57,22 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi - media-fonts/font-misc-misc media-fonts/font-cursor-misc - media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic + media-fonts/font-misc-misc + media-fonts/font-xfree86-type1 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg + media-libs/libpng media-libs/libpulse media-libs/libvorbis media-libs/mesa media-libs/speex + media-libs/speexdsp net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux @@ -98,7 +100,6 @@ RDEPEND=" !hdx? ( !media-plugins/hdx-realtime-media-engine ) usb? ( virtual/libudev ) " -DEPENDS="" pkg_nofetch() { elog "Download the client file ${A} from @@ -234,8 +235,9 @@ src_install() { cp -a util "${ED}/${ICAROOT}" || die test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine - rm -r "${S}"/keystore/cacerts || die dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts + insinto "${ICAROOT}"/keystore/intcerts + doins keystore/intcerts/* local other_files=( icasessionmgr diff --git a/net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild b/net-misc/icaclient/icaclient-23.7.0.17.ebuild index 760b4ca1580f..03db22459332 100644 --- a/net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild +++ b/net-misc/icaclient/icaclient-23.7.0.17.ebuild @@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz ) LICENSE="icaclient" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx" +IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb" RESTRICT="mirror strip fetch" ICAROOT="/opt/Citrix/ICAClient" @@ -40,6 +40,13 @@ REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} libgstreamer-0.10.so.0 " +# video background blurring, optional +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + libopencv_core.so.407 + libopencv_imgcodecs.so.407 + libopencv_imgproc.so.407 +" + BDEPEND=" hdx? ( media-plugins/hdx-realtime-media-engine ) " @@ -50,20 +57,22 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi - media-fonts/font-misc-misc media-fonts/font-cursor-misc - media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic + media-fonts/font-misc-misc + media-fonts/font-xfree86-type1 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg + media-libs/libpng media-libs/libpulse media-libs/libvorbis media-libs/mesa media-libs/speex + media-libs/speexdsp net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux @@ -89,8 +98,8 @@ RDEPEND=" x11-libs/pango ${BDEPEND} !hdx? ( !media-plugins/hdx-realtime-media-engine ) + usb? ( virtual/libudev ) " -DEPENDS="" pkg_nofetch() { elog "Download the client file ${A} from @@ -122,6 +131,14 @@ src_prepare() { rm lib/UIDialogLibWebKit.so || die cp nls/en/module.ini . || die + if use usb; then + # inspired by debian usb support package postinst + sed -i -e 's/^[ \t]*VirtualDriver[ \t]*=.*$/&, GenericUSB/' module.ini || die + sed -i -e '/\[ICA 3.0\]/a\GenericUSB=on' module.ini || true + echo "[GenericUSB]" >> module.ini || true + echo "DriverName=VDGUSB.DLL" >> module.ini + fi + if use hdx; then "${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die mv new_module.ini module.ini || die @@ -134,8 +151,19 @@ src_install() { dodir "${ICAROOT}" + keepdir /etc/icaclient + + insinto "${ICAROOT}" exeinto "${ICAROOT}" doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord + if use usb; then + doexe usb/ctxusb usb/ctxusbd usb/ctx_usb_isactive + doins usb/*.DLL + insinto /etc/icaclient + doins usb/usb.conf + dosym ../../../etc/icaclient/usb.conf "${ICAROOT}"/usb.conf + insinto "${ICAROOT}" + fi exeinto "${ICAROOT}"/lib doexe lib/*.so @@ -145,11 +173,10 @@ src_install() { doins nls/en.UTF-8/eula.txt done - insinto "${ICAROOT}" - doins -r usb - insinto "${ICAROOT}"/config doins config/* + mv "${ED}/${ICAROOT}"/config/module.ini "${ED}"/etc/icaclient/ || die + dosym ../../../../etc/icaclient/module.ini "${ICAROOT}"/config/module.ini for tmpl in {appsrv,wfclient}.template ; do newins nls/en/${tmpl} ${tmpl/template/ini} done @@ -208,8 +235,9 @@ src_install() { cp -a util "${ED}/${ICAROOT}" || die test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine - rm -r "${S}"/keystore/cacerts || die dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts + insinto "${ICAROOT}"/keystore/intcerts + doins keystore/intcerts/* local other_files=( icasessionmgr @@ -268,6 +296,12 @@ pkg_postinst() { ewarn "not need to be explicitly installed anymore." fi fi + + if use usb; then + einfo + einfo "Add users of ${CATEGORY}/${PN} to group 'usb' for redirect to work" + einfo + fi } pkg_postrm() { diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml index 3c9ca3ab8356..2e136fc44c0a 100644 --- a/net-misc/icaclient/metadata.xml +++ b/net-misc/icaclient/metadata.xml @@ -1,13 +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>henning@hennsch.de</email> - <name>Henning Schild</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="person"> + <email>amynka@gentoo.org</email> </maintainer> <use> <flag name="hdx">Install and enable hdx-realtime-media-engine plugin</flag> diff --git a/net-misc/icecast/icecast-2.4.4-r1.ebuild b/net-misc/icecast/icecast-2.4.4-r1.ebuild index 3e9a5650a56b..46d51ac3475b 100644 --- a/net-misc/icecast/icecast-2.4.4-r1.ebuild +++ b/net-misc/icecast/icecast-2.4.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/icecast/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="kate +speex +ssl +theora +yp" +IUSE="kate +speex selinux +ssl +theora +yp" #Although there is a --with-ogg and --with-orbis configure option, they're #only useful for specifying paths, not for disabling. @@ -31,7 +31,10 @@ DEPEND=" theora? ( media-libs/libtheora ) yp? ( net-misc/curl ) " -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-icecast ) +" PATCHES=( # bug #368539 diff --git a/net-misc/icingadb/Manifest b/net-misc/icingadb/Manifest index 161543d5f044..dde44ce3907b 100644 --- a/net-misc/icingadb/Manifest +++ b/net-misc/icingadb/Manifest @@ -1,4 +1,4 @@ -DIST icingadb-1.0.0-deps.tar.xz 6857272 BLAKE2B eb5ea6ae34125d40b148f6d58befd19671f389933632e5781e4fedd7880ac68923e6843e601df28d01d3fdf17320357b4b169354cb9206144d14b12de8f9c801 SHA512 d7e1efa871e87f8aaff21da23831f8b67e64db3ae6310b7e224d2558fcd27993eaa8317d4e0df0610ec92cbf056d63ea09fca61173e199a2b88ec2fe2c06ad21 -DIST icingadb-1.0.0.tar.gz 3846335 BLAKE2B 89739ce52ae21fd695261eb90f1edcf209a319416687359f63d1bf21ac3dc999db159149207dceccc007a88e59d5f93a7c4ba555c110e3935afdedab4a917445 SHA512 e414ed2146d29d990d82b13026db0d96e72747708a642b382732feeec8a48402cb40edc00e85a8b383e37aaaf4c7f60236747047df189b981668e59d3b2770c0 DIST icingadb-1.1.0-deps.tar.xz 9188036 BLAKE2B d816220d66d354f348c7eb9874d2edd65d67418d2c5ff0352c5fad524239e9bbcba53cec0cbae710a8d075fce2365c76f20a0cbca10afca62844f51df9e43092 SHA512 94534e7d8c1479d5579336ff353b142b62d19c36030e59667d0276caf6fa643f7024557c1c2ea6bfe7c70e2abd87b9ae25ac6213272627c25d927ebf06760270 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 diff --git a/net-misc/icingadb/icingadb-1.1.0.ebuild b/net-misc/icingadb/icingadb-1.1.0.ebuild index 1b8e0bfff47a..909f5c5f8426 100644 --- a/net-misc/icingadb/icingadb-1.1.0.ebuild +++ b/net-misc/icingadb/icingadb-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 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" RDEPEND=" acct-user/icinga diff --git a/net-misc/icingadb/icingadb-1.0.0.ebuild b/net-misc/icingadb/icingadb-1.1.1.ebuild index 1b8e0bfff47a..1482f551186c 100644 --- a/net-misc/icingadb/icingadb-1.0.0.ebuild +++ b/net-misc/icingadb/icingadb-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,11 +8,11 @@ inherit go-module 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://github.com/hydrapolic/gentoo-dist/raw/master/icinga/${P}-deps.tar.xz" + https://dev.gentoo.org/~juippis/distfiles/${P}-deps.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=" acct-user/icinga diff --git a/net-misc/inetutils/Manifest b/net-misc/inetutils/Manifest new file mode 100644 index 000000000000..81c1302e7a72 --- /dev/null +++ b/net-misc/inetutils/Manifest @@ -0,0 +1 @@ +DIST inetutils-2.4.tar.xz 1558308 BLAKE2B 1f7a33f313b736b305f62587c727ba843659621fbd89610dea81a0acf0e74aca8d3005cca2e3451fe30517880678023d4949bf1b1276bb660b80802e97c06bc8 SHA512 e7e6a5d7e2e02f07a2a6cfc09694e3c0a4e4a8ef8a435eed41902eba13caeed329ae6d6ba94b0de8f789e307f04656d12c48c1c0217b69d162bc5efb0ff6adee diff --git a/net-misc/inetutils/inetutils-2.4.ebuild b/net-misc/inetutils/inetutils-2.4.ebuild new file mode 100644 index 000000000000..e7e723de8d59 --- /dev/null +++ b/net-misc/inetutils/inetutils-2.4.ebuild @@ -0,0 +1,86 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit pam + +DESCRIPTION="Collection of common network programs" +HOMEPAGE="https://www.gnu.org/software/inetutils/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +SERVERS="ftpd inetd rexecd rlogind rshd syslogd talkd telnetd tftpd uucpd" +CLIENTS="ftp dnsdomainname hostname ping ping6 rcp rexec rlogin rsh logger telnet tftp whois ifconfig traceroute" +PROGRAMS="${SERVERS} ${CLIENTS}" +IUSE="idn kerberos pam tcpd ${PROGRAMS}" + +DEPEND=" + sys-libs/readline:0= + ftpd? ( virtual/libcrypt:0= ) + idn? ( net-dns/libidn2:= ) + kerberos? ( virtual/krb5 ) + pam? ( sys-libs/pam ) + tcpd? ( sys-apps/tcp-wrappers ) + uucpd? ( virtual/libcrypt:0= ) +" +RDEPEND="${DEPEND} + ftpd? ( net-ftp/ftpbase[pam?] ) + ftp? ( !net-ftp/ftp ) + dnsdomainname? ( !sys-apps/net-tools ) + hostname? ( !sys-apps/coreutils[hostname(-)] !sys-apps/net-tools[hostname(+)] ) + ping? ( !net-misc/iputils ) + ping6? ( !net-misc/iputils[ipv6(+)] ) + rcp? ( !net-misc/netkit-rsh ) + rexec? ( !net-misc/netkit-rsh ) + rlogin? ( !net-misc/netkit-rsh ) + rsh? ( !net-misc/netkit-rsh ) + logger? ( !sys-apps/util-linux[logger(+)] ) + telnet? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd ) + tftp? ( !net-ftp/tftp-hpa ) + whois? ( !net-misc/whois ) + ifconfig? ( !sys-apps/net-tools ) + traceroute? ( !net-analyzer/traceroute ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert alignof ) + +src_configure() { + local myconf=( + --disable-clients + --disable-servers + $(use_with idn) + --without-krb4 + $(use_with kerberos krb5) + --without-shishi + $(use_with pam) + $(use_with tcpd wrap) + ) + + local prog + for prog in ${PROGRAMS}; do + myconf+=( $(use_enable "${prog}") ) + done + + econf "${myconf[@]}" +} + +iu_pamd() { + if use "$1"; then + pamd_mimic system-remote-login "$2" auth account password session + fi +} + +src_install() { + default + iu_pamd rexecd rexec + iu_pamd rlogind rlogin + iu_pamd rshd rsh + if use kerberos; then + iu_pamd rlogind krlogin + iu_pamd rshd krsh + fi +} diff --git a/net-misc/inetutils/metadata.xml b/net-misc/inetutils/metadata.xml new file mode 100644 index 000000000000..3f826440008a --- /dev/null +++ b/net-misc/inetutils/metadata.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>floppym@gentoo.org</email> + <name>Mike Gilbert</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <use> + <flag name="ftpd">Enable ftpd</flag> + <flag name="inetd">Enable inetd</flag> + <flag name="rexecd">Enable rexecd</flag> + <flag name="rlogind">Enable rlogind</flag> + <flag name="rshd">Enable rshd</flag> + <flag name="syslogd">Enable syslogd</flag> + <flag name="talkd">Enable talkd</flag> + <flag name="telnetd">Enable telnetd</flag> + <flag name="tftpd">Enable tftpd</flag> + <flag name="uucpd">Enable uucpd</flag> + <flag name="ftp">Enable ftp</flag> + <flag name="dnsdomainname">Enable domainname</flag> + <flag name="hostname">Enable hostname</flag> + <flag name="ping">Enable ping</flag> + <flag name="ping6">Enable ping6</flag> + <flag name="rcp">Enable rcp</flag> + <flag name="rexec">Enable rexec</flag> + <flag name="rlogin">Enable rlogin</flag> + <flag name="rsh">Enable rsh</flag> + <flag name="logger">Enable logger</flag> + <flag name="telnet">Enable telnet</flag> + <flag name="tftp">Enable tftp</flag> + <flag name="whois">Enable whois</flag> + <flag name="ifconfig">Enable ifconfig</flag> + <flag name="traceroute">Enable traceroute</flag> + </use> +</pkgmetadata> diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild index 0ad1312186d1..acc7c7928e39 100644 --- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild +++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="IP Calculator prints broadcast/network/etc for an IP address and netmask" -LICENSE="GPL-2+" HOMEPAGE="http://jodies.de/ipcalc" SRC_URI=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz " -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +S="${WORKDIR}"/${PN}-0.5 + +LICENSE="GPL-2+" SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=">=dev-lang/perl-5.6.0" -S=${WORKDIR}/${PN}-0.5 src_prepare() { eapply "${WORKDIR}"/debian/patches/*.patch diff --git a/net-misc/ipcalc/metadata.xml b/net-misc/ipcalc/metadata.xml index d5af4bcfaf13..d1dfb6813d0d 100644 --- a/net-misc/ipcalc/metadata.xml +++ b/net-misc/ipcalc/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <upstream> + <remote-id type="github">kjokjo/ipcalc</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index 146d924f2570..7f75b85aeaba 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -1,3 +1,5 @@ DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea -DIST iperf-3.12.tar.gz 648136 BLAKE2B 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae SHA512 9b0600a19750311557833b32ca5c4be809ab98643522f125645dd8f83c482017e42fbe5fc9484624731176a59b67203a468eb81eebf1a37b9c1b3eff818857ba 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/files/iperf-3.12-fix-bashism.patch b/net-misc/iperf/files/iperf-3.12-fix-bashism.patch deleted file mode 100644 index 1f3a321f42c9..000000000000 --- a/net-misc/iperf/files/iperf-3.12-fix-bashism.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://github.com/esnet/iperf/pull/1398 - -From 3a03f775ca103f2e824abef903130280c57ca8ac Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 2 Oct 2022 02:58:59 +0100 -Subject: [PATCH] config/iperf_config_static_bin.m4: fix bashism - -configure scripts need to be runnable with a POSIX-compliant /bin/sh. - -On many (but not all!) systems, /bin/sh is provided by Bash, so errors -like this aren't spotted. Notably Debian defaults to /bin/sh provided -by dash which doesn't tolerate such bashisms as '=='. - -This retains compatibility with bash. - -Fixes configure warnings/errors like: -``` -./configure: 2670: test: x: unexpected operator -``` - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/config/iperf_config_static_bin.m4 -+++ b/config/iperf_config_static_bin.m4 -@@ -7,6 +7,6 @@ AC_ARG_ENABLE([static-bin], - [:]) - AM_CONDITIONAL([ENABLE_STATIC_BIN], [test x$enable_static_bin = xno]) - --AS_IF([test "x$enable_static_bin" == xyes], -+AS_IF([test "x$enable_static_bin" = xyes], - [LDFLAGS="$LDFLAGS --static"] - []) ---- a/configure -+++ b/configure -@@ -2667,7 +2667,7 @@ else - fi - - --if test "x$enable_static_bin" == xyes -+if test "x$enable_static_bin" = xyes - then : - LDFLAGS="$LDFLAGS --static" - - diff --git a/net-misc/iperf/iperf-3.12.ebuild b/net-misc/iperf/iperf-3.14.ebuild index 43049cb7d17e..a136b4ecd132 100644 --- a/net-misc/iperf/iperf-3.12.ebuild +++ b/net-misc/iperf/iperf-3.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,7 +27,6 @@ DOCS=( README.md RELNOTES.md ) PATCHES=( "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch - "${FILESDIR}"/${PN}-3.12-fix-bashism.patch "${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch ) diff --git a/net-misc/iperf/iperf-3.15.ebuild b/net-misc/iperf/iperf-3.15.ebuild new file mode 100644 index 000000000000..4aec461864c3 --- /dev/null +++ b/net-misc/iperf/iperf-3.15.ebuild @@ -0,0 +1,54 @@ +# 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/releases/download/${PV}/${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.16.ebuild b/net-misc/iperf/iperf-3.16.ebuild new file mode 100644 index 000000000000..e9a1b344d9db --- /dev/null +++ b/net-misc/iperf/iperf-3.16.ebuild @@ -0,0 +1,54 @@ +# 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/releases/download/${PV}/${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/ipmiview/Manifest b/net-misc/ipmiview/Manifest index 2a46bec2cd28..ec25fd2773c2 100644 --- a/net-misc/ipmiview/Manifest +++ b/net-misc/ipmiview/Manifest @@ -1 +1 @@ -DIST IPMIView_2.21.0_build.221118_bundleJRE_Linux_x64.tar.gz 152487572 BLAKE2B 3183a7eb48b476d5ba46d7bbb8e5e9287b5622f92474984c60580c4273fe077526e276d7b849011fd6e9fc2e7c170947ab6dafe64fa47ee1ee9b3c3b74318d3f SHA512 4e21bee8c81acc0afc33df34e10530157a09908957c3aad54b9f51ca71b83e79d1b52a804f18f34fb8bbfaf2574ab7a3b65d0f66495aa27284cd67baa387f737 +DIST IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64.tar.gz 117666196 BLAKE2B 32284883846dc780cd1b613bc34f91d2fa6f4bad144ef7a26f76b78852a81e8adcbcf64a08aff06919f2029c8880b3ca6a8bae0674779139216b55659d3415f2 SHA512 103cc4c12f3ad6a503877db85abd89ad4e0dfdb48d99d30483ab3b97534e7f1729cc94b19ad0ff45c381986807a443d45338df24e7edc41839ed7e718804d46a diff --git a/net-misc/ipmiview/ipmiview-2.21.0.221118.ebuild b/net-misc/ipmiview/ipmiview-2.21.1.230720.ebuild index 0969639c5c31..6417f07fea8f 100644 --- a/net-misc/ipmiview/ipmiview-2.21.0.221118.ebuild +++ b/net-misc/ipmiview/ipmiview-2.21.1.230720.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ MY_PV="$(ver_cut 1-3)" DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC" HOMEPAGE="https://www.supermicro.com/" -SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz" +SRC_URI="https://www.supermicro.com/Bios/sw_download/588/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz" LICENSE="supermicro" SLOT="0" diff --git a/net-misc/ipsvd/files/ipsvd-1.0.0-fix-musl-clang-16.patch b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-musl-clang-16.patch new file mode 100644 index 000000000000..922369ca48c5 --- /dev/null +++ b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-musl-clang-16.patch @@ -0,0 +1,139 @@ +Bug: https://bugs.gentoo.org/897946 +Don't use sig_unblock and other such functions, they are deprecated. +--- a/src/cdb_make.c ++++ b/src/cdb_make.c +@@ -15,7 +15,7 @@ int cdb_make_start(struct cdb_make *c,int fd) + c->numentries = 0; + c->fd = fd; + c->pos = sizeof c->final; +- buffer_init(&c->b,write,fd,c->bspace,sizeof c->bspace); ++ buffer_init(&c->b,(void *)write,fd,c->bspace,sizeof c->bspace); + return seek_set(fd,c->pos); + } + +--- a/src/pathexec_run.c ++++ b/src/pathexec_run.c +@@ -1,5 +1,6 @@ + /* Public domain. */ + ++#include <unistd.h> + #include "error.h" + #include "stralloc.h" + #include "str.h" +--- a/src/prot.c ++++ b/src/prot.c +@@ -1,5 +1,7 @@ + /* Public domain. */ + ++#include <grp.h> ++#include <unistd.h> + #include "hasshsgr.h" + #include "prot.h" + +--- a/src/seek_set.c ++++ b/src/seek_set.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + + #include <sys/types.h> ++#include <unistd.h> + #include "seek.h" + + #define SET 0 /* sigh */ +--- a/src/sig_block.c ++++ b/src/sig_block.c +@@ -6,35 +6,23 @@ + + void sig_block(int sig) + { +-#ifdef HASSIGPROCMASK + sigset_t ss; + sigemptyset(&ss); + sigaddset(&ss,sig); + sigprocmask(SIG_BLOCK,&ss,(sigset_t *) 0); +-#else +- sigblock(1 << (sig - 1)); +-#endif + } + + void sig_unblock(int sig) + { +-#ifdef HASSIGPROCMASK + sigset_t ss; + sigemptyset(&ss); + sigaddset(&ss,sig); + sigprocmask(SIG_UNBLOCK,&ss,(sigset_t *) 0); +-#else +- sigsetmask(sigsetmask(~0) & ~(1 << (sig - 1))); +-#endif + } + + void sig_blocknone(void) + { +-#ifdef HASSIGPROCMASK + sigset_t ss; + sigemptyset(&ss); + sigprocmask(SIG_SETMASK,&ss,(sigset_t *) 0); +-#else +- sigsetmask(0); +-#endif + } +--- a/src/sig_pause.c ++++ b/src/sig_pause.c +@@ -6,11 +6,7 @@ + + void sig_pause(void) + { +-#ifdef HASSIGPROCMASK + sigset_t ss; + sigemptyset(&ss); + sigsuspend(&ss); +-#else +- sigpause(0); +-#endif + } +Binary files a/src/sig_pause.o and b/src/sig_pause.o differ +--- a/src/udpsvd.c ++++ b/src/udpsvd.c +@@ -268,7 +268,7 @@ int main(int argc, const char **argv, const char *const *envp) { + if (user) { + bufnum[fmt_ulong(bufnum, ugid.uid)] =0; + out(", uid "); out(bufnum); +- bufnum[fmt_ulong(bufnum, ugid.gid)] =0; ++ bufnum[fmt_ulong(bufnum, (unsigned long) ugid.gid)] =0; + out(", gid "); out(bufnum); + } + flush(", starting.\n"); +--- a/src/chkshsgr.c ++++ b/src/chkshsgr.c +@@ -1,5 +1,7 @@ + /* Public domain. */ + ++#define _GNU_SOURCE ++#include <grp.h> + #include <unistd.h> + + int main() +--- a/src/tcpsvd.c ++++ b/src/tcpsvd.c +@@ -1,6 +1,8 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#define _GNU_SOURCE ++#include <grp.h> + #include <unistd.h> + #include "dns.h" + #include "socket.h" +--- a/src/udpsvd.c ++++ b/src/udpsvd.c +@@ -1,7 +1,9 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#define _GNU_SOURCE + #include <unistd.h> ++#include <grp.h> + #include "dns.h" + #include "socket.h" + #include "ip4.h" diff --git a/net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild b/net-misc/ipsvd/ipsvd-1.0.0-r3.ebuild index 2b0e4522e88a..342c393df9da 100644 --- a/net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild +++ b/net-misc/ipsvd/ipsvd-1.0.0-r3.ebuild @@ -1,40 +1,34 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs flag-o-matic +inherit toolchain-funcs -DESCRIPTION="ipsvd is a set of internet protocol service daemons for Unix" +DESCRIPTION="Set of internet protocol service daemons for Unix" HOMEPAGE="http://smarden.org/ipsvd/" SRC_URI="http://smarden.org/ipsvd/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="static" - -DEPEND="" -RDEPEND="" S="${WORKDIR}/net/${P}" PATCHES=( "${FILESDIR}"/${P}-fix-parallel-make.diff + "${FILESDIR}"/${PN}-1.0.0-fix-musl-clang-16.patch ) src_configure() { cd "${S}"/src - if use static ; then - append-ldflags -static - fi echo "$(tc-getCC) ${CFLAGS}" > conf-cc echo "$(tc-getCC) ${LDFLAGS}" > conf-ld } src_compile() { - cd "${S}"/src + cd "${S}"/src || die emake } @@ -45,6 +39,6 @@ src_install() { doman man/ipsvd-instruct.5 man/ipsvd.7 man/udpsvd.8 \ man/tcpsvd.8 man/ipsvd-cdb.8 - insinto html - dohtml doc/*.html + local HTML_DOCS=( doc/ ) + einstalldocs } diff --git a/net-misc/iputils/iputils-20221126-r1.ebuild b/net-misc/iputils/iputils-20221126-r1.ebuild index e758f6d437a8..f307d79736a8 100644 --- a/net-misc/iputils/iputils-20221126-r1.ebuild +++ b/net-misc/iputils/iputils-20221126-r1.ebuild @@ -1,13 +1,6 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag, all USE flags enabled and -# tar ${S}/doc folder. - EAPI=8 PLOCALES="de fr ja pt_BR tr uk zh_CN" diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index b4e1ae73bca6..f1fd401dbdc4 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -1,13 +1,6 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag, all USE flags enabled and -# tar ${S}/doc folder. - EAPI=8 PLOCALES="de fr ja pt_BR tr uk zh_CN" diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index 71e41b678851..72422573e8de 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -1,3 +1,3 @@ -DIST kafka_2.13-3.3.1.tgz 105053134 BLAKE2B 73eb6e8eab021a20ba79f5ec50e9efbbbbf666236553d7e658fcf5d5dd8bf61ee79b8057a76eb6d2906c5772fea1f6b8e9e27e6ad9ef3a0b740548b14758491e SHA512 d14d9cc97d1702649b33378f38060c4a6220850a3d7182d1af20e905cb98728e51f2aeec63121f5773a389d6b66891b7508e5d23584dd1a4e424825e3d54e3e0 -DIST kafka_2.13-3.3.2.tgz 106619987 BLAKE2B 483587654f8f63b4196d49030cd8a5d82b5dcfa02aad6b8ba5673c8a4293c214159fd54236b810561ef2b7340d8b56deff78d7313a4675286e798bb5d220237c SHA512 f56657105a67f6195c1d4795b5fb4a00fc5e2f5cce061d7f7a504063778187b325c6fbe51d7c59f57cd7ef323a37d4c2c780c27a5609a2008852cbfa944287b3 -DIST kafka_2.13-3.4.0.tgz 106290956 BLAKE2B 27b3331d0d9c5767a52fff3d78ada43e43651174831d822be438c412981b86567e85ff20b8a14bdc632b45753012c2066f6eabc7f1b799afbafeb11fe65b50f0 SHA512 2c405149c065627ce2125088dfcce0a4dc23aebaa72c1157736d5829cb5cbef273c0915ec55d2d8ba38e5e0524f0720f43e07d7d677439cd2ac7bea618caa65b +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 diff --git a/net-misc/kafka-bin/kafka-bin-3.3.2.ebuild b/net-misc/kafka-bin/kafka-bin-3.4.1.ebuild index 62f5d3c5f537..62f5d3c5f537 100644 --- a/net-misc/kafka-bin/kafka-bin-3.3.2.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.4.1.ebuild diff --git a/net-misc/kafka-bin/kafka-bin-3.4.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.5.1.ebuild index 62f5d3c5f537..62f5d3c5f537 100644 --- a/net-misc/kafka-bin/kafka-bin-3.4.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.5.1.ebuild diff --git a/net-misc/kafka-bin/kafka-bin-3.3.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild index 313f507f0bdf..62f5d3c5f537 100644 --- a/net-misc/kafka-bin/kafka-bin-3.3.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index 08665ba991a5..a29210d24713 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/net-misc/kea/kea-2.4.0.ebuild b/net-misc/kea/kea-2.4.0.ebuild new file mode 100644 index 000000000000..bf1c596ab6ba --- /dev/null +++ b/net-misc/kea/kea-2.4.0.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2023 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..12} ) + +inherit autotools fcaps python-single-r1 systemd tmpfiles + +if [[ ${PV} = 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.isc.org/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 + if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" + fi + fi +fi + +LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +IUSE="debug doc mysql +openssl postgres +samples shell test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/boost:= + dev-libs/log4cplus + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) + 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}-2.2.0-openssl-version.patch +) + +pkg_setup() { + use shell && python-single-r1_pkg_setup +} + +src_prepare() { + default + + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + + # 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-rpath + --disable-static + --enable-generate-messages + --enable-perfdhcp + --localstatedir="${EPREFIX}/var" + --runstatedir="${EPREFIX}/run" + --without-werror + --with-log4cplus + $(use_enable debug) + $(use_enable doc generate-docs) + $(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-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 65ef75d7f344..bf1c596ab6ba 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -10,7 +10,7 @@ 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 diff --git a/net-misc/keychain/keychain-2.8.5-r2.ebuild b/net-misc/keychain/keychain-2.8.5-r2.ebuild index ca3a54636a79..d3ab687678b2 100644 --- a/net-misc/keychain/keychain-2.8.5-r2.ebuild +++ b/net-misc/keychain/keychain-2.8.5-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="dev-lang/perl" diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest index b55511e81f18..03bb2c05724a 100644 --- a/net-misc/kio-zeroconf/Manifest +++ b/net-misc/kio-zeroconf/Manifest @@ -1,2 +1,2 @@ -DIST kio-zeroconf-22.12.3.tar.xz 42596 BLAKE2B 2f95fc55b0f287eadcfbb474e50f36575d368e57d5e8eaae2622b2f0237bc5ab0e84a39a3dad17835efb0b12e951a74cd042ed6daaad7afb56f3dbde038282a9 SHA512 47953f62e1aaa816ca9f7e898375da255c1bae5b10d5e64d367c22b587152a0d0f3f612aa08809c2a8eae8b3089e9ba0bda139df96da30b7d3da785e1df80723 -DIST kio-zeroconf-23.04.1.tar.xz 44096 BLAKE2B ae7c97756309bbcea42295f49df52c1f77d9cd9f73d072deef3bf0fe8163a93223d2e627d80a22697dd3bcfa61e31dfc831966ef746897cc73ddc37614e91709 SHA512 1aa4746f390c8733129af7f23c70a82a4a01cf5e47d8e9e84198edc89a1f4fc27865b2fd169def31e52f85b7fde6d542cee0ead83963663014a070b63da7c45c +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 diff --git a/net-misc/kio-zeroconf/kio-zeroconf-22.12.3.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild index 342f51b206a1..b5993cb40e3e 100644 --- a/net-misc/kio-zeroconf/kio-zeroconf-22.12.3.ebuild +++ b/net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KFMIN=5.101.0 -QTMIN=5.15.5 +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)" diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.04.1.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.3.ebuild index ddfe1f05dac0..b5993cb40e3e 100644 --- a/net-misc/kio-zeroconf/kio-zeroconf-23.04.1.ebuild +++ b/net-misc/kio-zeroconf/kio-zeroconf-23.08.3.ebuild @@ -3,15 +3,15 @@ EAPI=8 -KFMIN=5.104.0 -QTMIN=5.15.5 +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" +KEYWORDS="amd64 arm64 ~ppc64 x86" IUSE="" DEPEND=" 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 8fae2ce8e5f2..5dcd7cb600b7 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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,10 +18,10 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" src_prepare() { - sed -e "s|gcc.*\-o|$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o|" \ + sed -i -e "s|gcc.*\-o|$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o|" \ -e "s|g++.*\-o|$(tc-getCXX) ${CFLAGS} ${LDFLAGS} -o|" \ - -i testing/Makefile || die - sed -e "s|f in data|f in ${EPREFIX}/usr/share/l7-protocols/data|" \ + testing/Makefile || die + sed -i -e "s|f in data|f in ${EPREFIX}/usr/share/l7-protocols/data|" \ testing/timeit.sh || die ht_fix_file testing/*.sh eapply_user diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest index 51a524d4b820..deed140279eb 100644 --- a/net-misc/libteam/Manifest +++ b/net-misc/libteam/Manifest @@ -1 +1,2 @@ +DIST libteam-1.23.tar.gz 173445 BLAKE2B 143e43cb092ac9aab8b152101c4c91c995436a6b02cf85fb710fa095a0bbd46fe70666149cfa9d86135b5496dd0287296e55d68f511aa5965c1d4f22f61ded57 SHA512 f78ceca4606b93e75fafdd97aa3cc44153fc42d31209f216c3da9c71abf38a2e4a690c71b8631ae09e02d7285d6bbd8292983fdc69eb921b0537a75558bc89f5 DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e diff --git a/net-misc/libteam/libteam-1.23.ebuild b/net-misc/libteam/libteam-1.23.ebuild new file mode 100644 index 000000000000..1b9b1ec0290c --- /dev/null +++ b/net-misc/libteam/libteam-1.23.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pirko/${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="http://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" + +DOCS=( README ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable syslog logging) \ + $(use_enable dbus) \ + $(use_enable zmq) +} + +src_install() { + default + + 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/linuxptp/Manifest b/net-misc/linuxptp/Manifest index bd6d2da1cdd6..99d89fba1a94 100644 --- a/net-misc/linuxptp/Manifest +++ b/net-misc/linuxptp/Manifest @@ -1 +1 @@ -DIST linuxptp-3.1.1.tgz 218784 BLAKE2B 5b46580a0e1b6e003f5f03e512c4f9b348c086f356fd47d3480da5e8223ba291fdb213798c696c37759896a99bccf21cd7e7daddce5aa5ed5701afb0e622a755 SHA512 c3c40987fe68480a8473097ebc3c506fb4f8f3b6456bbe637b2b3cb0b3e0182f1513b511fdc04b3607d5f7d8bd1bd22502bb86eb13f9fa4fa63a3331846b33ec +DIST linuxptp-4.1.tgz 252373 BLAKE2B 9dc6bb69c98a8b452250554b5e06b39d445b81a3e0c7ce2beaa7bd1d2cb969928496827bd3d3e32136c9fe55f1103ab312441c2a4cdee035c7d6b7526f0c1327 SHA512 144c03677f2c61c58d05c5c5dbb771b7aac3860507d9ba814f67f6da024c3cb2019f9e8cf39b983d39a6feddd1b24a1f40a678b4ff7af8aa564ee813e322dfae diff --git a/net-misc/linuxptp/linuxptp-3.1.1-r1.ebuild b/net-misc/linuxptp/linuxptp-4.1.ebuild index de162a29e0a7..f121905d932c 100644 --- a/net-misc/linuxptp/linuxptp-3.1.1-r1.ebuild +++ b/net-misc/linuxptp/linuxptp-4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit linux-info systemd toolchain-funcs DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" -HOMEPAGE="http://linuxptp.sourceforge.net/" +HOMEPAGE="https://linuxptp.nwtime.org/" SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" LICENSE="GPL-2" diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.19-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.19-r1.ebuild index 7bd9ae882e39..fc25414b64cf 100644 --- a/net-misc/lksctp-tools/lksctp-tools-1.0.19-r1.ebuild +++ b/net-misc/lksctp-tools/lksctp-tools-1.0.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit flag-o-matic autotools linux-info DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation" -HOMEPAGE="http://lksctp.sourceforge.net/" +HOMEPAGE="https://github.com/sctp/lksctp-tools/wiki" SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( GPL-2+ LGPL-2.1 )" diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest index 2ac27a995e7f..8d58693add2d 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -1 +1,2 @@ DIST lldpd-1.0.16.tar.gz 1967182 BLAKE2B 3a359ec6539087ab1ffa5e1f83b90cc375b047b6e404df21067621bac9c9e5bab4b04209e9111d72fc2486046fb1d4b6744c093342c908f9a6475cd0b5a33328 SHA512 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1 +DIST lldpd-1.0.17.tar.gz 1983689 BLAKE2B e74a1cdd965b26e9bad509fefb66bddfd74028a7d5122e561aed51eeb1b42c26497ce07169218133e4b99f12f4e0951065280c4ea8e47d54ecb6a8e697104106 SHA512 8f6d6ea6a32cc0f238158a2d1f08224224bca250cf61f80e4d8b633c0471e4ff9a17a7a7d7f313f10d557a256c7419f54cbb3b78903b7bba3619f9c5b6c114c8 diff --git a/net-misc/lldpd/lldpd-1.0.17.ebuild b/net-misc/lldpd/lldpd-1.0.17.ebuild new file mode 100644 index 000000000000..bd0f6ba2ac4e --- /dev/null +++ b/net-misc/lldpd/lldpd-1.0.17.ebuild @@ -0,0 +1,110 @@ +# 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" + +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/lyricwikia/lyricwikia-0.1.11-r2.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild new file mode 100644 index 000000000000..e5c93282a1f9 --- /dev/null +++ b/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Python API to get song lyrics from LyricWikia" +HOMEPAGE="https://github.com/enricobacis/lyricwikia" +SRC_URI="https://github.com/enricobacis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )" + +RDEPEND=" + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] +" + +PATCHES="${FILESDIR}/${P}-skip-online-test.patch" + +distutils_enable_tests pytest + +python_prepare_all() { + # do not depend on deprecated dep + sed -i -e '/pytest-runner/d' setup.py || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + distutils-r1_python_install_all + + # rename the executable to avoid file conflict with net-im/lyrics-in-terminal + find "${D}" -name 'lyrics' -execdir mv {} lyricwikia \; || die +} + +pkg_postinst() { + elog "Note that access to LyricWikia through this API (and products that use this API) should comply to the LyricWikia terms of use" + elog "" + elog "LyricWikia is now offline, this package is provided solely for the purpose of satisfying media-video/vidify's dependencies" +} diff --git a/net-misc/lyricwikia/metadata.xml b/net-misc/lyricwikia/metadata.xml index 270110553011..264f58e3938d 100644 --- a/net-misc/lyricwikia/metadata.xml +++ b/net-misc/lyricwikia/metadata.xml @@ -7,4 +7,7 @@ <name>Andrew Ammerlaan</name> </maintainer> <stabilize-allarches/> + <upstream> + <remote-id type="github">enricobacis/lyricwikia</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index f6d11b5554dc..39221eead1c1 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -1,3 +1,5 @@ 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 diff --git a/net-misc/memcached/memcached-1.6.21-r1.ebuild b/net-misc/memcached/memcached-1.6.21-r1.ebuild new file mode 100644 index 000000000000..53e00ffd929c --- /dev/null +++ b/net-misc/memcached/memcached-1.6.21-r1.ebuild @@ -0,0 +1,104 @@ +# 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.ebuild b/net-misc/memcached/memcached-1.6.21.ebuild new file mode 100644 index 000000000000..0987a83cff6b --- /dev/null +++ b/net-misc/memcached/memcached-1.6.21.ebuild @@ -0,0 +1,106 @@ +# 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 new file mode 100644 index 000000000000..53e00ffd929c --- /dev/null +++ b/net-misc/memcached/memcached-1.6.22.ebuild @@ -0,0 +1,104 @@ +# 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/mikutter/mikutter-5.0.4.ebuild b/net-misc/mikutter/mikutter-5.0.4.ebuild index c09e571b2a2b..0d3a72a482ca 100644 --- a/net-misc/mikutter/mikutter-5.0.4.ebuild +++ b/net-misc/mikutter/mikutter-5.0.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -USE_RUBY="ruby30 ruby31" +USE_RUBY="ruby31" inherit desktop ruby-ng @@ -68,12 +68,11 @@ all_ruby_unpack() { } all_ruby_install() { - local rubyversion - local r + local ruby - for r in $USE_RUBY; do - if use ruby_targets_${r}; then - rubyversion=${r} + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if use ruby_targets_${ruby}; then + break fi done @@ -81,7 +80,7 @@ all_ruby_install() { doexe mikutter.rb insinto /usr/share/mikutter doins -r core plugin - sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \ + sed -e "s/ruby19/${ruby}/" "${FILESDIR}"/mikutter \ | newbin - mikutter dodoc README make_desktop_entry mikutter Mikutter \ diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild index c09e571b2a2b..0d3a72a482ca 100644 --- a/net-misc/mikutter/mikutter-9999.ebuild +++ b/net-misc/mikutter/mikutter-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -USE_RUBY="ruby30 ruby31" +USE_RUBY="ruby31" inherit desktop ruby-ng @@ -68,12 +68,11 @@ all_ruby_unpack() { } all_ruby_install() { - local rubyversion - local r + local ruby - for r in $USE_RUBY; do - if use ruby_targets_${r}; then - rubyversion=${r} + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if use ruby_targets_${ruby}; then + break fi done @@ -81,7 +80,7 @@ all_ruby_install() { doexe mikutter.rb insinto /usr/share/mikutter doins -r core plugin - sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \ + sed -e "s/ruby19/${ruby}/" "${FILESDIR}"/mikutter \ | newbin - mikutter dodoc README make_desktop_entry mikutter Mikutter \ diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest index e78fd054249a..aaef89fe6b17 100644 --- a/net-misc/minidlna/Manifest +++ b/net-misc/minidlna/Manifest @@ -1,2 +1,2 @@ -DIST minidlna-1.3.2.tar.gz 736820 BLAKE2B e35266be94e4585f399c80a6909318ce973d443506f6becdacdb00802ed0ce060ebf8401ff1b5dfef0b451f609d98f805c80b9a0c87e23d14084338047418620 SHA512 1dca810aeb59f19f530b5fd589beb04085b65ece94a55a54f2f7a0b771e7c5487493f13e6d9120e0b9aced08b0f98de58640dec26def214333dae1fea951f589 +DIST minidlna-1.3.3.tar.gz 824527 BLAKE2B 489b7ecb54a20f6111a65388ad2c52d477164046131af490cbcef7cd3ff2b841644f549bcad708ea6d4548f4111d5b2b63bafc0f079edf160467b85c682cbc5b SHA512 3571af71b49d46aacc273a9b35e2c78aeccb966c1d6122f8186074c34f9a177ac60622ccf29f307d8d73f502c7a99f023f96f0c43bbd398c7ef82bb57d77cc1d DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e diff --git a/net-misc/minidlna/minidlna-1.3.2-r1.ebuild b/net-misc/minidlna/minidlna-1.3.3.ebuild index e56727ba5429..e56727ba5429 100644 --- a/net-misc/minidlna/minidlna-1.3.2-r1.ebuild +++ b/net-misc/minidlna/minidlna-1.3.3.ebuild diff --git a/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild b/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild index 8fc5bad4ca58..5ff039094c33 100644 --- a/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild +++ b/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-miniupnp ) " -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc src_configure() { sed -i -e '/#define HAVE_IP_MREQN/{s:/[*]::;s:[*]/::;}' config.h || die diff --git a/net-misc/minissdpd/minissdpd-1.6.0.ebuild b/net-misc/minissdpd/minissdpd-1.6.0.ebuild index 6e3e3b181684..36e245adb5c3 100644 --- a/net-misc/minissdpd/minissdpd-1.6.0.ebuild +++ b/net-misc/minissdpd/minissdpd-1.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-miniupnp ) " -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc src_compile() { emake CC="$(tc-getCC)" diff --git a/net-misc/miniupnpd/miniupnpd-2.3.1.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.1.ebuild index cd058e612f1a..b28bd1d20603 100644 --- a/net-misc/miniupnpd/miniupnpd-2.3.1.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,7 +47,7 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-miniupnp ) " -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc src_prepare() { default diff --git a/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild index 0bed1072de26..b28bd1d20603 100644 --- a/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild @@ -47,7 +47,7 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-miniupnp ) " -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc src_prepare() { default diff --git a/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild index 0bed1072de26..b28bd1d20603 100644 --- a/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild @@ -47,7 +47,7 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-miniupnp ) " -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc src_prepare() { default diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index cc11caaca071..6ae0b2c209c0 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1 +1,2 @@ DIST ModemManager-1.18.12.tar.xz 2589020 BLAKE2B e82db0a62d29753e22b9f9c09e60d8f5dca070cbac27b6df54ff8cd166cbb837dca3b162ac06afea0e75abdc8d407253a28cee58dacd739d4b485fa9f5485acb SHA512 7ee3b091ca2350a1d52f1ff0c0657c9f279594ffbff5ea57be59ca024331cafbac34901ca9ed4ef2b71e8c51b594526f921d3aeee6e8748cd0532a16218c5d6c +DIST ModemManager-1.20.6.tar.bz2 1467367 BLAKE2B 6fc6e678fac966ccd6697e469152e3b0fa93d868d16985828e01b4890ba35beacc8f1c5a47a74bf8586035088c6f61124d12214d022e30dbc3b9196b0dd6f28e SHA512 2c5c121d6a74a7dc0922231a88ba64e350e947a57dae25ce7e8c58b6041b60fd5c4ff395e641beef3447b0239e1e60c15c2752e47e77a648a1bea9ef5f3ac577 diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml index 9d7421218e6c..136f0f9354a1 100644 --- a/net-misc/modemmanager/metadata.xml +++ b/net-misc/modemmanager/metadata.xml @@ -2,8 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> + <email>freedesktop-bugs@gentoo.org</email> </maintainer> <use> <flag name="mbim">Enable MBIM modem protocol</flag> diff --git a/net-misc/modemmanager/modemmanager-1.18.12.ebuild b/net-misc/modemmanager/modemmanager-1.18.12.ebuild index 9510f3fb1144..cd49618244b2 100644 --- a/net-misc/modemmanager/modemmanager-1.18.12.ebuild +++ b/net-misc/modemmanager/modemmanager-1.18.12.ebuild @@ -13,7 +13,7 @@ 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" -IUSE="elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala" +IUSE="elogind +introspection mbim policykit +qmi +qrtr selinux systemd test +udev vala" REQUIRED_USE=" ?? ( elogind systemd ) qrtr? ( qmi ) @@ -34,6 +34,7 @@ DEPEND=" " RDEPEND="${DEPEND} policykit? ( acct-group/plugdev ) + selinux? ( sec-policy/selinux-modemmanager ) " BDEPEND=" dev-util/gdbus-codegen diff --git a/net-misc/modemmanager/modemmanager-1.20.6.ebuild b/net-misc/modemmanager/modemmanager-1.20.6.ebuild new file mode 100644 index 000000000000..f306012e1aa1 --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.20.6.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) +inherit bash-completion-r1 meson python-any-r1 optfeature systemd udev vala xdg + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/ https://gitlab.freedesktop.org/mobile-broadband/ModemManager" +SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/${PV}/ModemManager-${PV}.tar.bz2" + +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" + +IUSE="elogind gtk-doc +introspection +mbim policykit +qmi +qrtr selinux systemd test +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + qrtr? ( qmi ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + udev? ( >=dev-libs/libgudev-232:= ) + introspection? ( >=dev-libs/gobject-introspection-1.38:= ) + mbim? ( >=net-libs/libmbim-1.28.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection?] ) + qmi? ( >=net-libs/libqmi-1.32.0:=[qrtr?] ) + qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-modemmanager ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +python_check_deps() { + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + use vala && vala_setup + default +} + +src_configure() { + # Let's avoid BuildRequiring bash-completion, install it manually + local emesonargs=( + -Dbash_completion=false + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + + $(meson_use udev) + -Dudevdir="${EPREFIX}$(get_udevdir)" + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" + + $(meson_use systemd systemd_journal) + + -Dpolkit=$(usex policykit permissive no) + + $(meson_use mbim) + $(meson_use qmi) + $(meson_use qrtr) + + $(meson_use vala vapi) + ) + if use systemd || use elogind; then + emesonargs+=(-Dsystemd_suspend_resume=true) + else + emesonargs+=(-Dsystemd_suspend_resume=false) + fi + meson_src_configure +} + +src_install() { + meson_src_install + newinitd "${FILESDIR}/modemmanager.initd" modemmanager + newbashcomp cli/mmcli-completion mmcli +} + +pkg_postinst() { + xdg_pkg_postinst + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + use udev && udev_reload + + systemd_reenable ModemManager.service + + optfeature "the case your modem shows up as a storage drive" sys-apps/usb_modeswitch +} + +pkg_postrm() { + xdg_pkg_postrm + use udev && udev_reload +} diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest new file mode 100644 index 000000000000..0456414d887d --- /dev/null +++ b/net-misc/moonlight/Manifest @@ -0,0 +1 @@ +DIST MoonlightSrc-5.0.1.tar.gz 79820559 BLAKE2B ae67db6aab9e2104021e35b5bc4822a57a3b82a03f6b2bd1cc95e356833f163e9f6f30afc082dc8d1e4b120ef9ef7aeca2f30eec88502773020e0a6b48cbf0b1 SHA512 618d67afd4638e6c051850fc68b68fd313c9334300e35370b0b3741ec51e30da212633954b7ea47cc1f0644f5005cc06ecf861349418512919453d576f9acd60 diff --git a/net-misc/moonlight/metadata.xml b/net-misc/moonlight/metadata.xml new file mode 100644 index 000000000000..7b6d9ea7ef4f --- /dev/null +++ b/net-misc/moonlight/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>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">moonlight-stream/moonlight-qt</remote-id> + </upstream> + <use> + <flag name="cuda">Enable accelerated video rendering on NVIDIA hardware</flag> + <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.ebuild new file mode 100644 index 000000000000..8b57b5053b13 --- /dev/null +++ b/net-misc/moonlight/moonlight-5.0.1.ebuild @@ -0,0 +1,80 @@ +# 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/moonlight-stream/moonlight-qt.git" + EGIT_SUBMODULES=( '*' -libs -soundio ) + inherit git-r3 +else + SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}" +fi + +inherit qmake-utils xdg + +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" + +RDEPEND=" + dev-libs/openssl:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-libs/libglvnd + media-libs/libpulse + media-libs/libsdl2[haptic,kms,joystick,sound,video] + media-libs/opus + media-libs/sdl2-ttf + media-video/ffmpeg:=[cuda?,libdrm?,mmal?] + libdrm? ( x11-libs/libdrm ) + soundio? ( media-libs/libsoundio:= ) + vaapi? ( media-libs/libva:=[wayland?,X?] ) + vdpau? ( x11-libs/libvdpau ) + wayland? ( dev-libs/wayland ) + X? ( x11-libs/libX11 ) +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + dev-qt/qtcore + virtual/pkgconfig +" + +src_prepare() { + default + + # Force system libsoundio over bundled version. + rm -r soundio/ || die +} + +src_configure() { + eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ + $(usex cuda "" disable-cuda) \ + $(usex libdrm "" disable-libdrm) \ + $(usex mmal "" disable-mmal) \ + $(usex vaapi "" disable-libva) \ + $(usex vdpau "" disable-libvdpau) \ + $(usex wayland "" disable-wayland) \ + $(usex X "" disable-x11) \ + $(usev embedded) \ + $(usev glslow) \ + $(usev soundio) \ + " +} + +src_install() { + emake install INSTALL_ROOT="${D}" + einstalldocs +} diff --git a/net-misc/moonlight/moonlight-9999.ebuild b/net-misc/moonlight/moonlight-9999.ebuild new file mode 100644 index 000000000000..8b57b5053b13 --- /dev/null +++ b/net-misc/moonlight/moonlight-9999.ebuild @@ -0,0 +1,80 @@ +# 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/moonlight-stream/moonlight-qt.git" + EGIT_SUBMODULES=( '*' -libs -soundio ) + inherit git-r3 +else + SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}" +fi + +inherit qmake-utils xdg + +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" + +RDEPEND=" + dev-libs/openssl:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-libs/libglvnd + media-libs/libpulse + media-libs/libsdl2[haptic,kms,joystick,sound,video] + media-libs/opus + media-libs/sdl2-ttf + media-video/ffmpeg:=[cuda?,libdrm?,mmal?] + libdrm? ( x11-libs/libdrm ) + soundio? ( media-libs/libsoundio:= ) + vaapi? ( media-libs/libva:=[wayland?,X?] ) + vdpau? ( x11-libs/libvdpau ) + wayland? ( dev-libs/wayland ) + X? ( x11-libs/libX11 ) +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + dev-qt/qtcore + virtual/pkgconfig +" + +src_prepare() { + default + + # Force system libsoundio over bundled version. + rm -r soundio/ || die +} + +src_configure() { + eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ + $(usex cuda "" disable-cuda) \ + $(usex libdrm "" disable-libdrm) \ + $(usex mmal "" disable-mmal) \ + $(usex vaapi "" disable-libva) \ + $(usex vdpau "" disable-libvdpau) \ + $(usex wayland "" disable-wayland) \ + $(usex X "" disable-x11) \ + $(usev embedded) \ + $(usev glslow) \ + $(usev soundio) \ + " +} + +src_install() { + emake install INSTALL_ROOT="${D}" + einstalldocs +} diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest index e50cb037f88f..7bf67a1c1125 100644 --- a/net-misc/mosh/Manifest +++ b/net-misc/mosh/Manifest @@ -1,2 +1,2 @@ DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 -DIST mosh-1.4.0.tar.gz 399624 BLAKE2B a122b859f1c626ed231b6b1bb484eacfa7c76da0f764394e9c42596c5d89cc3a40beae3076f95b07e73aa590422b1397f17ce1583f68436dff6b74233d609839 SHA512 7ea895a3fb86e0e94ddf2d86660ca42e9a8954cebee2b2b86952e4db4475a450fdadbfe415872908494c8900f4f42a4fb861c49308d08185037d21b9359df758 +DIST mosh-1.4.0.tar.gz 393465 BLAKE2B 076b70742292dfd012aff70cc7d76eb6568ddd92600ce3f834dfdcb5064526dd3744e1672dd9fd5f172c70f501a6114b016aa8c8256a8168d2ae0a75dd8e7344 SHA512 38c11f52ff1e42965b50a22bf6de80b0fa8ebbff841d825e760abf69c788a2bf5f34e6f7fc047574d595118334eef9edf8da5520b52cdde3ac1a79d7ad70312e diff --git a/net-misc/mosh/mosh-1.3.2-r3.ebuild b/net-misc/mosh/mosh-1.3.2-r3.ebuild index bb82ed9190a5..3cda6f2836f5 100644 --- a/net-misc/mosh/mosh-1.3.2-r3.ebuild +++ b/net-misc/mosh/mosh-1.3.2-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools bash-completion-r1 +inherit autotools bash-completion-r1 flag-o-matic DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" HOMEPAGE="https://mosh.org" @@ -49,6 +49,9 @@ src_prepare() { } src_configure() { + # protobuf needs >=c++14 + append-cxxflags -std=gnu++14 + econf \ --disable-completion \ $(use_enable client) \ diff --git a/net-misc/mosh/mosh-1.4.0.ebuild b/net-misc/mosh/mosh-1.4.0.ebuild index 7f9a5b4d44c5..123086e09347 100644 --- a/net-misc/mosh/mosh-1.4.0.ebuild +++ b/net-misc/mosh/mosh-1.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools bash-completion-r1 +inherit autotools bash-completion-r1 flag-o-matic MY_P=${PN}-${PV/_rc/rc} DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" @@ -57,6 +57,9 @@ src_prepare() { src_configure() { MAKEOPTS+=" V=1" + # protobuf needs >=c++14 + append-cxxflags -std=gnu++14 + local myeconfargs=( # We install it ourselves in src_install --disable-completion diff --git a/net-misc/mptcpd/mptcpd-0.12.ebuild b/net-misc/mptcpd/mptcpd-0.12.ebuild index e97f30754fdf..919e6df2371e 100644 --- a/net-misc/mptcpd/mptcpd-0.12.ebuild +++ b/net-misc/mptcpd/mptcpd-0.12.ebuild @@ -23,7 +23,7 @@ DEPEND=" BDEPEND=" doc? ( app-doc/doxygen - app-text/pandoc + virtual/pandoc ) virtual/pkgconfig " diff --git a/net-misc/mptcpd/mptcpd-9999.ebuild b/net-misc/mptcpd/mptcpd-9999.ebuild index 2ee9b4505be0..919e6df2371e 100644 --- a/net-misc/mptcpd/mptcpd-9999.ebuild +++ b/net-misc/mptcpd/mptcpd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ DEPEND=" BDEPEND=" doc? ( app-doc/doxygen - app-text/pandoc + virtual/pandoc ) virtual/pkgconfig " diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest index aa3497937b92..77778566e09f 100644 --- a/net-misc/mrouted/Manifest +++ b/net-misc/mrouted/Manifest @@ -1,2 +1,3 @@ DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131 DIST mrouted-4.4.tar.gz 316949 BLAKE2B c768f78588ef5a321b33a6444627db0eae36dfd1798f58672392729e0ce45392fbcaad074e55eccef43dcda5d29cfee24f30aa85eded130ad8d1a6a006e62411 SHA512 cadd4cb15674c04bd976daad36ac38ec93eb9d6d0e2888cb7b4b73d2802f58beb11c122de34c1c5214a58f74dc832f35bff0820265370f4636036813ff283c09 +DIST mrouted-4.5.tar.gz 322493 BLAKE2B 1c4702d41f7bb9b6bd39cf718f28714555987b5837a858c6bb7697ad85f7a8b090bcee87d6997eecce728f3f645ac6ed41edd6bcd762b07ef92c52551ea11fba SHA512 145decbd1fba826196f719a7712bb9568080b2b5757eb80f79185537cd045ca1def36e34e93804ecaaa815607f43b58fc768b307098d90ac808ed5717a0c58d7 diff --git a/net-misc/mrouted/mrouted-4.5.ebuild b/net-misc/mrouted/mrouted-4.5.ebuild new file mode 100644 index 000000000000..82e719972457 --- /dev/null +++ b/net-misc/mrouted/mrouted-4.5.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs systemd + +DESCRIPTION="IP multicast routing daemon" +HOMEPAGE="https://troglobit.com/projects/mrouted/" +SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="Stanford GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="rsrr test" + +# Needs unshare +RESTRICT="!test? ( test ) test" + +BDEPEND=" + app-alternatives/yacc + virtual/pkgconfig +" + +src_configure() { + tc-export CC CXX + + econf \ + $(usev rsrr --enable-rsrr) \ + $(use_enable test) +} + +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" +} + +src_install() { + default + + insinto /etc + doins mrouted.conf + + newinitd "${FILESDIR}"/mrouted.rc mrouted + systemd_dounit mrouted.service +} diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest index 68080486b712..af64682c14f8 100644 --- a/net-misc/ndisc6/Manifest +++ b/net-misc/ndisc6/Manifest @@ -1 +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 diff --git a/net-misc/ndisc6/files/rdnssd.rc-2 b/net-misc/ndisc6/files/rdnssd.rc-2 new file mode 100644 index 000000000000..a3a2a45a2d1f --- /dev/null +++ b/net-misc/ndisc6/files/rdnssd.rc-2 @@ -0,0 +1,24 @@ +#!/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 +} + +command="rdnssd" +pidfile="/var/run/rdnssd.pid" +command_args="${RDNSSD_OPTS}" +command_args_foreground="-f" + +start_pre() { + checkpath -d -o nobody /var/run/rdnssd +} + +stop_post() { + if command -v resolvconf >/dev/null; then + resolvconf -f -d rdnssd + fi +} diff --git a/net-misc/ndisc6/files/resolvconf-2 b/net-misc/ndisc6/files/resolvconf-2 new file mode 100644 index 000000000000..79d69c60e7ad --- /dev/null +++ b/net-misc/ndisc6/files/resolvconf-2 @@ -0,0 +1,7 @@ +#!/bin/sh + +if command -v resolvconf >/dev/null; then + exec resolvconf -a rdnssd </var/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.6.ebuild index 41d31d5d2b5c..ca2f9f669509 100644 --- a/net-misc/ndisc6/ndisc6-1.0.6.ebuild +++ b/net-misc/ndisc6/ndisc6-1.0.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6" +DESCRIPTION="IPv6 diagnostic tools" HOMEPAGE="https://www.remlab.net/ndisc6/" SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2" diff --git a/net-misc/ndisc6/ndisc6-1.0.7.ebuild b/net-misc/ndisc6/ndisc6-1.0.7.ebuild new file mode 100644 index 000000000000..4f0384e87ae2 --- /dev/null +++ b/net-misc/ndisc6/ndisc6-1.0.7.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="IPv6 diagnostic tools" +HOMEPAGE="https://www.remlab.net/ndisc6/" +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" +IUSE="debug" + +BDEPEND="dev-lang/perl + sys-devel/gettext" + +src_configure() { + 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-2 rdnssd + newconfd "${FILESDIR}"/rdnssd.conf rdnssd + + exeinto /etc/rdnssd + newexe "${FILESDIR}"/resolvconf-2 resolvconf + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/net-misc/ndppd/ndppd-0.2.5.ebuild b/net-misc/ndppd/ndppd-0.2.5.ebuild index 3957e91d0229..8edc69925c53 100644 --- a/net-misc/ndppd/ndppd-0.2.5.ebuild +++ b/net-misc/ndppd/ndppd-0.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,9 +12,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" - src_install() { emake PREFIX=/usr DESTDIR="${D}" install insinto /etc diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest index 784257b264ae..8c1bd2bdd95b 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -1,3 +1,3 @@ -DIST netifrc-0.7.3.tar.gz 84770 BLAKE2B 075440bfd81e4dedd406d9555a18f530b07a47f9268130ebcca6d43d35e9cc5f01105a3eb0ddc084a16e17912aa10e378833b1eef1defd2fc6b22f817cd220bd SHA512 a82ac6835c15763becb5845a8c8d90dfd8d6c289ea5e00b0d7ae332d3e7ad6797f0fdcbf27bb9f44ff345c98884cdfa13210c76089585b8dd9970ded5f6236d8 -DIST netifrc-0.7.4.tar.bz2 75487 BLAKE2B 3ac3114ee4fb538c620284d02d3c1a0adc905f349ab40e7ff7065a4837113a36824b3962511160d997fc3a85701d55d569d8ac6b6b00c4665281d5b765827f76 SHA512 4934e2b7247a65847eed3a0f982c1c3996c486d7cb1cb401c29d8a6ea36eb94930a64e1cb84ff6ffdfb305e75f369fe6834062fcbb5e1d77d9f336d6592f3dff 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 diff --git a/net-misc/netifrc/netifrc-0.7.5.ebuild b/net-misc/netifrc/netifrc-0.7.5.ebuild index e31fe4b745c9..5f51fbe7ef3f 100644 --- a/net-misc/netifrc/netifrc-0.7.5.ebuild +++ b/net-misc/netifrc/netifrc-0.7.5.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Netifrc" if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" @@ -14,10 +14,10 @@ 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi -LICENSE="BSD-2" +LICENSE="BSD-2 GPL-2" SLOT="0" IUSE="+dhcp" diff --git a/net-misc/netifrc/netifrc-0.7.3.ebuild b/net-misc/netifrc/netifrc-0.7.6-r1.ebuild index d06417b6031a..54f749377303 100644 --- a/net-misc/netifrc/netifrc-0.7.3.ebuild +++ b/net-misc/netifrc/netifrc-0.7.6-r1.ebuild @@ -1,34 +1,45 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" +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 +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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -LICENSE="BSD-2" +LICENSE="BSD-2 GPL-2" SLOT="0" -IUSE="" +IUSE="+dhcp" -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions +RDEPEND=" + sys-apps/gentoo-functions >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" + dhcp? ( + || ( + net-misc/dhcpcd + net-misc/dhcp[client] + sys-apps/busybox + ) + ) +" +BDEPEND=" + kernel_linux? ( virtual/pkgconfig ) +" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + 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" @@ -39,29 +50,34 @@ src_prepare() { } src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" + MAKE_ARGS=( + PREFIX="${EPREFIX}" + UPREFIX="${EPREFIX}/usr" + UDEVDIR="${EPREFIX}$(get_udevdir)" + LIBEXECDIR="${EPREFIX}/lib/${PN}" + PF="${PF}" + ) - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all + emake "${MAKE_ARGS[@]}" all } src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install + emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" + 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' - dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.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." @@ -69,3 +85,7 @@ pkg_postinst() { elog "${EROOT}/usr/share/doc/${P}/README" fi } + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/netifrc/netifrc-0.7.3-r1.ebuild b/net-misc/netifrc/netifrc-0.7.6.ebuild index 7181e1758d64..71acc5378ef6 100644 --- a/net-misc/netifrc/netifrc-0.7.3-r1.ebuild +++ b/net-misc/netifrc/netifrc-0.7.6.ebuild @@ -1,33 +1,37 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" +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 +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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -LICENSE="BSD-2" +LICENSE="BSD-2 GPL-2" SLOT="0" IUSE="+dhcp" -RDEPEND="sys-apps/gentoo-functions +RDEPEND=" + sys-apps/gentoo-functions >=sys-apps/openrc-0.15 - dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )" + dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) ) +" BDEPEND="kernel_linux? ( virtual/pkgconfig )" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + 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" diff --git a/net-misc/netifrc/netifrc-0.7.4.ebuild b/net-misc/netifrc/netifrc-0.7.7.ebuild index d2c47b241e5c..a05e5bb7a079 100644 --- a/net-misc/netifrc/netifrc-0.7.4.ebuild +++ b/net-misc/netifrc/netifrc-0.7.7.ebuild @@ -1,33 +1,45 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" +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 +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.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" +LICENSE="BSD-2 GPL-2" SLOT="0" IUSE="+dhcp" -RDEPEND="sys-apps/gentoo-functions +RDEPEND=" + sys-apps/gentoo-functions >=sys-apps/openrc-0.15 - dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" + dhcp? ( + || ( + net-misc/dhcpcd + net-misc/dhcp[client] + sys-apps/busybox + ) + ) +" +BDEPEND=" + kernel_linux? ( virtual/pkgconfig ) +" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + 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" @@ -65,6 +77,7 @@ src_install() { 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." @@ -72,3 +85,7 @@ pkg_postinst() { elog "${EROOT}/usr/share/doc/${P}/README" fi } + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild index 67e26c8b1ccf..54f749377303 100644 --- a/net-misc/netifrc/netifrc-9999.ebuild +++ b/net-misc/netifrc/netifrc-9999.ebuild @@ -1,33 +1,45 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" +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 +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" +LICENSE="BSD-2 GPL-2" SLOT="0" IUSE="+dhcp" -RDEPEND="sys-apps/gentoo-functions +RDEPEND=" + sys-apps/gentoo-functions >=sys-apps/openrc-0.15 - dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" + dhcp? ( + || ( + net-misc/dhcpcd + net-misc/dhcp[client] + sys-apps/busybox + ) + ) +" +BDEPEND=" + kernel_linux? ( virtual/pkgconfig ) +" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + 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" @@ -65,6 +77,7 @@ src_install() { 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." @@ -72,3 +85,7 @@ pkg_postinst() { elog "${EROOT}/usr/share/doc/${P}/README" fi } + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r5.ebuild index 3ecbe4ece85c..891003317d46 100644 --- a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild +++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs flag-o-matic -DESCRIPTION="Netkit - bootparamd" +DESCRIPTION="Netkit - bootparamd: Net-boot support daemon" HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz" @@ -15,21 +15,20 @@ KEYWORDS="amd64 ~hppa ~mips ppc sparc x86" IUSE="+libtirpc" DEPEND=" - !<=net-misc/netkit-bootpd-0.17-r2 libtirpc? ( net-libs/rpcsvc-proto net-libs/libtirpc ) !libtirpc? ( sys-libs/glibc[rpc(-)] ) " RDEPEND=${DEPEND} -src_prepare() { - eapply "${FILESDIR}"/0.17-jumpstart.patch - eapply "${FILESDIR}"/0.17-libtirpc.patch +PATCHES=( + "${FILESDIR}"/0.17-jumpstart.patch + "${FILESDIR}"/0.17-libtirpc.patch +) +src_prepare() { # don't reset LDFLAGS (bug #335457), manpages into /usr/share/man sed -i -e '/^LDFLAGS=/d ; /MANDIR=/s:man:share/man:' configure || die - sed -i -e 's:install -s:install:' rpc.bootparamd/Makefile || die - default } diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild index 6c1adb7f6586..32182eb67888 100644 --- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild +++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild @@ -12,7 +12,9 @@ SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/finger/bsd-finger-${PV}.ta LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="" +IUSE="selinux" + +RDEPEND="selinux? ( sec-policy/selinux-finger )" S=${WORKDIR}/bsd-finger-${PV} diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild index c115df77f660..b418b6da1309 100644 --- a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild +++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="pam" RDEPEND=" diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild new file mode 100644 index 000000000000..1832ecd0e9ab --- /dev/null +++ b/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public |