diff options
Diffstat (limited to 'net-misc')
594 files changed, 14680 insertions, 9247 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/aria2-1.36.0-r1.ebuild b/net-misc/aria2/aria2-1.36.0-r1.ebuild index 3b2ecbe4c67d..39236f9eb903 100644 --- a/net-misc/aria2/aria2-1.36.0-r1.ebuild +++ b/net-misc/aria2/aria2-1.36.0-r1.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 a46c6e4c7b08..ae3e82f39208 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -1,11 +1,7 @@ -DIST asterisk-16.26.1.tar.gz 28001023 BLAKE2B d426566827bd3466720f94eed04a654edac3566fd7cdd77e0a1596d4536b5612e24d48e8dc6891a89f2f63feef938a5c1fd6898c5a5efcd56d1a11500fa9e00b SHA512 cc8c72c8167210bc506ee224f83208d1c0f983a9e061465a25b133fce526fdf56693a9e5cbb1f65d13cb9c9515619663748b332c704d17e21d90ef37a697948a -DIST asterisk-16.27.0.tar.gz 28014649 BLAKE2B 785650674bb2762ab898118cf49aa2cddde60f7e42df0a882751e36053f3cfb7de94475acf6bd484a1998c04b1edd1dca2ee4e9895bf9e411d9b09f91f7a4743 SHA512 ae016a79f8c38c5ae0069d0fa7434a564c8a72efa69135ce17dc7febf220a189ef47aba064ab39a2f49be0f7d5138b36e29f2d004ba51aa3724708efce645d1e -DIST asterisk-16.29.0.tar.gz 28105953 BLAKE2B a17dbbb1f717ba6d03da71f761f063a5b95e71f50378cf6bc3abdbaf1bcbac462be1b051c1fe1812a6f2c9082c9928a85ea60346dae742149f230ab8ec6c997f SHA512 7a83778c406dbb7d1e0eebc4eb9f51c841fc5fc987445014e685ade9e143bb81e2fb4870a6ddaf3e4721e75bbd5d6468c9d896616bb1411bad84ac6ca510d69b -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.13.0.tar.gz 28127627 BLAKE2B 24e030d5226fb3cad8e2fedce951fab047afbdf5556821bc246acc3731f25398d47eac7b7e0a97f019d9e97cc6f8990967019db62845f21f3b3459a2c3fced02 SHA512 085dfcf15f99d7d96b49a720156678c4de5a88b55375257a9a1234f9dd83f21eed1685d4177dae5978272608e690582367c6c34fdef91bbad54299594d0ce9df -DIST asterisk-18.15.0.tar.gz 28219845 BLAKE2B 712e14bcc2f24b645c39fdfbae19771134e065a9f83187e6578aeb70686a19e66faef4fb700089379274b7fbe9f99cdeec92761fa734926b3bb5db2f02cad8ff SHA512 acf202246e149ddc44ffb688a834455420d6ab53989560568cdccf0da121821ee946c45085c964b52632e24109741908d3f4c00ca00d0b4a9402c128becd9e28 -DIST asterisk-18.15.1.tar.gz 28216621 BLAKE2B f354a49111b22fe37caf72ba552d8ecc3dec17605771d153d05b01d7e3017c6a50087309c37078d32b6dc375bbb14dfee89356eb46355f47374a08d5427179a1 SHA512 c8bee50023b137d95b02ce770c9983fc3d8cfc10f7d714ab658fb118813ccf29d97b0ada64bfd2795ce3a0f9ecfe82bd85ab3abefe9c8cc83454cd50ff8e5cf5 -DIST asterisk-18.16.0.tar.gz 28278347 BLAKE2B 3e588d3ff6b14eb5334b0c2cca07ee026b9db20e83b07d0e21b1ec2d3fed8779c4e188248d151d9ac6e46da96e0e6a5673429394c84e0d445457d84f1ecc8eee SHA512 50cebb63e270a802a14e43c07ed1b9bf6b989a6a608c44d5aa3f415e66d4306523e5f916be21d6cef260e35fd097d2dc25ec850987dc407df873446c784f737a -DIST asterisk-20.0.1.tar.gz 27983541 BLAKE2B a7d5f2b4d7721c66bb04ab395f97432791824b8e1136b224a03e52dd78d600f358278ad1a7dd2ec8684d5b850c3e65d5e14b98f7ecc3cee2ef93c4287e541dd3 SHA512 91e4835fd01233c81af0120d511522881af69e65abcc62a9e2241c89357a970b94901dfd7a7fcdbeba59eb3aa4c27f95735f2a10891f1ad6f2c36bb3244423e4 -DIST asterisk-20.1.0.tar.gz 28043611 BLAKE2B a9476afc1764b05193625724707077c92e975b8c78d89b9ed41a4b123d3b5d04c90f1e09d1cd20c4181ca1ea7d6e3d9f81521676540c7bfaa806ba51b462371f SHA512 e31652b37f918b1be0c395122b1013576a551c962c056963f87c2fce3561689b8a565e9b74e3fff0394879a505532d55d175ef9860dd9589323074b51149aaf6 +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.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.26.1.ebuild b/net-misc/asterisk/asterisk-16.26.1.ebuild deleted file mode 100644 index 92057c69d284..000000000000 --- a/net-misc/asterisk/asterisk-16.26.1.ebuild +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="https://www.asterisk.org/" -SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -IUSE_VOICEMAIL_STORAGE=( - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - >=dev-libs/jansson-2.11:= - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - sys-apps/util-linux - sys-libs/zlib - virtual/libcrypt:= - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - blocks? ( sys-libs/blocksruntime ) - cluster? ( sys-cluster/corosync ) - codec2? ( media-libs/codec2:= ) - curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) - freetds? ( dev-db/freetds ) - gtalk? ( dev-libs/iksemel ) - http? ( dev-libs/gmime:2.6 ) - iconv? ( virtual/libiconv ) - ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.9:= ) - portaudio? ( media-libs/portaudio ) - postgres? ( dev-db/postgresql:* ) - radius? ( net-dialup/freeradius-client ) - snmp? ( net-analyzer/net-snmp:= ) - span? ( media-libs/spandsp ) - speex? ( - media-libs/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - dev-libs/openssl:0= - ) - systemd? ( sys-apps/systemd ) - !systemd? ( !sys-apps/systemd ) - unbound? ( net-dns/unbound ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( virtual/imap-c-client ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="dev-libs/libxml2:2 - virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -_make_args=( - "NOISY_BUILD=yes" - "ASTDBDIR=\$(ASTDATADIR)/astdb" - "ASTVARRUNDIR=/run/asterisk" - "ASTCACHEDIR=/var/cache/asterisk" - "OPTIMIZE=" - "DEBUG=" - "DESTDIR=${D}" - "CONFIG_SRC=configs/samples" - "CONFIG_EXTEN=.sample" -) - -pkg_pretend() { - CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users - have reported that this module dropped critical SIP packets in their deployments. You - may want to disable it if you see such problems." - check_extra_config - - [[ "${MERGE_TYPE}" == binary ]] && return - - if tc-is-clang; then - use blocks || die "CC=clang requires USE=blocks" - else - use blocks && die "USE=blocks can only be used with CC=clang" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ - AC_CONFIG_SUBDIRS=menuselect eautoreconf -} - -src_configure() { - local vmst - local copt cstate - - econf \ - SED=sed \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - --without-jansson-bundled \ - --without-pjproject-bundled \ - $(use_with caps cap) \ - $(use_with codec2) \ - $(use_with lua lua) \ - $(use_with http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) \ - $(use_with unbound) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(use "$1" && echo enable || echo disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake "${_make_args[@]}" menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # Disable conversion tools (which fails to compile in some cases). - _menuselect --disable astdb2bdb menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select codec2 codec_codec2 - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select deprecated app_macro - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do - if use "${vmst#+}"; then - _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do - _menuselect --enable "${o}" menuselect.makeopts - done - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do - cstate=--enable - [[ "${copt}" == -* ]] && cstate=--disable - ebegin "Custom option ${copt#[-+]} ${cstate:2}d" - _menuselect ${cstate} "${copt#[-+]}" - eend $? - done - fi -} - -src_compile() { - emake "${_make_args[@]}" -} - -src_install() { - local d - - dodir "/usr/$(get_libdir)/pkgconfig" - - diropts -m 0750 -o root -g asterisk - dodir /etc/asterisk - - emake "${_make_args[@]}" install install-configs - - fowners asterisk: /var/lib/asterisk/astdb - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - 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 - - # install the upgrade documentation - dodoc UPGRADE* BUGS CREDITS - - # 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. - while read d <&3; do - keepdir "${d#${ED}}" - done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") -} - -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" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - fi - - if use deprecated; then - ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." - ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" - ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" - fi - - if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then - ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" - ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" - ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" - ewarn "steps to migrate:" - ewarn "1. /etc/init.d/asterisk stop" - ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" - ewarn "3. /etc/init.d/asterisk start" - ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." - fi -} diff --git a/net-misc/asterisk/asterisk-16.27.0.ebuild b/net-misc/asterisk/asterisk-16.27.0.ebuild deleted file mode 100644 index 357286071693..000000000000 --- a/net-misc/asterisk/asterisk-16.27.0.ebuild +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="https://www.asterisk.org/" -SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -IUSE_VOICEMAIL_STORAGE=( - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - >=dev-libs/jansson-2.11:= - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - sys-apps/util-linux - sys-libs/zlib - virtual/libcrypt:= - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - blocks? ( sys-libs/blocksruntime ) - cluster? ( sys-cluster/corosync ) - codec2? ( media-libs/codec2:= ) - curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) - freetds? ( dev-db/freetds ) - gtalk? ( dev-libs/iksemel ) - http? ( dev-libs/gmime:2.6 ) - iconv? ( virtual/libiconv ) - ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.9:= ) - portaudio? ( media-libs/portaudio ) - postgres? ( dev-db/postgresql:* ) - radius? ( net-dialup/freeradius-client ) - snmp? ( net-analyzer/net-snmp:= ) - span? ( media-libs/spandsp ) - speex? ( - media-libs/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - dev-libs/openssl:0= - ) - systemd? ( sys-apps/systemd ) - !systemd? ( !sys-apps/systemd ) - unbound? ( net-dns/unbound ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( virtual/imap-c-client ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="dev-libs/libxml2:2 - virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -_make_args=( - "NOISY_BUILD=yes" - "ASTDBDIR=\$(ASTDATADIR)/astdb" - "ASTVARRUNDIR=/run/asterisk" - "ASTCACHEDIR=/var/cache/asterisk" - "OPTIMIZE=" - "DEBUG=" - "DESTDIR=${D}" - "CONFIG_SRC=configs/samples" - "CONFIG_EXTEN=.sample" -) - -pkg_pretend() { - CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users - have reported that this module dropped critical SIP packets in their deployments. You - may want to disable it if you see such problems." - check_extra_config - - [[ "${MERGE_TYPE}" == binary ]] && return - - if tc-is-clang; then - use blocks || die "CC=clang requires USE=blocks" - else - use blocks && die "USE=blocks can only be used with CC=clang" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ - AC_CONFIG_SUBDIRS=menuselect eautoreconf -} - -src_configure() { - local vmst - local copt cstate - - econf \ - SED=sed \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - --without-jansson-bundled \ - --without-pjproject-bundled \ - $(use_with caps cap) \ - $(use_with codec2) \ - $(use_with lua lua) \ - $(use_with http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) \ - $(use_with unbound) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(use "$1" && echo enable || echo disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake "${_make_args[@]}" menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # Disable conversion tools (which fails to compile in some cases). - _menuselect --disable astdb2bdb menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select codec2 codec_codec2 - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select deprecated app_macro - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do - if use "${vmst#+}"; then - _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do - _menuselect --enable "${o}" menuselect.makeopts - done - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do - cstate=--enable - [[ "${copt}" == -* ]] && cstate=--disable - ebegin "Custom option ${copt#[-+]} ${cstate:2}d" - _menuselect ${cstate} "${copt#[-+]}" - eend $? - done - fi -} - -src_compile() { - emake "${_make_args[@]}" -} - -src_install() { - local d - - dodir "/usr/$(get_libdir)/pkgconfig" - - diropts -m 0750 -o root -g asterisk - dodir /etc/asterisk - - emake "${_make_args[@]}" install install-configs - - fowners asterisk: /var/lib/asterisk/astdb - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - 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 - - # install the upgrade documentation - dodoc UPGRADE* BUGS CREDITS - - # 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. - while read d <&3; do - keepdir "${d#${ED}}" - done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") -} - -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" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - fi - - if use deprecated; then - ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." - ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" - ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" - fi - - if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then - ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" - ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" - ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" - ewarn "steps to migrate:" - ewarn "1. /etc/init.d/asterisk stop" - ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" - ewarn "3. /etc/init.d/asterisk start" - ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." - fi -} diff --git a/net-misc/asterisk/asterisk-16.29.0.ebuild b/net-misc/asterisk/asterisk-16.29.0.ebuild deleted file mode 100644 index 6d68818bc88a..000000000000 --- a/net-misc/asterisk/asterisk-16.29.0.ebuild +++ /dev/null @@ -1,377 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="https://www.asterisk.org/" -SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -IUSE_VOICEMAIL_STORAGE=( - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - >=dev-libs/jansson-2.11:= - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - sys-apps/util-linux - sys-libs/zlib - virtual/libcrypt:= - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - blocks? ( sys-libs/blocksruntime ) - cluster? ( sys-cluster/corosync ) - codec2? ( media-libs/codec2:= ) - curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) - freetds? ( dev-db/freetds ) - gtalk? ( dev-libs/iksemel ) - http? ( dev-libs/gmime:2.6 ) - iconv? ( virtual/libiconv ) - ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.9:= ) - portaudio? ( media-libs/portaudio ) - postgres? ( dev-db/postgresql:* ) - radius? ( net-dialup/freeradius-client ) - snmp? ( net-analyzer/net-snmp:= ) - span? ( media-libs/spandsp ) - speex? ( - media-libs/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - dev-libs/openssl:0= - ) - systemd? ( sys-apps/systemd ) - !systemd? ( !sys-apps/systemd ) - unbound? ( net-dns/unbound ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( net-libs/c-client[ssl=] ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="dev-libs/libxml2:2 - virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -_make_args=( - "NOISY_BUILD=yes" - "ASTDBDIR=\$(ASTDATADIR)/astdb" - "ASTVARRUNDIR=/run/asterisk" - "ASTCACHEDIR=/var/cache/asterisk" - "OPTIMIZE=" - "DEBUG=" - "DESTDIR=${D}" - "CONFIG_SRC=configs/samples" - "CONFIG_EXTEN=.sample" -) - -pkg_pretend() { - CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users - have reported that this module dropped critical SIP packets in their deployments. You - may want to disable it if you see such problems." - check_extra_config - - [[ "${MERGE_TYPE}" == binary ]] && return - - if tc-is-clang; then - use blocks || die "CC=clang requires USE=blocks" - else - use blocks && die "USE=blocks can only be used with CC=clang" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ - AC_CONFIG_SUBDIRS=menuselect eautoreconf -} - -src_configure() { - local vmst - local copt cstate - - econf \ - SED=sed \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - --without-jansson-bundled \ - --without-pjproject-bundled \ - $(use_with caps cap) \ - $(use_with codec2) \ - $(use_with lua lua) \ - $(use_with http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) \ - $(use_with unbound) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(use "$1" && echo enable || echo disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake "${_make_args[@]}" menuselect.makeopts - - # Disable astdb2* tools. We've been on sqlite long enough - # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) - _menuselect --disable astdb2sqlite3 menuselect.makeopts - _menuselect --disable astdb2bdb menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # Disable conversion tools (which fails to compile in some cases). - _menuselect --disable astdb2bdb menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select codec2 codec_codec2 - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select deprecated app_macro - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do - if use "${vmst#+}"; then - _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do - _menuselect --enable "${o}" menuselect.makeopts - done - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do - cstate=--enable - [[ "${copt}" == -* ]] && cstate=--disable - ebegin "Custom option ${copt#[-+]} ${cstate:2}d" - _menuselect ${cstate} "${copt#[-+]}" - eend $? - done - fi -} - -src_compile() { - emake "${_make_args[@]}" -} - -src_install() { - local d - - dodir "/usr/$(get_libdir)/pkgconfig" - - diropts -m 0750 -o root -g asterisk - dodir /etc/asterisk - - emake "${_make_args[@]}" install install-configs - - fowners asterisk: /var/lib/asterisk/astdb - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - 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 - - # install the upgrade documentation - dodoc UPGRADE* BUGS CREDITS - - # 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. - while read d <&3; do - keepdir "${d#${ED}}" - done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") -} - -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" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - fi - - if use deprecated; then - ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." - ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" - ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" - fi - - if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then - ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" - ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" - ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" - ewarn "steps to migrate:" - ewarn "1. /etc/init.d/asterisk stop" - ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" - ewarn "3. /etc/init.d/asterisk start" - ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." - fi -} diff --git a/net-misc/asterisk/asterisk-16.30.0.ebuild b/net-misc/asterisk/asterisk-16.30.0.ebuild index a984cb830e26..a684412a9be4 100644 --- a/net-misc/asterisk/asterisk-16.30.0.ebuild +++ b/net-misc/asterisk/asterisk-16.30.0.ebuild @@ -12,7 +12,7 @@ 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_file diff --git a/net-misc/asterisk/asterisk-16.29.1.ebuild b/net-misc/asterisk/asterisk-16.30.1.ebuild index e3865affb104..b2a0d086ac1e 100644 --- a/net-misc/asterisk/asterisk-16.29.1.ebuild +++ b/net-misc/asterisk/asterisk-16.30.1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single 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_file @@ -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.13.0.ebuild b/net-misc/asterisk/asterisk-18.13.0.ebuild deleted file mode 100644 index 4294a967beb9..000000000000 --- a/net-misc/asterisk/asterisk-18.13.0.ebuild +++ /dev/null @@ -1,370 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="https://www.asterisk.org/" -SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -IUSE_VOICEMAIL_STORAGE=( - voicemail_storage_odbc - voicemail_storage_imap -) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - >=dev-libs/jansson-2.11:= - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - sys-apps/util-linux - sys-libs/zlib - virtual/libcrypt:= - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - blocks? ( sys-libs/blocksruntime ) - cluster? ( sys-cluster/corosync ) - codec2? ( media-libs/codec2:= ) - curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) - freetds? ( dev-db/freetds ) - gtalk? ( dev-libs/iksemel ) - http? ( dev-libs/gmime:2.6 ) - iconv? ( virtual/libiconv ) - ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.12:= ) - portaudio? ( media-libs/portaudio ) - postgres? ( dev-db/postgresql:* ) - radius? ( net-dialup/freeradius-client ) - snmp? ( net-analyzer/net-snmp:= ) - span? ( media-libs/spandsp ) - speex? ( - media-libs/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - dev-libs/openssl:0= - ) - systemd? ( sys-apps/systemd ) - !systemd? ( !sys-apps/systemd ) - unbound? ( net-dns/unbound ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( virtual/imap-c-client ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="dev-libs/libxml2:2 - virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -_make_args=( - "NOISY_BUILD=yes" - "ASTDBDIR=\$(ASTDATADIR)/astdb" - "ASTVARRUNDIR=/run/asterisk" - "ASTCACHEDIR=/var/cache/asterisk" - "OPTIMIZE=" - "DEBUG=" - "DESTDIR=${D}" - "CONFIG_SRC=configs/samples" - "CONFIG_EXTEN=.sample" -) - -pkg_pretend() { - CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users - have reported that this module dropped critical SIP packets in their deployments. You - may want to disable it if you see such problems." - check_extra_config - - [[ "${MERGE_TYPE}" == binary ]] && return - - if tc-is-clang; then - use blocks || die "CC=clang requires USE=blocks" - else - use blocks && die "USE=blocks can only be used with CC=clang" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ - AC_CONFIG_SUBDIRS=menuselect eautoreconf -} - -src_configure() { - local vmst - local copt cstate - - econf \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - --without-jansson-bundled \ - --without-pjproject-bundled \ - $(use_with caps cap) \ - $(use_with codec2) \ - $(use_with lua lua) \ - $(use_with http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) \ - $(use_with unbound) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(use "$1" && echo enable || echo disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake "${_make_args[@]}" menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # Disable conversion tools (which fails to compile in some cases). - _menuselect --disable astdb2bdb menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select codec2 codec_codec2 - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select deprecated app_macro - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - _menuselect --enable app_voicemail menuselect.makeopts - for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do - if use "${vmst#+}"; then - _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do - _menuselect --enable "${o}" menuselect.makeopts - done - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do - cstate=--enable - [[ "${copt}" == -* ]] && cstate=--disable - ebegin "Custom option ${copt#[-+]} ${cstate:2}d" - _menuselect ${cstate} "${copt#[-+]}" - eend $? - done - fi -} - -src_compile() { - emake "${_make_args[@]}" -} - -src_install() { - local d - - dodir "/usr/$(get_libdir)/pkgconfig" - - diropts -m 0750 -o root -g asterisk - dodir /etc/asterisk - - emake "${_make_args[@]}" install install-headers install-configs - - fowners asterisk: /var/lib/asterisk/astdb - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - 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 - - # install the upgrade documentation - dodoc UPGRADE* BUGS CREDITS - - # 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. - while read d <&3; do - keepdir "${d#${ED}}" - done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") -} - -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" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - fi - - if use deprecated; then - ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." - ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" - ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" - fi - - if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then - ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" - ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" - ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" - ewarn "steps to migrate:" - ewarn "1. /etc/init.d/asterisk stop" - ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" - ewarn "3. /etc/init.d/asterisk start" - ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." - fi -} diff --git a/net-misc/asterisk/asterisk-18.16.0.ebuild b/net-misc/asterisk/asterisk-18.17.0.ebuild index 3aeec65e1492..015737c8a097 100644 --- a/net-misc/asterisk/asterisk-18.16.0.ebuild +++ b/net-misc/asterisk/asterisk-18.17.0.ebuild @@ -12,7 +12,7 @@ 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 diff --git a/net-misc/asterisk/asterisk-18.15.1.ebuild b/net-misc/asterisk/asterisk-18.18.0.ebuild index 1b7dcbf17867..b2e2fa41bd6b 100644 --- a/net-misc/asterisk/asterisk-18.15.1.ebuild +++ b/net-misc/asterisk/asterisk-18.18.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 @@ -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 @@ -115,6 +115,7 @@ _make_args=( "DESTDIR=${D}" "CONFIG_SRC=configs/samples" "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" ) pkg_pretend() { @@ -311,8 +312,8 @@ 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 + 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 diff --git a/net-misc/asterisk/asterisk-18.15.0.ebuild b/net-misc/asterisk/asterisk-18.18.1.ebuild index 6f67640cb4aa..3f4247463485 100644 --- a/net-misc/asterisk/asterisk-18.15.0.ebuild +++ b/net-misc/asterisk/asterisk-18.18.1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single 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 @@ -26,7 +26,8 @@ REQUIRED_USE="gtalk? ( xmpp ) " PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch" ) DEPEND="acct-user/asterisk @@ -98,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" @@ -114,6 +116,7 @@ _make_args=( "DESTDIR=${D}" "CONFIG_SRC=configs/samples" "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" ) pkg_pretend() { @@ -310,14 +313,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 @@ -327,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. @@ -341,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-20.1.0.ebuild b/net-misc/asterisk/asterisk-20.3.0.ebuild index 78b8025b2537..e4e12e12fba8 100644 --- a/net-misc/asterisk/asterisk-20.1.0.ebuild +++ b/net-misc/asterisk/asterisk-20.3.0.ebuild @@ -27,6 +27,7 @@ REQUIRED_USE="gtalk? ( xmpp ) PATCHES=( "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch" ) DEPEND="acct-user/asterisk @@ -113,6 +114,7 @@ _make_args=( "DESTDIR=${D}" "CONFIG_SRC=configs/samples" "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" ) pkg_pretend() { @@ -306,8 +308,8 @@ 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 + 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 diff --git a/net-misc/asterisk/asterisk-20.0.1.ebuild b/net-misc/asterisk/asterisk-20.3.1.ebuild index 44307ed35aed..080afa1dc8ea 100644 --- a/net-misc/asterisk/asterisk-20.0.1.ebuild +++ b/net-misc/asterisk/asterisk-20.3.1.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=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/" @@ -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 @@ -98,6 +98,7 @@ RDEPEND="${DEPEND} net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" BDEPEND="dev-libs/libxml2:2 virtual/pkgconfig" @@ -114,6 +115,7 @@ _make_args=( "DESTDIR=${D}" "CONFIG_SRC=configs/samples" "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" ) pkg_pretend() { @@ -307,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 @@ -324,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. @@ -338,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/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch b/net-misc/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch new file mode 100644 index 000000000000..540888368223 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch @@ -0,0 +1,71 @@ +From 79468a12c3533720c938731a8b7728ba4ff5a326 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Wed, 10 May 2023 23:13:17 +0200 +Subject: [PATCH] configure: fix test code to match gethostbyname_r prototype. + +This enables the test to work with CC=clang. + +Without this the test for 6 args would fail with: + +utils.c:99:12: error: static declaration of 'gethostbyname_r' follows non-static declaration +static int gethostbyname_r (const char *name, struct hostent *ret, char *buf, + ^ +/usr/include/netdb.h:177:12: note: previous declaration is here +extern int gethostbyname_r (const char *__restrict __name, + ^ + +Fixing the expected return type to int sorts this out. + +Signed-off-by: Jaco Kroon <jaco@uls.co.za> +--- + configure | 4 ++-- + configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index bf78e2aade..b046dfc755 100755 +--- a/configure ++++ b/configure +@@ -17537,7 +17537,7 @@ $as_echo_n "checking for gethostbyname_r with 6 arguments... " >&6; } + int + main () + { +-struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL); ++int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL); + ; + return 0; + } +@@ -17565,7 +17565,7 @@ $as_echo_n "checking for gethostbyname_r with 5 arguments... " >&6; } + int + main () + { +-struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL); ++int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL); + ; + return 0; + } +diff --git a/configure.ac b/configure.ac +index ab6632beac..aeec352054 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -962,7 +962,7 @@ if test "x$have_gethostbyname_r_public_declaration" = "xyes"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include <stdlib.h> + #include <netdb.h>], +- [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);])], ++ [int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);])], + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_GETHOSTBYNAME_R_6], 1, [Define to 1 if your system has gethostbyname_r with 6 arguments.]), + AC_MSG_RESULT(no) +@@ -972,7 +972,7 @@ if test "x$have_gethostbyname_r_public_declaration" = "xyes"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include <stdlib.h> + #include <netdb.h>], +- [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);])], ++ [int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);])], + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_GETHOSTBYNAME_R_5], 1, [Define to 1 if your system has gethostbyname_r with 5 arguments.]), + AC_MSG_RESULT(no) +-- +2.39.3 + diff --git a/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.1 b/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.1 new file mode 100644 index 000000000000..1a85eccf9b25 --- /dev/null +++ b/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.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/files/initd-18.17.1-20.2.1 b/net-misc/asterisk/files/initd-18.17.1-20.2.1 new file mode 100644 index 000000000000..7d48b36456bf --- /dev/null +++ b/net-misc/asterisk/files/initd-18.17.1-20.2.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/autossh/autossh-1.4g.ebuild b/net-misc/autossh/autossh-1.4g-r1.ebuild index 57c7452cb478..4a227c8620c6 100644 --- a/net-misc/autossh/autossh-1.4g.ebuild +++ b/net-misc/autossh/autossh-1.4g-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 @@ -11,7 +11,7 @@ LICENSE="BSD" KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" -RDEPEND="net-misc/openssh" +RDEPEND="virtual/openssh" src_install() { dobin autossh diff --git a/net-misc/autossh/autossh-1.4g-r2.ebuild b/net-misc/autossh/autossh-1.4g-r2.ebuild new file mode 100644 index 000000000000..d792505d9987 --- /dev/null +++ b/net-misc/autossh/autossh-1.4g-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Automatically restart SSH sessions and tunnels" +HOMEPAGE="https://www.harding.motd.ca/autossh/" +SRC_URI="https://www.harding.motd.ca/${PN}/${P}.tgz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +SLOT="0" + +DEPEND="dev-libs/libbsd" +RDEPEND="${DEPEND} + virtual/openssh" + +PATCHES=( + "${FILESDIR}"/autossh-1.4g-libbsd.patch + "${FILESDIR}"/autossh-1.4g-printf.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + dobin autossh + dodoc CHANGES README autossh.host rscreen + doman autossh.1 +} diff --git a/net-misc/autossh/files/autossh-1.4g-libbsd.patch b/net-misc/autossh/files/autossh-1.4g-libbsd.patch new file mode 100644 index 000000000000..09292b8b096d --- /dev/null +++ b/net-misc/autossh/files/autossh-1.4g-libbsd.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index 4bb9380..8c15089 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,9 +110,10 @@ AC_FUNC_SELECT_ARGTYPES + AC_FUNC_STRFTIME + AC_FUNC_VPRINTF + AC_CHECK_FUNCS([alarm daemon dup2 gethostbyname gettimeofday memmove]) +-AC_CHECK_FUNCS([memset poll select setproctitle socket strchr strerror]) ++AC_CHECK_FUNCS([memset poll select socket strchr strerror]) + AC_CHECK_FUNCS([strncasecmp strtoul uname vsyslog]) + ++AC_CHECK_LIB(bsd, setproctitle) + AC_CHECK_LIB(nsl, gethostbyname) + AC_CHECK_LIB(socket, connect) + +diff --git a/autossh.c b/autossh.c +index e2e3b84..9d3c1bf 100644 +--- a/autossh.c ++++ b/autossh.c +@@ -52,6 +52,7 @@ typedef int32_t socklen_t; + #include <syslog.h> + #include <time.h> + #include <errno.h> ++#include <bsd/unistd.h> + + #ifndef HAVE_POLL + # ifdef HAVE_SELECT diff --git a/net-misc/autossh/files/autossh-1.4g-printf.patch b/net-misc/autossh/files/autossh-1.4g-printf.patch new file mode 100644 index 000000000000..362232395dd8 --- /dev/null +++ b/net-misc/autossh/files/autossh-1.4g-printf.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +index 4bb9380..38e2cf6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -133,7 +134,11 @@ AC_CHECK_LIB(socket, connect) + # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [ + AC_TRY_LINK([], +- [ extern char *__progname; printf("%s", __progname); ], ++ [ ++ #include <stdio.h>; ++ extern char *__progname; ++ printf("%s", __progname); ++ ], + [ ac_cv_libc_defines___progname="yes" ], + [ ac_cv_libc_defines___progname="no" ] + ) diff --git a/net-misc/axel/metadata.xml b/net-misc/axel/metadata.xml index c6cbe71355c8..05ac5e3edf7c 100644 --- a/net-misc/axel/metadata.xml +++ b/net-misc/axel/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 --> <upstream> <remote-id type="github">axel-download-accelerator/axel</remote-id> </upstream> 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/bfgminer/bfgminer-5.5.0-r2.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r3.ebuild index 9e83d64682d7..b2d490f666fe 100644 --- a/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild +++ b/net-misc/bfgminer/bfgminer-5.5.0-r3.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=6 @@ -83,7 +83,7 @@ DEPEND=" dev-libs/hidapi ) proxy_getwork? ( - net-libs/libmicrohttpd + net-libs/libmicrohttpd:= ) proxy_stratum? ( dev-libs/libevent diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml index a09139478be5..f3445a9a70b0 100644 --- a/net-misc/cadaver/metadata.xml +++ b/net-misc/cadaver/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> - <maintainer type="person" proxied="proxy"> - <email>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">notroj/cadaver</remote-id> </upstream> diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index c7c58771f45d..da9d29c4ac09 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,2 +1,4 @@ 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-r4.ebuild b/net-misc/chrony/chrony-4.3-r5.ebuild index decff6e1797f..1bbf83b000a6 100644 --- a/net-misc/chrony/chrony-4.3-r4.ebuild +++ b/net-misc/chrony/chrony-4.3-r5.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86" fi fi @@ -44,6 +44,7 @@ DEPEND=" acct-user/ntp sys-libs/libcap ) + libtomcrypt? ( dev-libs/libtomcrypt:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) diff --git a/net-misc/chrony/chrony-4.3-r2.ebuild b/net-misc/chrony/chrony-4.4.ebuild index 858662d459ce..0323ccfde089 100644 --- a/net-misc/chrony/chrony-4.3-r2.ebuild +++ b/net-misc/chrony/chrony-4.4.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,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 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 @@ -27,7 +27,7 @@ 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" +IUSE="+caps +cmdmon debug html 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 ) ) @@ -44,6 +44,7 @@ DEPEND=" acct-user/ntp sys-libs/libcap ) + libtomcrypt? ( dev-libs/libtomcrypt:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) @@ -55,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? ( @@ -80,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() { @@ -119,7 +117,6 @@ src_configure() { $(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 @@ -166,6 +163,9 @@ src_compile() { src_install() { default + # Compatibility with other distributions who install to /etc/chrony.conf (bug #835461) + dosym -r /etc/chrony/chrony.conf /etc/chrony.conf + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd newconfd "${T}"/chronyd.conf chronyd diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 64fe1397809a..2f8dfbd335cc 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 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 @@ -44,6 +44,7 @@ DEPEND=" acct-user/ntp sys-libs/libcap ) + libtomcrypt? ( dev-libs/libtomcrypt:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) @@ -78,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/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/cmst/cmst-2023.03.14.ebuild b/net-misc/cmst/cmst-2023.03.14.ebuild index 7c4125bead9e..da5e9cf339c6 100644 --- a/net-misc/cmst/cmst-2023.03.14.ebuild +++ b/net-misc/cmst/cmst-2023.03.14.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="dev-qt/qtcore:5 diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index 0f851994e08c..f633d07aa562 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -1,3 +1,3 @@ -DIST connman-82ce08135a14ef4ab5b5b60f1e426a26b9fc72fc.tar.gz 742300 BLAKE2B 90d6332ce6ee29ee313b6e83cb4c77982bfff02bf358cf066df7a77cfacfaaeb6b06315f7452a86b33a7351adb7883a608020010834604f94ae4671d72e268b4 SHA512 35c95b9544ee204bf57df3ff4258f3454a3d34e4fff2fe19d74df2fead8956c919fe5ecde7554b22c32504a32b15adb5c0d858457acdf21f4d2df766d4a0de4b +DIST connman-1.42.tar.gz 743965 BLAKE2B 1d9eeb4c917978df502de684128a3464bbc7f3960878842a3ac27295dc5d049641cd5218a9542055b5d9ab2b6114fb773fc8a173f54dca3afe37109ab58bde35 SHA512 98ede28854e5948c8b67c5ba03b156ed9966e9fcda2d39168062873b194a192d12af885c63d9a2cb0b7b5b882b69fdbb0e09c4eb0c6772a76db06de7b9e363d7 +DIST connman-24180d1243bf005c721be6f9d8d6da67bb669c55.tar.gz 744924 BLAKE2B 87b1b1dc09c483fb69d75c5c43b89492b32d0e0357fb25208c369a446f85641e5e364ce3bd21f0e43c95e06a8578f28dea4b26decb8a0ebf591bf4c44616645f SHA512 dd6eb7684aeac7a07c504de018b6efda2ceab4ff3b66e4942bf8d8a37e1feee609a63a5b9fa73ce3b3582b6949ea3399f8740bcb7dc39885d239610d3b280d0c DIST connman-9971144ae862e83f1f5d8cb84c0b62f2542dcdec.tar.gz 743500 BLAKE2B 513380639f02c103f4e9aca73571e00edc42894e612712c20319c3ee9b8845bff41ce05b17016b52b7d34f09c8f74f877a639fd21455b13a5a2ef1554eb0b093 SHA512 bc37dabb13b76e3fa0efd811d664f321b47118d378285dfa06710ec227822c409ed0c60c2f42c00ae081e47ec879ec1b19f784e9fc2346d1d57f6e87550dda22 -DIST connman-cb05780d86c39cfb5e6d9ac2b288bf3244a95d57.tar.gz 738675 BLAKE2B d2c8ee587bdf045e4438a5c4c48475a5ba8ae390032dbdee44ed884273d741e290fcaeb5cee1025a7dec1f7f7034cf01d3e074d08004024dc541bff1b729627c SHA512 3d49f7fad6044c080a5805cc35dbecbdf916d66a2ace0246631936fbf46d80fcfff960df79a8471069caa00975dd74f5fcc17812811ce9c93919e2947ef23f6d diff --git a/net-misc/connman/connman-1.42_pre20220828-r1.ebuild b/net-misc/connman/connman-1.42.ebuild index 7bd768066253..55d02f7ec4ab 100644 --- a/net-misc/connman/connman-1.42_pre20220828-r1.ebuild +++ b/net-misc/connman/connman-1.42.ebuild @@ -1,17 +1,15 @@ -# 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 autotools systemd tmpfiles -COMMIT=cb05780d86c39cfb5e6d9ac2b288bf3244a95d57 - 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 ppc ppc64 ~riscv x86" + 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 DESCRIPTION="Provides a daemon for managing internet connections" @@ -26,44 +24,56 @@ wispr" REQUIRED_USE="^^ ( iptables nftables )" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.16 +COMMON_DEPEND=">=dev-libs/glib-2.16 + net-libs/gnutls >=sys-apps/dbus-1.2.24 sys-libs/readline:0= - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - iwd? ( net-wireless/iwd ) - l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= ) - ofono? ( net-misc/ofono ) + >=net-libs/libmnl-1.0.0:0= + ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) - policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} + 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" ) -S=${WORKDIR}/${PN}-${COMMIT} + +if [ ! -z ${COMMIT} ]; then + S=${WORKDIR}/${PN}-${COMMIT} +fi src_prepare() { default eautoreconf - cp "${FILESDIR}"/${PN}.initd2 "${T}" + cp "${FILESDIR}"/connman.initd2 "${T}" if use iwd; then - sed -i -e "s/need dbus/need dbus iwd/" "${T}"/${PN}.initd2 || die + 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() { - econf \ + local myeconfargs=( --localstatedir=/var \ --runstatedir=/run \ --with-systemdunitdir=$(systemd_get_systemunitdir) \ @@ -75,7 +85,6 @@ src_configure() { $(use_enable debug) \ $(use_enable ethernet ethernet builtin) \ $(use_enable examples test) \ - $(use_enable iwd) \ $(use_enable l2tp l2tp builtin) \ $(use_enable networkmanager nmcompat) \ $(use_enable ofono ofono builtin) \ @@ -85,12 +94,24 @@ src_configure() { $(use_enable pptp pptp builtin) \ $(use_enable tools) \ $(use_enable vpnc vpnc builtin) \ - $(use_enable wifi wifi 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() { diff --git a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild index d1dc59e3b63c..9d426a8103da 100644 --- a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild +++ b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi DESCRIPTION="Provides a daemon for managing internet connections" @@ -53,7 +53,10 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6.39" PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" ) -S=${WORKDIR}/${PN}-${COMMIT} + +if [ ! -z ${COMMIT} ]; then + S=${WORKDIR}/${PN}-${COMMIT} +fi src_prepare() { default diff --git a/net-misc/connman/connman-1.42_pre20221103.ebuild b/net-misc/connman/connman-1.42_pre20230411.ebuild index b8d1f42fca68..f30ba8c349dd 100644 --- a/net-misc/connman/connman-1.42_pre20221103.ebuild +++ b/net-misc/connman/connman-1.42_pre20230411.ebuild @@ -1,10 +1,10 @@ -# 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 autotools systemd tmpfiles -COMMIT=82ce08135a14ef4ab5b5b60f1e426a26b9fc72fc +COMMIT=24180d1243bf005c721be6f9d8d6da67bb669c55 if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -26,44 +26,56 @@ wispr" REQUIRED_USE="^^ ( iptables nftables )" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.16 +COMMON_DEPEND=">=dev-libs/glib-2.16 + net-libs/gnutls >=sys-apps/dbus-1.2.24 sys-libs/readline:0= - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - iwd? ( net-wireless/iwd ) - l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= ) - ofono? ( net-misc/ofono ) + >=net-libs/libmnl-1.0.0:0= + ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) - policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} + 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" ) -S=${WORKDIR}/${PN}-${COMMIT} + +if [ ! -z ${COMMIT} ]; then + S=${WORKDIR}/${PN}-${COMMIT} +fi src_prepare() { default eautoreconf - cp "${FILESDIR}"/${PN}.initd2 "${T}" + cp "${FILESDIR}"/connman.initd2 "${T}" if use iwd; then - sed -i -e "s/need dbus/need dbus iwd/" "${T}"/${PN}.initd2 || die + 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() { - econf \ + local myeconfargs=( --localstatedir=/var \ --runstatedir=/run \ --with-systemdunitdir=$(systemd_get_systemunitdir) \ @@ -75,7 +87,6 @@ src_configure() { $(use_enable debug) \ $(use_enable ethernet ethernet builtin) \ $(use_enable examples test) \ - $(use_enable iwd) \ $(use_enable l2tp l2tp builtin) \ $(use_enable networkmanager nmcompat) \ $(use_enable ofono ofono builtin) \ @@ -85,12 +96,24 @@ src_configure() { $(use_enable pptp pptp builtin) \ $(use_enable tools) \ $(use_enable vpnc vpnc builtin) \ - $(use_enable wifi wifi 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() { diff --git a/net-misc/connman/connman-9999.ebuild b/net-misc/connman/connman-9999.ebuild index 9f0547208dca..7e8c30b36e79 100644 --- a/net-misc/connman/connman-9999.ebuild +++ b/net-misc/connman/connman-9999.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit autotools systemd tmpfiles +COMMIT="" + if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" else - SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + 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" @@ -24,36 +26,56 @@ wispr" REQUIRED_USE="^^ ( iptables nftables )" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.16 +COMMON_DEPEND=">=dev-libs/glib-2.16 + net-libs/gnutls >=sys-apps/dbus-1.2.24 sys-libs/readline:0= - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - iwd? ( net-wireless/iwd ) - l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= ) - ofono? ( net-misc/ofono ) + >=net-libs/libmnl-1.0.0:0= + ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) - policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} + 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() { - econf \ + local myeconfargs=( --localstatedir=/var \ --runstatedir=/run \ --with-systemdunitdir=$(systemd_get_systemunitdir) \ @@ -65,7 +87,6 @@ src_configure() { $(use_enable debug) \ $(use_enable ethernet ethernet builtin) \ $(use_enable examples test) \ - $(use_enable iwd) \ $(use_enable l2tp l2tp builtin) \ $(use_enable networkmanager nmcompat) \ $(use_enable ofono ofono builtin) \ @@ -75,12 +96,24 @@ src_configure() { $(use_enable pptp pptp builtin) \ $(use_enable tools) \ $(use_enable vpnc vpnc builtin) \ - $(use_enable wifi wifi 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() { @@ -92,7 +125,7 @@ src_install() { fi keepdir /usr/lib/${PN}/scripts keepdir /var/lib/${PN} - newinitd "${FILESDIR}"/${PN}.initd2 ${PN} + newinitd "${T}"/${PN}.initd2 ${PN} newconfd "${FILESDIR}"/${PN}.confd ${PN} } 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 7b6217a5f3f0..6c37bee74e3e 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,6 +1,8 @@ -DIST curl-7.87.0.tar.xz 2547932 BLAKE2B b272ec928c5ef1728434630d8910f58834327a30570913df9d47921a2810d002bd88b81371005197db857d3a53386420c1e28b1e463e6241d46c1e50fbce0c13 SHA512 aa125991592667280dce3788aabe81487cf8c55b0afc59d675cc30b76055bb7114f5380b4a0e3b6461a8f81bf9812fa26d493a85f7e01d84263d484a0d699ee7 -DIST curl-7.87.0.tar.xz.asc 488 BLAKE2B 031d8236b357bd3c519548b181254dc0aea1efc1375738bce04f4f331d35bafe99d1ca394ecf5943ede7cae040854b6d2b478fd305147eb7330f8d50e5d95c96 SHA512 0bcc12bafc4ae50d80128af2cf4bf1a1ec6018ebb8d5b9c49f52b51c0c25acc77e820858965656549ef43c1f923f4e5fe75b0a3523623154b4cfb9dc8a1d76e4 -DIST curl-7.88.1.tar.xz 2581032 BLAKE2B ed7e7aa29efb02fd89a53d5c8d0ec79b4d17612ea07d2a6b5a951f0ca651b4cf7264704344b1a0c2d82196f4cb5c08525e06b4cdd432bc3278ff23c7a6580839 SHA512 b8d30c52a6d1c3e272608a7a8db78dfd79aef21330f34d6f1df43839a400e13ac6aac72a383526db0b711a70ecbec89a3b934677d7ecf5094fd64d3dbcb3492f -DIST curl-7.88.1.tar.xz.asc 488 BLAKE2B ea90d840846fca3f0b17838a84431cb44d6e3f8d2b42c3eced1fb1c929a58e8899b303c93d27ca3cafcaa52e7269ac440e7102191d6b2c2751729a6c4116e82f SHA512 d6dc720533004c4d533cc4fb3dd33ac28d95e114f440ec011e4b58f65d1f4c40cfa10ba26d2e2f2f1f9de99511632578b4758c5e79593c7c30d29788fdf1cbb6 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.2.tar.xz 2612652 BLAKE2B 66d0828912bb9971dac99025aa8b5c1c2fac1f8b568f2a8a97bd9f66986bdb164b603b539ec3e123cd6a26ea65829e58c90fc9852be88b42074cf40c89c566d1 SHA512 532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4 +DIST curl-8.1.2.tar.xz.asc 488 BLAKE2B 304dbdb51aa113c0b70b2662e29b1be3294b04f5f00264ce60703756363999cd567dcd0301e27b294d1d53f16ecc016ba429fcbea240949b372750f7e6e7375a SHA512 d120299a2d59259aeb19ae0fa3a3e181e25b6927677187037c61a0901879956177ce8dda10764073a47848f81dcbbcb94e0b6008742994042b6b8fd194e169c3 +DIST curl-8.2.1.tar.xz 2631932 BLAKE2B 77c0b067935397afb3961378f2fe349fa988c6379c1ab7437c5d5f967710b2e9ba7aec91df8fe58a8b26c00c0164d4db9bd095ca27d1bf52b768c8d83cc0ecaf SHA512 3f78c9330c52d32b166f17829fc2be13418ef925e88f75aacad7f369e7afe00dc4a56566418730dbb845b2b284d721b08f639df322e2e1ef2dfab165c4189094 +DIST curl-8.2.1.tar.xz.asc 488 BLAKE2B 569a7c8d338f7175b5035fa281861b57cce7f5327ec6437d79e215e5a806619c9432d7960687e5463787f681cc408371c1eb1f0db7fb8678b8ef34ec50ef69d0 SHA512 31ee66a09e7bd14de949ae991c23a0b905d38407b73ae39bae6d01854d8708355c14bc4d0eab3ff931b85986d0236dd34e934eef6061f4b70739137fd0525084 +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 diff --git a/net-misc/curl/curl-8.0.1.ebuild b/net-misc/curl/curl-8.0.1.ebuild index 6af2629111d2..d55ecb0e531c 100644 --- a/net-misc/curl/curl-8.0.1.ebuild +++ b/net-misc/curl/curl-8.0.1.ebuild @@ -13,9 +13,9 @@ SRC_URI=" verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) " -LICENSE="curl" +LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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" 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" @@ -106,7 +106,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) PATCHES=( - "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch # Backports diff --git a/net-misc/curl/curl-7.88.1-r2.ebuild b/net-misc/curl/curl-8.1.2.ebuild index d1a2c5b2213a..95c1c204617f 100644 --- a/net-misc/curl/curl-7.88.1-r2.ebuild +++ b/net-misc/curl/curl-8.1.2.ebuild @@ -1,24 +1,35 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +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" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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" +# These select the default SSL implementation IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc +RESTRICT="!test? ( test )" -#Only one default ssl provider can be enabled +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied REQUIRED_USE=" ssl? ( ^^ ( @@ -28,57 +39,63 @@ REQUIRED_USE=" curl_ssl_openssl curl_ssl_rustls ) - )" - -# lead to lots of false negatives, bug #285669 -RESTRICT="!test? ( test )" + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_nss? ( nss ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) +" -RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-0.11.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.15.0[gnutls,ssl,-openssl,${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}] - app-misc/ca-certificates ) 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}] ) - nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - dev-libs/nss-pem - app-misc/ca-certificates - ) rustls? ( net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] ) ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}] - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" - + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl +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 )" + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) @@ -90,23 +107,25 @@ 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}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch - - "${FILESDIR}"/${P}-header-dump-segfault.patch - "${FILESDIR}"/${P}-onion-resolution.patch - "${FILESDIR}"/${P}-pipewait.patch - "${FILESDIR}"/${P}-silent-parallel.patch ) src_prepare() { default - # Some tests (HTTP/#) rely on ssl certificates that are stored VCS which breaks - # with out-of-tree builds. - sed -i "s:my \$path = getcwd():my \$path = \"${S}/tests\":" tests/http*-server.pl \ - || die "Unable to update test locations" eprefixify curl-config.in eautoreconf } @@ -118,44 +137,43 @@ multilib_src_configure() { 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" + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" myconf+=( --with-gnutls ) fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" + if use nss; then + multilib_is_native_abi && 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" + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi - if use rustls || use curl_ssl_rustls; then - einfo "SSL provided by rustls" + if use rustls; then + 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" + multilib_is_native_abi && 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." @@ -256,7 +274,7 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myconf[@]}" if ! multilib_is_native_abi; then - # avoid building the client + # 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 @@ -287,6 +305,8 @@ multilib_src_configure() { echo "Requires.private: ${priv[*]}" >> libcurl.pc || die } +# 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) @@ -295,9 +315,12 @@ multilib_src_test() { # -k: keep test files after completion # -am: automake style TAP output # -p: print logs if test fails - # Note: if needed, we can disable tests. See e.g. Fedora's packaging + # 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" + # Note: we don't run the testsuite for cross-compilation. + # 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() { diff --git a/net-misc/curl/curl-7.88.1-r1.ebuild b/net-misc/curl/curl-8.2.1.ebuild index 9857f3a4d3a3..e869fa2db24e 100644 --- a/net-misc/curl/curl-7.88.1-r1.ebuild +++ b/net-misc/curl/curl-8.2.1.ebuild @@ -1,24 +1,36 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 -inherit autotools multilib-minimal prefix verify-sig +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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/" -SRC_URI="https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )" -LICENSE="curl" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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" +# These select the default SSL implementation IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc +RESTRICT="!test? ( test )" -#Only one default ssl provider can be enabled +# 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? ( ^^ ( @@ -28,57 +40,65 @@ REQUIRED_USE=" curl_ssl_openssl curl_ssl_rustls ) - )" - -# lead to lots of false negatives, bug #285669 -RESTRICT="!test? ( test )" + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_nss? ( nss ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( !openssl ) +" -RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-0.13.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.17.0[gnutls,ssl,-openssl,${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}] - app-misc/ca-certificates ) 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}] ) - nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - dev-libs/nss-pem - app-misc/ca-certificates - ) rustls? ( net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] ) ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}] - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl +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 )" + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) @@ -90,22 +110,25 @@ 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}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch - - "${FILESDIR}"/${P}-header-dump-segfault.patch - "${FILESDIR}"/${P}-pipewait.patch - "${FILESDIR}"/${P}-silent-parallel.patch ) src_prepare() { default - # Some tests (HTTP/#) rely on ssl certificates that are stored VCS which breaks - # with out-of-tree builds. - sed -i "s:my \$path = getcwd():my \$path = \"${S}/tests\":" tests/http*-server.pl \ - || die "Unable to update test locations" eprefixify curl-config.in eautoreconf } @@ -117,47 +140,47 @@ multilib_src_configure() { 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 + 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" + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" myconf+=( --with-gnutls ) fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" + if use nss; then + multilib_is_native_abi && 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" + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi - if use rustls || use curl_ssl_rustls; then - einfo "SSL provided by rustls" + if use rustls; then + 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" + multilib_is_native_abi && 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 @@ -222,7 +245,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) @@ -244,6 +267,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 @@ -252,10 +276,16 @@ multilib_src_configure() { ) fi + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + ECONF_SOURCE="${S}" econf "${myconf[@]}" if ! multilib_is_native_abi; then - # avoid building the client + # 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 @@ -286,6 +316,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) @@ -294,9 +335,22 @@ multilib_src_test() { # -k: keep test files after completion # -am: automake style TAP output # -p: print logs if test fails - # Note: if needed, we can disable tests. See e.g. Fedora's packaging + # 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" + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests. + # 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$((7*$(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-7.87.0-r2.ebuild b/net-misc/curl/curl-8.3.0.ebuild index 41b0429d9230..2761514f73e0 100644 --- a/net-misc/curl/curl-7.87.0-r2.ebuild +++ b/net-misc/curl/curl-8.3.0.ebuild @@ -1,90 +1,105 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 -inherit autotools prefix multilib-minimal verify-sig +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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/" -SRC_URI="https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )" -LICENSE="curl" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 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 quiche" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc +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_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_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( !openssl ) +" -# lead to lots of false negatives, bug #285669 -RESTRICT="!test? ( test )" +# 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="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=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}] ) ssl? ( gnutls? ( + app-misc/ca-certificates net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates ) mbedtls? ( - net-libs/mbedtls:=[${MULTILIB_USEDEP}] app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) openssl? ( dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) - nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - dev-libs/nss-pem - app-misc/ca-certificates - ) rustls? ( net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] ) ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}] - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl + +BDEPEND=" + dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) ) - verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) @@ -96,12 +111,20 @@ 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}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch - - "${FILESDIR}"/${P}-gnutls-openssl-build.patch - "${FILESDIR}"/${P}-typecheck-deprecated.patch ) src_prepare() { @@ -118,48 +141,40 @@ multilib_src_configure() { 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 ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) - if use gnutls || use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" myconf+=( --with-gnutls ) fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" + if use mbedtls; then + multilib_is_native_abi && 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" + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi - if use rustls || use curl_ssl_rustls; then - einfo "SSL provided by rustls" + if use rustls; then + 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 @@ -179,7 +194,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 @@ -208,13 +228,14 @@ multilib_src_configure() { --enable-doh --enable-symbol-hiding --enable-http-auth - $(use_enable ipv6) + --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 @@ -223,7 +244,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) @@ -233,21 +254,37 @@ multilib_src_configure() { --without-msh3 $(use_with nghttp3) $(use_with nghttp3 ngtcp2) - $(use_with quiche) + --without-quiche $(use_with rtmp librtmp) --without-schannel --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx $(use_enable websockets) --without-winidn --without-wolfssl --with-zlib $(use_with zstd) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions ) + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + ECONF_SOURCE="${S}" econf "${myconf[@]}" if ! multilib_is_native_abi; then - # avoid building the client + # 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 @@ -262,10 +299,6 @@ multilib_src_configure() { libs+=( "-lnghttp2" ) priv+=( "libnghttp2" ) fi - if use quiche; then - libs+=( "-lquiche" ) - priv+=( "quiche" ) - fi if use nghttp3; then libs+=( "-lnghttp3" "-lngtcp2" ) priv+=( "libnghttp3" "libngtcp2" ) @@ -282,6 +315,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) @@ -290,9 +334,22 @@ multilib_src_test() { # -k: keep test files after completion # -am: automake style TAP output # -p: print logs if test fails - # Note: if needed, we can disable tests. See e.g. Fedora's packaging + # 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" + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests. + # 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$((7*$(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 new file mode 100644 index 000000000000..2761514f73e0 --- /dev/null +++ b/net-misc/curl/curl-9999.ebuild @@ -0,0 +1,359 @@ +# 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 multiprocessing prefix toolchain-funcs verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" +SLOT="0" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls +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_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_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + 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-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=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}] ) + 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}] + ) + 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-1.15.0:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + die "Please file a bug, hit impossible condition w/ USE=ssl handling." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --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) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests. + # 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$((7*$(makeopts_jobs))) !241 !1083" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/files/curl-7.87.0-gnutls-openssl-build.patch b/net-misc/curl/files/curl-7.87.0-gnutls-openssl-build.patch deleted file mode 100644 index 88463dc003f7..000000000000 --- a/net-misc/curl/files/curl-7.87.0-gnutls-openssl-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugs.gentoo.org/887833 -https://github.com/curl/curl/issues/10110 -https://github.com/curl/curl/commit/aef4dc892d012d990c85c7bad0d9d06c2ebfa775 - -From aef4dc892d012d990c85c7bad0d9d06c2ebfa775 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Thu, 22 Dec 2022 17:40:26 +0100 -Subject: [PATCH] md4: fix build with GnuTLS + OpenSSL v1 - -Reported-by: Esdras de Morais da Silva - -Fixes #10110 -Closes #10142 ---- a/lib/md4.c -+++ b/lib/md4.c -@@ -86,11 +86,7 @@ - #include "memdebug.h" - - --#if defined(USE_WOLFSSL) && !defined(WOLFSSL_NO_MD4) -- --#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4) -- --#elif defined(USE_GNUTLS) -+#if defined(USE_GNUTLS) - - typedef struct md4_ctx MD4_CTX; - -@@ -109,6 +105,10 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) - md4_digest(ctx, MD4_DIGEST_SIZE, result); - } - -+#elif defined(USE_WOLFSSL) && !defined(WOLFSSL_NO_MD4) -+ -+#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4) -+ - #elif defined(AN_APPLE_OS) - typedef CC_MD4_CTX MD4_CTX; - diff --git a/net-misc/curl/files/curl-7.87.0-typecheck-deprecated.patch b/net-misc/curl/files/curl-7.87.0-typecheck-deprecated.patch deleted file mode 100644 index dec6d117efa4..000000000000 --- a/net-misc/curl/files/curl-7.87.0-typecheck-deprecated.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://bugs.gentoo.org/890587 -https://github.com/curl/curl/issues/10148 -https://github.com/curl/curl/commit/e2aed004302e51cfa5b6ce8c8ab65ef92aa83196 - -From e2aed004302e51cfa5b6ce8c8ab65ef92aa83196 Mon Sep 17 00:00:00 2001 -From: Patrick Monnerat <patrick@monnerat.net> -Date: Fri, 23 Dec 2022 15:35:27 +0100 -Subject: [PATCH] typecheck: accept expressions for option/info parameters - -As expressions can have side effects, evaluate only once. - -To enable deprecation reporting only once, get rid of the __typeof__ -use to define the local temporary variable and use the target type -(CURLoption/CURLINFO). This also avoids multiple reports on type -conflicts (if some) by the curlcheck_* macros. - -Note that CURLOPT_* and CURLINFO_* symbols may be deprecated, but not -their values: a curl_easy_setopt call with an integer constant as option -will never report a deprecation. - -Reported-by: Thomas Klausner -Fixes #10148 -Closes #10149 ---- a/include/curl/typecheck-gcc.h -+++ b/include/curl/typecheck-gcc.h -@@ -42,9 +42,8 @@ - */ - #define curl_easy_setopt(handle, option, value) \ - __extension__({ \ -- CURL_IGNORE_DEPRECATION(__typeof__(option) _curl_opt = option;) \ -+ CURLoption _curl_opt = (option); \ - if(__builtin_constant_p(_curl_opt)) { \ -- (void) option; \ - CURL_IGNORE_DEPRECATION( \ - if(curlcheck_long_option(_curl_opt)) \ - if(!curlcheck_long(value)) \ -@@ -120,9 +119,8 @@ - /* wraps curl_easy_getinfo() with typechecking */ - #define curl_easy_getinfo(handle, info, arg) \ - __extension__({ \ -- CURL_IGNORE_DEPRECATION(__typeof__(info) _curl_info = info;) \ -+ CURLINFO _curl_info = (info); \ - if(__builtin_constant_p(_curl_info)) { \ -- (void) info; \ - CURL_IGNORE_DEPRECATION( \ - if(curlcheck_string_info(_curl_info)) \ - if(!curlcheck_arr((arg), char *)) \ - diff --git a/net-misc/curl/files/curl-7.88.1-header-dump-segfault.patch b/net-misc/curl/files/curl-7.88.1-header-dump-segfault.patch deleted file mode 100644 index 48ebb7a5e45f..000000000000 --- a/net-misc/curl/files/curl-7.88.1-header-dump-segfault.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/curl/curl/commit/1c9cfb7af368feefb522caf81b052ee742a76da8 -From: Daniel Stenberg <daniel@haxx.se> -Date: Mon, 20 Feb 2023 18:35:13 +0100 -Subject: [PATCH] tool_operate: avoid fclose(NULL) on bad header dump file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #10570 -Reported-by: Jérémy Rabasco -Closes #10571 ---- a/src/tool_operate.c -+++ b/src/tool_operate.c -@@ -984,12 +984,13 @@ static CURLcode single_transfer(struct GlobalConfig *global, - */ - if(!per->prev || per->prev->config != config) { - newfile = fopen(config->headerfile, "wb+"); -- fclose(newfile); -+ if(newfile) -+ fclose(newfile); - } - newfile = fopen(config->headerfile, "ab+"); - - if(!newfile) { -- warnf(global, "Failed to open %s\n", config->headerfile); -+ errorf(global, "Failed to open %s\n", config->headerfile); - result = CURLE_WRITE_ERROR; - break; - } diff --git a/net-misc/curl/files/curl-7.88.1-onion-resolution.patch b/net-misc/curl/files/curl-7.88.1-onion-resolution.patch deleted file mode 100644 index d3385623da5f..000000000000 --- a/net-misc/curl/files/curl-7.88.1-onion-resolution.patch +++ /dev/null @@ -1,134 +0,0 @@ -https://bugs.gentoo.org/887287 -https://github.com/curl/curl/pull/10705 - -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/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 \ --\ -+test1464 test1465 test1466 test1467 test1468 test1469 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> --- -2.39.2 - diff --git a/net-misc/curl/files/curl-7.88.1-pipewait.patch b/net-misc/curl/files/curl-7.88.1-pipewait.patch deleted file mode 100644 index 6c626a86c8e0..000000000000 --- a/net-misc/curl/files/curl-7.88.1-pipewait.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://github.com/curl/curl/commit/821f6e2a89de8aec1c7da3c0f381b92b2b801efc -From: Stefan Eissing <stefan@eissing.org> -Date: Thu, 9 Feb 2023 16:07:34 +0100 -Subject: [PATCH] CURLOPT_PIPEWAIT: allow waited reuse also for subsequent - connections - -note: Dropped test portion of patch; not shipped in source tarball! - -As tested in test_02_07, when firing off 200 urls with --parallel, 199 -wait for the first connection to be established. if that is multiuse, -urls are added up to its capacity. - -The first url over capacity opens another connection. But subsequent -urls found the same situation and open a connection too. They should -have waited for the second connection to actually connect and make its -capacity known. - -This change fixes that by - -- setting `connkeep()` early in the HTTP setup handler. as otherwise - a new connection is marked as closeit by default and not considered - for multiuse at all -- checking the "connected" status for a candidate always and continuing - to PIPEWAIT if no alternative is found. - -pytest: -- removed "skip" from test_02_07 -- added test_02_07b to check that http/1.1 continues to work as before - -Closes #10456 ---- a/lib/http.c -+++ b/lib/http.c -@@ -233,6 +233,7 @@ static CURLcode http_setup_conn(struct Curl_easy *data, - - Curl_mime_initpart(&http->form); - data->req.p.http = http; -+ connkeep(conn, "HTTP default"); - - if((data->state.httpwant == CURL_HTTP_VERSION_3) - || (data->state.httpwant == CURL_HTTP_VERSION_3ONLY)) { ---- a/lib/url.c -+++ b/lib/url.c -@@ -1170,14 +1170,14 @@ ConnectionExists(struct Curl_easy *data, - continue; - } - } -+ } - -- if(!Curl_conn_is_connected(check, FIRSTSOCKET)) { -- foundPendingCandidate = TRUE; -- /* Don't pick a connection that hasn't connected yet */ -- infof(data, "Connection #%ld isn't open enough, can't reuse", -- check->connection_id); -- continue; -- } -+ if(!Curl_conn_is_connected(check, FIRSTSOCKET)) { -+ foundPendingCandidate = TRUE; -+ /* Don't pick a connection that hasn't connected yet */ -+ infof(data, "Connection #%ld isn't open enough, can't reuse", -+ check->connection_id); -+ continue; - } - - #ifdef USE_UNIX_SOCKETS diff --git a/net-misc/curl/files/curl-7.88.1-silent-parallel.patch b/net-misc/curl/files/curl-7.88.1-silent-parallel.patch deleted file mode 100644 index 1162067f73b3..000000000000 --- a/net-misc/curl/files/curl-7.88.1-silent-parallel.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/curl/curl/commit/475207c1c834ecf203dc4f3bc1917ae87628b6d0 -From: Daniel Stenberg <daniel@haxx.se> -Date: Tue, 21 Feb 2023 11:38:03 +0100 -Subject: [PATCH] tool_progress: shut off progress meter for --silent in - parallel - -Reported-by: finkjsc on github -Fixes #10573 -Closes #10579 ---- a/src/tool_progress.c -+++ b/src/tool_progress.c -@@ -173,7 +173,7 @@ bool progress_meter(struct GlobalConfig *global, - struct timeval now; - long diff; - -- if(global->noprogress) -+ if(global->noprogress || global->silent) - return FALSE; - - now = tvnow(); diff --git a/net-misc/curl/files/curl-7.30.0-prefix.patch b/net-misc/curl/files/curl-prefix.patch index fd495c49b132..fd495c49b132 100644 --- a/net-misc/curl/files/curl-7.30.0-prefix.patch +++ b/net-misc/curl/files/curl-prefix.patch diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml index cdd47f10334b..10ae7d7198e0 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -20,7 +20,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="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</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> diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest index 72e63527c043..39bdb6ec81be 100644 --- a/net-misc/dahdi-tools/Manifest +++ b/net-misc/dahdi-tools/Manifest @@ -1 +1,2 @@ DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694 +DIST dahdi-tools-3.2.0.tar.gz 729392 BLAKE2B 77667a16fd18fa5b6ffd67d9bd267c4ea5e6ff3841938de64704b7e6f1818b23feff196701c62ceb0a56c677614b4c2a4d4d1f4f533020559e8b3b3c12785bf5 SHA512 29df9a768c6db872bd51926dac11178400a03e2e1d0771ae163433ce300af71691f5c7a60f8756c0e6cef8a43f1331944cb4e44393f04a0ff8dee19bc9e7cf16 diff --git a/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild new file mode 100644 index 000000000000..773d22263bd4 --- /dev/null +++ b/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 perl-functions udev + +DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="ppp" +PATCHES=( + "${FILESDIR}/dahdi-nondigium-blacklist.patch" + "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" + "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" + "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" + "${FILESDIR}/dahdi-tools-3.2.0-lto.patch" +) + +DEPEND="dev-libs/newt + net-misc/dahdi + sys-kernel/linux-headers + virtual/libusb:1 + ppp? ( net-dialup/ppp:= )" +RDEPEND="${DEPEND} + dev-lang/perl:= + dev-perl/CGI" +BDEPEND="dev-lang/perl + sys-apps/file" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" + sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." + sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." +} + +src_install() { + local bashcompdir="$(get_bashcompdir)" + local bashcmd bashcmdtarget + + emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install + emake DESTDIR="${ED}" install-config + + dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest + + # install init scripts + newinitd "${FILESDIR}"/dahdi.init2 dahdi + newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf + newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf + + bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || + die "Error parsing dahdi bash completion file for commands") + + # Delete *if* the libtool file exists, bug #778380 + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch new file mode 100644 index 000000000000..75f6c1a93eee --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch @@ -0,0 +1,61 @@ +From bc45d96413902e0ded093908bc3a02410d799e24 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Thu, 11 May 2023 17:28:02 +0200 +Subject: [PATCH] Fix compilation with LTO. + +--- + xpp/echo_loader.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/xpp/echo_loader.c b/xpp/echo_loader.c +index 827f6ef..adfb1f4 100644 +--- a/xpp/echo_loader.c ++++ b/xpp/echo_loader.c +@@ -409,7 +409,7 @@ UINT32 Oct6100UserGetTime(tPOCT6100_GET_TIME f_pTime) + struct timeval tv; + unsigned long long total_usecs; + unsigned int mask = ~0; +- ++ + gettimeofday(&tv, 0); + total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) + + (((unsigned long long)(tv.tv_usec))); +@@ -564,7 +564,7 @@ UINT32 Oct6100UserDriverReadBurstApi(tPOCT6100_READ_BURST_PARAMS f_pBurstParams) + return cOCT6100_ERR_OK; + } + +-inline int get_ver(struct astribank *astribank) ++static inline int get_ver(struct astribank *astribank) + { + return spi_send(astribank, 0, 0, 1, 1); + } +@@ -647,7 +647,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe + /* General parameters */ + OpenChip.fEnableChannelRecording = TRUE; + +- /* Chip ID.*/ ++ /* Chip ID.*/ + OpenChip.ulUserChipId = 1; + + /* Set the max number of accesses to 1024 to speed things up */ +@@ -775,7 +775,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe + ChannelOpen.VqeConfig.fRinDcOffsetRemoval = TRUE; + ChannelOpen.VqeConfig.fSinDcOffsetRemoval = TRUE; + +- ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; ++ ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; + /* cOCT6100_COMFORT_NOISE_NORMAL + cOCT6100_COMFORT_NOISE_EXTENDED, + cOCT6100_COMFORT_NOISE_OFF, +@@ -824,7 +824,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe + ChannelOpen.VqeConfig.fRinDcOffsetRemoval = TRUE; + ChannelOpen.VqeConfig.fSinDcOffsetRemoval = TRUE; + +- ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; ++ ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; + /* cOCT6100_COMFORT_NOISE_NORMAL + cOCT6100_COMFORT_NOISE_EXTENDED, + cOCT6100_COMFORT_NOISE_OFF, +-- +2.39.3 + diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml index c3fad2fc57e4..41312228e19d 100644 --- a/net-misc/dahdi-tools/metadata.xml +++ b/net-misc/dahdi-tools/metadata.xml @@ -12,4 +12,7 @@ <use> <flag name="ppp">Enables PPP/DAHDIRAS support</flag> </use> + <upstream> + <remote-id type="github">asterisk/dahdi-tools</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest index 716cde8c9cc2..856dd7fb9c7e 100644 --- a/net-misc/dahdi/Manifest +++ b/net-misc/dahdi/Manifest @@ -16,7 +16,10 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43 DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 +DIST dahdi-linux-3.2.0.tar.gz 1617958 BLAKE2B 1a35ba69719e7cebf7cf471f901a3280e1558b8e8e4f615fcc974a08a83f62e71ee653b47f3a09e85e96a0447e4516996ef254497746492fe50eebef5515e217 SHA512 cb4b06d5a83aae7ce54049137d989fa6275367debc77a1df64cc36ba1bda08a058ea92f01bb873bcd83c3c7d58ff4c5da42c67bbbe8a02b8f4f0e12348c4a072 DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157 +DIST gentoo-dahdi-patches-3.2.0.tar.bz2 6947 BLAKE2B 8e4d2245d966a14c6eec7045c74788decc52c5dec562e7d09670766f169e6890a7fae2bf245ab198276780210564e891fe5d16b6e0d44ff5be876f218c23f2fb SHA512 c47a092d17abb0070cebfae540363a01bb8a9927e05524c3d50e76d69249115b3caf83d436469153b7a519e6c6952baab14d6bf898a440373f90d02359fbb4ae DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762 +DIST gentoo-dahdi-sources-3.2.0.tar.bz2 87595 BLAKE2B 18a2f007581ac653e0a1a50c77b36b0b2065e1dfd5c32ffe754cbb66b7aaf6df52dc4f856f8a9e0440f6ecf193c56e7506db24ab2b0ede43d9a1185ef84e0036 SHA512 4f13597914427f2e6cea08c6dce9e9bedf5d35a62c8d5dc545e8fb1268ffeb5dece84a27c2a50a8d55a7b8eda1d4fe2bfe18465b0492b45a3684170c5a600072 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 diff --git a/net-misc/dahdi/dahdi-3.2.0.ebuild b/net-misc/dahdi/dahdi-3.2.0.ebuild new file mode 100644 index 000000000000..8b59341edcee --- /dev/null +++ b/net-misc/dahdi/dahdi-3.2.0.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic linux-mod toolchain-funcs + +MY_P="${P/dahdi/dahdi-linux}" +JNET=1.0.14 +GENTOO_PATCHVERSION=3.2.0 +GENTOO_SOURCEVERSION=3.2.0 +S="${WORKDIR}/${MY_P}" + +JNET_DRIVERS="cwain qozap ztgsm" + +DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz + https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz + https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2 + https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2 + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz +" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="flash oslec" + +PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" ) + +CONFIG_CHECK="MODULES PCI ~CRC_CCITT" + +pkg_setup() { + use oslec && CONFIG_CHECK+=" ECHO" + linux-mod_pkg_setup +} + +src_unpack() { + local file drv + + unpack ${A} + # Copy the firmware tarballs over, the makefile will try and download them otherwise + for file in ${A} ; do + [[ "${file}" = dahdi-fw* ]] || continue + cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || + die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" + done + # But without the .bin's it'll still fall over and die, so copy those too. + mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || + die "Error moving firmware files into the right folders." + + for drv in ${JNET_DRIVERS}; do + ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || + die "Error linking ${drv}.c from jnet to DAHDI." + ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || + die "Error linking ${drv}.h from jnet to DAHDI." + done + + # Find the stuff from gentoo-sources (ie, modules that has been removed by + # upstream and we're re-adding). + DAHDI_GENTOO_MODULES="" + for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do + [[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/" + [[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o" + mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed." + done +} + +src_prepare() { + if use flash; then + sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || + die "Failed to define FXSFLASH" + sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ + include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" + fi + if use oslec; then + sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ + drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." + fi + default +} + +src_compile() { + unset ARCH + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ + DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ + LDFLAGS="$(raw-ldflags)" all +} + +src_install() { + einfo "Installing kernel module" + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ + DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \ + LDFLAGS="$(raw-ldflags)" install + + # Remove the blank "version" files (these files are all empty, and root owned). + find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" + + # If the kernel sources have a System.map, and there a suitable depmod + # available (seemingly when we're not cross-compiling), then the kernel + # sources depmod kicks in. Remove the files caused by that. + find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" +} diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml index 55eff7ad9e4b..2bd89c9cbc5a 100644 --- a/net-misc/dahdi/metadata.xml +++ b/net-misc/dahdi/metadata.xml @@ -13,4 +13,7 @@ <flag name="flash">Support (short) flash on FXS</flag> <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag> </use> + <upstream> + <remote-id type="github">asterisk/dahdi-linux</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/datapipe/datapipe-1.0-r2.ebuild b/net-misc/datapipe/datapipe-1.0-r2.ebuild index 840d7da32660..622423b24877 100644 --- a/net-misc/datapipe/datapipe-1.0-r2.ebuild +++ b/net-misc/datapipe/datapipe-1.0-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2019 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 -DESCRIPTION="bind a local port and connect it to a remote socket" -HOMEPAGE="http://http.distributed.net/pub/dcti/unsupported/" -SRC_URI="ftp://ftp.distributed.net/pub/dcti/unsupported/${P}.tar.gz http://http.distributed.net/pub/dcti/unsupported/${P}.tar.gz" +DESCRIPTION="Bind a local port and connect it to a remote socket" +HOMEPAGE="https://http.distributed.net/pub/dcti/unsupported/" +SRC_URI="ftp://ftp.distributed.net/pub/dcti/unsupported/${P}.tar.gz + https://http.distributed.net/pub/dcti/unsupported/${P}.tar.gz" LICENSE="public-domain" SLOT="0" diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild index 9fa84b982375..48fb12a0f5d6 100644 --- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild @@ -26,6 +26,7 @@ BDEPEND=" acct-user/dhcp" DEPEND=" + sys-libs/zlib:= client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild index 955d356609f4..d8539208aefd 100644 --- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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 @@ -26,6 +26,7 @@ BDEPEND=" acct-user/dhcp" DEPEND=" + sys-libs/zlib:= client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) @@ -76,6 +77,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch" # Possible upstream candidates + "${FILESDIR}/${PN}-4.4.3-configure-clang16.patch" ) src_prepare() { @@ -172,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 @@ -212,6 +212,7 @@ src_install() { dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} docinto html dodoc doc/References.html + newtmpfiles "${FILESDIR}"/dhcp.tmpfiles dhcp.conf if [[ -e client/dhclient ]] ; then # Move the client to / @@ -240,7 +241,6 @@ src_install() { newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 - newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf systemd_dounit "${FILESDIR}"/dhcpd4.service systemd_dounit "${FILESDIR}"/dhcpd6.service systemd_dounit "${FILESDIR}"/dhcrelay4.service @@ -257,9 +257,6 @@ src_install() { mv "${f}" "${f%.example}" || die done sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die - - diropts -m0750 -o dhcp -g dhcp - keepdir /var/lib/dhcp } pkg_preinst() { @@ -279,9 +276,7 @@ pkg_preinst() { } pkg_postinst() { - if use server ; then - tmpfiles_process dhcpd.conf - fi + tmpfiles_process dhcp.conf if use client ; then ewarn "The client and relay functionality will be removed in the next release!" diff --git a/net-misc/dhcp/files/dhcp-4.4.3-configure-clang16.patch b/net-misc/dhcp/files/dhcp-4.4.3-configure-clang16.patch new file mode 100644 index 000000000000..38c24ff9f2bb --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.4.3-configure-clang16.patch @@ -0,0 +1,143 @@ +https://src.fedoraproject.org/rpms/dhcp/blob/5a0c1922defd9dbb94fa7d9fd3294031ffe72df9/f/0030-bind-configure-c99.patch + +Downstream-only patch. +Upstream bind9 development has changed configure significantly: +https://gitlab.isc.org/isc-projects/bind9 + +From 035224d94d4cf93257cf5440a2e4e129540e81e8 Mon Sep 17 00:00:00 2001 +From: Arjun Shankar <arjun@redhat.com> +Date: Thu, 20 Apr 2023 15:34:01 +0200 +Subject: [PATCH] Port to C99 + +--- a/bind/bind-9.11.36/configure ++++ b/bind/bind-9.11.36/configure +@@ -20016,7 +20016,7 @@ else + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-main() { ++int main() { + char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);} + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +@@ -20056,7 +20056,7 @@ else + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : ++int main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : + inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 : + (inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); } + _ACEOF +@@ -21346,7 +21346,7 @@ else + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} ++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5 +@@ -21363,7 +21363,7 @@ else + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} ++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: long int" >&5 +@@ -21380,7 +21380,7 @@ else + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} ++int main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: long long int" >&5 +@@ -21759,7 +21759,7 @@ int + main () + { + +- main() { asm("ics"); exit(0); } ++ int main() { asm("ics"); exit(0); } + + ; + return 0; +@@ -21782,7 +21782,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +- main() { asm("ics"); exit(0); } ++ int main() { asm("ics"); exit(0); } + + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +--- a/bind/bind-9.11.36/configure.ac ++++ b/bind/bind-9.11.36/configure.ac +@@ -3274,7 +3274,7 @@ AC_TRY_RUN([ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-main() { ++int main() { + char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}], + [AC_MSG_RESULT(yes) + ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"], +@@ -3297,7 +3297,7 @@ AC_TRY_RUN([ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : ++int main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : + inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 : + (inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); }], + [AC_MSG_RESULT(yes) +@@ -3901,7 +3901,7 @@ AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}], ++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}], + [AC_MSG_RESULT(int) + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int"], + [ +@@ -3909,7 +3909,7 @@ AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}], ++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}], + [AC_MSG_RESULT(long int) + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int"], + [ +@@ -3917,7 +3917,7 @@ AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}], ++int main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}], + [AC_MSG_RESULT(long long int) + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"], + [AC_MSG_ERROR([unable to determine sizeof rlim_cur]) +@@ -4117,7 +4117,7 @@ case "$enable_atomic" in + if test "X$GCC" = "Xyes"; then + AC_MSG_CHECKING([if asm("ics"); works]) + AC_TRY_COMPILE(,[ +- main() { asm("ics"); exit(0); } ++ int main() { asm("ics"); exit(0); } + ], + [AC_MSG_RESULT(yes) + use_atomic=yes], +@@ -4125,7 +4125,7 @@ case "$enable_atomic" in + saved_cflags="$CFLAGS" + CFLAGS="$CFLAGS -Wa,-many" + AC_TRY_RUN([ +- main() { asm("ics"); exit(0); } ++ int main() { asm("ics"); exit(0); } + ], + [AC_MSG_RESULT([yes, required -Wa,-many]) + use_atomic=yes], +-- +2.40.0 diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5 index f0ea9b0c7904..66b29cd3bb00 100644 --- a/net-misc/dhcp/files/dhcpd.init5 +++ b/net-misc/dhcp/files/dhcpd.init5 @@ -77,11 +77,9 @@ start() { local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)" checkpath -f -o dhcp:dhcp "${chroot}${leasefile}" - # Setup LD_PRELOAD so name resolution works in our chroot. if [ -n "${chroot}" ] ; then checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/ - export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so" if ! mountinfo -q "${chroot}/proc" ; then mount --bind /proc "${chroot}/proc" fi diff --git a/net-misc/dhcp/files/dhcpd.tmpfiles b/net-misc/dhcp/files/dhcpd.tmpfiles deleted file mode 100644 index ee2f4deeaadf..000000000000 --- a/net-misc/dhcp/files/dhcpd.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -d /var/lib/dhcp/ 0755 dhcp dhcp -f /var/lib/dhcp/dhcpd.leases 0644 dhcp dhcp
\ No newline at end of file diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index b60aceb199a1..e33e688a5913 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1 +1,4 @@ +DIST dhcpcd-10.0.1.tar.xz 263564 BLAKE2B f1e93285d040b98bede86bb2e87e372afc0d1d124e7a6580c23d8d228a34ee17001fc3c2d9091b16fb082fe2f2ad7ba50c0dd7b0db2b2237ab1cff9ca152100a SHA512 31b0ac780b8592d3d40437837fd759a357b0200dbdc7fd8c62287a4fedc052f324fb8006daff84455906c82d5a4cb6a04916b94a0ad9b17899532f83daf51d3d +DIST dhcpcd-10.0.2.tar.xz 264324 BLAKE2B 999033b4c0bc46943332b0b7ed3f1869ad54e2c37346523a15fbd3d9f29db1e01c1ddd0a300826021d3e20493ea06358ef47ac6a02c50331ca0d90e31a123b85 SHA512 1231caba6b6a2264ba80be0c888f52ce1c8de21289c3a4452b5319dae76d8c1c78331a822372e77ee1419d12c23c1d57df712499d43983eb535e79c6a8e78f42 DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 +DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee diff --git a/net-misc/dhcpcd/dhcpcd-10.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.1.ebuild new file mode 100644 index 000000000000..1ea2577fd47a --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-10.0.1.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" +else + MY_P="${P/_alpha/-alpha}" + MY_P="${MY_P/_beta/-beta}" + MY_P="${MY_P/_rc/-rc}" + SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" + +LICENSE="BSD-2" +SLOT="0" +IUSE="debug +embedded ipv6 privsep +udev" + +DEPEND="udev? ( virtual/udev )" +RDEPEND=" + ${DEPEND} + privsep? ( + acct-group/dhcpcd + acct-user/dhcpcd + ) +" + +src_configure() { + local myeconfargs=( + --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" + --localstatedir="${EPREFIX}/var" + --prefix="${EPREFIX}" + --with-hook=ntp.conf + $(use_enable debug) + $(use_enable embedded) + $(use_enable ipv6) + $(use_enable privsep) + $(usex elibc_glibc '--with-hook=yp.conf' '') + --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") + $(usex privsep '--privsepuser=dhcpcd' '') + $(usex udev '' '--without-dev --without-udev') + CC="$(tc-getCC)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + keepdir /var/lib/dhcpcd + newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd + systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service +} + +pkg_postinst() { + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() + + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid + local new_duid="${dbdir}"/duid + if [[ -e "${old_old_duid}" ]] ; then + # Upgrade the duid file to the new format if needed + if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then + sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" + fi + + # Move the duid to /etc, a more sensible location + if [[ ! -e "${old_duid}" ]] ; then + cp -p "${old_old_duid}" "${new_duid}" + fi + old_files+=( "${old_old_duid}" ) + fi + + # dhcpcd-7 moves the files out of /etc + if [[ -e "${old_duid}" ]] ; then + if [[ ! -e "${new_duid}" ]] ; then + cp -p "${old_duid}" "${new_duid}" + fi + old_files+=( "${old_duid}" ) + fi + local old_secret="${EROOT}"/etc/dhcpcd.secret + local new_secret="${dbdir}"/secret + if [[ -e "${old_secret}" ]] ; then + if [[ ! -e "${new_secret}" ]] ; then + cp -p "${old_secret}" "${new_secret}" + fi + old_files+=( "${old_secret}" ) + fi + + # dhcpcd-7 renames some files in /var/lib/dhcpcd + local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic + local new_rdm="${dbdir}"/rdm_monotonic + if [[ -e "${old_rdm}" ]] ; then + if [[ ! -e "${new_rdm}" ]] ; then + cp -p "${old_rdm}" "${new_rdm}" + fi + old_files+=( "${old_rdm}" ) + fi + local lease= + for lease in "${dbdir}"/dhcpcd-*.lease*; do + [[ -f "${lease}" ]] || continue + old_files+=( "${lease}" ) + local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") + [[ -e "${dbdir}/${new_lease}" ]] && continue + cp "${lease}" "${dbdir}/${new_lease}" + done + + # Warn about removing stale files + if [[ -n "${old_files[@]}" ]] ; then + elog + elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" + elog "${EROOT}/etc to ${dbdir}" + elog "and copied leases in ${dbdir} to new files with the dhcpcd-" + elog "prefix dropped." + elog + elog "You should remove these files if you don't plan on reverting" + elog "to an older version:" + local old_file= + for old_file in ${old_files[@]}; do + elog " ${old_file}" + done + fi + + if [ -z "${REPLACING_VERSIONS}" ]; then + elog + elog "dhcpcd has zeroconf support active by default." + elog "This means it will always obtain an IP address even if no" + elog "DHCP server can be contacted, which will break any existing" + elog "failover support you may have configured in your net configuration." + elog "This behaviour can be controlled with the noipv4ll configuration" + elog "file option or the -L command line switch." + elog "See the dhcpcd and dhcpcd.conf man pages for more details." + + elog + elog "Dhcpcd has duid enabled by default, and this may cause issues" + elog "with some dhcp servers. For more information, see" + elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" + fi + + if ! has_version net-dns/bind-tools; then + elog + elog "If you activate the lookup-hostname hook to look up your hostname" + elog "using the dns, you need to install net-dns/bind-tools." + fi +} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.2.ebuild new file mode 100644 index 000000000000..f311304756fa --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-10.0.2.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" +else + MY_P="${P/_alpha/-alpha}" + MY_P="${MY_P/_beta/-beta}" + MY_P="${MY_P/_rc/-rc}" + SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" + + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" + +LICENSE="BSD-2 BSD ISC MIT" +SLOT="0" +IUSE="debug +embedded ipv6 privsep +udev" + +DEPEND="udev? ( virtual/udev )" +RDEPEND=" + ${DEPEND} + privsep? ( + acct-group/dhcpcd + acct-user/dhcpcd + ) +" + +src_configure() { + local myeconfargs=( + --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" + --localstatedir="${EPREFIX}/var" + --prefix="${EPREFIX}" + --with-hook=ntp.conf + $(use_enable debug) + $(use_enable embedded) + $(use_enable ipv6) + $(use_enable privsep) + $(usex elibc_glibc '--with-hook=yp.conf' '') + --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") + $(usex privsep '--privsepuser=dhcpcd' '') + $(usex udev '' '--without-dev --without-udev') + CC="$(tc-getCC)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + keepdir /var/lib/dhcpcd + newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd + systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service +} + +pkg_postinst() { + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() + + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid + local new_duid="${dbdir}"/duid + if [[ -e "${old_old_duid}" ]] ; then + # Upgrade the duid file to the new format if needed + if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then + sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" + fi + + # Move the duid to /etc, a more sensible location + if [[ ! -e "${old_duid}" ]] ; then + cp -p "${old_old_duid}" "${new_duid}" + fi + old_files+=( "${old_old_duid}" ) + fi + + # dhcpcd-7 moves the files out of /etc + if [[ -e "${old_duid}" ]] ; then + if [[ ! -e "${new_duid}" ]] ; then + cp -p "${old_duid}" "${new_duid}" + fi + old_files+=( "${old_duid}" ) + fi + local old_secret="${EROOT}"/etc/dhcpcd.secret + local new_secret="${dbdir}"/secret + if [[ -e "${old_secret}" ]] ; then + if [[ ! -e "${new_secret}" ]] ; then + cp -p "${old_secret}" "${new_secret}" + fi + old_files+=( "${old_secret}" ) + fi + + # dhcpcd-7 renames some files in /var/lib/dhcpcd + local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic + local new_rdm="${dbdir}"/rdm_monotonic + if [[ -e "${old_rdm}" ]] ; then + if [[ ! -e "${new_rdm}" ]] ; then + cp -p "${old_rdm}" "${new_rdm}" + fi + old_files+=( "${old_rdm}" ) + fi + local lease= + for lease in "${dbdir}"/dhcpcd-*.lease*; do + [[ -f "${lease}" ]] || continue + old_files+=( "${lease}" ) + local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") + [[ -e "${dbdir}/${new_lease}" ]] && continue + cp "${lease}" "${dbdir}/${new_lease}" + done + + # Warn about removing stale files + if [[ -n "${old_files[@]}" ]] ; then + elog + elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" + elog "${EROOT}/etc to ${dbdir}" + elog "and copied leases in ${dbdir} to new files with the dhcpcd-" + elog "prefix dropped." + elog + elog "You should remove these files if you don't plan on reverting" + elog "to an older version:" + local old_file= + for old_file in ${old_files[@]}; do + elog " ${old_file}" + done + fi + + if [ -z "${REPLACING_VERSIONS}" ]; then + elog + elog "dhcpcd has zeroconf support active by default." + elog "This means it will always obtain an IP address even if no" + elog "DHCP server can be contacted, which will break any existing" + elog "failover support you may have configured in your net configuration." + elog "This behaviour can be controlled with the noipv4ll configuration" + elog "file option or the -L command line switch." + elog "See the dhcpcd and dhcpcd.conf man pages for more details." + + elog + elog "Dhcpcd has duid enabled by default, and this may cause issues" + elog "with some dhcp servers. For more information, see" + elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" + fi + + if ! has_version net-dns/bind-tools; then + elog + elog "If you activate the lookup-hostname hook to look up your hostname" + elog "using the dns, you need to install net-dns/bind-tools." + fi +} diff --git a/net-misc/dhcpcd/dhcpcd-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 6ad423e41da9..1ea2577fd47a 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.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 ~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/" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" + LICENSE="BSD-2" 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/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/dleyna-server/metadata.xml b/net-misc/dleyna-server/metadata.xml deleted file mode 100644 index f5c82f790bf7..000000000000 --- a/net-misc/dleyna-server/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="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">phako/dleyna-server</remote-id> - </upstream> -</pkgmetadata> 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-cli/dropbox-cli-2023.ebuild b/net-misc/dropbox-cli/dropbox-cli-2023.ebuild index 44405e85739c..62034ba7f496 100644 --- a/net-misc/dropbox-cli/dropbox-cli-2023.ebuild +++ b/net-misc/dropbox-cli/dropbox-cli-2023.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+gpg" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index cb6980eeb5a2..9acaff8bbbba 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,5 +1,7 @@ DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712 -DIST dropbox-lnx.x86-168.4.4802.tar.gz 108507391 BLAKE2B 58579507c1899e0d7861ad26c8734f244c6a29aab82e59f533dbaaae8dd21966e6225435c83853541b34eafd83e755bfde67a96439f73a13d57bd608ae54df3f SHA512 c0d38db2b4b37b8889018341bd045947ad024bff50c6443da48b69cb273a0891efb37294f3a7841201d45cd3a01f1917c40c0942da9530c4afe1b67c17be757d -DIST dropbox-lnx.x86-169.4.5684.tar.gz 108791244 BLAKE2B a7f4966a5bf6a61a25a5ddc2bf7a3e8033c4420b33d22865c6789dc26a7bc57a047ab7c10d5e7b5cf45ea4d61a7ca3c5781bd7b9482e558d87a91183fce59028 SHA512 1e80d6f47c811f6398eae17f91b2052b3c6f645e2053d318f17ecf7b1d3ffe0e491a0d52cad3a0e0bda286d22bbd2053da082e36016e80872013edbd8d1ec81e -DIST dropbox-lnx.x86_64-168.4.4802.tar.gz 110197663 BLAKE2B 6f4bca5fcd7def68a5e7f83c95e9b21254162504725df5459d2eb18813802a952739cf006ffa4b4fbbb64f6798803f348225895216e7a19a84bcb79b95149ee1 SHA512 6a59f75f9947c54512886872f4e67c2a069ab939bd31b246d9878830e348e9558c4cfa622e7974272a52b4723f6507eac484d1690f135f6f0e78f94bf08009ec -DIST dropbox-lnx.x86_64-169.4.5684.tar.gz 110350680 BLAKE2B d912400516d655171194073f8ca05817f17fdd266ebf9391d9120b065f667ed8febdfdb80f019247ce9744198bbb78160f1936b9e08fe972f78d4194f2880d11 SHA512 8dc9c600f4e12d9a3ada648d36bffc4ccc56f855abcf0e27b2c4127aeb597d9556300cb677cf7027b29956cbb5e6563dc45f49569db95870c431f15b7eaf015e +DIST dropbox-lnx.x86-181.4.5678.tar.gz 112778488 BLAKE2B 58464f93af02a40d08c049de30d702a55cc23021a1460ee3f0116c3dc6ecd72dedc057a17e07047fd1588d96d548f6da87f104572a8fe3bfbc26761f8953c7f0 SHA512 7cfdd048012ed5202408f4d4bc81693fb178b06500469a4a57284b901deabacbaf7b6b59f5acfa5aa985eedecb1d0883134fc9f605d68f4204e44bec9e26473a +DIST dropbox-lnx.x86-182.4.6427.tar.gz 112940367 BLAKE2B 57ac19684973efa395a26087734a4ea4def06accdee813d1be8635e80d688dd43c52cbe80805d9b983df50d7a23f61f1d6b725ec87e252fc57c81a02b2c917c3 SHA512 0822c4de8a0a63f2a97b83cffcbcde6b30c7700bb4a06cefd5d9bf68b54f67520c85a8852820523103ec63f7008e4dfa1dd3d6802b0375e6a30f3d65e7d4fe87 +DIST dropbox-lnx.x86-183.4.7058.tar.gz 112562961 BLAKE2B 23a7f94c8825b08b1cfa2cb5bd6ee4425d868ced13e842c7f800674c870adde34f4cbb821b41e3da268b988604bc73771e0dfe202c94da15b02f079b58d0438f SHA512 cdd503aaa3d827b76e0dde6153c1b4d32e4dc5a48aecd81a23f6a9cba91cbae989e33251a27b92d2224856bc844f43035d10e3f3fc4e10b4c79ed1f8630afc48 +DIST dropbox-lnx.x86_64-181.4.5678.tar.gz 114189162 BLAKE2B c339d40fe82d3a2bae3f7e2f0e510d5e7f77d0a04d0875bfa558aef07f7676279cec4a79afb57e22bc1616460cbf5279058448310faa33e6e048a216ca2c43a0 SHA512 067b620535a398a77c9d8bbf6e0a924feb5730135970f900e34c6aa71cae9c239fcb60b41ad742937ca96019b5d617df37379db9244300c149e3bdf0b196e028 +DIST dropbox-lnx.x86_64-182.4.6427.tar.gz 114508859 BLAKE2B f2b837567a54574496f24e40351a0641eaa0f7b447f49d59c2bab456b66e8a94ec50fd6bef32b71d5cd75a4153152fd7586e07a7e7cef6d67dff1e7c086559fe SHA512 86b9b37931bbc1fed0e4720f6bd331061162def39097eeb91ac836d941d880f03c427d476c4051be3e519a9589889d1409348fbfd0595678c461b69b3049c62d +DIST dropbox-lnx.x86_64-183.4.7058.tar.gz 114216470 BLAKE2B 256bc5d4e008f6b7036768c672f086a82f23553701f23a515ef82d94be63cb6fbb5dc99e9b7aa59b401b2ac16ef9555f6c627df149311a9ed56f7a47d45eb225 SHA512 e531d0322126994c6943ce6922e0beee954fdcd9d10b9d6256375b3ee2016a113bf82780ce04dcf3e1409a823752a97e453b00922469d52f70bdbbd159914761 diff --git a/net-misc/dropbox/dropbox-168.4.4802.ebuild b/net-misc/dropbox/dropbox-181.4.5678.ebuild index b0b4cee9bbeb..b0b4cee9bbeb 100644 --- a/net-misc/dropbox/dropbox-168.4.4802.ebuild +++ b/net-misc/dropbox/dropbox-181.4.5678.ebuild diff --git a/net-misc/dropbox/dropbox-169.4.5684.ebuild b/net-misc/dropbox/dropbox-182.4.6427.ebuild index e1949fb60f88..e1949fb60f88 100644 --- a/net-misc/dropbox/dropbox-169.4.5684.ebuild +++ b/net-misc/dropbox/dropbox-182.4.6427.ebuild diff --git a/net-misc/dropbox/dropbox-183.4.7058.ebuild b/net-misc/dropbox/dropbox-183.4.7058.ebuild new file mode 100644 index 000000000000..e1949fb60f88 --- /dev/null +++ b/net-misc/dropbox/dropbox-183.4.7058.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop pax-utils systemd xdg + +DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" +HOMEPAGE="https://www.dropbox.com/" +SRC_URI=" + amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) + x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz ) + https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg +" + +LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="selinux X" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/.*" +QA_EXECSTACK="opt/dropbox/dropbox" + +BDEPEND="dev-util/patchelf" + +# Be sure to have GLIBCXX_3.4.9, #393125 +RDEPEND=" + X? ( + x11-themes/hicolor-icon-theme + ) + selinux? ( sec-policy/selinux-dropbox ) + app-arch/bzip2 + dev-libs/glib:2 + dev-libs/libffi-compat:6 + media-libs/fontconfig + media-libs/freetype + net-misc/wget + sys-libs/zlib + sys-libs/ncurses-compat:5 + virtual/opengl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + x11-libs/libxcb +" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" || die + mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die + mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die + rmdir "${S}"/dropbox-lnx.*-${PV}/ || die + rmdir .dropbox-dist || die +} + +src_prepare() { + default + # we supply all of these in RDEPEND + rm -vf libGL.so.1 libX11* libffi.so.6 || die + # some of these do not appear to be used + rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ + PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ + wmctrl libdrm.so.2 libpopt.so.0 || die + if use X ; then + mv images/hicolor/16x16/status "${T}" || die + else + rm -vrf images || die + fi + patchelf --set-rpath '$ORIGIN' \ + apex._apex.*.so \ + nucleus_python.*.so \ + tprt.*.so \ + || die + pax-mark cm dropbox + mv README ACKNOWLEDGEMENTS "${T}" || die +} + +src_install() { + local targetdir="/opt/dropbox" + + insinto "${targetdir}" + doins -r * + fperms a+x "${targetdir}"/{dropbox,dropboxd} + dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" + + if use X; then + doicon -s 16 -c status "${T}"/status + newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg + fi + + make_desktop_entry "${PN}" "Dropbox" "dropbox" + + newinitd "${FILESDIR}"/dropbox.initd dropbox + newconfd "${FILESDIR}"/dropbox.conf dropbox + systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" + + dodoc "${T}"/{README,ACKNOWLEDGEMENTS} +} + +pkg_postinst() { + einfo "Warning: while running, dropbox may attempt to autoupdate itself in" + einfo " your user's home directory. To prevent this, run the following as" + einfo " each user who will run dropbox:" + einfo "" + einfo "install -dm0 ~/.dropbox-dist" +} diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest index d1815a77271e..ac4a3f1698a5 100644 --- a/net-misc/electron-cash/Manifest +++ b/net-misc/electron-cash/Manifest @@ -1,3 +1 @@ -DIST electron-cash-4.2.10.tar.gz 8023055 BLAKE2B e79c000f4278c323a8f14aa8d960c25c2971a8c5736e31a6f18f4b5faae11a8ff5339de3193e191c21373075bd6472570770d14262c9b5d41e3eca2b91e633d3 SHA512 f90a11f6a5d79024f982f8ab148c9c079049114bcb0c405da9f54b62620afbda462e074abde01bed7fa12d0090a842e393e24e66ff74031a87f0c79f6323895a DIST electron-cash-4.2.11.tar.gz 8039918 BLAKE2B 3139647fd22aaa88ff9a514b83e12dd3b36abb6affe9b51b270e1936f4d37ec3ea867ebcfe388f428392093996d2bf7d1268ee0b2447c5d559a39c3e35745dfc SHA512 7b01d2d94b29a3f054738cd89344a7c15136f90d6aa66dd587da315471aeb053bee1d7bbeab46016054b7dd98915bb2225a381d082a8fd137997c05957e2d44a -DIST electron-cash-4.2.9.tar.gz 8023098 BLAKE2B 37a55e2161a8f7c2d9b11c1bc564d77ace84ad745be677bb41f07af2b8c18c223e6cf37c7df42dea170341f276babd8eda4bd9564e9069fc9623a059cc92f09b SHA512 e27dda4a4c8b81ad7b303652fdb2d893c3d53e76eb0f7e295753a7f92676c895ea8087e424a43bbb2d32db9a4f0e8c03b779cf9daf2ff8e51d4813a097ac9c6c diff --git a/net-misc/electron-cash/electron-cash-4.2.10.ebuild b/net-misc/electron-cash/electron-cash-4.2.10.ebuild deleted file mode 100644 index a0a595b84faf..000000000000 --- a/net-misc/electron-cash/electron-cash-4.2.10.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{9..10} ) - -PYTHON_REQ_USE="ncurses?" - -inherit desktop distutils-r1 xdg-utils - -MY_P="Electron-Cash-${PV}" -DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)" -HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash" -SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb - l10n_es l10n_ja l10n_pt l10n_zh-CN" -RESTRICT+=" test" - -REQUIRED_USE=" - || ( cli ncurses qt5 ) - amodem? ( qt5 ) - cosign? ( qt5 ) - digitalbitbox? ( qt5 ) - email? ( qt5 ) - qrcode? ( qt5 ) - sync? ( qt5 ) - vkb? ( qt5 ) -" - -RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/ecdsa[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/pathvalidate[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/pyaes[${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[${PYTHON_USEDEP}] - net-libs/stem[${PYTHON_USEDEP}] - amodem? ( dev-python/amodem[${PYTHON_USEDEP}] ) - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( dev-lang/python ) - dev-libs/libsecp256k1 -" - -distutils_enable_tests pytest - -S="${WORKDIR}/${MY_P}" - -DOCS="RELEASE-NOTES" - -src_prepare() { - eapply "${FILESDIR}/3.3.6-no-user-root.patch" - - # Prevent icon from being installed in the wrong location - sed -i '/icons/d' setup.py || die - - if use qt5; then - pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die - else - sed "s|'electroncash_gui.qt',||" -i setup.py || die - fi - - local wordlist= - for wordlist in \ - $(usex l10n_ja '' japanese) \ - $(usex l10n_pt '' portuguese) \ - $(usex l10n_es '' spanish) \ - $(usex l10n_zh-CN '' chinese_simplified) \ - ; do - rm -f "electroncash/wordlist/${wordlist}.txt" || die - sed -i "/${wordlist}\\.txt/d" electroncash/mnemonic.py || die - done - - # Remove unrequested GUI implementations: - local gui setup_py_gui - for gui in \ - $(usex cli '' stdio) \ - $(usex qt5 '' qt ) \ - $(usex ncurses '' text ) \ - ; do - rm electroncash_gui/"${gui}"* -r || die - done - - # And install requested ones... - for gui in \ - $(usex qt5 qt '') \ - ; do - setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," - done - - sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || 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}" || die - - local plugin - # trezor requires python trezorlib module - # keepkey requires trezor - for plugin in \ - $(usex amodem '' audio_modem ) \ - $(usex cosign '' cosigner_pool ) \ - $(usex digitalbitbox '' digitalbitbox ) \ - $(usex email '' email_requests ) \ - hw_wallet \ - ledger \ - keepkey \ - $(usex sync '' labels ) \ - trezor \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm -r electroncash_plugins/"${plugin}"* || die - sed -i "/${plugin}/d" setup.py || die - done - - eapply_user - - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 icons/${PN}.png - distutils-r1_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electron-cash/electron-cash-4.2.11.ebuild b/net-misc/electron-cash/electron-cash-4.2.11.ebuild index a0a595b84faf..8028eb404b26 100644 --- a/net-misc/electron-cash/electron-cash-4.2.11.ebuild +++ b/net-misc/electron-cash/electron-cash-4.2.11.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="ncurses?" diff --git a/net-misc/electron-cash/electron-cash-4.2.9.ebuild b/net-misc/electron-cash/electron-cash-4.2.9.ebuild deleted file mode 100644 index a3c9f12450d9..000000000000 --- a/net-misc/electron-cash/electron-cash-4.2.9.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{9..10} ) - -PYTHON_REQ_USE="ncurses?" - -inherit desktop distutils-r1 xdg-utils - -MY_P="Electron-Cash-${PV}" -DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)" -HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash" -SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb - l10n_es l10n_ja l10n_pt l10n_zh-CN" - -REQUIRED_USE=" - || ( cli ncurses qt5 ) - amodem? ( qt5 ) - cosign? ( qt5 ) - digitalbitbox? ( qt5 ) - email? ( qt5 ) - qrcode? ( qt5 ) - sync? ( qt5 ) - vkb? ( qt5 ) -" - -RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/ecdsa[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/pathvalidate[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/pyaes[${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[${PYTHON_USEDEP}] - net-libs/stem[${PYTHON_USEDEP}] - amodem? ( dev-python/amodem[${PYTHON_USEDEP}] ) - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( dev-lang/python ) - dev-libs/libsecp256k1 -" - -S="${WORKDIR}/${MY_P}" - -DOCS="RELEASE-NOTES" - -src_prepare() { - eapply "${FILESDIR}/3.3.6-no-user-root.patch" - - # Prevent icon from being installed in the wrong location - sed -i '/icons/d' setup.py || die - - if use qt5; then - pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die - else - sed "s|'electroncash_gui.qt',||" -i setup.py || die - fi - - local wordlist= - for wordlist in \ - $(usex l10n_ja '' japanese) \ - $(usex l10n_pt '' portuguese) \ - $(usex l10n_es '' spanish) \ - $(usex l10n_zh-CN '' chinese_simplified) \ - ; do - rm -f "electroncash/wordlist/${wordlist}.txt" || die - sed -i "/${wordlist}\\.txt/d" electroncash/mnemonic.py || die - done - - # Remove unrequested GUI implementations: - local gui setup_py_gui - for gui in \ - $(usex cli '' stdio) \ - $(usex qt5 '' qt ) \ - $(usex ncurses '' text ) \ - ; do - rm electroncash_gui/"${gui}"* -r || die - done - - # And install requested ones... - for gui in \ - $(usex qt5 qt '') \ - ; do - setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," - done - - sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || 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}" || die - - local plugin - # trezor requires python trezorlib module - # keepkey requires trezor - for plugin in \ - $(usex amodem '' audio_modem ) \ - $(usex cosign '' cosigner_pool ) \ - $(usex digitalbitbox '' digitalbitbox ) \ - $(usex email '' email_requests ) \ - hw_wallet \ - ledger \ - keepkey \ - $(usex sync '' labels ) \ - trezor \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm -r electroncash_plugins/"${plugin}"* || die - sed -i "/${plugin}/d" setup.py || die - done - - eapply_user - - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 icons/${PN}.png - distutils-r1_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild index 25bf90e5643a..64c650229a76 100644 --- a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild +++ b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="ncurses?" inherit distutils-r1 xdg-utils desktop diff --git a/net-misc/electrum-ltc/metadata.xml b/net-misc/electrum-ltc/metadata.xml index 34dfbc02bb8e..ba01051095fc 100644 --- a/net-misc/electrum-ltc/metadata.xml +++ b/net-misc/electrum-ltc/metadata.xml @@ -9,4 +9,7 @@ <flag name="cli">Enables the CLI interface</flag> <flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag> </use> + <upstream> + <remote-id type="github">pooler/electrum-ltc</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index c70dd058d84d..7d5ce8d29252 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1,3 +1,2 @@ -DIST electrum-4.3.2.gh.tar.gz 5460546 BLAKE2B b2367116aef2a2a76dca30a635188bcd99f0fdd46ce6e8c5a2d6608fbb8f0a58e88b8352c5db92b7c8709f7bbc420fc1860204aca1efc2f2c4be2c788bfa1909 SHA512 dfb137e01ca6e511fb5ac70c34dcb01f36bdb209d7d290bd53c8fa5f95783f346898478d6e58435b241928dfe05ff46455e2e587520d47892c66b3198ab89c82 -DIST electrum-4.3.3.gh.tar.gz 5511225 BLAKE2B dd7700d185ad1d8d58c609a3b388fc4764eca68eb20bb2254046daa5faa5e790fe31a61536ab086a6f632f42346cf22121a3b85b85ae1d45ab8f59ad49e66455 SHA512 33e357d49a0839b269bf8eb5a617b9a866a85a4953a109a382930718ce204a36a93638be1d9111ca9a5349f0aed496e86f5f2b43ffa8b1ce6683c50a8b76ec6c -DIST electrum-4.3.4.gh.tar.gz 5512701 BLAKE2B a57e3ffddacfd5c63dc7f5cb59bbfe06323e7c8ab708d49e1301356fdcc0204e8126894c3c4b6dd790bd8e64cabc84a410592ea94b361cc553d4dcaa5921f50e SHA512 dc821cbda2e95853627b141292da5a07d8a672cfaabb0b160c67b3020442416593136984b42bf021f815e22671fbded67e6d2dee95e4e46f63e5c9a8fe01ebc9 +DIST electrum-4.4.5.gh.tar.gz 5631717 BLAKE2B d780f3f466a337476e235bdb1eb6cd2eddb30bb3f4d9e28510f46594dab444e96d0515cea93ceb7ad4fcaa4b6372aaa80625cdfd3c137fe12e5410489582f5e6 SHA512 6eb91e51a2a0de440e0fe5407a6081a6e5ddd833b528f4a175d17d1b8799eb372f0ef0fa3f66a9b0136e39a7e83f238d33edc33c9bcc32e080f3fa9ac0166e24 +DIST electrum-4.4.6.gh.tar.gz 5637532 BLAKE2B c6b7667c7699f9eb11013c446e203ac4205df1d78e2fb8d44309bd6340c85bd9b4f6aef364f9bf9da4f262b58c74a7830c290c0659cd388b4a50863926dffa67 SHA512 e643a7119a8746d0f9ae02888bcdcf5ab4216ea19483113cf270b2cf23c8c615f0013a2aaf2c5f488655bf52cd190ab76761fa54f4b851039bc7add0c05ad320 diff --git a/net-misc/electrum/electrum-4.3.3-r1.ebuild b/net-misc/electrum/electrum-4.3.3-r1.ebuild deleted file mode 100644 index b6b87e979a15..000000000000 --- a/net-misc/electrum/electrum-4.3.3-r1.ebuild +++ /dev/null @@ -1,95 +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..10} ) -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 - - 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 -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum/electrum-4.3.2-r1.ebuild b/net-misc/electrum/electrum-4.4.5.ebuild index 7dae01a5ebe4..78458a0ccfd1 100644 --- a/net-misc/electrum/electrum-4.3.2-r1.ebuild +++ b/net-misc/electrum/electrum-4.4.5.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="ncurses?" inherit distutils-r1 xdg-utils @@ -27,7 +27,7 @@ REQUIRED_USE="|| ( cli ncurses qt5 )" RDEPEND=" ${PYTHON_DEPS} - <dev-libs/libsecp256k1-0.2 + <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}] @@ -35,12 +35,13 @@ 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}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] @@ -63,6 +64,9 @@ src_prepare() { # 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 @@ -87,6 +91,20 @@ 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() { diff --git a/net-misc/electrum/electrum-4.3.4.ebuild b/net-misc/electrum/electrum-4.4.6.ebuild index 526eb9a1a6bd..1cc9eb1f94ba 100644 --- a/net-misc/electrum/electrum-4.3.4.ebuild +++ b/net-misc/electrum/electrum-4.4.6.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="ncurses?" inherit distutils-r1 xdg-utils @@ -27,7 +27,7 @@ REQUIRED_USE="|| ( cli ncurses qt5 )" RDEPEND=" ${PYTHON_DEPS} - <dev-libs/libsecp256k1-0.2 + <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}] @@ -35,12 +35,13 @@ 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}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] @@ -63,6 +64,9 @@ src_prepare() { # 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 diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest index 7b892213e049..1b6a26247a91 100644 --- a/net-misc/ena-driver/Manifest +++ b/net-misc/ena-driver/Manifest @@ -1,3 +1,3 @@ DIST ena-driver-2.6.1-linux.tar.gz 542085 BLAKE2B 1509d3a22478d648426c788e8343ca121883a2d5fc241a8dbd95836ae48160795ae953a2327ea31190caaf8eaa69d72331a1cf250b56fe8af2fcfd98e3ecd313 SHA512 a24c2c062cd66cbfa8fb9b1fa7093650eda1061bd502a3e57bfdbf3b5b36064f457860e4d5cb045f11de6437e03ad2cfb3390be8876a0ee7a474be1d5cdd8f40 -DIST ena-driver-2.8.0-linux.tar.gz 1196967 BLAKE2B 2f4c5ebba357fbea42aee5f921f60d9b7f18558df6e955e39c81c4e4693b5fe39ae7de2123c6e74e0ea9c99888fcf143b68ce67de55efbd4b30a37cf805cde40 SHA512 549b33f913bc4fa48f27d24e66d77032e32992f7f9c6afb1ce82e89d343516201442c70f3146d919b81632b97baee699f1c60001cb2a1730720681fa28452e3e -DIST ena-driver-2.8.2-linux.tar.gz 1199506 BLAKE2B b9c6ed91341f2475481556dcb7615f97e9701ad0fdd3452d193c334ae169e59a74f66d32d2a8d04c43024dee34282070b65201d635bc01e326a59e8d3aa698dc SHA512 3921dff857b1bbbd9d97401a8740c50d9849fcda71683ca8ba656affcc6df472836b109cb182703b85e2521bc59183a1204eac46f430522f1ba48c8d66e1db7e +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.2.ebuild b/net-misc/ena-driver/ena-driver-2.8.9.ebuild index 21df1541893f..e7f73db785b4 100644 --- a/net-misc/ena-driver/ena-driver-2.8.2.ebuild +++ b/net-misc/ena-driver/ena-driver-2.8.9.ebuild @@ -3,7 +3,7 @@ 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" @@ -17,24 +17,14 @@ 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 +) + +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.0.ebuild b/net-misc/ena-driver/ena-driver-2.9.1.ebuild index 93f2ae0cff84..eb8ed9525827 100644 --- a/net-misc/ena-driver/ena-driver-2.8.0.ebuild +++ b/net-misc/ena-driver/ena-driver-2.9.1.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" @@ -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/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/etherdfs/etherdfs-20180203-r2.ebuild b/net-misc/etherdfs/etherdfs-20180203-r4.ebuild index 50c020777f6f..9a85cc57a896 100644 --- a/net-misc/etherdfs/etherdfs-20180203-r2.ebuild +++ b/net-misc/etherdfs/etherdfs-20180203-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,7 +35,8 @@ src_prepare() { default # Respect users LDFLAGS - sed -e 's/$(CFLAGS)/& $(LDFLAGS)/' -i Makefile || die + # Don't redefine FORTIFY_SOURCE + sed -e 's/$(CFLAGS)/& $(LDFLAGS)/' -e 's/-D_FORTIFY_SOURCE=1//g' -i Makefile || die } src_compile() { @@ -56,7 +57,7 @@ src_install() { newinitd "${FILESDIR}"/etherdfs.initd etherdfs newconfd "${FILESDIR}"/etherdfs.confd etherdfs - systemd_dounit "${FILESDIR}"/etherdfs.service + systemd_newunit "${FILESDIR}"/etherdfs.service-r1 etherdfs.service einstalldocs } diff --git a/net-misc/etherdfs/files/etherdfs.service b/net-misc/etherdfs/files/etherdfs.service-r1 index d5a6ed474a6a..ed56b2dfbdab 100644 --- a/net-misc/etherdfs/files/etherdfs.service +++ b/net-misc/etherdfs/files/etherdfs.service-r1 @@ -4,7 +4,7 @@ After=network-online.target [Service] EnvironmentFile=/etc/conf.d/etherdfs -ExecStart=/usr/bin/ethersrv-linux ${INTERFACE} ${STORAGEDIR} +ExecStart=/usr/bin/ethersrv-linux lo /tmp [Install] WantedBy=multi-user.target diff --git a/net-misc/ethflop/ethflop-20191003-r1.ebuild b/net-misc/ethflop/ethflop-20191003-r2.ebuild index 4c959d92f65d..51efe0cd19d7 100644 --- a/net-misc/ethflop/ethflop-20191003-r1.ebuild +++ b/net-misc/ethflop/ethflop-20191003-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -39,7 +39,7 @@ src_install() { newinitd "${FILESDIR}"/ethflopd.initd ethflopd newconfd "${FILESDIR}"/ethflopd.confd ethflopd - systemd_dounit "${FILESDIR}"/ethflopd.service + systemd_newunit "${FILESDIR}"/ethflopd.service-r1 ethflopd.service dodoc ethflop.txt } diff --git a/net-misc/ethflop/files/ethflopd.service b/net-misc/ethflop/files/ethflopd.service-r1 index 2b6c31902ec6..39fa29a52171 100644 --- a/net-misc/ethflop/files/ethflopd.service +++ b/net-misc/ethflop/files/ethflopd.service-r1 @@ -4,7 +4,7 @@ After=network-online.target [Service] EnvironmentFile=/etc/conf.d/ethflopd -ExecStart=/usr/bin/ethflopd ${INTERFACE} ${STORAGEDIR} +ExecStart=/usr/bin/ethflopd lo /tmp [Install] WantedBy=multi-user.target 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..c1b61d51c65f 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,2 +1,4 @@ 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-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.9.0.ebuild b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild index 4e7072196f80..ca7d9504ea65 100644 --- a/net-misc/freerdp/freerdp-2.9.0.ebuild +++ b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2022 Gentoo Authors +# Copyright 2011-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" RDEPEND=" @@ -55,8 +55,9 @@ RDEPEND=" x11-libs/libXrandr ) 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 @@ -79,7 +80,10 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-util/valgrind ) +" BDEPEND=" virtual/pkgconfig X? ( doc? ( @@ -88,6 +92,10 @@ BDEPEND=" ) ) " +PATCHES=( + "${FILESDIR}"/${P}-ffmpeg-6.patch +) + src_configure() { # bug #881695 filter-lto @@ -106,12 +114,14 @@ src_configure() { -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) -DWITH_JPEG=$(usex jpeg ON OFF) + -DWITH_GSSAPI=$(usex kerberos ON OFF) -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) -DWITH_OPENH264=$(usex openh264 ON OFF) -DWITH_PULSE=$(usex pulseaudio ON OFF) -DWITH_SERVER=$(usex server ON OFF) -DWITH_PCSC=$(usex smartcard ON OFF) -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) + -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF) -DWITH_X11=$(usex X ON OFF) -DWITH_XINERAMA=$(usex xinerama ON OFF) -DWITH_XV=$(usex xv ON OFF) diff --git a/net-misc/freerdp/freerdp-2.10.0.ebuild b/net-misc/freerdp/freerdp-2.11.0-r1.ebuild index 871cd1613174..2a906f8c6a0d 100644 --- a/net-misc/freerdp/freerdp-2.10.0.ebuild +++ b/net-misc/freerdp/freerdp-2.11.0-r1.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 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,9 +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 @@ -79,7 +81,10 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-util/valgrind ) +" BDEPEND=" virtual/pkgconfig X? ( doc? ( @@ -93,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) @@ -105,13 +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.1.ebuild b/net-misc/freerdp/freerdp-2.11.1.ebuild new file mode 100644 index 000000000000..2a906f8c6a0d --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.1.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 aabe0a91863d..2a906f8c6a0d 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2022 Gentoo Authors +# Copyright 2011-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 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,9 +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 @@ -79,7 +81,10 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-util/valgrind ) +" BDEPEND=" virtual/pkgconfig X? ( doc? ( @@ -93,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) @@ -105,13 +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-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 aabe0a91863d..bce001a9b143 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2022 Gentoo Authors +# Copyright 2011-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +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? ( @@ -54,9 +55,15 @@ 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 ) + sdl? ( + media-libs/libsdl2 + media-libs/sdl2-ttf + ) server? ( X? ( x11-libs/libXcursor @@ -68,7 +75,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 @@ -79,7 +89,10 @@ RDEPEND=" x11-libs/libxkbfile ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-util/valgrind ) +" BDEPEND=" virtual/pkgconfig X? ( doc? ( @@ -93,10 +106,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) @@ -106,16 +122,22 @@ src_configure() { -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_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..bab72ad70c2a 100644 --- a/net-misc/freerdp/metadata.xml +++ b/net-misc/freerdp/metadata.xml @@ -6,6 +6,7 @@ <name>Mike Gilbert</name> </maintainer> <use> + <flag name="aad">Enable login via Azure AD</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 8a218a181e80..4110279680e9 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -1,2 +1,3 @@ -DIST frr-8.4.1.tar.gz 9886182 BLAKE2B be270f34e9ffdbf87a10c7bbd73e9f244128821f1c014060880015e4e7e06165dbc1dc3253894bda5dc1a0607a5bdbad21a70532e9019f1e06d0abd24beffff1 SHA512 69f936580d2e7838e1f15fdfa71a4fa00e7acaa93df4cdbd6129560fbcd45f3754cf5d03b4c9331bf4850477560d63d5509d185098583d19fa93d9e960e1483a -DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac SHA512 1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7 +DIST frr-8.5.2.tar.gz 10076639 BLAKE2B 2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404 SHA512 1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972 +DIST frr-8.5.tar.gz 10068379 BLAKE2B ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4 SHA512 13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f +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-v2 b/net-misc/frr/files/frr-openrc-v2 new file mode 100644 index 000000000000..24e326ed84a7 --- /dev/null +++ b/net-misc/frr/files/frr-openrc-v2 @@ -0,0 +1,301 @@ +#!/sbin/openrc-run +# +# FRR OpenRC init script. +# +# Copyright (C) 2020 Rafael F. Zalamena +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; only version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +description="FRR initialization script." + +# FRR variables. +frr_dir="/usr/lib/frr" +frr_state_dir="/run/frr" +config_file="/etc/frr/frr.conf" +daemon_file="/etc/frr/daemons" +daemon_db="/run/frrdb" +vty_config_file="/etc/frr/vtysh.conf" +frr_reload="$frr_dir/frr-reload.py" +frr_reload_log="$frr_state_dir/reload.log" + +# Don't change profile here, use $daemon_file. This is the default. +frr_profile="traditional" + +# watchfrr variables. +watchfrr_daemons='' +watchfrr_pidfile="$frr_state_dir/watchfrr.pid" + +# +# Helpers. +# +_check_daemon_binary() { + local daemon=$1 + + [ -x "$frr_dir/$daemon" ] && return 0 + + eerror "No binary found for $daemon in $frr_dir" + return 1 +} + +_load_daemon_list() { + # Load FRR daemons configuration file. + while read line <&3 ; do + case $line in + ""|"#"*) + # Skip empty/commented lines. + continue + ;; + + *d=*|*_instances=*|*_options=*|*_wrap=*) + # Load daemon options. + eval "$line" + ;; + + MAX_FDS=*|frr_profile=*|vtysh_enable=*) + # Load misc configuration. + eval "$line" + ;; + esac + done 3< $daemon_file + + # `zebra` and `staticd` are mandatory. + _check_daemon_binary 'zebra' || return 1 + _check_daemon_binary 'staticd' || return 1 + watchfrr_daemons='zebra staticd' + + # Create the watchfrr command line. + for daemon in \ + babeld bfdd bgpd eigrpd fabricd isisd ldpd nhrpd ospfd ospf6d pbrd \ + pimd ripd ripngd sharpd vrrpd \ + ; do + # Trick to read variable name with variable. + cdaemon=$(eval echo \$$daemon) + cdaemon_instances=$(eval echo \$${daemon}_instances) + + # Add daemon to command line if specified. + if [ ! -z $cdaemon ] && [ $cdaemon = 'yes' ]; then + _check_daemon_binary $daemon || return 1 + + # Multi instance daemon handling. + if [ ! -z $cdaemon_instances ]; then + for instance in $(echo $cdaemon_instances | tr ',' ' '); do + watchfrr_daemons="$watchfrr_daemons $daemon-$instance" + done + continue + fi + + # Single instance daemon handling. + watchfrr_daemons="$watchfrr_daemons $daemon" + continue + fi + done +} + +_frr_start() { + # Apply MAX_FDS configuration if set. + if [ ! -z $MAX_FDS ]; then + veinfo " Setting maximum file descriptors to ${MAX_FDS}" + prlimit -n $MAX_FDS >/dev/null 2>/dev/null + fi + + # Save started daemons to state database. + rm -f -- $daemon_db + for daemon in $watchfrr_daemons; do + echo $daemon >> $daemon_db + veinfo " Starting $daemon..." + done + + veinfo " Starting watchfrr..." + + # Start watchfrr which will start all configured daemons. + eval $all_wrap $frr_dir/watchfrr -d -F $frr_profile $watchfrr_daemons + + veinfo " Loading configuration..." + + # After starting the daemons, lets load the configuration. + if [ $vtysh_enable = 'yes' ]; then + vtysh -b -n + else + veinfo " Configuration loading disabled (vtysh_enable=$vtysh_enable)" + fi +} + +_get_pid() { + local daemon=$1 + local pid_file="$frr_state_dir/$daemon.pid" + + # Test for file existence. + if [ ! -r "$pid_file" ]; then + eerror "Failed to find or read $daemon pid file" + return 1 + fi + + # Get PID if any. + pid=$(cat $pid_file) + if [ -z $pid ]; then + eerror "$daemon PID file empty" + return 1 + fi + + return 0 +} + +_stop_daemon() { + local daemon=$1 + local pid_file="$frr_state_dir/$daemon.pid" + + # Get daemon pid. + _get_pid $daemon + + # Ask daemon to quit. + kill -2 "$pid" + + # Test if daemon is still running. + attempts=1200 + while kill -0 "$pid" 2>/dev/null; do + sleep 0.5 + [ $((attempts - 1)) -gt 0 ] || break + done + + # Tell user about our situation. + if kill -0 "$pid" 2>/dev/null ; then + eerror "Failed to stop $daemon (PID=${pid})" + return 1 + else + rm -f -- $pid_file + fi +} + +_frr_stop() { + local failures=0 + + # Stop watchfrr first so it doesn't restart anyone. + veinfo " Stopping watchfrr..." + _stop_daemon watchfrr || failures=1 + + # Read started daemon database. + while read line <&3 ; do + case $line in + ""|"#"*) + # Skip empty/commented lines. + continue + ;; + + *) + # Get daemon name. + veinfo " Stopping $line..." + _stop_daemon $line || failures=1 + ;; + esac + done 3< $daemon_db + + # Remove daemon database file. + rm -f -- $daemon_db + + return $failures +} + +_check_watchfrr() { + _get_pid watchfrr || return 1 + return 0 +} + +# +# Main. +# +depend() { + # We need root to write logs. + need localmount + # Optionally wait for network to start. + use net + # Expect /run to be ready. + after bootmisc +} + +start_pre() { + # Check configuration file readability. + checkpath -f -m 0640 -o frr:frr $vty_config_file + checkpath -f -m 0640 -o frr:frr $daemon_file + checkpath -f -m 0640 -o frr:frr $config_file + + # Check run state directory. + checkpath -d -o frr $frr_state_dir + + # Load daemon list and peform checks. + _load_daemon_list +} + +start() { + # Load daemon list. + _load_daemon_list + + # Handle restarts. + if [ "$RC_CMD" = 'restart' ]; then + ebegin 'Reloading FRR configuration' + else + ebegin 'Starting FRR' + fi + + # Start FRR. + _frr_start + + # New daemons and watchfrr started, apply new configuration. + if [ "$RC_CMD" = 'restart' ]; then + "$frr_reload" --reload "$config_file" 2>/run/frr/reload.log + [ $? -ne 0 ] && ewarn " Failed to reload (check $frr_reload_log)" + # NOTE: we can't return bad status otherwise OpenRC will think we + # failed to start, lets print a helpful message instead. + fi + + eend 0 +} + +stop() { + local failures=0 + + # Handle restarts. + if [ "$RC_CMD" = 'restart' ]; then + # Load daemon list. + _load_daemon_list + + # We must restart 'watchfrr' in order to start new daemons. + veinfo " Stopping watchfrr..." + _stop_daemon watchfrr + + # Stop daemons that are no longer in configuration file. + for daemon in $(ls -1 /run/frr/*.pid | cut -d '.' -f 1); do + # Filter daemon name. + daemon=$(basename "$daemon") + + # Skip watchfrr. + [ "$daemon" = 'watchfrr' ] && continue + + echo "$watchfrr_daemons" | grep "$daemon" >/dev/null + if [ $? -ne 0 ]; then + veinfo " Stopping $daemon..." + _stop_daemon $daemon + fi + done + + return 0 + fi + + ebegin 'Stopping FRR' + _frr_stop || failures=1 + eend $failures 'some daemons failed to stop' +} + +status() { + _check_watchfrr || return 1 +} diff --git a/net-misc/frr/frr-8.4.2.ebuild b/net-misc/frr/frr-8.5.2-r1.ebuild index ada6b8925460..3d4d9aba14d7 100644 --- a/net-misc/frr/frr-8.4.2.ebuild +++ b/net-misc/frr/frr-8.5.2-r1.ebuild @@ -48,12 +48,12 @@ RDEPEND=" ${COMMON_DEPEND} $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') !net-misc/quagga + sys-apps/util-linux " 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 +143,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.1.ebuild b/net-misc/frr/frr-8.5.ebuild index 1edebad2d2fe..7ad15586bc9b 100644 --- a/net-misc/frr/frr-8.4.1.ebuild +++ b/net-misc/frr/frr-8.5.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" diff --git a/net-misc/frr/frr-9.0.ebuild b/net-misc/frr/frr-9.0.ebuild new file mode 100644 index 000000000000..73df8c4dd6f6 --- /dev/null +++ b/net-misc/frr/frr-9.0.ebuild @@ -0,0 +1,151 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools pam python-single-r1 systemd + +DESCRIPTION="The FRRouting Protocol Suite" +HOMEPAGE="https://frrouting.org/" +SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz" +# FRR tarballs have weird format. +S="${WORKDIR}/frr-${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + acct-user/frr + dev-libs/json-c:0= + dev-libs/protobuf-c:0= + >=net-libs/libyang-2.0.0 + <net-libs/libyang-2.1.111 + sys-libs/libcap + sys-libs/readline:0= + virtual/libcrypt:= + grpc? ( net-libs/grpc:= ) + nhrp? ( net-dns/c-ares:0= ) + pam? ( sys-libs/pam ) + rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) + snmp? ( net-analyzer/net-snmp:= ) +" +BDEPEND=" + ~dev-util/clippy-${PV} + sys-devel/flex + app-alternatives/yacc + doc? ( dev-python/sphinx ) +" +DEPEND=" + ${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) + test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) +" +RDEPEND=" + ${COMMON_DEPEND} + $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') + !net-misc/quagga +" + +PATCHES=( + "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch + "${FILESDIR}"/${PN}-8.4.1-logrotate.patch +) + +src_prepare() { + default + + python_fix_shebang tools + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --with-pkg-extra-version="-gentoo" + --enable-configfile-mask=0640 + --enable-logfile-mask=0640 + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/lib/frr + --sbindir="${EPREFIX}"/usr/lib/frr + --libexecdir="${EPREFIX}"/usr/lib/frr + --sysconfdir="${EPREFIX}"/etc/frr + --localstatedir="${EPREFIX}"/run/frr + --with-moduledir="${EPREFIX}"/usr/lib/frr/modules + --with-clippy="${BROOT}"/usr/bin/clippy + --enable-user=frr + --enable-group=frr + --enable-vty-group=frr + --enable-multipath=64 + $(use_enable doc) + $(use_enable fpm) + $(use_enable grpc) + $(use_enable ipv6 ospf6d) + $(use_enable ipv6 ripngd) + $(use_enable ipv6 rtadv) + $(use_enable kernel_linux realms) + $(use_enable nhrp nhrpd) + $(usex ospfapi '--enable-ospfclient' '' '' '') + $(use_enable rpki) + $(use_enable snmp) + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + + use doc && emake -C doc html +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + # Install user documentation if asked + use doc && dodoc -r doc/user/_build/html + + # Create configuration directory with correct permissions + keepdir /etc/frr + fowners frr:frr /etc/frr + fperms 775 /etc/frr + + # Create logs directory with the correct permissions + keepdir /var/log/frr + fowners frr:frr /var/log/frr + fperms 775 /var/log/frr + + # Install the default configuration files + insinto /etc/frr + doins tools/etc/frr/vtysh.conf + doins tools/etc/frr/frr.conf + doins tools/etc/frr/daemons + + # Fix permissions/owners. + fowners frr:frr /etc/frr/vtysh.conf + fowners frr:frr /etc/frr/frr.conf + fowners frr:frr /etc/frr/daemons + fperms 640 /etc/frr/vtysh.conf + fperms 640 /etc/frr/frr.conf + fperms 640 /etc/frr/daemons + + # Install logrotate configuration + insinto /etc/logrotate.d + newins redhat/frr.logrotate frr + + # Install PAM configuration file + use pam && newpamd "${FILESDIR}"/frr.pam frr + + # Install init scripts + systemd_dounit tools/frr.service + newinitd "${FILESDIR}"/frr-openrc-v2 frr + + # Conflict files, installed by net-libs/libsmi, bug #758383 + rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die +} diff --git a/net-misc/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 11053f2c6277..b0a47e1d0637 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,5 +1 @@ -DIST gallery-dl-1.24.2.gh.tar.gz 509230 BLAKE2B e0be565c00d4c81b613bdc3fe9983a5a7cc7a1f131750ec79f16e3b38d134f49ef8fb8f9585767c1abdb3c3d3abc4681f5546460373d53da0646f7fd73a3d47b SHA512 2b8780d9ebf868635f76315a5f7a426ed72b4db4e7a12f97ebc86520fa6d5908f39fb26e876cbc46e8249b083f3bf5dc4d38a3c2ddb27873c473c80bac0af415 -DIST gallery-dl-1.24.4.gh.tar.gz 518668 BLAKE2B 73ef2894d1355716001a5b82c43547d8156a646136b9a87e91ab0c51c4c238509da077e6ca79e8701a65c3e846aaa4adeac8d3f8cdfb50e140e815f56b55d358 SHA512 19285f9db2eba95252f13af176c314a318fd71503913ce6b54e4b31d0c41b1ca79498289531ca0b9d67630395c8212ba497c5c2a838f554c24d1672c5c16caf3 -DIST gallery-dl-1.24.5.gh.tar.gz 525743 BLAKE2B 6b8611242bbb6a6dc76508ec452c3618fe75d6ffdc3185b5f246e5568f32861647649d63e9479b187f086aeb4ea4f567567fc387bbe1df0cb4994a00d4ba76f1 SHA512 648707e5be450501aa66f34b89aae1cf7b80c93bee5105c9eeae4fa19e34df41b231066a23113e963119105050e6aed8e654d10d107086ab5a815095dcf562c2 -DIST gallery-dl-1.25.0.gh.tar.gz 540793 BLAKE2B e02daf0b2deb8196fc587a3fd17e4bb8b0d14ca67c6384e120d3fadaa261b5d9143885c2717d0e98dc0467285a7ebfa9f9bc5da7ad5bd39a239a6975e0a900eb SHA512 e0cc041343130acf47f0ab4b7b7ac0ac42389bc457748404b9b0bc17f8a8690b225ab30c0c3d523925138608508417ecc4052981a5615d0747a2a064f6236ed4 -DIST gallery-dl-1.25.1.gh.tar.gz 543977 BLAKE2B ab6437ebb4f840fb3fac27a3f0d2536215dc02376b0129d9b7d4c9420cc64405edf5961c0155d7fb9d7001028bf218a299bfd44bbf2ef2b60f567e51050e504e SHA512 96f929af5cf70c7a89eca2ac8380cd7ba36ed806d062a6e339238ebfec2387aa4806d432cd28599b37382a69d7cdb33306069d41954e1421dff2523e2ae6a8df +DIST gallery-dl-1.25.8.gh.tar.gz 570435 BLAKE2B 33cd558c0f30cc31adbd0a51365b9501309be001cb0f7a3bb83e21dc797ca7e097b94e1575e4c0342fad44a5fca07a486d1e44db1a12d90ade06d0bc4acf8384 SHA512 22bd9e330efe24cb56e7b9b3eb219094aa897bb620253c4dd3fcda33df82fc021f1151dd9a6aff1f762c3ed4d426aadc75a398a659b30f64f254780554f46687 diff --git a/net-misc/gallery-dl/gallery-dl-1.24.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.24.4.ebuild deleted file mode 100644 index f6cab0159f71..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.24.4.ebuild +++ /dev/null @@ -1,39 +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 -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.24.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.24.5.ebuild deleted file mode 100644 index f6cab0159f71..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.24.5.ebuild +++ /dev/null @@ -1,39 +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 -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.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.25.0.ebuild deleted file mode 100644 index 9dcd7bdbba2f..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.25.0.ebuild +++ /dev/null @@ -1,39 +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 -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.25.1.ebuild deleted file mode 100644 index 9dcd7bdbba2f..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.25.1.ebuild +++ /dev/null @@ -1,39 +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 -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.24.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.25.8.ebuild index f6cab0159f71..e83e798733f1 100644 --- a/net-misc/gallery-dl/gallery-dl-1.24.2.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.25.8.ebuild @@ -22,7 +22,8 @@ fi LICENSE="GPL-2" SLOT="0" -# tests require network access +# Tests require network access. +PROPERTIES="test_network" RESTRICT="test" RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild index 9dcd7bdbba2f..b3da2a9c870f 100644 --- a/net-misc/gallery-dl/gallery-dl-9999.ebuild +++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild @@ -22,7 +22,8 @@ fi LICENSE="GPL-2" SLOT="0" -# tests require network access +# Tests require network access. +PROPERTIES="test_network" RESTRICT="test" RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" 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/geomyidae/Manifest b/net-misc/geomyidae/Manifest index 80daa6666b7c..61b389f74027 100644 --- a/net-misc/geomyidae/Manifest +++ b/net-misc/geomyidae/Manifest @@ -1 +1,2 @@ DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41 +DIST geomyidae-v0.69.tar.gz 34631 BLAKE2B a1d7e33d403df5d6bb4d5fdc0999fdcfa94da058dd5dc1c0f22c49b9cc1b06cf45fafdb839eb91dec78be0aa778e3a74bf26d8ffa5054d45e5c6e86918480ad4 SHA512 c66f751472c35107c2c91f1675ab40bf68da1d3d5742ec94125c8ecba54b2832e82c8106a3627da53216cf3802ae7900ef8457c383160614ecce2a07b318662a diff --git a/net-misc/geomyidae/geomyidae-0.69.ebuild b/net-misc/geomyidae/geomyidae-0.69.ebuild new file mode 100644 index 000000000000..3bd6b1bc1db3 --- /dev/null +++ b/net-misc/geomyidae/geomyidae-0.69.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A daemon to serve the gopher protocol" +HOMEPAGE="http://r-36.net/scm/geomyidae/" +SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tar.gz" + +S="${WORKDIR}/${PN}-v${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND=" + acct-group/gopherd + acct-user/gopherd + dev-libs/libretls:0= +" +DEPEND="${RDEPEND}" + +src_prepare() { + # remove /usr/lib from LDFLAGS, bug #731672 + sed -i \ + -e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \ + Makefile || die 'sed on Makefile failed' + + eapply_user +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dosbin ${PN} + + newinitd rc.d/Gentoo.init.d ${PN} + newconfd rc.d/Gentoo.conf.d ${PN} + + insinto /var/gopher + doins index.gph + fowners -R root:gopherd /var/gopher + fperms -R g=rX,o=rX /var/gopher + + doman ${PN}.8 + dodoc CGI.md README +} diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest index ddd60768bfa8..98e1e21d1893 100644 --- a/net-misc/gnome-connections/Manifest +++ b/net-misc/gnome-connections/Manifest @@ -1,3 +1,2 @@ -DIST gnome-connections-43.0.tar.xz 3992760 BLAKE2B 16ff3cc5d587a6169fdf749ae6e743cd0fbec2b6e127c684ec42ba17da6e73d1d66ef4ef621d01452d21230dc8c99bc27678ec0364b9522b5685cec4b9c69445 SHA512 cd9d53f2e4b8e679992c5a65aa89554d1b840174ecf0f75f103265ebc2f07f63f210da4ef7e3c36af8b5fe761ec9ae4711eb92f5f40ae00225fcd9f2f8a9157b -DIST gnome-connections-44.0.tar.xz 3998876 BLAKE2B 062769eafddb52da9962a59c11697205a0370d890425488a29d1bec2d4f2ba62041ff7d271d9bc7aae1a4fe108fa617864eea63755a6c02de07b340329dd2e5c SHA512 8193877175e5d553ada0b0c7985ee2029c85d0cb2fde16d5a47b9c6c0027deb22c4d1c8f4b2188ab430f3702318b2c1a229b0297a1e90aea45697e733733b3e9 -DIST gnome-connections-44.rc.tar.xz 3998264 BLAKE2B a6d44c699e6698cba6b794cd0f36db971a8fc59bad4b4fe8f9b2a9b4c5be2eb66368c5dac0c4321195a1f3b30d1ac7196d76284ff01ab2806b8fad462f32a7e9 SHA512 8c23725340595fc0e3642a362e539e0f87b6908d0b35d4871a61984c40523f3c30dec1bdff7f68bc04c8d89fea742c91f5c5c3f2e389039e0c295cb33d661c23 +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-43.0.ebuild b/net-misc/gnome-connections/gnome-connections-43.0.ebuild deleted file mode 100644 index 0233ec0e65d1..000000000000 --- a/net-misc/gnome-connections/gnome-connections-43.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit gnome.org gnome2-utils meson python-any-r1 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" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/gobject-introspection - >=dev-libs/glib-2.50:2 - >=x11-libs/gtk+-3.22:3[introspection] - >=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=" - ${PYTHON_DEPS} - $(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-connections/gnome-connections-44.0.ebuild b/net-misc/gnome-connections/gnome-connections-44.1.ebuild index 325726aeadc2..325726aeadc2 100644 --- a/net-misc/gnome-connections/gnome-connections-44.0.ebuild +++ b/net-misc/gnome-connections/gnome-connections-44.1.ebuild diff --git a/net-misc/gnome-connections/gnome-connections-44_rc.ebuild b/net-misc/gnome-connections/gnome-connections-45.0.ebuild index 74f7c0599466..b6330f5a7f91 100644 --- a/net-misc/gnome-connections/gnome-connections-44_rc.ebuild +++ b/net-misc/gnome-connections/gnome-connections-45.0.ebuild @@ -7,12 +7,10 @@ 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" -SRC_URI="https://download.gnome.org/sources/${PN}/44/${PN}-44.rc.tar.xz" -S="${WORKDIR}/${PN}-44.rc" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~loong" IUSE="test" RESTRICT="!test? ( test )" @@ -20,6 +18,7 @@ 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 diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest deleted file mode 100644 index 0bc8613a87a7..000000000000 --- a/net-misc/gnome-online-miners/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gnome-online-miners-3.34.0-tracker3.patch 61820 BLAKE2B 0f9f6f09ffb90a5087d227b9eee6f8016cd83cf2459d10a727448dd2a7263e5e1d0ad8b58932e3e7cb86dd32aafc3ead700f7db46d7f9a099ed000acc472aa2d SHA512 11d29fcb91175e6df20dcfdab8ae758a45d2ab03430c1b09284739ad5071b3c3a6297626dd4fa0584021c26d306dced4c0deb109e7488bf48627ee3bc32d443d -DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464 diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild deleted file mode 100644 index 491fb418c85f..000000000000 --- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME2_EAUTORECONF="yes" - -inherit gnome2 - -DESCRIPTION="Crawls through your online content" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners" -SRC_URI="${SRC_URI} - https://src.fedoraproject.org/rpms/gnome-online-miners/raw/f36/f/tracker3.patch -> ${P}-tracker3.patch" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="flickr" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" - -# libgdata[gnome] needed for goa support -RDEPEND=" - app-misc/tracker:3= - >=dev-libs/glib-2.56.0:2 - >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] - media-libs/grilo:0.3 - >=net-libs/gnome-online-accounts-3.13.3:= - >=net-libs/libgfbgraph-0.2.2:0.2 - >=net-libs/libzapojit-0.0.2 - flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - # From Fedora, waiting to be accepted by upstream - # https://gitlab.gnome.org/GNOME/gnome-online-miners/-/merge_requests/3 - "${DISTDIR}/${P}-tracker3.patch" -) - -src_configure() { - gnome2_src_configure \ - $(use_enable flickr) \ - --disable-static \ - --enable-facebook \ - --enable-google \ - --enable-media-server \ - --enable-owncloud \ - --enable-windows-live -} diff --git a/net-misc/gnome-online-miners/metadata.xml b/net-misc/gnome-online-miners/metadata.xml deleted file mode 100644 index f3596b32d252..000000000000 --- a/net-misc/gnome-online-miners/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <use> - <flag name="flickr">Enable Flickr support</flag> - </use> - <upstream> - <remote-id type="gnome-gitlab">Archive/gnome-online-miners</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest index 6d14aad81427..0b63ac2313b3 100644 --- a/net-misc/gnome-remote-desktop/Manifest +++ b/net-misc/gnome-remote-desktop/Manifest @@ -1,3 +1,3 @@ -DIST gnome-remote-desktop-43.3.tar.xz 196540 BLAKE2B a33dcb830cd5ed0e9c44da8717a7c621231a97a0d503daa007d6d4c47feb83e16905f61a9ebe60ce5231b7fbad035ab24603284f9c9212ccb48dab90cb845a5c SHA512 67dc7c4ab7d2db9ef843e30b688e024ed91341c09fbf4c7d33f4c1d8b7d9d3564fb64bc948b12f2aee3ca8a545fb21842ce79970ec1ddaf99fd64c41a44b8f59 -DIST gnome-remote-desktop-44.0.tar.xz 199392 BLAKE2B a1a58a9d100dc1cf40fe03eaf611ac4c895bfb4e135a05ce25d8e00cafb5b7eecddcd7ca98bec65f39ef65fe430e1827214a5775820383f6502f10c437f761b0 SHA512 6ca62126790be4498806aeb61c02edf68f113aa1ec53ab73f8bd822b10f5957b32a67d5a23f7ba023db117a8b2fe8fb3be87ea72bca1c22dedde00e94677549e -DIST gnome-remote-desktop-44.rc.tar.xz 199388 BLAKE2B 69ee4ad0cae29eea60a79cce24b5852fdffb524af599e21a4a4963bac6e10fa3cef9c4ed361fc1fb2ebf4954968365288ec6da747e1363b0e0e87e7faeeb138a SHA512 ed33a3add26ada4b8d15d3e0e22cb14ac87c6779c5c7ad89db5ceacae457b4967460a40994c38ebf59b194c23c6d5a94e1b8719ad60d582961091b7ca9ad5ae2 +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.rc.tar.xz 210708 BLAKE2B 4914490b4be2a3e801fdf61085d042dd7ce48b3afebe2088eb8402e1a3498035afe974b4842b18a3302bb34b0a376aaf0dc98cc748b14c19d0d4ca2d388b87db SHA512 1aea24c27c45d343821abe2cb4429afdba14cd636885bdac9f80bf811732e33249bb24632ee723dbe609a77488434051e4f109570da93397cd1e25aba96de1d0 diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.0.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.ebuild index 595e4cdbee2a..595e4cdbee2a 100644 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.0.ebuild +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.ebuild diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44_rc.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild index c842fb5d9532..d7c4a7f43cf6 100644 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44_rc.ebuild +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild @@ -7,8 +7,6 @@ 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" -SRC_URI="https://download.gnome.org/sources/${PN}/44/${PN}-44.rc.tar.xz" -S="${WORKDIR}/${PN}-44.rc" LICENSE="GPL-2+" SLOT="0" @@ -22,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:= @@ -44,6 +43,7 @@ RDEPEND="${DEPEND} x11-wm/mutter[screencast] " BDEPEND=" + dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig @@ -60,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-43.3.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45_rc.ebuild index 9b0c3dfafbb2..d7c4a7f43cf6 100644 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.3.ebuild +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45_rc.ebuild @@ -20,13 +20,14 @@ 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:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 - >=net-misc/freerdp-2.8.0:=[server] + >=net-misc/freerdp-2.10.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 @@ -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/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index f5ada3e45297..edd110e4f8db 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,2 +1,2 @@ -DIST gns3-gui-2.2.34.tar.gz 5045580 BLAKE2B 00ec1a44d9ff0ce9157e578c984fb619458b267d0f2906cef0c1766fca6c3cf542ce87eef317dfe2c96899f8e4a7d178dca9bb62e5c3a514f63306b105b9fb43 SHA512 46f43d6696f6f2aa8ed64b126d95e93416898aeb87558e9dd505c1ca9fc31de0cbfc8a8eeb26027f13a68bfcd96424e2c17073e7e583e8f4eeeaf6758317e437 -DIST gns3-gui-2.2.37.tar.gz 5048202 BLAKE2B bfc26350b60f7f790ab603bcc27ca4432bb4b19d92a3bcd766aa6739a332599afb5f710ff209b708a71fb4a4f515ce3f215434c025418989410d3dfa3a80c294 SHA512 800d746ba90be06260fac8f2a9db471da47aff66f10b94cfa46053d93820ba3e06b8e7146829de1bf7e8b09f83f4a57965bc044e0683f210a5cb3faadf9d4dd4 +DIST gns3-gui-2.2.41.tar.gz 5046775 BLAKE2B 8ca83ed58312bd2cf0c0e854cebe6001121bf21e9f26804b779fc81ec06689c154d704b9cf2e7a5d57608519c3fbe724b07437b64c5840dd2ad6119f38669a29 SHA512 b86e23808c6158d6811a51901aff3f10c9722ca51389c2d241c6d174992299c83529014e6a098a2d5777fabda212ffb2731025843cc317f8560868bcb8cb2195 +DIST gns3-gui-2.2.42.tar.gz 5048413 BLAKE2B 19c4f1977797af0a3c2bbed926cc8f9361840658dbdc25ad9a2972bec21749c84d5cdc477079f01b8c354e21e9663b27bcbc09f974c914c188f98ec151b7bd67 SHA512 19940857308da3810047cec9285c34b0011e4dc44a1316bf2fe5042e0f255546e8e3d2d4788a1f70baedb498a295223916633f4950ef9dbfa19b8e72c7545176 diff --git a/net-misc/gns3-gui/gns3-gui-2.2.37.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.41.ebuild index 650a3b5a099a..50f98a4b6407 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.37.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.41.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +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/sentry-sdk-1.17.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-gui/gns3-gui-2.2.34.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild index ee2c380c56e5..5834bf62b463 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.34.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +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/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.1[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.9.5[${PYTHON_USEDEP}] + >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}] ~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 f1a72b8aefc4..836d982115b0 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,2 +1,2 @@ -DIST gns3-server-2.2.34.tar.gz 10249497 BLAKE2B 740ce654a675fb096434685d496f4fea25d19881237b160293ddb8a66ddbcaf7bcf399dd7a19e87cd68fb6d7aadee6420f7b07227d2b3aa4af1a2087ed65c134 SHA512 576e7e04f2681912882b98b19155d7ec61d10e6c54c40878c3850b0432763c18a3eca4f12bb7c1b19a836e440183fbad356e6cff3d84487767fe82f29e4adfd8 -DIST gns3-server-2.2.37.tar.gz 9690092 BLAKE2B 9cc7dabde818996ea87494cb4a61a4ba5f9ad2dfe028a4ca9d45e9bd8f6dd4a17b4845275a87386ad068be4f354f932e6cada8d2b8eafd54230ea82fae3f5571 SHA512 f56d1f130e3179fe250b12e9459d8b66745c780c94380cce0ed60206918458f4aab119faa77b23ef7c58115bee11ff2ef6630539b5f184ab2d36b936564de1b7 +DIST gns3-server-2.2.41.tar.gz 10736066 BLAKE2B c2ab5c99a67a8cd79a898e244a77eea13477c6030b5b11a63c1747802ff309dc77ee62a6ad7191c7d8bf84d62badecf924379eb58afb4d4f111a9d34380d4aec SHA512 ec34bb81e96034a36f4bc7aeadaf5ae221be23069612477e5af9c908e3764e44029d22115eac602e0a26fedc99d67d4ed64cbf5da12c6a89bf00c3cd99d2ab7b +DIST gns3-server-2.2.42.tar.gz 10735078 BLAKE2B 424f73fcb7377a518873b4880b77b6e057d8293fb96073eca59224b0e5e5c1e50114f30c564b861e91769380d9d15b3c2c28a8f4cec3358282902af09eeccd30 SHA512 9982fabcdd587b090833b9137124a0accb2990cee91ca5d19d8ee691f807d547670a38b2168d0f71465088a3971eac73e101cc284922732b5132ac47b84d84f6 diff --git a/net-misc/gns3-server/files/gns3-server-2.2.33.1-openrc-posix-complaint.patch b/net-misc/gns3-server/files/gns3-server-2.2.33.1-openrc-posix-complaint.patch deleted file mode 100644 index 9c263bd812f9..000000000000 --- a/net-misc/gns3-server/files/gns3-server-2.2.33.1-openrc-posix-complaint.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 3b108563a0784df332791d44cf70bbba0fc81822 -Author: Michael Mair-Keimberger <mmk@levelnine.at> -Date: Mon Aug 8 19:23:16 2022 +0200 - - gns3.service.openrc: make openrc script posix compliant - -diff --git a/init/gns3.service.openrc b/init/gns3.service.openrc -index 8b0864cd..5a574fca 100755 ---- a/init/gns3.service.openrc -+++ b/init/gns3.service.openrc -@@ -23,8 +23,8 @@ depend() { - - checkconfig() { - if yesno "${GNS3_SERVER_LOG_ENABLED}" ; then -- command_args+=" --log ${GNS3_SERVER_LOG}"; -- if [ "${command_user}" ] ; then -+ command_args="${command_args} --log ${GNS3_SERVER_LOG}"; -+ if [ "${command_user}" ] ; then - checkpath --directory --mode 0700 --owner "${command_user}" "${GNS3_SERVER_LOG_PATH}"; - else - unset command_user diff --git a/net-misc/gns3-server/gns3-server-2.2.37.ebuild b/net-misc/gns3-server/gns3-server-2.2.41.ebuild index d399b6d9463f..174ef962de0c 100644 --- a/net-misc/gns3-server/gns3-server-2.2.37.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.41.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+" @@ -21,15 +21,15 @@ RDEPEND=" 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-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/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.17.0[${PYTHON_USEDEP}] net-misc/ubridge sys-apps/busybox[static] " diff --git a/net-misc/gns3-server/gns3-server-2.2.34.ebuild b/net-misc/gns3-server/gns3-server-2.2.42.ebuild index 0b9158470f08..de2185845ca4 100644 --- a/net-misc/gns3-server/gns3-server-2.2.34.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.42.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +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,18 +20,18 @@ RDEPEND=" acct-group/gns3 acct-user/gns3 app-emulation/dynamips - >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.1[${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/jinja-3.0.3[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.1[${PYTHON_USEDEP}] - >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.9.5[${PYTHON_USEDEP}] + >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] + >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}] net-misc/ubridge - sys-apps/busybox + sys-apps/busybox[static] " BDEPEND=" test? ( @@ -39,10 +39,6 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/${PN}-2.2.33.1-openrc-posix-complaint.patch" - ) - distutils_enable_tests pytest src_prepare() { @@ -50,9 +46,6 @@ src_prepare() { # newer python packages are fine sed -i -e 's/[<>=].*//' requirements.txt || die - - # Remove Pre-built busybox binary - rm gns3server/compute/docker/resources/bin/busybox || die } python_install() { @@ -61,7 +54,7 @@ python_install() { systemd_dounit init/gns3.service.systemd newinitd init/gns3.service.openrc gns3server - mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die + 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 } diff --git a/net-misc/gofish/gofish-1.2-r1.ebuild b/net-misc/gofish/gofish-1.2-r2.ebuild index ab81b6ae1b8b..c23940d7517e 100644 --- a/net-misc/gofish/gofish-1.2-r1.ebuild +++ b/net-misc/gofish/gofish-1.2-r2.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,9 +12,11 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc ~x86" +# See bug #905314 for bsd-games blocker. RDEPEND=" acct-group/gopher acct-user/gopher + !games-misc/bsd-games " DOCS=( Configure_GoFish ) diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest index 8c6da0bfef71..4c9c9d7ecf73 100644 --- a/net-misc/gsasl/Manifest +++ b/net-misc/gsasl/Manifest @@ -1,4 +1,2 @@ -DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a -DIST gsasl-2.0.0.tar.gz 3274625 BLAKE2B fb9ce9b3be0cbd0902128a3e8b57ad1f78c9259da646d3da56777b05922152c5e7f019a4c037a9e42a161153e87b140146eab2f2a55e33de9b52d6814a250fd3 SHA512 b7c4e3dfdaa50eaba38f3c0914dedb4bc689d1226fcf162e5bfb3942fa6ce1e96405715a747adca78150709f34830f699e9f995f04ce586cd3d0c14b275910e6 DIST gsasl-2.0.1.tar.gz 3279632 BLAKE2B a25d121a5043455ed827a6bdc776c10d467a49b4dc6b73d2f4b08fecbf1ca5f423ffdcfd39e0d2bf71f724ed8302ffd8acda4fda3ef10ceadece60509ac73500 SHA512 01c6f6bd9f986c942a25b89fee0052aef8c10bf914ead29983abdf0cc8fcaa7223fd9d9eeafb4be07e4bc318f087f6f6258facaaeb7f83bca8de512406812be5 DIST gsasl-2.2.0.tar.gz 3290469 BLAKE2B ca57765f299939a6f9457aac3d51132f7b5a0e2f0788523349083a65e5de0b780573000c378e0fff844cf9f882239e7ff6e0b520ae66a60f3e928c16d6f74857 SHA512 0ae318a8616fe675e9718a3f04f33731034f9a7ba03d83ccb1a72954ded54ced35dc7c7e173fdcb6fa0f0813f8891c6cbcedf8bf70b37d00b8ec512eb9f07f5f diff --git a/net-misc/gsasl/gsasl-1.10.0.ebuild b/net-misc/gsasl/gsasl-1.10.0.ebuild deleted file mode 100644 index 62338661d0ef..000000000000 --- a/net-misc/gsasl/gsasl-1.10.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -# NOTE: Please bump with net-libs/libgsasl -DESCRIPTION="The GNU SASL client, server, and library" -HOMEPAGE="https://www.gnu.org/software/gsasl/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -# Before giving keywords, please check https://www.gnu.org/software/gsasl/ to see -# if it's a stable release or not! -KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads" - -DEPEND=" - gcrypt? ( dev-libs/libgcrypt:0= ) - idn? ( net-dns/libidn:= ) - kerberos? ( virtual/krb5 ) - nls? ( >=sys-devel/gettext-0.18.1 ) - ntlm? ( net-libs/libntlm ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i -e '/gl_WARN_ADD(\[-Werror/d' \ - -e 's/ -Werror//' configure.ac || die - sed -i -e 's/ -Werror//' lib/configure.ac || die - - eautoreconf -} - -src_configure() { - local krb5_impl - - if use kerberos; then - krb5_impl="--with-gssapi-impl=" - - # These are the two providers of virtual/krb5 - if has_version app-crypt/mit-krb5; then - krb5_impl+="mit" - else - krb5_impl+="heimdal" - fi - fi - - econf \ - --enable-client \ - --enable-server \ - --disable-valgrind-tests \ - --disable-rpath \ - --without-libshishi \ - --without-libgss \ - --disable-kerberos_v5 \ - $(use_enable kerberos gssapi) \ - ${krb5_impl} \ - $(use_enable kerberos gs2) \ - $(use_with gcrypt libgcrypt) \ - $(use_enable nls) \ - $(use_with idn stringprep) \ - $(use_enable ntlm) \ - $(use_with ntlm libntlm) \ - $(use_enable static-libs static) \ - $(use_enable threads) -} - -src_install() { - default - - if ! use static-libs; then - rm -f "${ED}"/usr/lib*/lib*.la || die - fi - - doman doc/gsasl.1 doc/man/*.3 - - if use doc; then - dodoc doc/*.{eps,ps,pdf} - docinto html - dodoc doc/*.html - docinto examples - dodoc examples/*.c - fi -} diff --git a/net-misc/gsasl/gsasl-2.0.0.ebuild b/net-misc/gsasl/gsasl-2.0.0.ebuild deleted file mode 100644 index 1c47d7944f81..000000000000 --- a/net-misc/gsasl/gsasl-2.0.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="The GNU SASL client, server, and library" -HOMEPAGE="https://www.gnu.org/software/gsasl/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see -# if it's a stable release or not! -KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" -REQUIRED_USE="|| ( client server )" - -DEPEND=" - !net-libs/libgsasl - gcrypt? ( dev-libs/libgcrypt:0= ) - gnutls? ( net-libs/gnutls:= ) - idn? ( net-dns/libidn:= ) - kerberos? ( virtual/krb5 ) - nls? ( >=sys-devel/gettext-0.18.1 ) - ntlm? ( >=net-libs/libntlm-0.3.5 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i \ - -e '/gl_WARN_ADD(\[-Werror/d' \ - -e 's/ -Werror//' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - local krb5_impl - - if use kerberos; then - krb5_impl="--with-gssapi-impl=" - - # These are the two providers of virtual/krb5 - if has_version app-crypt/mit-krb5; then - krb5_impl+="mit" - else - krb5_impl+="heimdal" - fi - fi - - local myeconfargs=( - --disable-valgrind-tests - --disable-rpath - - --with-packager-bug-reports="https://bugs.gentoo.org" - --with-packager-version="r${PR}" - --with-packager="Gentoo Linux" - - $(use_enable client) - $(use_enable server) - - $(use_enable kerberos gssapi) - ${krb5_impl} - $(use_enable kerberos gs2) - - $(use_with gcrypt libgcrypt) - $(use_with gnutls) - $(use_enable nls) - $(use_with idn stringprep) - $(use_enable ntlm) - $(use_enable static-libs static) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if ! use static-libs; then - rm -f "${ED}"/usr/lib*/lib*.la || die - fi - - doman doc/gsasl.1 doc/man/*.3 -} diff --git a/net-misc/gsasl/gsasl-2.2.0.ebuild b/net-misc/gsasl/gsasl-2.2.0.ebuild index 8f9dc56c9fb3..ff825515aa75 100644 --- a/net-misc/gsasl/gsasl-2.2.0.ebuild +++ b/net-misc/gsasl/gsasl-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ LICENSE="GPL-3" SLOT="0" # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see # if it's a stable release or not! -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" REQUIRED_USE="|| ( client server )" diff --git a/net-misc/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/httpie/Manifest b/net-misc/httpie/Manifest index 71715da957bc..37b4fc74d5dd 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1,4 +1 @@ -DIST httpie-2.4.0.tar.gz 1772537 BLAKE2B 111451cc7dc353d5b586554f98ac715a3198f03e74d261944a5f021d2dcc948455500800222b323d182a2a067d0549bda7c318ab3a6c934b9a9beec64aff2db2 SHA512 44cc7ff4fe0f3d8c53a7dd750465f6b56c36f5bbac06d22b760579bd60949039e82313845699669a659ec91adc69dbeac22c06ddd63af64e6f2e0edecf3e732a -DIST httpie-2.5.0.tar.gz 1105177 BLAKE2B 6e16868c81522d4e6d2fc0a4e093c190f18ced720b35217930865ae3f8e168193cc33dfecc13c5d310f52647d6e79d17b247f56e56e8586d633a2d9502be66a7 SHA512 f14aa23fea7578181b9bd6ededea04de9ddf0b2f697b23f76d2d96e2c17b95617318c711750bad6af550400dbc03732ab17fdf84e59d577f33f073e600a55330 -DIST httpie-2.6.0.tar.gz 1133495 BLAKE2B 3ac61fc68ab59ac7523b030a8c7af85c4af05357aa19282b514b813351efabe783f47ab82d292117e0a9170ff793b71356941dc4eb159c585629cae3adec9b5a SHA512 acd7dc847b67e27909c49ccddec84321c4d73fa5b49f06ce3d94d790093a8f168a1c6627bc4921ca8c0e48b9904f38e17935b645495e2313d16ac2eecf659038 DIST httpie-3.2.1.gh.tar.gz 1276550 BLAKE2B 627aa3db762e9e407f882be2c4267f5227301b189695537e7ac69ff140d6d39292251e131f9b9e7761e904a736d112bb4c1f5c6708c1468c6309474ee8c140b6 SHA512 ffcf6050138c49d5acb01f214d9b3fee6c78502c4c6dc45a295bafc88aafd1789f97a69c922f6e093fb48a402c1f83a7fff5307849130df81c4bcb2d595a03bf diff --git a/net-misc/httpie/files/httpie-urllib3-2-fixes.patch b/net-misc/httpie/files/httpie-urllib3-2-fixes.patch new file mode 100644 index 000000000000..2c6c5d348171 --- /dev/null +++ b/net-misc/httpie/files/httpie-urllib3-2-fixes.patch @@ -0,0 +1,57 @@ +From f8bb34ebf97bf6a103a7d021b16059522d76d52d Mon Sep 17 00:00:00 2001 +From: Brendon Smith <bws@bws.bio> +Date: Sat, 6 May 2023 16:24:26 -0400 +Subject: [PATCH] Fix `urllib3.util.ssl_.DEFAULT_CIPHERS` import + +--- + httpie/cli/definition.py | 4 ++-- + httpie/ssl_.py | 15 ++++++++++----- + 2 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/httpie/cli/definition.py b/httpie/cli/definition.py +index 0e5f91edf7..5e54d1c896 100644 +--- a/httpie/cli/definition.py ++++ b/httpie/cli/definition.py +@@ -831,8 +831,8 @@ def format_auth_help(auth_plugins_mapping, *, isolation_mode: bool = False): + short_help='A string in the OpenSSL cipher list format.', + help=f""" + +- A string in the OpenSSL cipher list format. By default, the following +- is used: ++ A string in the OpenSSL cipher list format. By default, the available ++ system ciphers will be used, which are: + + {DEFAULT_SSL_CIPHERS} + +diff --git a/httpie/ssl_.py b/httpie/ssl_.py +index b9438543eb..c8dba0ea8d 100644 +--- a/httpie/ssl_.py ++++ b/httpie/ssl_.py +@@ -3,13 +3,9 @@ + + from httpie.adapters import HTTPAdapter + # noinspection PyPackageRequirements +-from urllib3.util.ssl_ import ( +- DEFAULT_CIPHERS, create_urllib3_context, +- resolve_ssl_version, +-) ++from urllib3.util.ssl_ import create_urllib3_context, resolve_ssl_version + + +-DEFAULT_SSL_CIPHERS = DEFAULT_CIPHERS + SSL_VERSION_ARG_MAPPING = { + 'ssl2.3': 'PROTOCOL_SSLv23', + 'ssl3': 'PROTOCOL_SSLv3', +@@ -94,3 +90,12 @@ def _is_key_file_encrypted(key_file): + return True + + return False ++ ++ ++try: ++ from urllib3.util.ssl_ import DEFAULT_CIPHERS ++except ImportError: ++ _context = HTTPieHTTPSAdapter._create_ssl_context(verify=False) ++ DEFAULT_CIPHERS = ":".join([cipher["name"] for cipher in _context.get_ciphers()]) ++ ++DEFAULT_SSL_CIPHERS = DEFAULT_CIPHERS diff --git a/net-misc/httpie/httpie-2.4.0.ebuild b/net-misc/httpie/httpie-2.4.0.ebuild deleted file mode 100644 index 4945ee2660c9..000000000000 --- a/net-misc/httpie/httpie-2.4.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_9 ) -PYTHON_REQ_USE="ssl(+)" - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] - >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - local skipped_tests=() - - skipped_tests+=( - tests/test_uploads.py::test_chunked_json - tests/test_uploads.py::test_chunked_form - tests/test_uploads.py::test_chunked_stdin - tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked - tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked - tests/test_tokens.py::test_verbose_chunked - ) - - pytest -v ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-2.5.0.ebuild b/net-misc/httpie/httpie-2.5.0.ebuild deleted file mode 100644 index 5ffc65594473..000000000000 --- a/net-misc/httpie/httpie-2.5.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{9,10} ) -PYTHON_REQ_USE="ssl(+)" - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] - >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/responses[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-3.2.1-r1.ebuild b/net-misc/httpie/httpie-3.2.1-r1.ebuild index b24ab5442eee..8408d5324ea8 100644 --- a/net-misc/httpie/httpie-3.2.1-r1.ebuild +++ b/net-misc/httpie/httpie-3.2.1-r1.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/httpie-2.6.0.ebuild b/net-misc/httpie/httpie-3.2.1-r2.ebuild index d49c983b4185..217a2307a2d1 100644 --- a/net-misc/httpie/httpie-2.6.0.ebuild +++ b/net-misc/httpie/httpie-3.2.1-r2.ebuild @@ -1,26 +1,28 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="ssl(+)" +DISTUTILS_USE_PEP517=setuptools inherit bash-completion-r1 distutils-r1 DESCRIPTION="Modern command line HTTP client" HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" RDEPEND=" - dev-python/charset_normalizer[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] dev-python/defusedxml[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] + dev-python/multidict[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] " @@ -33,6 +35,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}/${PN}-urllib3-2-fixes.patch" +) + distutils_enable_tests pytest python_install_all() { 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/httpstat/httpstat-1.3.1-r1.ebuild b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild index da4d547a2347..cdd345b94cba 100644 --- a/net-misc/httpstat/httpstat-1.3.1-r1.ebuild +++ b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND="net-misc/curl:*" diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest index 218b2008cdd0..e17a04187a42 100644 --- a/net-misc/icaclient/Manifest +++ b/net-misc/icaclient/Manifest @@ -1,2 +1,4 @@ -DIST linuxx64-23.2.0.10.tar.gz 165430863 BLAKE2B 92e3eb397691c938768c4893ebbbef48cccbaf120de40956f3883fff76ac770fe55f3e99b397634776626d76962a18a8ce0a4814f5b8a52f39a3910e4cc764ae SHA512 9eaff591e14df82a05d5c8aa4b1ec763495671a5b46476b0d722ec0893939be99d99cf820432f27293b5d8c482544397562f8ab5be210b648d278a73cc65fb0a -DIST linuxx86-23.2.0.10.tar.gz 147975174 BLAKE2B 20ef9c6059b39c79deb5098c4f8ba02bb82fee9c4eb06eab8fb5f49c450a87a1374febc044b8130a8cd5112b4bbdaa45dabb8e14fe009be4016cdbf5864b2803 SHA512 f2cebaeaadd53e0431de0455b24a0dc6063eea3586cf1b696c33849ee51623a11add431c11b9bf91b8228ecf4c49d157781643debd1248cf6cd88b974844201a +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.2.0.10-r1.ebuild b/net-misc/icaclient/icaclient-23.5.0.58.ebuild index 760b4ca1580f..03db22459332 100644 --- a/net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild +++ b/net-misc/icaclient/icaclient-23.5.0.58.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/icaclient-23.7.0.17.ebuild b/net-misc/icaclient/icaclient-23.7.0.17.ebuild new file mode 100644 index 000000000000..03db22459332 --- /dev/null +++ b/net-misc/icaclient/icaclient-23.7.0.17.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop wrapper xdg-utils + +DESCRIPTION="ICA Client for Citrix Presentation servers" +HOMEPAGE="https://www.citrix.com/" +SRC_URI="amd64? ( linuxx64-${PV}.tar.gz ) + x86? ( linuxx86-${PV}.tar.gz )" + +LICENSE="icaclient" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb" +RESTRICT="mirror strip fetch" + +ICAROOT="/opt/Citrix/ICAClient" + +QA_PREBUILT="${ICAROOT#/}/*" + +# we have binaries for two conflicting kerberos implementations +# https://bugs.gentoo.org/792090 +# https://bugs.gentoo.org/775995 +REQUIRES_EXCLUDE=" + libgssapi.so.3 + libgssapi_krb5.so.2 libkrb5.so.3 +" +# when using media-plugins/hdx-realtime-media-engine we better not ignore that +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + !hdx? ( libunwind.so.1 ) +" +# we have binaries which wouls still support gstreamer:0.10 +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + libgstapp-0.10.so.0 + libgstbase-0.10.so.0 + libgstinterfaces-0.10.so.0 + libgstpbutils-0.10.so.0 + 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 ) +" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret + dev-libs/glib:2 + dev-libs/libxml2 + media-fonts/font-adobe-100dpi + media-fonts/font-cursor-misc + 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 + sys-libs/libcxx + sys-libs/libcxxabi + sys-libs/zlib + virtual/krb5 + virtual/libudev + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXt + x11-libs/pango + ${BDEPEND} + !hdx? ( !media-plugins/hdx-realtime-media-engine ) + usb? ( virtual/libudev ) +" + +pkg_nofetch() { + elog "Download the client file ${A} from + https://www.citrix.com/downloads/workspace-app/" + elog "and place it into your DISTDIR directory." +} + +pkg_setup() { + case ${ARCH} in + amd64) + ICAARCH=linuxx64 + ;; + x86) + ICAARCH=linuxx86 + ;; + *) + eerror "Given architecture is not supported by Citrix." + ;; + esac +} + +src_unpack() { + default + mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die +} + +src_prepare() { + default + 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 + fi + mv module.ini config/ || die +} + +src_install() { + local bin tmpl dest + + 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 + + for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do + insinto "${dest}" + doins nls/en.UTF-8/eula.txt + done + + 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 + touch "${ED}/${ICAROOT}"/config/.server || die + + insinto "${ICAROOT}"/gtk + doins gtk/* + + insinto "${ICAROOT}"/gtk/glade + doins gtk/glade/* + + insinto "${ICAROOT}"/site + doins -r site/* + + dodir "${ICAROOT}"/help + + insinto "${ICAROOT}"/config/usertemplate + doins config/usertemplate/* + + local lang LANGCODES=( en ) + use l10n_de && LANGCODES+=( de ) + use l10n_es && LANGCODES+=( es ) + use l10n_fr && LANGCODES+=( fr ) + use l10n_ja && LANGCODES+=( ja ) + use l10n_zh-CN && LANGCODES+=( zh_CN ) + + for lang in ${LANGCODES[@]} ; do + insinto "${ICAROOT}"/nls/${lang} + doins nls/${lang}/* + + insinto "${ICAROOT}"/nls/$lang/UTF-8 + doins nls/${lang}.UTF-8/* + + insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES + doins nls/${lang}/LC_MESSAGES/* + + insinto "${ICAROOT}"/nls/${lang} + dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8 + + for tmpl in {appsrv,wfclient}.template ; do + cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \ + "${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \ + || die + done + done + + insinto "${ICAROOT}"/nls + dosym en /opt/Citrix/ICAClient/nls/C + + insinto "${ICAROOT}"/icons + doins icons/* + + insinto "${ICAROOT}"/keyboard + doins keyboard/* + + cp -a util "${ED}/${ICAROOT}" || die + test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine + + dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts + insinto "${ICAROOT}"/keystore/intcerts + doins keystore/intcerts/* + + local other_files=( + icasessionmgr + NativeMessagingHost + UtilDaemon + ) + + exeinto "${ICAROOT}" + for bin in ${other_files[@]} ; do + doexe ${bin} + done + + # https://bugs.gentoo.org/655922 + dosym gst_play1.0 "${ICAROOT}"/util/gst_play + dosym gst_read1.0 "${ICAROOT}"/util/gst_read + dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so + + doenvd "${FILESDIR}"/10ICAClient + + for bin in configmgr conncenter new_store ; do + make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util + done + + for bin in selfservice wfica ; do + make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}" + done + + dodir /etc/revdep-rebuild/ + echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \ + > "${ED}"/etc/revdep-rebuild/70icaclient + + insinto "${ICAROOT}"/pkginf + newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}" + + # 651926 + domenu "${FILESDIR}"/*.desktop + + insinto /usr/share/mime/packages + doins desktop/Citrix-mime_types.xml +} + +pkg_preinst() { + # previous versions of the ebuild created that and left it around + # we own it now and avoid conflict warnings with this + rm -f "${ROOT}${ICAROOT}/config/module.ini" +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + + if ! use hdx; then + if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then + ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want" + ewarn "to use media-plugins/hdx-realtime-media-engine. Which does" + 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() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml index 83d0f6942931..2e136fc44c0a 100644 --- a/net-misc/icaclient/metadata.xml +++ b/net-misc/icaclient/metadata.xml @@ -1,15 +1,11 @@ <?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> + <flag name="usb">Allow connecting USB devices to virtual desktops</flag> </use> </pkgmetadata> 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/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..b4708ff13b08 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -1,3 +1,4 @@ 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 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..e9a1b344d9db --- /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/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..6896a2882131 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -1,3 +1,2 @@ -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 diff --git a/net-misc/kafka-bin/kafka-bin-3.3.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.3.1.ebuild deleted file mode 100644 index 313f507f0bdf..000000000000 --- a/net-misc/kafka-bin/kafka-bin-3.3.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A high-throughput distributed messaging system" -HOMEPAGE="https://kafka.apache.org/" - -# pick recommended scala version -SCALA_VERSION=2.13 -MY_PN="kafka" -MY_P="${MY_PN}_${SCALA_VERSION}-${PV}" -SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz" - -RESTRICT="mirror" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="internal-zookeeper connect" - -COMMON_DEPEND="acct-group/kafka - acct-user/kafka - virtual/jre:=" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${MY_P}" -INSTALL_DIR="/opt/${MY_PN}" - -src_prepare() { - sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die - sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die - sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.properties" || die - eapply_user -} - -src_install() { - insinto /etc/kafka - doins config/zookeeper.properties config/server.properties - if use "internal-zookeeper"; then - keepdir /var/lib/kafka/zookeeper - newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper" - - ewarn "Zookeeper owner has been changed to kafka:kafka" - ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper" - ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper" - ewarn "to keep the previous behavior." - ewarn "All logs files have been move to /var/log/kafka/" - fi |