summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/anydesk/Manifest2
-rw-r--r--net-misc/anydesk/anydesk-6.3.1.ebuild (renamed from net-misc/anydesk/anydesk-6.3.0.ebuild)2
-rw-r--r--net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild5
-rw-r--r--net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild4
-rw-r--r--net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch39
-rw-r--r--net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch11
-rw-r--r--net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch41
-rw-r--r--net-misc/aria2/Manifest1
-rw-r--r--net-misc/aria2/aria2-1.36.0-r1.ebuild199
-rw-r--r--net-misc/aria2/aria2-1.37.0.ebuild9
-rw-r--r--net-misc/asahi-btsync/Manifest64
-rw-r--r--net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild98
-rw-r--r--net-misc/asahi-btsync/metadata.xml15
-rw-r--r--net-misc/asahi-wifisync/Manifest64
-rw-r--r--net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild98
-rw-r--r--net-misc/asahi-wifisync/metadata.xml15
-rw-r--r--net-misc/asterisk-base/asterisk-base-2.ebuild4
-rw-r--r--net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild4
-rw-r--r--net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild4
-rw-r--r--net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild4
-rw-r--r--net-misc/asterisk/Manifest6
-rw-r--r--net-misc/asterisk/asterisk-16.30.1-r1.ebuild365
-rw-r--r--net-misc/asterisk/asterisk-18.20.2.ebuild362
-rw-r--r--net-misc/asterisk/asterisk-18.21.0.ebuild362
-rw-r--r--net-misc/asterisk/asterisk-20.5.2.ebuild358
-rw-r--r--net-misc/asterisk/asterisk-20.6.0.ebuild357
-rw-r--r--net-misc/asterisk/asterisk-21.0.2.ebuild345
-rw-r--r--net-misc/asterisk/asterisk-21.1.0.ebuild344
-rw-r--r--net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch65
-rw-r--r--net-misc/autossh/autossh-1.4g-r1.ebuild20
-rw-r--r--net-misc/autossh/autossh-1.4g-r2.ebuild2
-rw-r--r--net-misc/axel/Manifest1
-rw-r--r--net-misc/axel/axel-2.17.13.ebuild33
-rw-r--r--net-misc/babeld/Manifest3
-rw-r--r--net-misc/babeld/babeld-1.13.1.ebuild40
-rw-r--r--net-misc/babeld/metadata.xml7
-rw-r--r--net-misc/balance/balance-3.57-r1.ebuild16
-rw-r--r--net-misc/balance/metadata.xml3
-rw-r--r--net-misc/bfgminer/bfgminer-5.5.0-r4.ebuild (renamed from net-misc/bfgminer/bfgminer-5.5.0-r3.ebuild)5
-rw-r--r--net-misc/bgpq4/bgpq4-1.8.ebuild4
-rw-r--r--net-misc/bird/bird-2.0.10.ebuild6
-rw-r--r--net-misc/bird/bird-2.0.11.ebuild6
-rw-r--r--net-misc/bird/bird-2.0.12-r1.ebuild6
-rw-r--r--net-misc/bird/bird-2.0.7.ebuild6
-rw-r--r--net-misc/bopm/bopm-3.1.3-r7.ebuild4
-rw-r--r--net-misc/buka/Manifest1
-rw-r--r--net-misc/buka/buka-3.0.1.ebuild33
-rw-r--r--net-misc/buka/metadata.xml12
-rw-r--r--net-misc/chrony/Manifest4
-rw-r--r--net-misc/chrony/chrony-4.5.ebuild (renamed from net-misc/chrony/chrony-4.4.ebuild)4
-rw-r--r--net-misc/chrony/chrony-9999.ebuild4
-rw-r--r--net-misc/clockspeed/clockspeed-0.62-r9.ebuild47
-rw-r--r--net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch212
-rw-r--r--net-misc/cmst/cmst-2023.03.14-r1.ebuild54
-rw-r--r--net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild6
-rw-r--r--net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch11
-rw-r--r--net-misc/croc/Manifest8
-rw-r--r--net-misc/croc/croc-9.6.13.ebuild (renamed from net-misc/croc/croc-9.6.2.ebuild)11
-rw-r--r--net-misc/croc/croc-9.6.9.ebuild (renamed from net-misc/croc/croc-9.6.4.ebuild)11
-rw-r--r--net-misc/croc/files/croc-disable-network-tests-r1.patch32
-rw-r--r--net-misc/croc/metadata.xml17
-rw-r--r--net-misc/curl/Manifest10
-rw-r--r--net-misc/curl/curl-8.5.0-r3.ebuild370
-rw-r--r--net-misc/curl/curl-8.6.0-r2.ebuild (renamed from net-misc/curl/curl-8.3.0-r2.ebuild)38
-rw-r--r--net-misc/curl/curl-8.7.1-r1.ebuild (renamed from net-misc/curl/curl-8.4.0.ebuild)15
-rw-r--r--net-misc/curl/curl-9999.ebuild8
-rw-r--r--net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch136
-rw-r--r--net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch131
-rw-r--r--net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch115
-rw-r--r--net-misc/curl/files/curl-8.5.0-ipv6-configure-c99.patch31
-rw-r--r--net-misc/curl/files/curl-8.5.0-mpd-stream-http-adjust_pollset.patch69
-rw-r--r--net-misc/curl/files/curl-8.6.0-rustls-fixes.patch252
-rw-r--r--net-misc/curl/files/curl-8.6.0-vtls-revert-receive-max-buffer-add-test-case.patch68
-rw-r--r--net-misc/curl/files/curl-8.7.1-rustls-fixes.patch49
-rw-r--r--net-misc/curl/metadata.xml6
-rw-r--r--net-misc/dahdi-tools/Manifest2
-rw-r--r--net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild70
-rw-r--r--net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild74
-rw-r--r--net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild73
-rw-r--r--net-misc/dahdi-tools/files/dahdi-autoconf.conf240
-rw-r--r--net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4271
-rw-r--r--net-misc/dahdi-tools/files/dahdi-autoconf.init2225
-rw-r--r--net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch12
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch26
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch40
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch39
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch19
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch61
-rw-r--r--net-misc/dahdi-tools/files/dahdi.init236
-rw-r--r--net-misc/dahdi-tools/metadata.xml18
-rw-r--r--net-misc/dahdi/Manifest25
-rw-r--r--net-misc/dahdi/dahdi-3.1.0-r3.ebuild107
-rw-r--r--net-misc/dahdi/dahdi-3.1.0-r4.ebuild120
-rw-r--r--net-misc/dahdi/dahdi-3.2.0.ebuild120
-rw-r--r--net-misc/dahdi/metadata.xml19
-rw-r--r--net-misc/dhcp/Manifest1
-rw-r--r--net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild (renamed from net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild)71
-rw-r--r--net-misc/dhcp/files/dhcpd.conf24
-rw-r--r--net-misc/dhcp/files/dhcpd.init55
-rw-r--r--net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild2
-rw-r--r--net-misc/dhcpcd/Manifest2
-rw-r--r--net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild2
-rw-r--r--net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild (renamed from net-misc/dhcpcd/dhcpcd-10.0.4.ebuild)19
-rw-r--r--net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild170
-rw-r--r--net-misc/dhcpcd/dhcpcd-10.0.6.ebuild (renamed from net-misc/dhcpcd/dhcpcd-10.0.5.ebuild)11
-rw-r--r--net-misc/dhcpcd/dhcpcd-9999.ebuild11
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch46
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch46
-rw-r--r--net-misc/dibbler/dibbler-1.0.1-r4.ebuild4
-rw-r--r--net-misc/downloader-cli/Manifest1
-rw-r--r--net-misc/downloader-cli/downloader-cli-0.3.3.ebuild21
-rw-r--r--net-misc/downloader-cli/downloader-cli-0.3.4.ebuild21
-rw-r--r--net-misc/dropbear/Manifest2
-rw-r--r--net-misc/dropbear/dropbear-2024.84.ebuild187
-rw-r--r--net-misc/dropbear/files/dropbear-2024.84-dbscp.patch20
-rw-r--r--net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch36
-rw-r--r--net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch13
-rw-r--r--net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch14
-rw-r--r--net-misc/dropbear/metadata.xml1
-rw-r--r--net-misc/dropbox-cli/Manifest1
-rw-r--r--net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild33
-rw-r--r--net-misc/dropbox/Manifest8
-rw-r--r--net-misc/dropbox/dropbox-195.4.4995.ebuild (renamed from net-misc/dropbox/dropbox-186.4.6207.ebuild)4
-rw-r--r--net-misc/dropbox/dropbox-196.4.6900.ebuild (renamed from net-misc/dropbox/dropbox-187.4.5691.ebuild)4
-rw-r--r--net-misc/econnman/Manifest1
-rw-r--r--net-misc/econnman/econnman-1.1_p20160305-r1.ebuild36
-rw-r--r--net-misc/econnman/metadata.xml8
-rw-r--r--net-misc/electron-cash/electron-cash-4.2.11.ebuild13
-rw-r--r--net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild4
-rw-r--r--net-misc/electrum/Manifest2
-rw-r--r--net-misc/electrum/electrum-4.5.4.ebuild (renamed from net-misc/electrum/electrum-4.4.6.ebuild)16
-rw-r--r--net-misc/ena-driver/Manifest5
-rw-r--r--net-misc/ena-driver/ena-driver-2.11.1.ebuild (renamed from net-misc/ena-driver/ena-driver-2.9.1.ebuild)2
-rw-r--r--net-misc/ena-driver/ena-driver-2.12.0.ebuild (renamed from net-misc/ena-driver/ena-driver-2.10.0.ebuild)2
-rw-r--r--net-misc/ena-driver/ena-driver-2.8.9.ebuild30
-rw-r--r--net-misc/etherdfs/Manifest2
-rw-r--r--net-misc/etherdfs/etherdfs-20180203-r5.ebuild (renamed from net-misc/etherdfs/etherdfs-20180203-r4.ebuild)6
-rw-r--r--net-misc/etherdfs/metadata.xml2
-rw-r--r--net-misc/eventd/metadata.xml1
-rw-r--r--net-misc/freerdp/Manifest7
-rw-r--r--net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch37
-rw-r--r--net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch329
-rw-r--r--net-misc/freerdp/files/freerdp-2.11.2-clang.patch29
-rw-r--r--net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch279
-rw-r--r--net-misc/freerdp/freerdp-2.10.0-r3.ebuild137
-rw-r--r--net-misc/freerdp/freerdp-2.11.1.ebuild137
-rw-r--r--net-misc/freerdp/freerdp-2.11.5-r10.ebuild (renamed from net-misc/freerdp/freerdp-2.11.2.ebuild)111
-rw-r--r--net-misc/freerdp/freerdp-2.11.5-r2.ebuild (renamed from net-misc/freerdp/freerdp-2.11.0-r1.ebuild)34
-rw-r--r--net-misc/freerdp/freerdp-2.9999.ebuild108
-rw-r--r--net-misc/freerdp/freerdp-3.0.0_beta3.ebuild149
-rw-r--r--net-misc/freerdp/freerdp-3.4.0-r11.ebuild188
-rw-r--r--net-misc/freerdp/freerdp-9999.ebuild124
-rw-r--r--net-misc/freerdp/metadata.xml1
-rw-r--r--net-misc/frr/Manifest3
-rw-r--r--net-misc/frr/frr-9.0.1.ebuild151
-rw-r--r--net-misc/frr/frr-9.0.2.ebuild (renamed from net-misc/frr/frr-9.0.ebuild)5
-rw-r--r--net-misc/frr/metadata.xml4
-rw-r--r--net-misc/gallery-dl/Manifest5
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.26.3.ebuild40
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.26.8.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.26.1.ebuild)31
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.26.9.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.26.2.ebuild)31
-rw-r--r--net-misc/gallery-dl/gallery-dl-9999.ebuild31
-rw-r--r--net-misc/geoipupdate/Manifest6
-rw-r--r--net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch26
-rw-r--r--net-misc/geoipupdate/geoipupdate-6.0.0.ebuild48
-rw-r--r--net-misc/geoipupdate/geoipupdate-6.1.0.ebuild44
-rw-r--r--net-misc/gerbera/metadata.xml9
-rw-r--r--net-misc/gnome-connections/Manifest1
-rw-r--r--net-misc/gnome-connections/gnome-connections-44.1.ebuild63
-rw-r--r--net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild (renamed from net-misc/gnome-connections/gnome-connections-45.0.ebuild)4
-rw-r--r--net-misc/gnome-remote-desktop/Manifest2
-rw-r--r--net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.ebuild73
-rw-r--r--net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild76
-rw-r--r--net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild (renamed from net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1.ebuild)6
-rw-r--r--net-misc/gns3-gui/Manifest4
-rw-r--r--net-misc/gns3-gui/gns3-gui-2.2.44.1.ebuild (renamed from net-misc/gns3-gui/gns3-gui-2.2.42.ebuild)6
-rw-r--r--net-misc/gns3-gui/gns3-gui-2.2.45.ebuild (renamed from net-misc/gns3-gui/gns3-gui-2.2.43.ebuild)11
-rw-r--r--net-misc/gns3-server/Manifest4
-rw-r--r--net-misc/gns3-server/gns3-server-2.2.44.1.ebuild (renamed from net-misc/gns3-server/gns3-server-2.2.43.ebuild)6
-rw-r--r--net-misc/gns3-server/gns3-server-2.2.45.ebuild (renamed from net-misc/gns3-server/gns3-server-2.2.42.ebuild)12
-rw-r--r--net-misc/gsasl/Manifest1
-rw-r--r--net-misc/gsasl/gsasl-2.2.0.ebuild4
-rw-r--r--net-misc/gsasl/gsasl-2.2.1.ebuild101
-rw-r--r--net-misc/htail/htail-1.5.ebuild9
-rw-r--r--net-misc/httpstat/Manifest1
-rw-r--r--net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch12
-rw-r--r--net-misc/httpstat/httpstat-1.3.1-r1.ebuild6
-rw-r--r--net-misc/httpstat/httpstat-1.3.1.ebuild27
-rw-r--r--net-misc/hurl/hurl-4.1.0.ebuild5
-rw-r--r--net-misc/inetutils/Manifest2
-rw-r--r--net-misc/inetutils/inetutils-2.5.ebuild (renamed from net-misc/inetutils/inetutils-2.4.ebuild)4
-rw-r--r--net-misc/iperf/Manifest3
-rw-r--r--net-misc/iperf/iperf-3.14.ebuild54
-rw-r--r--net-misc/iperf/iperf-3.16.ebuild (renamed from net-misc/iperf/iperf-3.13.ebuild)4
-rw-r--r--net-misc/iputils/Manifest1
-rw-r--r--net-misc/iputils/iputils-20240117.ebuild131
-rw-r--r--net-misc/iputils/iputils-99999999.ebuild2
-rw-r--r--net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch37
-rw-r--r--net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch44
-rw-r--r--net-misc/jwhois/jwhois-4.0-r2.ebuild38
-rw-r--r--net-misc/jwhois/metadata.xml1
-rw-r--r--net-misc/kafka-bin/Manifest6
-rw-r--r--net-misc/kafka-bin/kafka-bin-3.5.2.ebuild (renamed from net-misc/kafka-bin/kafka-bin-3.5.1.ebuild)2
-rw-r--r--net-misc/kafka-bin/kafka-bin-3.6.1.ebuild (renamed from net-misc/kafka-bin/kafka-bin-3.4.1.ebuild)0
-rw-r--r--net-misc/kafka-bin/kafka-bin-3.7.0.ebuild (renamed from net-misc/kafka-bin/kafka-bin-3.6.0.ebuild)2
-rw-r--r--net-misc/kea/Manifest3
-rw-r--r--net-misc/kea/files/ax_gtest.m453
-rw-r--r--net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch10
-rw-r--r--net-misc/kea/files/kea-1.9.10-gtest.patch143
-rw-r--r--net-misc/kea/kea-2.0.2.ebuild127
-rw-r--r--net-misc/kea/kea-2.4.0-r1.ebuild (renamed from net-misc/kea/kea-2.4.0.ebuild)23
-rw-r--r--net-misc/kea/kea-2.4.1.ebuild (renamed from net-misc/kea/kea-2.2.0.ebuild)25
-rw-r--r--net-misc/kea/kea-9999.ebuild11
-rw-r--r--net-misc/kio-zeroconf/Manifest4
-rw-r--r--net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild25
-rw-r--r--net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild (renamed from net-misc/kio-zeroconf/kio-zeroconf-23.08.3.ebuild)19
-rw-r--r--net-misc/kio-zeroconf/kio-zeroconf-24.02.2.ebuild27
-rw-r--r--net-misc/kio-zeroconf/metadata.xml4
-rw-r--r--net-misc/l7-filter-userspace/metadata.xml5
-rw-r--r--net-misc/l7-protocols/metadata.xml5
-rw-r--r--net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild4
-rw-r--r--net-misc/linuxptp/Manifest1
-rw-r--r--net-misc/linuxptp/files/linuxptp-4.2-user_cpp.patch11
-rw-r--r--net-misc/linuxptp/linuxptp-4.2.ebuild49
-rw-r--r--net-misc/linuxptp/metadata.xml1
-rw-r--r--net-misc/lldpd/Manifest1
-rw-r--r--net-misc/lldpd/lldpd-1.0.16-r2.ebuild8
-rw-r--r--net-misc/lldpd/lldpd-1.0.17.ebuild9
-rw-r--r--net-misc/lldpd/lldpd-1.0.18.ebuild (renamed from net-misc/lldpd/lldpd-1.0.16.ebuild)15
-rw-r--r--net-misc/mcproxy/mcproxy-1.1.1-r2.ebuild4
-rw-r--r--net-misc/memcached/Manifest7
-rw-r--r--net-misc/memcached/files/memcached-1.2.2-fbsd.patch12
-rw-r--r--net-misc/memcached/files/memcached-1.4.4-as-needed.patch31
-rw-r--r--net-misc/memcached/memcached-1.6.23.ebuild (renamed from net-misc/memcached/memcached-1.6.20.ebuild)6
-rw-r--r--net-misc/memcached/memcached-1.6.24.ebuild (renamed from net-misc/memcached/memcached-1.6.18.ebuild)6
-rw-r--r--net-misc/memcached/memcached-1.6.25.ebuild (renamed from net-misc/memcached/memcached-1.6.21.ebuild)6
-rw-r--r--net-misc/memcached/memcached-1.6.26.ebuild (renamed from net-misc/memcached/memcached-1.6.19.ebuild)8
-rw-r--r--net-misc/mico/mico-2.3.13-r14.ebuild4
-rw-r--r--net-misc/mikutter/Manifest2
-rw-r--r--net-misc/mikutter/mikutter-5.0.5.ebuild94
-rw-r--r--net-misc/mikutter/mikutter-9999.ebuild57
-rw-r--r--net-misc/miniupnpd/Manifest10
-rw-r--r--net-misc/miniupnpd/miniupnpd-2.3.3.ebuild108
-rw-r--r--net-misc/miniupnpd/miniupnpd-2.3.5.ebuild (renamed from net-misc/miniupnpd/miniupnpd-2.3.1.ebuild)2
-rw-r--r--net-misc/miniupnpd/miniupnpd-2.3.6.ebuild (renamed from net-misc/miniupnpd/miniupnpd-2.3.2.ebuild)2
-rw-r--r--net-misc/modemmanager/modemmanager-1.18.12.ebuild6
-rw-r--r--net-misc/monmotha/Manifest1
-rw-r--r--net-misc/monmotha/files/monmotha.rc640
-rw-r--r--net-misc/monmotha/metadata.xml5
-rw-r--r--net-misc/monmotha/monmotha-2.3.8-r1.ebuild46
-rw-r--r--net-misc/moonlight/metadata.xml1
-rw-r--r--net-misc/moonlight/moonlight-5.0.1-r2.ebuild (renamed from net-misc/moonlight/moonlight-5.0.1.ebuild)11
-rw-r--r--net-misc/moonlight/moonlight-9999.ebuild11
-rw-r--r--net-misc/mptcpd/mptcpd-0.12.ebuild4
-rw-r--r--net-misc/mptcpd/mptcpd-9999.ebuild4
-rw-r--r--net-misc/mrouted/mrouted-4.2.ebuild4
-rw-r--r--net-misc/ndisc6/Manifest2
-rw-r--r--net-misc/ndisc6/files/rdnssd.rc-124
-rw-r--r--net-misc/ndisc6/files/resolvconf-17
-rw-r--r--net-misc/ndisc6/ndisc6-1.0.8.ebuild (renamed from net-misc/ndisc6/ndisc6-1.0.6.ebuild)23
-rw-r--r--net-misc/ndppd/ndppd-0.2.5-r1.ebuild (renamed from net-misc/ndppd/ndppd-0.2.5.ebuild)8
-rw-r--r--net-misc/nemesis/Manifest1
-rw-r--r--net-misc/nemesis/metadata.xml7
-rw-r--r--net-misc/nemesis/nemesis-1.8.ebuild26
-rw-r--r--net-misc/netdate/netdate-1.2-r2.ebuild27
-rw-r--r--net-misc/netifrc/Manifest3
-rw-r--r--net-misc/netifrc/netifrc-0.7.5.ebuild74
-rw-r--r--net-misc/netifrc/netifrc-0.7.6.ebuild78
-rw-r--r--net-misc/netifrc/netifrc-0.7.7.ebuild2
-rw-r--r--net-misc/netifrc/netifrc-0.7.8.ebuild (renamed from net-misc/netifrc/netifrc-0.7.6-r1.ebuild)4
-rw-r--r--net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild2
-rw-r--r--net-misc/networkmanager/Manifest5
-rw-r--r--net-misc/networkmanager/metadata.xml1
-rw-r--r--net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild400
-rw-r--r--net-misc/networkmanager/networkmanager-1.44.2.ebuild396
-rw-r--r--net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild (renamed from net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild)27
-rw-r--r--net-misc/nextcloud-client/Manifest8
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.11.1.ebuild (renamed from net-misc/nextcloud-client/nextcloud-client-3.10.1.ebuild)5
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.12.1.ebuild (renamed from net-misc/nextcloud-client/nextcloud-client-3.10.0.ebuild)7
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.12.2.ebuild (renamed from net-misc/nextcloud-client/nextcloud-client-3.8.2-r1.ebuild)7
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.12.3.ebuild (renamed from net-misc/nextcloud-client/nextcloud-client-3.9.1.ebuild)7
-rw-r--r--net-misc/nicstat/nicstat-1.95.ebuild10
-rw-r--r--net-misc/ntp/ntp-4.2.8_p17-r1.ebuild (renamed from net-misc/ntp/ntp-4.2.8_p17.ebuild)7
-rw-r--r--net-misc/ntp/ntp-4.2.8_p17-r2.ebuild162
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild8
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.2.ebuild8
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.2a.ebuild4
-rw-r--r--net-misc/ntpsec/ntpsec-9999.ebuild4
-rw-r--r--net-misc/nxplayer/nxplayer-7.6.2.4-r1.ebuild (renamed from net-misc/nxplayer/nxplayer-7.6.2.4.ebuild)4
-rw-r--r--net-misc/ofono/Manifest4
-rw-r--r--net-misc/ofono/ofono-1.33.ebuild66
-rw-r--r--net-misc/ofono/ofono-1.34.ebuild66
-rw-r--r--net-misc/ofono/ofono-2.1.ebuild4
-rw-r--r--net-misc/ofono/ofono-2.3.ebuild (renamed from net-misc/ofono/ofono-2.0.ebuild)6
-rw-r--r--net-misc/oidc-agent/Manifest1
-rw-r--r--net-misc/oidc-agent/oidc-agent-5.0.1.ebuild2
-rw-r--r--net-misc/oidc-agent/oidc-agent-5.1.0.ebuild102
-rw-r--r--net-misc/oidentd/oidentd-3.0.0-r1.ebuild6
-rw-r--r--net-misc/oidentd/oidentd-3.1.0.ebuild6
-rw-r--r--net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild4
-rw-r--r--net-misc/omnisync/omnisync-1.0_p20200130-r1.ebuild (renamed from net-misc/omnisync/omnisync-1.0_p20200130.ebuild)15
-rw-r--r--net-misc/openr2/Manifest1
-rw-r--r--net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch30
-rw-r--r--net-misc/openr2/openr2-1.3.0.ebuild35
-rw-r--r--net-misc/openssh-contrib/Manifest34
-rw-r--r--net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch18
-rw-r--r--net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch13
-rw-r--r--net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch58
-rw-r--r--net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch21
-rw-r--r--net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch44
-rw-r--r--net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch13
-rw-r--r--net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild532
-rw-r--r--net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild507
-rw-r--r--net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild (renamed from net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild)13
-rw-r--r--net-misc/openssh-contrib/openssh-contrib-9.7_p1-r1.ebuild (renamed from net-misc/openssh-contrib/openssh-contrib-9.4_p1-r1.ebuild)148
-rw-r--r--net-misc/openssh/Manifest12
-rw-r--r--net-misc/openssh/files/openssh-9.3_p1-GSSAPI-dns.patch345
-rw-r--r--net-misc/openssh/files/openssh-9.3_p1-gss-use-HOST_NAME_MAX.patch11
-rw-r--r--net-misc/openssh/files/openssh-9.3_p1-openssl-ignore-status.patch17
-rw-r--r--net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch58
-rw-r--r--net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch21
-rw-r--r--net-misc/openssh/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch44
-rw-r--r--net-misc/openssh/openssh-9.3_p1-r1.ebuild380
-rw-r--r--net-misc/openssh/openssh-9.4_p1-r1.ebuild380
-rw-r--r--net-misc/openssh/openssh-9.6_p1-r3.ebuild (renamed from net-misc/openssh/openssh-9.3_p2.ebuild)71
-rw-r--r--net-misc/openssh/openssh-9.7_p1-r2.ebuild (renamed from net-misc/openssh/openssh-9.5_p1-r2.ebuild)148
-rw-r--r--net-misc/openvswitch/Manifest1
-rw-r--r--net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch145
-rw-r--r--net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch32
-rw-r--r--net-misc/openvswitch/openvswitch-2.17.6.ebuild15
-rw-r--r--net-misc/openvswitch/openvswitch-2.17.8.ebuild174
-rw-r--r--net-misc/owncloud-client/Manifest2
-rw-r--r--net-misc/owncloud-client/metadata.xml3
-rw-r--r--net-misc/owncloud-client/owncloud-client-4.1.0.11250.ebuild77
-rw-r--r--net-misc/owncloud-client/owncloud-client-5.2.1.13040.ebuild54
-rw-r--r--net-misc/packETH/Manifest1
-rw-r--r--net-misc/packETH/metadata.xml1
-rw-r--r--net-misc/packETH/packETH-2.1-r1.ebuild65
-rw-r--r--net-misc/packETH/packETH-2.1.ebuild9
-rw-r--r--net-misc/packETH/packETH-3.0.ebuild64
-rw-r--r--net-misc/passt/Manifest4
-rw-r--r--net-misc/passt/files/Makefile-2024.03.20.patch13
-rw-r--r--net-misc/passt/metadata.xml27
-rw-r--r--net-misc/passt/passt-2023.12.04.ebuild29
-rw-r--r--net-misc/passt/passt-2023.12.30.ebuild29
-rw-r--r--net-misc/passt/passt-2024.03.20.ebuild40
-rw-r--r--net-misc/passt/passt-2024.03.26.ebuild40
-rw-r--r--net-misc/passt/passt-9999.ebuild40
-rw-r--r--net-misc/pedro/metadata.xml5
-rw-r--r--net-misc/pingu/pingu-1.5.ebuild57
-rw-r--r--net-misc/portspoof/portspoof-1.3-r1.ebuild (renamed from net-misc/portspoof/portspoof-1.3.ebuild)22
-rw-r--r--net-misc/portspoof/portspoof-9999.ebuild22
-rw-r--r--net-misc/proxychains/Manifest1
-rw-r--r--net-misc/proxychains/files/proxychains-4.17-makefile.patch54
-rw-r--r--net-misc/proxychains/metadata.xml10
-rw-r--r--net-misc/proxychains/proxychains-4.17.ebuild49
-rw-r--r--net-misc/proxytunnel/Manifest2
-rw-r--r--net-misc/proxytunnel/proxytunnel-1.12.2.ebuild (renamed from net-misc/proxytunnel/proxytunnel-1.11.1.ebuild)2
-rw-r--r--net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild (renamed from net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild)3
-rw-r--r--net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild3
-rw-r--r--net-misc/putty/Manifest2
-rw-r--r--net-misc/putty/metadata.xml1
-rw-r--r--net-misc/putty/putty-0.80.ebuild (renamed from net-misc/putty/putty-0.78.ebuild)7
-rw-r--r--net-misc/putty/putty-9999.ebuild96
-rw-r--r--net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch32
-rw-r--r--net-misc/r8152/r8152-2.17.1.ebuild5
-rw-r--r--net-misc/rabbitmq-server/Manifest1
-rw-r--r--net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild93
-rw-r--r--net-misc/radvd/files/radvd-2.19-configure-c99.patch46
-rw-r--r--net-misc/radvd/files/radvd-2.19.init83
-rw-r--r--net-misc/radvd/radvd-2.19-r5.ebuild4
-rw-r--r--net-misc/radvd/radvd-2.19-r6.ebuild (renamed from net-misc/radvd/radvd-2.19-r4.ebuild)48
-rw-r--r--net-misc/radvd/radvd-2.19-r7.ebuild (renamed from net-misc/radvd/radvd-2.19-r2.ebuild)57
-rw-r--r--net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild13
-rw-r--r--net-misc/redir/metadata.xml5
-rw-r--r--net-misc/remmina/Manifest2
-rw-r--r--net-misc/remmina/files/remmina-1.4.32-REM-2981.patch54
-rw-r--r--net-misc/remmina/remmina-1.4.31-r2.ebuild (renamed from net-misc/remmina/remmina-1.4.31.ebuild)16
-rw-r--r--net-misc/remmina/remmina-1.4.35-r1.ebuild (renamed from net-misc/remmina/remmina-1.4.33.ebuild)20
-rw-r--r--net-misc/rsync/Manifest4
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-notpedantic.patch25
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-strlcpy.patch46
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch12
-rw-r--r--net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch54
-rw-r--r--net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch32
-rw-r--r--net-misc/rsync/metadata.xml2
-rw-r--r--net-misc/rsync/rsync-3.2.7-r3.ebuild (renamed from net-misc/rsync/rsync-3.2.7-r2.ebuild)3
-rw-r--r--net-misc/rsync/rsync-3.2.7-r4.ebuild (renamed from net-misc/rsync/rsync-3.2.4-r3.ebuild)94
-rw-r--r--net-misc/rsync/rsync-3.3.0.ebuild199
-rw-r--r--net-misc/rsync/rsync-9999.ebuild8
-rw-r--r--net-misc/rwhoisd/Manifest1
-rw-r--r--net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch89
-rw-r--r--net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch33
-rw-r--r--net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild4
-rw-r--r--net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild61
-rw-r--r--net-misc/rygel/Manifest1
-rw-r--r--net-misc/rygel/rygel-0.42.5.ebuild87
-rw-r--r--net-misc/s3cmd/Manifest1
-rw-r--r--net-misc/s3cmd/s3cmd-2.4.0.ebuild32
-rw-r--r--net-misc/s6-networking/Manifest4
-rw-r--r--net-misc/s6-networking/metadata.xml8
-rw-r--r--net-misc/s6-networking/s6-networking-2.5.1.3.ebuild57
-rw-r--r--net-misc/s6-networking/s6-networking-2.6.0.0.ebuild57
-rw-r--r--net-misc/s6-networking/s6-networking-2.7.0.2.ebuild (renamed from net-misc/s6-networking/s6-networking-2.7.0.0.ebuild)10
-rw-r--r--net-misc/seafile-client/Manifest5
-rw-r--r--net-misc/seafile-client/metadata.xml9
-rw-r--r--net-misc/seafile-client/seafile-client-8.0.10.ebuild55
-rw-r--r--net-misc/seafile-client/seafile-client-9.0.0.ebuild55
-rw-r--r--net-misc/seafile-client/seafile-client-9.0.1.ebuild55
-rw-r--r--net-misc/seafile-client/seafile-client-9.0.2.ebuild55
-rw-r--r--net-misc/seafile-client/seafile-client-9.0.2_p1.ebuild55
-rw-r--r--net-misc/seafile/Manifest5
-rw-r--r--net-misc/seafile/metadata.xml9
-rw-r--r--net-misc/seafile/seafile-8.0.10-r3.ebuild66
-rw-r--r--net-misc/seafile/seafile-8.0.9-r2.ebuild (renamed from net-misc/seafile/seafile-8.0.9-r1.ebuild)5
-rw-r--r--net-misc/seafile/seafile-9.0.0.ebuild65
-rw-r--r--net-misc/seafile/seafile-9.0.1.ebuild65
-rw-r--r--net-misc/seafile/seafile-9.0.2.ebuild65
-rw-r--r--net-misc/seafile/seafile-9.0.2_p1.ebuild65
-rw-r--r--net-misc/seafile/seafile-9.0.3-r1.ebuild (renamed from net-misc/seafile/seafile-9.0.3.ebuild)3
-rw-r--r--net-misc/sks/files/sks-db.service7
-rw-r--r--net-misc/sks/files/sks-recon.service7
-rw-r--r--net-misc/sks/sks-1.1.6_p20200624-r2.ebuild (renamed from net-misc/sks/sks-1.1.6_p20200624-r1.ebuild)0
-rw-r--r--net-misc/smb4k/Manifest3
-rw-r--r--net-misc/smb4k/metadata.xml1
-rw-r--r--net-misc/smb4k/smb4k-3.2.5-r1.ebuild (renamed from net-misc/smb4k/smb4k-3.2.4.ebuild)10
-rw-r--r--net-misc/smb4k/smb4k-3.2.5-r2.ebuild85
-rw-r--r--net-misc/sntpd/metadata.xml3
-rw-r--r--net-misc/socat/Manifest1
-rw-r--r--net-misc/socat/socat-1.7.4.3.ebuild64
-rw-r--r--net-misc/socat/socat-1.7.4.4.ebuild58
-rw-r--r--net-misc/sock/sock-1.1-r2.ebuild8
-rw-r--r--net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild4
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild8
-rw-r--r--net-misc/spice-gtk/spice-gtk-9999.ebuild6
-rw-r--r--net-misc/spiped/metadata.xml4
-rw-r--r--net-misc/ssh-askpass-fullscreen/Manifest2
-rw-r--r--net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild4
-rw-r--r--net-misc/sshpass/Manifest1
-rw-r--r--net-misc/sshpass/sshpass-1.10.ebuild14
-rw-r--r--net-misc/sslh/Manifest1
-rw-r--r--net-misc/sslh/metadata.xml8
-rw-r--r--net-misc/sslh/sslh-2.1.1.ebuild84
-rw-r--r--net-misc/sslh/sslh-9999.ebuild20
-rw-r--r--net-misc/streamlink/Manifest7
-rw-r--r--net-misc/streamlink/files/streamlink-6.7.2-validator.patch61
-rw-r--r--net-misc/streamlink/metadata.xml1
-rw-r--r--net-misc/streamlink/streamlink-6.2.0.ebuild60
-rw-r--r--net-misc/streamlink/streamlink-6.5.1.ebuild (renamed from net-misc/streamlink/streamlink-6.4.2.ebuild)4
-rw-r--r--net-misc/streamlink/streamlink-6.6.2.ebuild (renamed from net-misc/streamlink/streamlink-6.4.1.ebuild)2
-rw-r--r--net-misc/streamlink/streamlink-6.7.2-r1.ebuild102
-rw-r--r--net-misc/streamlink/streamlink-6.7.3.ebuild98
-rw-r--r--net-misc/streamlink/streamlink-9999.ebuild26
-rw-r--r--net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild4
-rw-r--r--net-misc/stunnel/stunnel-5.71-r1.ebuild132
-rw-r--r--net-misc/stunnel/stunnel-5.71.ebuild6
-rw-r--r--net-misc/suite3270/Manifest1
-rw-r--r--net-misc/suite3270/suite3270-4.2_p5-r2.ebuild105
-rw-r--r--net-misc/suite3270/suite3270-4.3_p6.ebuild104
-rw-r--r--net-misc/sunshine/Manifest10
-rw-r--r--net-misc/sunshine/files/sunshine-0.22.0-nvcodec.patch27
-rw-r--r--net-misc/sunshine/files/sunshine-cross-cbs.patch59
-rw-r--r--net-misc/sunshine/files/sunshine-custom-ffmpeg.patch162
-rw-r--r--net-misc/sunshine/metadata.xml20
-rw-r--r--net-misc/sunshine/sunshine-0.22.2.ebuild378
-rw-r--r--net-misc/sunshine/sunshine-9999.ebuild378
-rw-r--r--net-misc/sysrepo/Manifest1
-rw-r--r--net-misc/sysrepo/sysrepo-2.2.150.ebuild40
-rw-r--r--net-misc/sysrepo/sysrepo-2.2.60.ebuild4
-rw-r--r--net-misc/teamviewer/Manifest12
-rw-r--r--net-misc/teamviewer/teamviewer-15.34.4.ebuild151
-rw-r--r--net-misc/teamviewer/teamviewer-15.48.4.ebuild (renamed from net-misc/teamviewer/teamviewer-15.42.4.ebuild)0
-rw-r--r--net-misc/tinyssh/Manifest2
-rw-r--r--net-misc/tinyssh/files/tinyssh-20240101_c99.patch33
-rw-r--r--net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch10
-rw-r--r--net-misc/tinyssh/tinyssh-20240101-r1.ebuild (renamed from net-misc/tinyssh/tinyssh-20230101.ebuild)10
-rw-r--r--net-misc/tuba/Manifest1
-rw-r--r--net-misc/tuba/metadata.xml (renamed from net-misc/openr2/metadata.xml)7
-rw-r--r--net-misc/tuba/tuba-0.6.3.ebuild72
-rw-r--r--net-misc/tuba/tuba-9999.ebuild66
-rw-r--r--net-misc/turbovnc/Manifest2
-rw-r--r--net-misc/turbovnc/turbovnc-3.1.1.ebuild146
-rw-r--r--net-misc/uftp/Manifest2
-rw-r--r--net-misc/uftp/uftp-5.0.3.ebuild (renamed from net-misc/uftp/uftp-5.0.1.ebuild)2
-rw-r--r--net-misc/unison/Manifest1
-rw-r--r--net-misc/unison/unison-2.53.3.ebuild99
-rw-r--r--net-misc/websocat/Manifest153
-rw-r--r--net-misc/websocat/websocat-1.10.0.ebuild250
-rw-r--r--net-misc/websocat/websocat-1.12.0.ebuild53
-rw-r--r--net-misc/websocat/websocat-1.6.0-r2.ebuild203
-rw-r--r--net-misc/websocat/websocat-1.9.0.ebuild207
-rw-r--r--net-misc/wget/Manifest4
-rw-r--r--net-misc/wget/files/wget-1.21.3-hsts-type.patch211
-rw-r--r--net-misc/wget/metadata.xml1
-rw-r--r--net-misc/wget/wget-1.24.5.ebuild (renamed from net-misc/wget/wget-1.21.3-r1.ebuild)19
-rw-r--r--net-misc/wget2/metadata.xml1
-rw-r--r--net-misc/wget2/wget2-2.0.1-r4.ebuild4
-rw-r--r--net-misc/wget2/wget2-2.1.0.ebuild4
-rw-r--r--net-misc/wget2/wget2-9999.ebuild4
-rw-r--r--net-misc/whois/Manifest4
-rw-r--r--net-misc/whois/whois-5.5.17-r1.ebuild81
-rw-r--r--net-misc/whois/whois-5.5.18-r1.ebuild81
-rw-r--r--net-misc/whois/whois-5.5.21.ebuild (renamed from net-misc/whois/whois-5.5.19.ebuild)2
-rw-r--r--net-misc/xmrig/Manifest3
-rw-r--r--net-misc/xmrig/metadata.xml7
-rw-r--r--net-misc/xmrig/xmrig-6.21.1.ebuild (renamed from net-misc/xmrig/xmrig-6.21.0.ebuild)4
-rw-r--r--net-misc/xmrig/xmrig-6.21.2.ebuild65
-rw-r--r--net-misc/xmrig/xmrig-9999.ebuild11
-rw-r--r--net-misc/yt-dlp/Manifest3
-rw-r--r--net-misc/yt-dlp/yt-dlp-2024.03.10.ebuild (renamed from net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild)19
-rw-r--r--net-misc/yt-dlp/yt-dlp-2024.04.09.ebuild77
-rw-r--r--net-misc/yt-dlp/yt-dlp-9999.ebuild21
-rw-r--r--net-misc/ytfzf/Manifest2
-rw-r--r--net-misc/ytfzf/ytfzf-2.6.2.ebuild (renamed from net-misc/ytfzf/ytfzf-2.6.1.ebuild)2
-rw-r--r--net-misc/ytmdl/Manifest2
-rw-r--r--net-misc/ytmdl/files/ytmdl-2023.11.26-data_files.patch11
-rw-r--r--net-misc/ytmdl/ytmdl-2023.11.26-r1.ebuild (renamed from net-misc/ytmdl/ytmdl-2023.11.26.ebuild)6
-rw-r--r--net-misc/ytmdl/ytmdl-2024.04.14.ebuild (renamed from net-misc/ytmdl/ytmdl-2023.7.27.ebuild)29
518 files changed, 12528 insertions, 11067 deletions
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index f0a2cd9b4276..fa0304d8712d 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -1,2 +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
+DIST anydesk-6.3.1-amd64.tar.gz 7050869 BLAKE2B d6cb708817947804a6c58a5d6edf7e49765fc962228c23aa89f37f8276f04f8501ca874190fe55ab4bb2efd9aea4e1f63e7750116e2351a7d452c8800f8c561b SHA512 f8985df5a58b17bf2f442b88b8a9211294c953987aeb267b91029bcc639f2a3679248613562916cef16897b87aab05e715313bd2be182c7929168d90ade2238f
diff --git a/net-misc/anydesk/anydesk-6.3.0.ebuild b/net-misc/anydesk/anydesk-6.3.1.ebuild
index 77d78ee0f0c6..8da50cec7b3c 100644
--- a/net-misc/anydesk/anydesk-6.3.0.ebuild
+++ b/net-misc/anydesk/anydesk-6.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
index 3f1113b4af76..a97170d14427 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,6 +36,9 @@ PATCHES=(
"${FILESDIR}/${PN}-3.3.1-flags.patch"
"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
+ "${FILESDIR}/${PN}-3.7.4-strlcpy-glibc-2.38.patch"
+ "${FILESDIR}/${PN}-3.7.4-musl.patch"
+ "${FILESDIR}/${PN}-3.7.4-gcc14.patch"
)
S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild
index c68f0b584466..b3920920cb47 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake git-r3 tmpfiles
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
new file mode 100644
index 000000000000..345d7d5c80e4
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
@@ -0,0 +1,39 @@
+--- a/src/aconnect.cc
++++ b/src/aconnect.cc
+@@ -6,6 +6,7 @@
+ #include "debug.h"
+ #include "portutils.h"
+
++#include <algorithm>
+ #include <future>
+
+ #include <sys/types.h>
+--- a/src/acregistry.cc
++++ b/src/acregistry.cc
+@@ -5,6 +5,7 @@
+ #include "cleaner.h"
+ #include "evabase.h"
+
++#include <algorithm>
+ #include <list>
+
+ #define IN_ABOUT_ONE_DAY 100000
+--- a/src/caddrinfo.cc
++++ b/src/caddrinfo.cc
+@@ -1,5 +1,6 @@
+ #include "meta.h"
+
++#include <algorithm>
+ #include <deque>
+ #include <memory>
+ #include <list>
+--- a/src/header.cc
++++ b/src/header.cc
+@@ -10,6 +10,7 @@
+ #include "filereader.h"
+ #include "httpdate.h"
+
++#include <algorithm>
+ #include <map>
+ #include <iostream>
+
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch
new file mode 100644
index 000000000000..01fb990fc98c
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/716564
+--- a/src/meta.h
++++ b/src/meta.h
+@@ -20,6 +20,7 @@
+ #include <strings.h>
+ #include <cstdlib>
+ #include <errno.h>
++#include <sys/time.h>
+
+ #include "astrop.h"
+
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch
new file mode 100644
index 000000000000..4d97d6b0d05c
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/913133
+
+From 7f4bb9de7c84bf55c446c98056259e4e6d8b61e7 Mon Sep 17 00:00:00 2001
+From: Richard Liu <richliu@techarea.org>
+Date: Fri, 19 Jan 2024 00:38:27 +0800
+Subject: [PATCH] fix compile error
+
+---
+ src/meta.cc | 2 +-
+ src/meta.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/meta.cc b/src/meta.cc
+index 9a2053f..5b15eff 100644
+--- a/src/meta.cc
++++ b/src/meta.cc
+@@ -831,7 +831,7 @@ bool scaseequals(string_view a, string_view b)
+ return true;
+ }
+
+-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY
++#if !defined(HAVE_STRLCPY)
+ size_t strlcpy(char *tgt, const char *src, size_t tgtSize)
+ {
+ auto p = src;
+diff --git a/src/meta.h b/src/meta.h
+index a1f4080..dafb754 100644
+--- a/src/meta.h
++++ b/src/meta.h
+@@ -323,7 +323,7 @@ class NoCaseStringMap : public std::map<mstring, mstring, ltstring>
+ static constexpr string_view svRN = szRN;
+ static constexpr string_view svLF = "\n";
+
+-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY
++#if !defined(HAVE_STRLCPY)
+ size_t strlcpy(char *tgt, const char *src, size_t tgtSize);
+ #endif
+ }
+--
+2.43.0
+
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 35240d12d207..eab5c84fe4d4 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,2 +1 @@
-DIST aria2-1.36.0.tar.xz 1619036 BLAKE2B 7894ec705f6fefdbc6c4844efa8a645b3e7674e36d04535ac96b9daf5098a453d047109bad0db16e6fd656f63a3ec0bab5746e8ba7d549149e2364395a94399f SHA512 8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542
DIST aria2-1.37.0.tar.xz 1705256 BLAKE2B 4714dd0806fb7693f45e854d544dadd87312a98eef93518f8e8ea5f3332d362724dead16c7ebfdbe594b8403ef7b44e09f4180629894506e333ec2a423828244 SHA512 df3b8b4de8fa8d78f203ea00c059e43585e18a229009f202e42e6a9e59db67d09df0dbba8a016e99ed73c82f59e4f8b26f86c2288afdbb96a6807cbe2c56e6b3
diff --git a/net-misc/aria2/aria2-1.36.0-r1.ebuild b/net-misc/aria2/aria2-1.36.0-r1.ebuild
deleted file mode 100644
index 39236f9eb903..000000000000
--- a/net-misc/aria2/aria2-1.36.0-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
- adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle
- nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-"
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="
- ?? ( jemalloc tcmalloc )
- metalink? ( xmlrpc )
-"
-RESTRICT="!test? ( test )"
-
-# Crazy GnuTLS/OpenSSL/etc. logic below:
-# 1. Those libraries are used for two purposes: TLS & MD.
-# 2. Upstream preferences are:
-# 1) gnutls [tls]
-# 2) !gnutls? -> openssl [tls+md]
-# 3) !openssl? -> nettle [md]
-# 4) !openssl? !nettle? -> gcrypt [md]
-# 5) !*? -> bundled md routines (we don't use them)
-# 3. There's also gmp usage for bittorrent with nettle.
-# 4. You can't really control features, just dependencies.
-# (we are skipping native Apple/Windows TLS support)
-#
-# We map this into:
-# ssl? -> openssl || (gnutls + (nettle || libgcrypt ))
-# !ssl? -> nettle || libgcrypt
-RDEPEND="
- sys-libs/zlib:0=
- adns? ( >=net-dns/c-ares-1.5.0:0= )
- jemalloc? ( dev-libs/jemalloc )
- libuv? ( >=dev-libs/libuv-1.13:0= )
- metalink? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= )
- )
- sqlite? ( dev-db/sqlite:3= )
- ssh? ( net-libs/libssh2:= )
- ssl? (
- app-misc/ca-certificates
- gnutls? (
- >=net-libs/gnutls-1.2.9:0=
- nettle? (
- >=dev-libs/nettle-2.4:0=
- bittorrent? (
- >=dev-libs/nettle-2.4:0=[gmp]
- >=dev-libs/gmp-6:0=
- )
- )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
- )
- !gnutls? (
- dev-libs/openssl:0=
- )
- )
- !ssl? (
- nettle? (
- >=dev-libs/nettle-2.4:0=
- bittorrent? (
- >=dev-libs/nettle-2.4:0=[gmp]
- >=dev-libs/gmp-6:0=
- )
- )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
- )
- tcmalloc? ( dev-util/google-perftools )
- xmlrpc? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= )
- )
-"
-
-DEPEND="
- ${RDEPEND}
- test? ( >=dev-util/cppunit-1.12.0:0 )
-"
-RDEPEND+="
- nls? ( virtual/libiconv virtual/libintl )
- scripts? ( dev-lang/ruby )
-"
-BDEPEND="app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
- if use scripts && ! use xmlrpc; then
- ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
- ewarn "and aria2mon scripts against the local aria2."
- fi
-}
-
-src_prepare() {
- default
- sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
- # Fails with USE=bittorrent && FEATURES=network-sandbox
- sed -i -E \
- -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageDispatcherTest/d' \
- -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageReceiverTest/d' \
- test/Makefile.in || die
-}
-
-src_configure() {
- local myconf=(
- # threads, epoll: check for best portability
-
- # do not try to compile and run a test LIBXML program
- --disable-xmltest
- # enable the shared library
- --enable-libaria2
- # zlib should always be available anyway
- --with-libz
- --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
- # optional features
- $(use_enable bittorrent)
- $(use_enable metalink)
- $(use_enable nls)
- $(use_with adns libcares)
- $(use_with jemalloc)
- $(use_with libuv)
- $(use_with sqlite sqlite3)
- $(use_with ssh libssh2)
- $(use_with tcmalloc)
-
- # forces bundled wslay
- --disable-websocket
- )
-
- # See TLS/MD logic described above deps.
- if use ssl && ! use gnutls; then
- # 1. if ssl & !gnutls, use openssl and disable gnutls
- myconf+=( --without-gnutls --with-openssl )
- else
- myconf+=(
- # 2. otherwise, disable openssl
- --without-openssl
- # 3. if ssl & gnutls, use gnutls
- $(use_with ssl gnutls)
-
- # 4. switch between nettle & libgcrypt
- $(use_with nettle libnettle)
- $(use_with !nettle libgcrypt)
- )
-
- # 5. if bittorrent is used along with nettle, use libgmp
- if use bittorrent && use nettle; then
- myconf+=( --with-libgmp )
- else
- myconf+=( --without-libgmp )
- fi
- fi
-
- # metalink+xmlrpc := libxml2 / expat
- # USE=(metalink || xmlrpc)
- # + USE=libxml2 -> libxml2
- # + USE=-libxml2 -> expat
-
- if use metalink || use xmlrpc; then
- myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
- else
- myconf+=( --without-libexpat --without-libxml2 )
- fi
-
- # Note:
- # - always enable gzip/http compression since zlib should always be available anyway
- # - always enable epoll since we can assume kernel 2.6.x
- # - other options for threads: solaris, pth, win32
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die
-
- dobashcomp doc/bash_completion/aria2c
- use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
- if use xmlrpc; then
- elog "If you would like to use the additional aria2mon and aria2rpc tools,"
- elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
- fi
-}
diff --git a/net-misc/aria2/aria2-1.37.0.ebuild b/net-misc/aria2/aria2-1.37.0.ebuild
index 5aad543edb93..c22966b826cd 100644
--- a/net-misc/aria2/aria2-1.37.0.ebuild
+++ b/net-misc/aria2/aria2-1.37.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit bash-completion-r1
+inherit bash-completion-r1 libtool
DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
HOMEPAGE="https://aria2.github.io/"
SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="
adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle
@@ -112,6 +112,8 @@ src_prepare() {
-e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageDispatcherTest/d' \
-e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageReceiverTest/d' \
test/Makefile.in || die
+
+ elibtoolize
}
src_configure() {
@@ -185,6 +187,7 @@ src_configure() {
src_install() {
default
+ find "${D}" -name '*.la' -delete || die
rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die
dobashcomp doc/bash_completion/aria2c
diff --git a/net-misc/asahi-btsync/Manifest b/net-misc/asahi-btsync/Manifest
new file mode 100644
index 000000000000..d6effe408e76
--- /dev/null
+++ b/net-misc/asahi-btsync/Manifest
@@ -0,0 +1,64 @@
+DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
+DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
+DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159
+DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3
+DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
+DIST anstyle-query-1.0.1.crate 8620 BLAKE2B 65d81d089b6f84e062276807e180e6a8b793cdf570e4e82a88dd1670ed1e15f6edc9ca8f55873069273efe170c2dbbbf75dd3b2b773c78d23c896c0d6f3bb237 SHA512 70178a50e4025a0ded9fa7235d045cd965889efe63bc319e418a3e34406a66a42c19a2d7684d8d607046cd8419ba9b789607fe5c50aeeeabb23d72de6ad43039
+DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
+DIST asahi-btsync-0.2.0.tar.gz 20839 BLAKE2B 2b09167cc6bf1ccb376666c06491a04872790de5917950d6877e791f2cec0591375b5fd1aa829b7ef43466d2c656d0ff87748505ce5c6c34d3bf8b7fd6e16267 SHA512 70149a1f3eab442e460c057ee2bc85936dcc98c0ec9039e0343ed3edd4cb7bb6fd77da9ec61afb47f5bfb73765ae31ad9aad7b355ed9d77b4a9a1842ce31b305
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitflags-2.3.3.crate 34320 BLAKE2B da9f42fc888e31d50d0b2f0d0cc1bddfa97e0c2d3eac60fd2cc451670f000b5148e58c3c40c348ef1bd516c7a568bcc3a97742ac5bdb9ef4772048eb922171af SHA512 8f063ba2bc3f638ca9200722e1c4370102589fb07aef25efcf63993fbf283cc86d554d11d24719f728ecabe540a47a90ce4113d8719f8e773f2344a66d21ff78
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea
+DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b
+DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4
+DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167
+DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
+DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
+DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST crc-3.0.1.crate 9950 BLAKE2B 2afbaee34f754953396e452260290422d19416dad4b88333e4501592deff3b3350363ca4c2b37d573ecd4e64a762b702b79445460f15fc90bdb8214fe43c0945 SHA512 aabe9d4058fb4710405146e978ec5881bce5ce8971618b69a7ff873b0fff15fc78e5c48ff0136ca6d37663a53905bc3c5daa0ed3a2ed4d8d721e90c3b0ec28a5
+DIST crc-catalog-2.2.0.crate 9931 BLAKE2B b9c36e7f41e67daafc31f6ee6bf37ef78980171cd84565c103770a57bbed1e04f2b7a7261e7917252b3b6be96837e8138a8b9829380be93a69ee6f33ea332397 SHA512 9fcd42c44c66798c97ed36b36a902dff6e83a96d86da0f146c0db287ed6a00c8827d6749bfcdd090083bb81103bb2397e388a0e2a21698d65550360a45453396
+DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST dlv-list-0.3.0.crate 11920 BLAKE2B 2f5d52dd47c97799e6e7fead83c0f239daca5422f7fd2f3662d3d4a22714b2a64a4b65df3a451ad43675d828e3265a10ae30428204c33f4e1efa8bcd6933ca8d SHA512 3efa93e5ee5ee2e480a7e8dbc6d5baeb289279871f8b9f4858a24abf3f8b57cf1fd36369a6b5a1e667c121985197063c8834141b220a58453c8399edc9da4206
+DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
+DIST gpt-3.1.0.crate 47134 BLAKE2B 24a1b4607ee07e590c89c1a68bb7f20251a99f5078c38e937cf4f4d0f83508830a9b62b7f5a1eb5475095c41c80d56ebfce91e65f25a61b161b2a088e1c0e179 SHA512 dd298a4b6b6a200482193ba560241bc3f3e2e9e790c06d016447f58004d1aeb37e554f99fc1d5b166e4062978ad19883d021405c08b9648a34159a002316e3b5
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
+DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
+DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
+DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038
+DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
+DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704
+DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
+DIST ordered-multimap-0.4.3.crate 19599 BLAKE2B 1287938e6bcb26c3e377fff6c492adfff7ca05fcdb5881d76edcf08aa89160180e6a2c2ad40b162e75997bc9fe36204c50d839d4305911de231bfd408345975a SHA512 92d02f260d912c70bc51a4e943ecf7be7e8211ff515dd6aa6029fbb0d0f67b8c689966b23e32520fc5b437caebab650e18a16cdd8b2a036edc91645faa9e47e8
+DIST os_str_bytes-6.5.1.crate 22778 BLAKE2B 1d3daa82b41e6e360ec17051be2c5b1a394fe49ae349b2888e6f30fccf99d102c71357f76c3f68118de59e24480221b352a223ed01f26f11bf707b1c7de81941 SHA512 6d7a4475398daaae4e3d55ad58a8fba729517acf5744a5a6296f477207ee91e5bc36c2b54e58f6f9b15ce9bc75286e9ba62a59d577f0171d8151d3aaa01311b8
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f
+DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
+DIST rust-ini-0.18.0.crate 15439 BLAKE2B e225973af6e7d8a8ebf0d37efa913f5eacf8beb42d30f759135b18ae6fed091537466afc7e2aacfe1d00514a76eb4a8bd99ff281859ca0f7c7e0db3c6d6fb1a9 SHA512 2907d0891ff2164deacb2f217b4b8484bee9b2c2d32c354518e9b4d74069639bab55190d0d8ca6fb0751180cf2be1477ed9b100e3a5cc9f02af52ea26f32ccf4
+DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
+DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
+DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST uuid-1.4.0.crate 55200 BLAKE2B 11e641e76f2f25f94430cbb473887cfa052f73527d7df2625d304d101c25ba0148c901460798dea962611df1f5af41119c29ff2aea25fd09bfd64368a2df8aab SHA512 92acf08ee1f36a3a394422ce9b1cdbe0ccf3fb8d878efe068fd025832af677466622bd1260e853c5232f18b4f5411136595aa07311a3f9886904800bee7cfaa0
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
+DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
+DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
+DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
+DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
+DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
+DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
+DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
diff --git a/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild b/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild
new file mode 100644
index 000000000000..38625d6d5889
--- /dev/null
+++ b/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ adler32@1.2.0
+ ahash@0.7.6
+ anstream@0.6.4
+ anstyle-parse@0.2.3
+ anstyle-query@1.0.1
+ anstyle-wincon@3.0.2
+ anstyle@1.0.4
+ atty@0.2.14
+ autocfg@1.1.0
+ bitflags@1.3.2
+ bitflags@2.3.3
+ cfg-if@1.0.0
+ clap@3.2.25
+ clap@4.4.11
+ clap_builder@4.4.11
+ clap_derive@4.4.7
+ clap_lex@0.2.4
+ clap_lex@0.6.0
+ colorchoice@1.0.0
+ crc-catalog@2.2.0
+ crc32fast@1.3.2
+ crc@3.0.1
+ dlv-list@0.3.0
+ getrandom@0.2.10
+ gpt@3.1.0
+ hashbrown@0.12.3
+ heck@0.4.1
+ hermit-abi@0.1.19
+ indexmap@1.9.3
+ libc@0.2.147
+ log@0.4.19
+ memoffset@0.7.1
+ nix@0.26.2
+ once_cell@1.18.0
+ ordered-multimap@0.4.3
+ os_str_bytes@6.5.1
+ pin-utils@0.1.0
+ proc-macro2@1.0.70
+ quote@1.0.33
+ rust-ini@0.18.0
+ static_assertions@1.1.0
+ strsim@0.10.0
+ syn@2.0.39
+ termcolor@1.2.0
+ textwrap@0.16.0
+ unicode-ident@1.0.12
+ utf8parse@0.2.1
+ uuid@1.4.0
+ version_check@0.9.4
+ wasi@0.11.0+wasi-snapshot-preview1
+ winapi-i686-pc-windows-gnu@0.4.0
+ winapi-util@0.1.5
+ winapi-x86_64-pc-windows-gnu@0.4.0
+ winapi@0.3.9
+ windows-sys@0.52.0
+ windows-targets@0.52.0
+ windows_aarch64_gnullvm@0.52.0
+ windows_aarch64_msvc@0.52.0
+ windows_i686_gnu@0.52.0
+ windows_i686_msvc@0.52.0
+ windows_x86_64_gnu@0.52.0
+ windows_x86_64_gnullvm@0.52.0
+ windows_x86_64_msvc@0.52.0
+"
+
+inherit cargo linux-info
+
+# Releases are not tagged
+COMMIT="11e47cfa7ddbec0059d683e6d98a4e0f95e3ffa3"
+MY_P="asahi-nvram-${COMMIT}"
+DESCRIPTION="Bluetooth pairing data handoff from macOS for Apple Silicon Macs"
+HOMEPAGE="https://github.com/WhatAmISupposedToPutHere/asahi-nvram"
+
+SRC_URI="
+ ${CARGO_CRATE_URIS}
+ https://github.com/WhatAmISupposedToPutHere/asahi-nvram/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}/asahi-btsync"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016 ZLIB"
+SLOT="0"
+KEYWORDS="~arm64"
+
+pkg_pretend() {
+ if use kernel_linux; then
+ linux_config_exists || die "No suitable kernel configuration could be found"
+ CONFIG_EXTRA="~MTD_SPI_NOR"
+ check_extra_config
+ fi
+}
diff --git a/net-misc/asahi-btsync/metadata.xml b/net-misc/asahi-btsync/metadata.xml
new file mode 100644
index 000000000000..c0d4d6d29036
--- /dev/null
+++ b/net-misc/asahi-btsync/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>jcalligeros99@gmail.com</email>
+ <name>James Calligeros</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>asahi@gentoo.org</email>
+ <name>Gentoo Asahi Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">WhatAmISupposedToPutHere/asahi-nvram</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-misc/asahi-wifisync/Manifest b/net-misc/asahi-wifisync/Manifest
new file mode 100644
index 000000000000..d1a4c14fc0ee
--- /dev/null
+++ b/net-misc/asahi-wifisync/Manifest
@@ -0,0 +1,64 @@
+DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
+DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
+DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159
+DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3
+DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
+DIST anstyle-query-1.0.1.crate 8620 BLAKE2B 65d81d089b6f84e062276807e180e6a8b793cdf570e4e82a88dd1670ed1e15f6edc9ca8f55873069273efe170c2dbbbf75dd3b2b773c78d23c896c0d6f3bb237 SHA512 70178a50e4025a0ded9fa7235d045cd965889efe63bc319e418a3e34406a66a42c19a2d7684d8d607046cd8419ba9b789607fe5c50aeeeabb23d72de6ad43039
+DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
+DIST asahi-wifisync-0.2.0.tar.gz 20839 BLAKE2B 2b09167cc6bf1ccb376666c06491a04872790de5917950d6877e791f2cec0591375b5fd1aa829b7ef43466d2c656d0ff87748505ce5c6c34d3bf8b7fd6e16267 SHA512 70149a1f3eab442e460c057ee2bc85936dcc98c0ec9039e0343ed3edd4cb7bb6fd77da9ec61afb47f5bfb73765ae31ad9aad7b355ed9d77b4a9a1842ce31b305
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitflags-2.3.3.crate 34320 BLAKE2B da9f42fc888e31d50d0b2f0d0cc1bddfa97e0c2d3eac60fd2cc451670f000b5148e58c3c40c348ef1bd516c7a568bcc3a97742ac5bdb9ef4772048eb922171af SHA512 8f063ba2bc3f638ca9200722e1c4370102589fb07aef25efcf63993fbf283cc86d554d11d24719f728ecabe540a47a90ce4113d8719f8e773f2344a66d21ff78
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea
+DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b
+DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4
+DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167
+DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
+DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
+DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST crc-3.0.1.crate 9950 BLAKE2B 2afbaee34f754953396e452260290422d19416dad4b88333e4501592deff3b3350363ca4c2b37d573ecd4e64a762b702b79445460f15fc90bdb8214fe43c0945 SHA512 aabe9d4058fb4710405146e978ec5881bce5ce8971618b69a7ff873b0fff15fc78e5c48ff0136ca6d37663a53905bc3c5daa0ed3a2ed4d8d721e90c3b0ec28a5
+DIST crc-catalog-2.2.0.crate 9931 BLAKE2B b9c36e7f41e67daafc31f6ee6bf37ef78980171cd84565c103770a57bbed1e04f2b7a7261e7917252b3b6be96837e8138a8b9829380be93a69ee6f33ea332397 SHA512 9fcd42c44c66798c97ed36b36a902dff6e83a96d86da0f146c0db287ed6a00c8827d6749bfcdd090083bb81103bb2397e388a0e2a21698d65550360a45453396
+DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST dlv-list-0.3.0.crate 11920 BLAKE2B 2f5d52dd47c97799e6e7fead83c0f239daca5422f7fd2f3662d3d4a22714b2a64a4b65df3a451ad43675d828e3265a10ae30428204c33f4e1efa8bcd6933ca8d SHA512 3efa93e5ee5ee2e480a7e8dbc6d5baeb289279871f8b9f4858a24abf3f8b57cf1fd36369a6b5a1e667c121985197063c8834141b220a58453c8399edc9da4206
+DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
+DIST gpt-3.1.0.crate 47134 BLAKE2B 24a1b4607ee07e590c89c1a68bb7f20251a99f5078c38e937cf4f4d0f83508830a9b62b7f5a1eb5475095c41c80d56ebfce91e65f25a61b161b2a088e1c0e179 SHA512 dd298a4b6b6a200482193ba560241bc3f3e2e9e790c06d016447f58004d1aeb37e554f99fc1d5b166e4062978ad19883d021405c08b9648a34159a002316e3b5
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
+DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
+DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
+DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038
+DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
+DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704
+DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
+DIST ordered-multimap-0.4.3.crate 19599 BLAKE2B 1287938e6bcb26c3e377fff6c492adfff7ca05fcdb5881d76edcf08aa89160180e6a2c2ad40b162e75997bc9fe36204c50d839d4305911de231bfd408345975a SHA512 92d02f260d912c70bc51a4e943ecf7be7e8211ff515dd6aa6029fbb0d0f67b8c689966b23e32520fc5b437caebab650e18a16cdd8b2a036edc91645faa9e47e8
+DIST os_str_bytes-6.5.1.crate 22778 BLAKE2B 1d3daa82b41e6e360ec17051be2c5b1a394fe49ae349b2888e6f30fccf99d102c71357f76c3f68118de59e24480221b352a223ed01f26f11bf707b1c7de81941 SHA512 6d7a4475398daaae4e3d55ad58a8fba729517acf5744a5a6296f477207ee91e5bc36c2b54e58f6f9b15ce9bc75286e9ba62a59d577f0171d8151d3aaa01311b8
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f
+DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
+DIST rust-ini-0.18.0.crate 15439 BLAKE2B e225973af6e7d8a8ebf0d37efa913f5eacf8beb42d30f759135b18ae6fed091537466afc7e2aacfe1d00514a76eb4a8bd99ff281859ca0f7c7e0db3c6d6fb1a9 SHA512 2907d0891ff2164deacb2f217b4b8484bee9b2c2d32c354518e9b4d74069639bab55190d0d8ca6fb0751180cf2be1477ed9b100e3a5cc9f02af52ea26f32ccf4
+DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
+DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
+DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST uuid-1.4.0.crate 55200 BLAKE2B 11e641e76f2f25f94430cbb473887cfa052f73527d7df2625d304d101c25ba0148c901460798dea962611df1f5af41119c29ff2aea25fd09bfd64368a2df8aab SHA512 92acf08ee1f36a3a394422ce9b1cdbe0ccf3fb8d878efe068fd025832af677466622bd1260e853c5232f18b4f5411136595aa07311a3f9886904800bee7cfaa0
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
+DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
+DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
+DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
+DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
+DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
+DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
+DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
diff --git a/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild b/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild
new file mode 100644
index 000000000000..4ab24a1b1b1e
--- /dev/null
+++ b/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ adler32@1.2.0
+ ahash@0.7.6
+ anstream@0.6.4
+ anstyle-parse@0.2.3
+ anstyle-query@1.0.1
+ anstyle-wincon@3.0.2
+ anstyle@1.0.4
+ atty@0.2.14
+ autocfg@1.1.0
+ bitflags@1.3.2
+ bitflags@2.3.3
+ cfg-if@1.0.0
+ clap@3.2.25
+ clap@4.4.11
+ clap_builder@4.4.11
+ clap_derive@4.4.7
+ clap_lex@0.2.4
+ clap_lex@0.6.0
+ colorchoice@1.0.0
+ crc-catalog@2.2.0
+ crc32fast@1.3.2
+ crc@3.0.1
+ dlv-list@0.3.0
+ getrandom@0.2.10
+ gpt@3.1.0
+ hashbrown@0.12.3
+ heck@0.4.1
+ hermit-abi@0.1.19
+ indexmap@1.9.3
+ libc@0.2.147
+ log@0.4.19
+ memoffset@0.7.1
+ nix@0.26.2
+ once_cell@1.18.0
+ ordered-multimap@0.4.3
+ os_str_bytes@6.5.1
+ pin-utils@0.1.0
+ proc-macro2@1.0.70
+ quote@1.0.33
+ rust-ini@0.18.0
+ static_assertions@1.1.0
+ strsim@0.10.0
+ syn@2.0.39
+ termcolor@1.2.0
+ textwrap@0.16.0
+ unicode-ident@1.0.12
+ utf8parse@0.2.1
+ uuid@1.4.0
+ version_check@0.9.4
+ wasi@0.11.0+wasi-snapshot-preview1
+ winapi-i686-pc-windows-gnu@0.4.0
+ winapi-util@0.1.5
+ winapi-x86_64-pc-windows-gnu@0.4.0
+ winapi@0.3.9
+ windows-sys@0.52.0
+ windows-targets@0.52.0
+ windows_aarch64_gnullvm@0.52.0
+ windows_aarch64_msvc@0.52.0
+ windows_i686_gnu@0.52.0
+ windows_i686_msvc@0.52.0
+ windows_x86_64_gnu@0.52.0
+ windows_x86_64_gnullvm@0.52.0
+ windows_x86_64_msvc@0.52.0
+"
+
+inherit cargo linux-info
+
+# Releases are not tagged
+COMMIT="11e47cfa7ddbec0059d683e6d98a4e0f95e3ffa3"
+MY_P="asahi-nvram-${COMMIT}"
+DESCRIPTION="WiFi network handoff from macOS for Apple Silicon Macs"
+HOMEPAGE="https://github.com/WhatAmISupposedToPutHere/asahi-nvram"
+
+SRC_URI="
+ ${CARGO_CRATE_URIS}
+ https://github.com/WhatAmISupposedToPutHere/asahi-nvram/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}/asahi-wifisync"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016 ZLIB"
+SLOT="0"
+KEYWORDS="~arm64"
+
+pkg_pretend() {
+ if use kernel_linux; then
+ linux_config_exists || die "No suitable kernel configuration could be found"
+ CONFIG_EXTRA="~MTD_SPI_NOR"
+ check_extra_config
+ fi
+}
diff --git a/net-misc/asahi-wifisync/metadata.xml b/net-misc/asahi-wifisync/metadata.xml
new file mode 100644
index 000000000000..c0d4d6d29036
--- /dev/null
+++ b/net-misc/asahi-wifisync/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>jcalligeros99@gmail.com</email>
+ <name>James Calligeros</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>asahi@gentoo.org</email>
+ <name>Gentoo Asahi Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">WhatAmISupposedToPutHere/asahi-nvram</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-misc/asterisk-base/asterisk-base-2.ebuild b/net-misc/asterisk-base/asterisk-base-2.ebuild
index 7d89202ca56f..98bf283c86b7 100644
--- a/net-misc/asterisk-base/asterisk-base-2.ebuild
+++ b/net-misc/asterisk-base/asterisk-base-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
net-misc/asterisk
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
index afa1249c00e6..65915f0e5c61 100644
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
S="${WORKDIR}"
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
index c4e002184790..6cdfb0808711 100644
--- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
BLACKLIST=("astcc-followed-by-the-pound-key")
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
index 9c5c1bcc2ef4..0cc3c194bb3b 100644
--- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -17,7 +17,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
S="${WORKDIR}"
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index ae3e82f39208..1f8a2ef7e547 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -3,5 +3,11 @@ DIST asterisk-16.30.1.tar.gz 28234979 BLAKE2B a9cd732feb00408876f90328d7f14dbfe4
DIST asterisk-18.17.0.tar.gz 28293243 BLAKE2B 8a162d7cac92df2b6dd430fedc1446a302b1b9c1061ddd4a236fd5797e8be17d53d7179d23a7c8bd4260c73d34dea2db2b9ebffd4eebb2ed714a286838bc5ddf SHA512 1a5dd9715811a8b699d49b057ef42f68ddc88cc22a568836a6a778f6ff22d3923f81840aef425819bb59f28bb27e321154ef9e1d3deba5ed7d39c7eca562e40e
DIST asterisk-18.18.0.tar.gz 28407407 BLAKE2B 2e49da8b93651268e2aa2f7f5e2b8ffb2f74c39eb74a4514593be39826912774584c4c33f3839a951ec068218e8db43153fee0a543a9adb94a90cc9338ad40c3 SHA512 bf3d73ef5b6a196d599771c913ae95596b0bfae8fc35cdf66181d7b56ffb4bd78078e25627e271c62988ed6342e69162a1f120cae6049dda6f1596d0759bee59
DIST asterisk-18.18.1.tar.gz 28407009 BLAKE2B b3c3325a8958fa25364c735508357e35e4ad3ea2390b4f83d7b132c4263b2b0b56a65abab60f337e55cbc3edd4df580f3904164ba76abd4198ce1be112c93d38 SHA512 d5058399beffd2f74a17b0fdcc97720e08540383facb2f3691376cb2086e3d2f8df5b0c9110699d09cffe1ed6b2fbdfe9926d0698af0fce39c6c0a9bb4643d30
+DIST asterisk-18.20.2.tar.gz 28448635 BLAKE2B 9949033f93d770673e80a86cd48a084da853d0cbb51aa50159e813653bb39efd062772331aeb5d127f0c1c58724d9c6d748d45a2e0803f276e83bc804b942c2c SHA512 3ee44047a2d9823550b031933b709e8fd7d6a2a0a4cfb2221187da0983f8d22e411b93fde22934753ae9a7272390c7feebc8addabf7e0943eb57ae7f2fa71b3c
+DIST asterisk-18.21.0.tar.gz 28446501 BLAKE2B 15a0f928f9c20eb676ffa25af8ac771494a417744758e6e9304451502ee2981c09e1c89c7012ec11edfb9a6bfd15599d462922a373a8f8d7d5074ea0b8c7e7cf SHA512 4a3c57af70b74918b61e1c67423667a876fcc519376f1795054a55700acb5d05da8e4e0a3e3187760203bc262678a6c29eae07ed2a5e2df84a9a555ec79cb48f
DIST asterisk-20.3.0.tar.gz 28176546 BLAKE2B 488cfe449c040c282afe438847d14f6cc20d1fb034fbb33555f8e43803b481d3f2b890ac01cc7d43278b41040093f8cedfc609c025cfab73fd8b9d23a0f67016 SHA512 332c24c089abca7059d80794b37a4f5dc34f0468a07f5534b0df26c5103e0508c9c5f3f35a02826ed6b33973c26503be2829fd51fa23a8056a58fa2b50b17730
DIST asterisk-20.3.1.tar.gz 28176262 BLAKE2B 9ee75ee297dc4df37f51f75444d46af083b794cb444ae77b601f17308889db22240939edf04761eb3d41e74e2a67a3329d427861a5a5d34fec6016d6660793bd SHA512 4e34de731211aebe916d19948c41aff370187bfadc1202837a96ebc7f218e5bd7c3936b5b4e34ba6e79c079f77eb5ed038239c903800d5a56ceda2f342218613
+DIST asterisk-20.5.2.tar.gz 28215394 BLAKE2B d9baddc5b2134fd8d7c23dc1407abc37ee937f4dc3ac6dacca43126e0f3ee45b5eca1b8a66834e267d8bb02eb35c8b2e73d854b0a234a85f2dc4048b9d1c4a99 SHA512 ff2d6ddd5b6031b6e4fcb15c82149c3272031b617bf5bca87af1d085464fcd9af6bd373e9431077ce58a558b50c6b2c9cd4d94e739ecc312371cd605e4746a84
+DIST asterisk-20.6.0.tar.gz 28208707 BLAKE2B 7eaebcec7dd58912bc4ef6eccf46c0f10b328997889febaa0bf03e2a60197c9d2db97a0ccfd2870085c87eb97ca3b45286138857504199f09ba2071b9a0c50a2 SHA512 31af71a325cdcb9eb5c6b8bb72f523e7da8dcb1b2d33eaa04a493a922421f90c2019bbed01ff5bc8aa46cd02fa72b80a48074ecb146f5399d62bc504a0e4c053
+DIST asterisk-21.0.2.tar.gz 26280477 BLAKE2B 4bcf2f42bf75b869e2279780c4bb3999786d844e57d48eb5fd8570e0f4ecea0de73d71077e5a5fe6ce64c1c36ef694c987872281fd30e9434bc67d91a3ce1249 SHA512 419d8c2abfa680bb1a812fcbea939f2505dc9f95f860c263c303731fb4e0870060e433787b344136832ccf9d0e34dc64da25240ab3651fb499f416ec3098a711
+DIST asterisk-21.1.0.tar.gz 26268701 BLAKE2B eae9bab916198ab6fba39142d96c6391ffa711c4ac5a4dd7926c0494dabcd1606bab0525e24477f453ff419329efb0a3abf5e9a012abd2a39f6f818505dd196a SHA512 1d4aea4f02950becb492af49e2d434df725676185651b4c1e5dc502f21c8380ce1368f75726bca124d41128ea01a8210d1e229883c442a42bbdb03530fc981c8
diff --git a/net-misc/asterisk/asterisk-16.30.1-r1.ebuild b/net-misc/asterisk/asterisk-16.30.1-r1.ebuild
new file mode 100644
index 000000000000..e396518bc948
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.30.1-r1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single toolchain-funcs
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ +voicemail_storage_file
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+ "${FILESDIR}/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch"
+ "${FILESDIR}/asterisk-16.30.1-r1-iax2_jitterbuffer.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.9:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+PDEPEND="net-misc/asterisk-base"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ SED=sed \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable astdb2* tools. We've been on sqlite long enough
+ # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+ _menuselect --disable astdb2sqlite3 menuselect.makeopts
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_misdn menuselect.makeopts
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ _menuselect --enable chan_mgcp menuselect.makeopts
+ _menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select alsa chan_alsa
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select deprecated app_macro
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql app_mysql cdr_mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select oss chan_oss
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select syslog cdr_syslog
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ # install the upgrade documentation
+ dodoc UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if use deprecated; then
+ ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+ ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-18.20.2.ebuild b/net-misc/asterisk/asterisk-18.20.2.ebuild
new file mode 100644
index 000000000000..a16cf2d20212
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.20.2.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single toolchain-funcs
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+PDEPEND="net-misc/asterisk-base"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+ "AST_FORTIFY_SOURCE="
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable astdb2* tools. We've been on sqlite long enough
+ # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+ _menuselect --disable astdb2sqlite3 menuselect.makeopts
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_misdn menuselect.makeopts
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ _menuselect --enable chan_mgcp menuselect.makeopts
+ _menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select alsa chan_alsa
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select deprecated app_macro
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql app_mysql cdr_mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select oss chan_oss
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select syslog cdr_syslog
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ _menuselect --enable app_voicemail menuselect.makeopts
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-headers install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ # install the upgrade documentation
+ dodoc UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if use deprecated; then
+ ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+ ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-18.21.0.ebuild b/net-misc/asterisk/asterisk-18.21.0.ebuild
new file mode 100644
index 000000000000..1d3b1fdda21d
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.21.0.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single toolchain-funcs
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+PDEPEND="net-misc/asterisk-base"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+ "AST_FORTIFY_SOURCE="
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \
+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable astdb2* tools. We've been on sqlite long enough
+ # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+ _menuselect --disable astdb2sqlite3 menuselect.makeopts
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_misdn menuselect.makeopts
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ _menuselect --enable chan_mgcp menuselect.makeopts
+ _menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select alsa chan_alsa
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select deprecated app_macro
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql app_mysql cdr_mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select oss chan_oss
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select syslog cdr_syslog
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ _menuselect --enable app_voicemail menuselect.makeopts
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-headers install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ # install the upgrade documentation
+ dodoc README* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if use deprecated; then
+ ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+ ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-20.5.2.ebuild b/net-misc/asterisk/asterisk-20.5.2.ebuild
new file mode 100644
index 000000000000..53593c91aac6
--- /dev/null
+++ b/net-misc/asterisk/asterisk-20.5.2.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single toolchain-funcs
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )"
+PDEPEND="net-misc/asterisk-base"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+ "AST_FORTIFY_SOURCE="
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable astdb2* tools. We've been on sqlite long enough
+ # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+ _menuselect --disable astdb2sqlite3 menuselect.makeopts
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ _menuselect --enable chan_mgcp menuselect.makeopts
+ _menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select alsa chan_alsa
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select deprecated app_macro chan_sip res_monitor
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ _menuselect --enable app_voicemail menuselect.makeopts
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-headers install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ # install the upgrade documentation
+ dodoc UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if use deprecated; then
+ ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+ ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-20.6.0.ebuild b/net-misc/asterisk/asterisk-20.6.0.ebuild
new file mode 100644
index 000000000000..020f846fa16f
--- /dev/null
+++ b/net-misc/asterisk/asterisk-20.6.0.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single toolchain-funcs
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )"
+PDEPEND="net-misc/asterisk-base"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+ "AST_FORTIFY_SOURCE="
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \
+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable astdb2* tools. We've been on sqlite long enough
+ # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+ _menuselect --disable astdb2sqlite3 menuselect.makeopts
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ _menuselect --enable chan_mgcp menuselect.makeopts
+ _menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select alsa chan_alsa
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select deprecated app_macro chan_sip res_monitor
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ _menuselect --enable app_voicemail menuselect.makeopts
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-headers install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ dodoc README* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if use deprecated; then
+ ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+ ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-21.0.2.ebuild b/net-misc/asterisk/asterisk-21.0.2.ebuild
new file mode 100644
index 000000000000..b4ed5f80b54c
--- /dev/null
+++ b/net-misc/asterisk/asterisk-21.0.2.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single toolchain-funcs
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )"
+PDEPEND="net-misc/asterisk-base"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+ "AST_FORTIFY_SOURCE="
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable astdb2* tools. We've been on sqlite long enough
+ # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+ _menuselect --disable astdb2sqlite3 menuselect.makeopts
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ _menuselect --enable app_voicemail menuselect.makeopts
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-headers install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ # install the upgrade documentation
+ dodoc UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-21.1.0.ebuild b/net-misc/asterisk/asterisk-21.1.0.ebuild
new file mode 100644
index 000000000000..53ef3dcce988
--- /dev/null
+++ b/net-misc/asterisk/asterisk-21.1.0.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single toolchain-funcs
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )"
+PDEPEND="net-misc/asterisk-base"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+ "AST_FORTIFY_SOURCE="
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \
+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable astdb2* tools. We've been on sqlite long enough
+ # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+ _menuselect --disable astdb2sqlite3 menuselect.makeopts
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ _menuselect --enable app_voicemail menuselect.makeopts
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-headers install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ dodoc README* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch b/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch
new file mode 100644
index 000000000000..67fb68b3cf42
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch
@@ -0,0 +1,65 @@
+From 73103bdcd5b342ce5dfa32039333ffadad551151 Mon Sep 17 00:00:00 2001
+From: Naveen Albert <asterisk@phreaknet.org>
+Date: Wed, 14 Dec 2022 16:00:51 +0000
+Subject: [PATCH] chan_iax2: Fix jitterbuffer regression prior to receiving
+ audio.
+
+ASTERISK_29392 (a security fix) introduced a regression by
+not processing frames when we don't have an audio format.
+
+Currently, chan_iax2 only calls jb_get to read frames from
+the jitterbuffer when the voiceformat has been set on the pvt.
+However, this only happens when we receive a voice frame, which
+means that prior to receiving voice frames, other types of frames
+get stalled completely in the jitterbuffer.
+
+To fix this, we now fallback to using the format negotiated during
+call setup until we've actually received a voice frame with a format.
+This ensures we're always able to read from the jitterbuffer.
+
+ASTERISK-30354 #close
+ASTERISK-30162 #close
+
+Change-Id: Ie4fd1e8e088a145ad89e0427c2100a530e964fe9
+---
+ channels/chan_iax2.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
+index ab6bd61638..5b3caf03b5 100644
+--- a/channels/chan_iax2.c
++++ b/channels/chan_iax2.c
+@@ -4158,9 +4158,19 @@ static void __get_from_jb(const void *p)
+ now.tv_usec += 1000;
+
+ ms = ast_tvdiff_ms(now, pvt->rxcore);
+-
+- voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
+- if (voicefmt && ms >= (next = jb_next(pvt->jb))) {
++ if (ms >= (next = jb_next(pvt->jb))) {
++ voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
++ if (!voicefmt) {
++ /* pvt->voiceformat won't be set if we haven't received any voice frames yet.
++ * In this case, fall back to using the format negotiated during call setup,
++ * so we don't stall the jitterbuffer completely. */
++ voicefmt = ast_format_compatibility_bitfield2format(pvt->peerformat);
++ }
++ if (!voicefmt) {
++ /* Really shouldn't happen, but if it does, should be looked into */
++ ast_log(LOG_WARNING, "No voice format and no peer format available on %s, backlogging frame\n", ast_channel_name(pvt->owner));
++ goto cleanup; /* Don't crash if there's no voice format */
++ }
+ ret = jb_get(pvt->jb, &frame, ms, ast_format_get_default_ms(voicefmt));
+ switch(ret) {
+ case JB_OK:
+@@ -4202,6 +4212,7 @@ static void __get_from_jb(const void *p)
+ break;
+ }
+ }
++cleanup:
+ if (pvt)
+ update_jbsched(pvt);
+ ast_mutex_unlock(&iaxsl[callno]);
+--
+2.41.0
+
diff --git a/net-misc/autossh/autossh-1.4g-r1.ebuild b/net-misc/autossh/autossh-1.4g-r1.ebuild
deleted file mode 100644
index 4a227c8620c6..000000000000
--- a/net-misc/autossh/autossh-1.4g-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Automatically restart SSH sessions and tunnels"
-HOMEPAGE="https://www.harding.motd.ca/autossh/"
-SRC_URI="https://www.harding.motd.ca/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="virtual/openssh"
-
-src_install() {
- dobin autossh
- dodoc CHANGES README autossh.host rscreen
- doman autossh.1
-}
diff --git a/net-misc/autossh/autossh-1.4g-r2.ebuild b/net-misc/autossh/autossh-1.4g-r2.ebuild
index d792505d9987..f35e6439a315 100644
--- a/net-misc/autossh/autossh-1.4g-r2.ebuild
+++ b/net-misc/autossh/autossh-1.4g-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.harding.motd.ca/autossh/"
SRC_URI="https://www.harding.motd.ca/${PN}/${P}.tgz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="0"
DEPEND="dev-libs/libbsd"
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 270463f6930d..545feeb4f3b6 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,2 +1,3 @@
DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1
+DIST axel-2.17.13.tar.xz 224788 BLAKE2B 07b3918277fa2a4b0cda5e989c3c001058cc0c8da52e479d56bd88956362cb1bbfa927b85ed870c5b0ddc599839fadb25aa5733bd295f060879d31c211913e16 SHA512 e36129de893c3c56fe89f7ff3accba9803b4e6d3b5094ed4266c10b33639b973c2fdc41beaf0a80d4fb5e62339580383497a15b4b7caad7d70c8fc581c0c4fc2
diff --git a/net-misc/axel/axel-2.17.13.ebuild b/net-misc/axel/axel-2.17.13.ebuild
new file mode 100644
index 000000000000..d2b41dac25da
--- /dev/null
+++ b/net-misc/axel/axel-2.17.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
+SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="nls ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}
+ nls? ( virtual/libintl virtual/libiconv )"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( doc/. )
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_with ssl ssl=openssl)
+}
+
+pkg_postinst() {
+ einfo 'To use axel with Portage, one can configure make.conf with:'
+ einfo
+ einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+ einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+}
diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest
index 22dd4987aa40..25aea5342b23 100644
--- a/net-misc/babeld/Manifest
+++ b/net-misc/babeld/Manifest
@@ -1 +1,4 @@
+DIST babeld-1.13.1.tar.gz 94890 BLAKE2B 78a58ca9b8c4d915e742081d90e210a14c1718c882d56a42926f29d1c99c53ea06ac8bc2c88f11e0af47a2f657d7649b41ccfcec79e4195c542cf5953e7c6d39 SHA512 c1733fbe115c1e07cc2455b1e0a5f61a53d50b1f2e81f24a82b04c988f1d8c6076e215005aae7e4e97f2497965d8459d0ac024fce016a22d8b416929a8569b13
DIST babeld-1.9.1.tar.gz 94668 BLAKE2B 169932e8d37d683bfa7e945e313d17c3ee633d11031d940ef3f5be3e0a9fbaffb28d47cf9f6d6ef6b25130af9a485ac4a629d0009485021d6f2fe19ec5382788 SHA512 433a9a2da02c56e93f5fc5f9399320f7f4dbac8d87eff9a539300d5740269eeda6be1302a2cf4a4b9c524780b286d9eb7898585fc530129a1f84341faf1e6fd0
+DIST babeld-BLAKE2-320c325437539ae91091ce62efec1913cd8093c2.tar.gz 895554 BLAKE2B eecc9cfebba1a9b0ccf64f2aab9bab4db96987cd3d75cffa40e7ba3bb6014f056c00fb6f5dc50477f38e4264625dd1702f2994e93dc8c3f8c1ba933d7e397188 SHA512 db668b6fad82c82a9431db0bad5982d9ba7ea3aeb3ede0a5335702a44fd19d23f2b89207940c060dba992009e1de7d8d892f6719cd8ffdeaed26303bdc7a7a6f
+DIST babeld-rfc6234-285c8b86c0c6b8e9ffe1c420c5b09fa229629a30.tar.gz 93167 BLAKE2B 64d6a43ca3e1bac434d21a2df5c8449cd3b8eef821ef7af731a4242fc14131b284ad72c11062cd9b5c1f03bff37578931f464165f288589a8a22911b6b4fcd71 SHA512 0adb4a891042fde32451368b93f861015614858e8fe42bb9b7b377e9cbb0b06fa3903dd9e901f93b7b12fd2428df621208295cd0a11ff55fbc6382e15aff8079
diff --git a/net-misc/babeld/babeld-1.13.1.ebuild b/net-misc/babeld/babeld-1.13.1.ebuild
new file mode 100644
index 000000000000..c4d5c377a8e8
--- /dev/null
+++ b/net-misc/babeld/babeld-1.13.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BLAKE2_COMMIT=320c325437539ae91091ce62efec1913cd8093c2
+RFC6234_COMMIT=285c8b86c0c6b8e9ffe1c420c5b09fa229629a30
+
+DESCRIPTION="a loop-free distance-vector routing protocol"
+HOMEPAGE="https://github.com/jech/babeld"
+SRC_URI="
+ https://github.com/jech/babeld/archive/${P}.tar.gz
+ https://github.com/BLAKE2/BLAKE2/archive/${BLAKE2_COMMIT}.tar.gz
+ -> ${PN}-BLAKE2-${BLAKE2_COMMIT}.tar.gz
+ https://github.com/massar/rfc6234/archive/${RFC6234_COMMIT}.tar.gz
+ -> ${PN}-rfc6234-${RFC6234_COMMIT}.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_unpack() {
+ default
+ cd "${S}"
+ rm -r BLAKE2 rfc6234 || die
+ ln -s ../BLAKE2-${BLAKE2_COMMIT} BLAKE2 || die
+ ln -s ../rfc6234-${RFC6234_COMMIT} rfc6234 || die
+}
+
+src_compile() {
+ emake CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ emake TARGET="${ED}" PREFIX="/usr" install
+ dodoc CHANGES README
+ doinitd "${FILESDIR}"/${PN}
+}
diff --git a/net-misc/babeld/metadata.xml b/net-misc/babeld/metadata.xml
index 2d9fb915a937..8a20628f200b 100644
--- a/net-misc/babeld/metadata.xml
+++ b/net-misc/babeld/metadata.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person"><email>heroxbd@gentoo.org</email></maintainer>
+ <maintainer type="person">
+ <email>heroxbd@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jech/babeld</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/balance/balance-3.57-r1.ebuild b/net-misc/balance/balance-3.57-r1.ebuild
index 1dbfe6c842cd..b432ff4b7e02 100644
--- a/net-misc/balance/balance-3.57-r1.ebuild
+++ b/net-misc/balance/balance-3.57-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit fcaps toolchain-funcs
+inherit fcaps flag-o-matic toolchain-funcs
DESCRIPTION="TCP Load Balancing Port Forwarder"
HOMEPAGE="https://balance.inlab.net"
@@ -25,6 +25,18 @@ src_prepare() {
tc-export CC
}
+src_compile() {
+ # -Werror=strict-aliasing
+ # https://bugs.gentoo.org/861599
+ # https://sourceforge.net/p/balance/bugs/13/
+ #
+ # Do not trust with LTO either.
+ append-flags -fno-strict-aliasing
+ filter-lto
+
+ default
+}
+
src_install() {
default
diff --git a/net-misc/balance/metadata.xml b/net-misc/balance/metadata.xml
index 115e9d64a669..9103896e5803 100644
--- a/net-misc/balance/metadata.xml
+++ b/net-misc/balance/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">balance</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/bfgminer/bfgminer-5.5.0-r3.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r4.ebuild
index b2d490f666fe..27be1f5518ea 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0-r3.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0-r4.ebuild
@@ -90,10 +90,7 @@ DEPEND="
)
screen? (
app-misc/screen
- || (
- >=sys-apps/coreutils-8.15
- app-misc/realpath
- )
+ >=sys-apps/coreutils-8.15
)
"
RDEPEND="${DEPEND}
diff --git a/net-misc/bgpq4/bgpq4-1.8.ebuild b/net-misc/bgpq4/bgpq4-1.8.ebuild
index a59c2865738d..f8e8353f66b3 100644
--- a/net-misc/bgpq4/bgpq4-1.8.ebuild
+++ b/net-misc/bgpq4/bgpq4-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bgp/bgpq4/archive/refs/tags/${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
src_prepare() {
default
diff --git a/net-misc/bird/bird-2.0.10.ebuild b/net-misc/bird/bird-2.0.10.ebuild
index 9e1415507309..68cedb7d4894 100644
--- a/net-misc/bird/bird-2.0.10.ebuild
+++ b/net-misc/bird/bird-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,8 +25,8 @@ RDEPEND="
)
libssh? ( net-libs/libssh:= )"
BDEPEND="
- sys-devel/bison
- sys-devel/flex
+ app-alternatives/yacc
+ app-alternatives/lex
sys-devel/m4
"
diff --git a/net-misc/bird/bird-2.0.11.ebuild b/net-misc/bird/bird-2.0.11.ebuild
index 05e00dc95fd6..44a995dcc670 100644
--- a/net-misc/bird/bird-2.0.11.ebuild
+++ b/net-misc/bird/bird-2.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,8 +25,8 @@ RDEPEND="
)
libssh? ( net-libs/libssh:= )"
BDEPEND="
- sys-devel/bison
- sys-devel/flex
+ app-alternatives/yacc
+ app-alternatives/lex
sys-devel/m4
"
diff --git a/net-misc/bird/bird-2.0.12-r1.ebuild b/net-misc/bird/bird-2.0.12-r1.ebuild
index ced3b211938d..daa657410251 100644
--- a/net-misc/bird/bird-2.0.12-r1.ebuild
+++ b/net-misc/bird/bird-2.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,8 +25,8 @@ RDEPEND="
)
libssh? ( net-libs/libssh:= )"
BDEPEND="
- sys-devel/bison
- sys-devel/flex
+ app-alternatives/yacc
+ app-alternatives/lex
sys-devel/m4
"
diff --git a/net-misc/bird/bird-2.0.7.ebuild b/net-misc/bird/bird-2.0.7.ebuild
index e1b3892ab3f7..397df5ee7aeb 100644
--- a/net-misc/bird/bird-2.0.7.ebuild
+++ b/net-misc/bird/bird-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,8 +14,8 @@ IUSE="+client debug"
RDEPEND="client? ( sys-libs/ncurses )
client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
- sys-devel/bison
+DEPEND="app-alternatives/lex
+ app-alternatives/yacc
sys-devel/m4"
PATCHES=(
diff --git a/net-misc/bopm/bopm-3.1.3-r7.ebuild b/net-misc/bopm/bopm-3.1.3-r7.ebuild
index d959f6b1af9d..f511e3b68eab 100644
--- a/net-misc/bopm/bopm-3.1.3-r7.ebuild
+++ b/net-misc/bopm/bopm-3.1.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86"
RDEPEND="acct-user/opm"
BDEPEND="
acct-user/opm
- sys-devel/autoconf-archive
+ dev-build/autoconf-archive
"
PATCHES=(
diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest
deleted file mode 100644
index 986b739eabe8..000000000000
--- a/net-misc/buka/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST buka-3.0.1.tar.gz 14697 BLAKE2B 2aabbe6bc78105bb0a1a44378c36ec82fef23df70d7600eaaa055d524bd4d38283644c49043f8c9d77cc52d7b1762f5ea4f2ddf896c0cda85ee677018679c1b6 SHA512 6893f1ad63130c55d2023abc0839e20f02ae4cede2162ec1d6e52d43f6b49cfc734b569776172b38bf2c208c2b41d123cb7bba9398ad689a22ce6703fa47eb22
diff --git a/net-misc/buka/buka-3.0.1.ebuild b/net-misc/buka/buka-3.0.1.ebuild
deleted file mode 100644
index 14302f2aa23f..000000000000
--- a/net-misc/buka/buka-3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="45e6b32de708759a4e15181a8e2ad5de55cc78ef"
-inherit optfeature
-
-DESCRIPTION="Download manga from buka.cn"
-HOMEPAGE="https://gitlab.com/drylemon/buka"
-SRC_URI="https://gitlab.com/drylemon/buka/repository/${PV}/archive.tar.gz?ref=${PV} -> ${P}.tar.gz"
-S=${WORKDIR}/${P}-${COMMIT}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/beautifulsoup4
- dev-python/requests
- sys-process/parallel
- net-misc/curl
- dev-util/dialog"
-
-src_install() {
- default
- doman "${PN}.1"
- dobin "${PN}" "${PN}-parse"
-}
-
-pkg_postinst() {
- optfeature "pdf support" media-gfx/imagemagick
- optfeature "cbz support" app-arch/zip
-}
diff --git a/net-misc/buka/metadata.xml b/net-misc/buka/metadata.xml
deleted file mode 100644
index ef8bb31dfe9d..000000000000
--- a/net-misc/buka/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>mo@dragona.ca</email>
- <name>Mohamad Issawi</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Gentoo Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 74d76950aa23..4c51ea908345 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,2 +1,2 @@
-DIST chrony-4.4.tar.gz 612094 BLAKE2B 470c3d4ab9aa5949df1c10d0ecbd556fba3ce9b05e9dc4a5475795c174fca48a624975df68552f78927a19b72cb6b4f136ed4e5fa04a833dbd8139d0be144e4f SHA512 45e060eb0c5892552f28dc436429e5823409cc93533127af27b64d08ff9c769fdc72694272232114f5ca1884c2bc8b5e842fae7956dc457358e937bcd3dda4d7
-DIST chrony-4.4.tar.gz.asc 833 BLAKE2B 07f863381d37e30435c3796c7ff4ac628dd81b248e76fe1b9ce6dff07f9f2bd9423a013c7d0a09f2bfe251a8e176b04731e1cb60829f1dc83a7321274d3f6992 SHA512 bb795b428567434937cbf3a12c559b549b89abe65010d04eed0fbdcfde35e7266771ea01c2c5581f3e5fae993f1782fff5a62c5ae09259d2b65dab9473d756a3
+DIST chrony-4.5.tar.gz 620287 BLAKE2B e89665e6ff700805b41f89e9349d280579aebab31a30817512a165da939c8f39dc55ef9a17a50e3d7e298015620667638ab119901a71868a9188093606a95d32 SHA512 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5
+DIST chrony-4.5.tar.gz.asc 833 BLAKE2B 7d680a4f5d86335b067b95cb900761615180701cabae5978d6f924063f7a43748534bb2e4f23cd9cd2e6919ed005014db6d396330fbfb5aa6d5f1c46f3c0c3a0 SHA512 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb
diff --git a/net-misc/chrony/chrony-4.4.ebuild b/net-misc/chrony/chrony-4.5.ebuild
index 356e5cbcd424..f6d81c3f64ff 100644
--- a/net-misc/chrony/chrony-4.4.ebuild
+++ b/net-misc/chrony/chrony-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -69,7 +69,7 @@ if [[ ${PV} == 9999 ]] ; then
# Needed for doc generation in 9999
REQUIRED_USE+=" html"
BDEPEND+="
- sys-devel/bison
+ app-alternatives/yacc
virtual/w3m
"
else
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 0141d909d34a..13628d6f3fc3 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -69,7 +69,7 @@ if [[ ${PV} == 9999 ]] ; then
# Needed for doc generation in 9999
REQUIRED_USE+=" html"
BDEPEND+="
- sys-devel/bison
+ app-alternatives/yacc
virtual/w3m
"
else
diff --git a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
new file mode 100644
index 000000000000..5607768def91
--- /dev/null
+++ b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Simple Network Time Protocol (NTP) client"
+HOMEPAGE="https://cr.yp.to/clockspeed.html"
+
+# this is the trailing part of the name for the latest leapseconds file.
+LEAPSECONDS_DATE="20081114"
+
+SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz
+ https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE""
+
+# http://cr.yp.to/distributors.html
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="static selinux"
+RESTRICT="mirror bindist test"
+
+DEPEND="sys-apps/groff"
+RDEPEND="net-dns/djbdns"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-fix-clang16-build.patch
+)
+
+src_configure() {
+ echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc || die
+ use static && append-ldflags -static
+ echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+ dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
+ dosbin "${FILESDIR}"/ntpclockset
+
+ doman *.1
+ dodoc BLURB CHANGES INSTALL README THANKS TODO
+
+ insinto /var/lib/clockspeed
+ newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat
+}
diff --git a/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch b/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch
new file mode 100644
index 000000000000..66bc89d0c261
--- /dev/null
+++ b/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch
@@ -0,0 +1,212 @@
+Since clang16 implicit function declarations and implicit integers
+result in a compilation error.
+
+Bug: https://bugs.gentoo.org/882307
+Patch has been sent upstream via mail
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2023-10-03)
+
+--- a/clockspeed.c
++++ b/clockspeed.c
+@@ -1,6 +1,7 @@
++#include <stdio.h>
++#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+-#include "readwrite.h"
+ #include "exit.h"
+ #include "select.h"
+ #include "scan.h"
+@@ -11,11 +12,12 @@
+ #include "error.h"
+ #include "auto_home.h"
+ #include "timing.h"
++#include "unistd.h"
+
+ #ifndef HASRDTSC
+ #ifndef HASGETHRTIME
+
+- Error! Need an unadjusted hardware clock.
++#error Need an unadjusted hardware clock.
+
+ #endif
+ #endif
+--- a/clockview.c
++++ b/clockview.c
+@@ -1,3 +1,4 @@
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <time.h>
+ #include "substdio.h"
+--- a/hier.c
++++ b/hier.c
+@@ -1,5 +1,24 @@
+ #include "auto_home.h"
+
++extern void h(char *home,
++int uid,
++int gid,
++int mode);
++
++extern void d(char *home,
++char *subdir,
++int uid,
++int gid,
++int mode);
++
++extern void c(
++char *home,
++char *subdir,
++char *file,
++int uid,
++int gid,
++int mode);
++
+ void hier()
+ {
+ d("/var/lib","clockspeed",-1,-1,0755);
+--- a/install.c
++++ b/install.c
+@@ -2,8 +2,9 @@
+ #include "strerr.h"
+ #include "error.h"
+ #include "open.h"
+-#include "readwrite.h"
+ #include "exit.h"
++#include <sys/stat.h>
++#include <unistd.h>
+
+ extern void hier();
+
+--- a/instcheck.c
++++ b/instcheck.c
+@@ -2,8 +2,9 @@
+ #include <sys/stat.h>
+ #include "strerr.h"
+ #include "error.h"
+-#include "readwrite.h"
+ #include "exit.h"
++#include <sys/stat.h>
++#include <unistd.h>
+
+ extern void hier();
+
+--- a/leapsecs_read.c
++++ b/leapsecs_read.c
+@@ -1,7 +1,9 @@
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <unistd.h>
+ #include "tai.h"
+ #include "leapsecs.h"
+
+--- a/sntpclock.c
++++ b/sntpclock.c
+@@ -3,12 +3,12 @@
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <unistd.h>
+ #include "strerr.h"
+ #include "ip.h"
+ #include "str.h"
+ #include "byte.h"
+ #include "substdio.h"
+-#include "readwrite.h"
+ #include "select.h"
+ #include "scan.h"
+ #include "leapsecs.h"
+@@ -79,7 +79,7 @@ int flagleap;
+ }
+
+ char outbuf[16];
+-substdio ssout = SUBSTDIO_FDBUF(write,1,outbuf,sizeof outbuf);
++substdio ssout = SUBSTDIO_FDBUF((int(*)())write,1,outbuf,sizeof outbuf);
+
+ #define FATAL "sntpclock: fatal: "
+ #define WARNING "sntpclock: warning: "
+--- a/taiclock.c
++++ b/taiclock.c
+@@ -3,17 +3,17 @@
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <unistd.h>
+ #include "strerr.h"
+ #include "ip.h"
+ #include "str.h"
+ #include "byte.h"
+ #include "substdio.h"
+-#include "readwrite.h"
+ #include "select.h"
+ #include "taia.h"
+
+ char outbuf[16];
+-substdio ssout = SUBSTDIO_FDBUF(write,1,outbuf,sizeof outbuf);
++substdio ssout = SUBSTDIO_FDBUF((int(*)())write,1,outbuf,sizeof outbuf);
+
+ #define FATAL "taiclock: fatal: "
+ #define WARNING "taiclock: warning: "
+
+--- a/auto-str.c
++++ b/auto-str.c
+@@ -5,7 +5,7 @@
+ char buf1[256];
+ substdio ss1 = SUBSTDIO_FDBUF(write,1,buf1,sizeof(buf1));
+
+-void puts(s)
++void myputs(s)
+ char *s;
+ {
+ if (substdio_puts(&ss1,s) == -1) _exit(111);
+@@ -25,20 +25,20 @@ char **argv;
+ value = argv[2];
+ if (!value) _exit(100);
+
+- puts("char ");
+- puts(name);
+- puts("[] = \"\\\n");
++ myputs("char ");
++ myputs(name);
++ myputs("[] = \"\\\n");
+
+ while (ch = *value++) {
+- puts("\\");
++ myputs("\\");
+ octal[3] = 0;
+ octal[2] = '0' + (ch & 7); ch >>= 3;
+ octal[1] = '0' + (ch & 7); ch >>= 3;
+ octal[0] = '0' + (ch & 7);
+- puts(octal);
++ myputs(octal);
+ }
+
+- puts("\\\n\";\n");
++ myputs("\\\n\";\n");
+ if (substdio_flush(&ss1) == -1) _exit(111);
+ _exit(0);
+ }
+--- a/trygethr.c
++++ b/trygethr.c
+@@ -1,7 +1,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+
+-main()
++int main()
+ {
+ hrtime_t t;
+
+--- a/tryrdtsc.c
++++ b/tryrdtsc.c
+@@ -1,4 +1,6 @@
+-main()
++#include <unistd.h>
++
++int main()
+ {
+ unsigned long x[2];
+ unsigned long y[2];
diff --git a/net-misc/cmst/cmst-2023.03.14-r1.ebuild b/net-misc/cmst/cmst-2023.03.14-r1.ebuild
new file mode 100644
index 000000000000..086fd50d0951
--- /dev/null
+++ b/net-misc/cmst/cmst-2023.03.14-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Qt GUI for Connman with system tray icon"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt6"
+
+DEPEND="qt6? ( dev-qt/qtbase:6 )
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+)
+"
+RDEPEND="${DEPEND}
+ net-misc/connman
+"
+BDEPEND="qt6? ( dev-qt/qttools:6 )
+ !qt6? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+ if use qt6; then
+ eqmake6 DISTRO=gentoo
+ else
+ eqmake5 DISTRO=gentoo
+ fi
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ rm -r "${D}"/usr/share/licenses || die
+ gunzip "${D}"/usr/share/man/man1/cmst.1.gz
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
index c950b57ae3c2..467860e1aae2 100644
--- a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
+++ b/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,6 +28,10 @@ DEPEND="${CDEOEND}
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.1-gtk_typecasts.patch
+)
+
src_prepare() {
default
sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die
diff --git a/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch b/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch
new file mode 100644
index 000000000000..25f29649404f
--- /dev/null
+++ b/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch
@@ -0,0 +1,11 @@
+--- a/src/status.c
++++ b/src/status.c
+@@ -119,7 +119,7 @@
+
+ gtk_menu_item_set_submenu(item, GTK_WIDGET(submenu));
+ gtk_container_add(GTK_CONTAINER(menu), GTK_WIDGET(item));
+- gtk_widget_set_sensitive(item, has_items);
++ gtk_widget_set_sensitive(GTK_WIDGET(item), has_items);
+
+ }
+
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index a9c654a82144..ed22cba32e44 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,4 +1,4 @@
-DIST croc-9.6.2-deps.tar.xz 27304100 BLAKE2B 6eac681bcc60db0b81abad19c3d8d994f2ea88618d90ade0229e9af436334e7bd3e907fa211e3b60a21049550d51c6e325bd9dfccacd4106abab32c7d49d9b66 SHA512 73d979f0d5a939b22304f1dc1976c096b7bee186f060d80aef4f64226a04d9b4f820d39ece9c9c9473791b4436d9e3fdb577f1342453dbbf2c4b765519e5a983
-DIST croc-9.6.2.tar.gz 507769 BLAKE2B df99a7d5d60f753d4d7fd5924bb09be6b21513acbc0c454d2e199fca4ab38eee0b443a091e3b3c64e155cb460e760959d955969231df8a93da2472a6b93703f0 SHA512 a3ad2f6a4bc6a45fa356963bd123ea755caa30c6a3b63e63cc67823ce27d44d62610ff9bfa498f694e356f673c3fcb3cec7ac669bedcde6eaf63111a78538965
-DIST croc-9.6.4-deps.tar.xz 26792064 BLAKE2B 31ead16462c1e10fff9e756c44f4ac7d47dcaa444dcb2fdcdd7f762d1617640a736d4223f74c9dd4f27b62bb3d635fe3035ec0127b3e50a7d8fa83ba26cdce43 SHA512 bc69c6d678888621d93be878a49ad71c04e6b38742d1c1558a1a84d1a63c71c9a901149048e6e4f0385514dbb551e89585e8ed25fc6ec89b9f2437f78f52a1e5
-DIST croc-9.6.4.tar.gz 508495 BLAKE2B 985b3f27fd807e62eda121dcad45e150621ff50cf82fc778cac601fdb16e0aab6bab886326bd80b0cc218608ddddd42a3f537fdfeec3948d1617a4169fefdd0e SHA512 d6eab257ee49d12d07e38b37ae1d60cbf70f627618ea32f2ec74370a09e78cad929de4b7d2bd02e9f300f698d45c8c28f4b4eb337a0be8f29e046fee4bb19b1f
+DIST croc-9.6.13-vendor.tar.xz 975216 BLAKE2B af70a58b6ae553029ff3c9b0e58c90d5d46ad7b9480e2fb7dd18a92c2b04854a68fde243b0dd149fdc7eba2c267e093510a93f63110f7fe073b25c95361e3d40 SHA512 f1200882ec634971c7c84b313d3a5bb2af533ef500f715d2908046fb9c481ec48fbda3cbb4a2ff93694fc19821a0e62e287b42b578aeca8ec19a3418c0b7bae0
+DIST croc-9.6.13.tar.gz 512627 BLAKE2B a3bf8f844a68af6ef3fc23d82168b70c92fa26485a5bf76b6ea6a4b21b2a328e7318edcd5d38ac860bd5c1fb29c3ddf01583ce9b6bef0f2d7bf98b224f683552 SHA512 c0734f7f73d6bb4eac2558733d0d04d9793760e24b02a12fbadef5a67f88be4d9f2036933a6881c8da613a6c2d47b529b5a40e02830eff7f99319059cb0b61fe
+DIST croc-9.6.9-vendor.tar.xz 974884 BLAKE2B d6d061fd8259126dc107de3efcae3a023c9a8db44ba96343350360c6d321d73720d1079d46927f65d9ea1001e6421751241d2fe1c04a4f450ff3c4dadc5c6be1 SHA512 2f4ab17ae0c00bc1ac097aeda9fc791b98d8cf6ad31644bdf600a4c321894dea9974155950723e9d19b15c011eef81ab27dae1b2bc2eb4517611bac77bde590f
+DIST croc-9.6.9.tar.gz 512036 BLAKE2B cdd18f9b4460905742d31852ceafda19a3e9c57ef33e6b2e0a21105da9b7d0cac1dfca50f6b217d76be6368d6fb26b540709c165b5b9781ca8952003811e83ad SHA512 5abd9eac5ffd4fae711f8169c4344aa6b61647309aa74267b1442b94d3a9d7ea11962b993862e00c7df8a23a260c20c643d468930836df71995652a5abf8772b
diff --git a/net-misc/croc/croc-9.6.2.ebuild b/net-misc/croc/croc-9.6.13.ebuild
index 160ea8b58614..d49781a4bf65 100644
--- a/net-misc/croc/croc-9.6.2.ebuild
+++ b/net-misc/croc/croc-9.6.13.ebuild
@@ -1,14 +1,15 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit bash-completion-r1 go-module systemd
DESCRIPTION="Easily and securely send things from one computer to another"
HOMEPAGE="https://github.com/schollz/croc"
SRC_URI="https://github.com/schollz/croc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~sultan/distfiles/net-misc/croc/${P}-deps.tar.xz"
+https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-vendor.tar.xz
+"
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
@@ -19,10 +20,6 @@ RDEPEND="
acct-user/croc
"
-PATCHES=(
- "${FILESDIR}/${PN}-disable-network-tests-r1.patch"
-)
-
DOCS=( README.md )
src_prepare() {
diff --git a/net-misc/croc/croc-9.6.4.ebuild b/net-misc/croc/croc-9.6.9.ebuild
index a3b14bea8b93..d49781a4bf65 100644
--- a/net-misc/croc/croc-9.6.4.ebuild
+++ b/net-misc/croc/croc-9.6.9.ebuild
@@ -1,14 +1,15 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit bash-completion-r1 go-module systemd
DESCRIPTION="Easily and securely send things from one computer to another"
HOMEPAGE="https://github.com/schollz/croc"
SRC_URI="https://github.com/schollz/croc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~sultan/distfiles/net-misc/croc/${P}-deps.tar.xz"
+https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-vendor.tar.xz
+"
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
@@ -19,10 +20,6 @@ RDEPEND="
acct-user/croc
"
-PATCHES=(
- "${FILESDIR}/${PN}-disable-network-tests-r1.patch"
-)
-
DOCS=( README.md )
src_prepare() {
diff --git a/net-misc/croc/files/croc-disable-network-tests-r1.patch b/net-misc/croc/files/croc-disable-network-tests-r1.patch
deleted file mode 100644
index 04540e14b9d4..000000000000
--- a/net-misc/croc/files/croc-disable-network-tests-r1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Disable tests that fail with network-sandbox
-
---- a/src/utils/utils_test.go
-+++ b/src/utils/utils_test.go
-@@ -7,7 +7,6 @@ import (
- "log"
- "math/rand"
- "os"
-- "strings"
- "testing"
-
- "github.com/schollz/croc/v9/src/models"
-@@ -189,19 +188,6 @@ func TestHashFile(t *testing.T) {
- assert.Equal(t, "e66c561610ad51e2", fmt.Sprintf("%x", hashed))
- }
-
--func TestPublicIP(t *testing.T) {
-- ip, err := PublicIP()
-- fmt.Println(ip)
-- assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
-- assert.Nil(t, err)
--}
--
--func TestLocalIP(t *testing.T) {
-- ip := LocalIP()
-- fmt.Println(ip)
-- assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
--}
--
- func TestGetRandomName(t *testing.T) {
- name := GetRandomName()
- fmt.Println(name)
diff --git a/net-misc/croc/metadata.xml b/net-misc/croc/metadata.xml
index b14d4f0b4014..c51b4929e88d 100644
--- a/net-misc/croc/metadata.xml
+++ b/net-misc/croc/metadata.xml
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">schollz/croc</remote-id>
- </upstream>
+ <maintainer type="person" proxied="yes">
+ <name>Armas Spann</name>
+ <email>zappel@simple-co.de</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">schollz/croc</remote-id>
+ <doc>https://schollz.com/tinker/croc6/</doc>
+ <bugs-to>https://github.com/schollz/croc/issues</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 0f6e4d3f8566..fd56dbdb80f0 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,4 +1,6 @@
-DIST curl-8.3.0.tar.xz 2641764 BLAKE2B 6875b20e27ed86f9b6ab256210d85e9fb3b39645e8be710b2e6fe29fba40220f870e06bc21e8a92244670fed0a08c7716e4806a267ede49c4ed6d66e03f5fcd4 SHA512 6404b4c74fe1185cb482631ca3a143996cb7298d0d8a76bfafd7696e7729c00559999a069bdba782dee3f3eb273fb678a4438cb27d3deca54022878cdff83a51
-DIST curl-8.3.0.tar.xz.asc 488 BLAKE2B ef5a749e579710d45db9f73da0cbcb58d77a9dfe73be622536496997fa792fe5cbd0331a31f01e21cbdb36c6384dca44baa647c9f3d20effabb5bfc275b1b491 SHA512 b7d45722640ac50181b20a6d663168ec6eec6691c5604ddfe9c7177f07da598cb2de688c631043dc428c311774d781ccd16bd1e2fb4f038be651e3bee383aec4
-DIST curl-8.4.0.tar.xz 2658376 BLAKE2B ea5ebecc3c1aeac3ae8fd0cf7d8ff3298149b9c4c556fb85ed8d9310e3613228eb6fca133b0dfb9268988f93d694779fab8d53510cfa5710c1320bb6638f05eb SHA512 7027dbf3b759b39d6ec9c4da58fadd254e84bb93bff599541b3bc3135bad4c2955c6237d7ddd60973f9f1a6948bc32d7e312985fb50658bc958b9f22fee74f2b
-DIST curl-8.4.0.tar.xz.asc 488 BLAKE2B 0fd4ea46a0942b9bc440e91e8f9323bba6d0eb02fbc87c227004c90e5be14cc644446bc235ab67f857b617975cdeada6ce38a647da9e0bd783e57d58f354cdb4 SHA512 b8b7a5b76be816e7b1552354f267f335fdc608cdadbd2c40ab44faf6450c6bbd2853b6de5c2746a1292aad33a8ee1c367380d32bb1a8282540b38c3b985a320e
+DIST curl-8.5.0.tar.xz 2658520 BLAKE2B cfd591f9703b9c63712dbe74494b05a80ce5a4fc4f8fc0fbf57058578eed5f33d71277f688d5d9f409bcd82e3a4cacaa5615a44f2a7c554559c6be7dd5188893 SHA512 acffa2cf61d9b8e4188575a1b40227da8d722df2e5fe8bb82a222b4eb2fd64bf8aebd90852ce050c79fb5e517d5cee2546bf7de92ede1dd394263e231cb741a3
+DIST curl-8.5.0.tar.xz.asc 488 BLAKE2B d706c401aecf345398411b94c87b8f1ecc752d73d24e1a578c8c0e62732e8e476333a2a4772428c6425eb0d124b1ceee8e377cf41d60a54b6f2df5cccc0b9f23 SHA512 9c6a2e61860878cd731d951fac1bb52cd314db20439a5173a95b48da1742737e02bfb9978d65e25de6535f839e281235203599a29f252e78e0d7a83769727329
+DIST curl-8.6.0.tar.xz 2630108 BLAKE2B 1b01de396008d57e154e2b5fc1acf1dd000703fa5d70b913dafea5487f0166bd8fdb63eee5c9b5af08a1ca40dd026144a791016f67c2395fcfc9c6b555929034 SHA512 359c08d88a5dec441255b36afe1a821730eca0ca8800ba52f57132b9e7d21f32457623907b4ae4876904b5e505eb1a59652372bb7de8dbd8db429dae9785e036
+DIST curl-8.6.0.tar.xz.asc 488 BLAKE2B 18d7583a9aa6a278bea5a8a74461ff06f45ec418cd4542b015c74091c353b340afcc5dfe7e5e99f0b9fac7de9251164044a85e4f6665bf042636868a2c613d0a SHA512 2b835bb4b307e5e1c929b7136c5acfb9f6f06efa471ac27060336cabcfac40e02143f40434986c5e6817d4a9562b09efa8ff3168beed310a45453148cc1b5c8f
+DIST curl-8.7.1.tar.xz 2707016 BLAKE2B a2a9f48d0b69c0d92fcbbda535ce55082a5243abe3ab2db80d6fa3f32fb2c98b65026d69fc45c94e966398cf9ba8d9c95b6b91f4768b54749ed3275dd21838ef SHA512 5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2
+DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed SHA512 f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37
diff --git a/net-misc/curl/curl-8.5.0-r3.ebuild b/net-misc/curl/curl-8.5.0-r3.ebuild
new file mode 100644
index 000000000000..1ea9264041c8
--- /dev/null
+++ b/net-misc/curl/curl-8.5.0-r3.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/curl/curl.git"
+else
+ SRC_URI="
+ https://curl.se/download/${P}.tar.xz
+ verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
+ "
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
+IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+# These select the default SSL implementation
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl provider can be enabled
+# The default ssl provider needs its USE satisfied
+# nghttp3 = https://bugs.gentoo.org/912029
+REQUIRED_USE="
+ ssl? (
+ ^^ (
+ curl_ssl_gnutls
+ curl_ssl_mbedtls
+ curl_ssl_openssl
+ curl_ssl_rustls
+ )
+ )
+ curl_ssl_gnutls? ( gnutls )
+ curl_ssl_mbedtls? ( mbedtls )
+ curl_ssl_openssl? ( openssl )
+ curl_ssl_rustls? ( rustls )
+ nghttp3? (
+ !openssl
+ alt-svc )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
+# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+
+RDEPEND="
+ >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+ adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
+ brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+ http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
+ idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+ nghttp3? (
+ >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
+ >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
+ )
+ psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+ rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+ ssl? (
+ gnutls? (
+ app-misc/ca-certificates
+ >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
+ dev-libs/nettle:=[${MULTILIB_USEDEP}]
+ )
+ mbedtls? (
+ app-misc/ca-certificates
+ net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+ )
+ openssl? (
+ >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+ )
+ rustls? (
+ ~net-libs/rustls-ffi-0.10.0:=[${MULTILIB_USEDEP}]
+ )
+ )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+ test? (
+ sys-apps/diffutils
+ http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+ nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+ )
+ verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/curl-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ __builtin_available
+ closesocket
+ CloseSocket
+ getpass_r
+ ioctlsocket
+ IoctlSocket
+ mach_absolute_time
+ setmode
+ _fseeki64
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-prefix.patch
+ "${FILESDIR}"/${PN}-respect-cflags-3.patch
+ "${FILESDIR}"/${P}-ipv6-configure-c99.patch
+ "${FILESDIR}"/${P}-mpd-stream-http-adjust_pollset.patch
+ "${FILESDIR}"/${PN}-8.6.0-rustls-fixes.patch
+)
+
+src_prepare() {
+ default
+
+ eprefixify curl-config.in
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # We make use of the fact that later flags override earlier ones
+ # So start with all ssl providers off until proven otherwise
+ # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+ local myconf=()
+
+ myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ if use ssl; then
+ myconf+=( --without-gnutls --without-mbedtls --without-rustls )
+
+ if use gnutls; then
+ multilib_is_native_abi && einfo "SSL provided by gnutls"
+ myconf+=( --with-gnutls )
+ fi
+ if use mbedtls; then
+ multilib_is_native_abi && einfo "SSL provided by mbedtls"
+ myconf+=( --with-mbedtls )
+ fi
+ if use openssl; then
+ multilib_is_native_abi && einfo "SSL provided by openssl"
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ fi
+ if use rustls; then
+ multilib_is_native_abi && einfo "SSL provided by rustls"
+ myconf+=( --with-rustls )
+ fi
+ if use curl_ssl_gnutls; then
+ multilib_is_native_abi && einfo "Default SSL provided by gnutls"
+ myconf+=( --with-default-ssl-backend=gnutls )
+ elif use curl_ssl_mbedtls; then
+ multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
+ myconf+=( --with-default-ssl-backend=mbedtls )
+ elif use curl_ssl_openssl; then
+ multilib_is_native_abi && einfo "Default SSL provided by openssl"
+ myconf+=( --with-default-ssl-backend=openssl )
+ elif use curl_ssl_rustls; then
+ multilib_is_native_abi && einfo "Default SSL provided by rustls"
+ myconf+=( --with-default-ssl-backend=rustls )
+ else
+ eerror "We can't be here because of REQUIRED_USE."
+ die "Please file a bug, hit impossible condition w/ USE=ssl handling."
+ fi
+
+ else
+ myconf+=( --without-ssl )
+ einfo "SSL disabled"
+ fi
+
+ # These configuration options are organized alphabetically
+ # within each category. This should make it easier if we
+ # ever decide to make any of them contingent on USE flags:
+ # 1) protocols first. To see them all do
+ # 'grep SUPPORT_PROTOCOLS configure.ac'
+ # 2) --enable/disable options second.
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+ # 3) --with/without options third.
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+ myconf+=(
+ $(use_enable alt-svc)
+ --enable-basic-auth
+ --enable-bearer-auth
+ --enable-digest-auth
+ --enable-kerberos-auth
+ --enable-negotiate-auth
+ --enable-aws
+ --enable-dict
+ --disable-ech
+ --enable-file
+ $(use_enable ftp)
+ $(use_enable gopher)
+ $(use_enable hsts)
+ --enable-http
+ $(use_enable imap)
+ $(use_enable ldap)
+ $(use_enable ldap ldaps)
+ --enable-ntlm
+ --disable-ntlm-wb
+ $(use_enable pop3)
+ --enable-rt
+ --enable-rtsp
+ $(use_enable samba smb)
+ $(use_with ssh libssh2)
+ $(use_enable smtp)
+ $(use_enable telnet)
+ $(use_enable tftp)
+ --enable-tls-srp
+ $(use_enable adns ares)
+ --enable-cookies
+ --enable-dateparse
+ --enable-dnsshuffle
+ --enable-doh
+ --enable-symbol-hiding
+ --enable-http-auth
+ --enable-ipv6
+ --enable-largefile
+ --enable-manual
+ --enable-mime
+ --enable-netrc
+ $(use_enable progress-meter)
+ --enable-proxy
+ --enable-socketpair
+ --disable-sspi
+ $(use_enable static-libs static)
+ --enable-pthreads
+ --enable-threaded-resolver
+ --disable-versioned-symbols
+ --without-amissl
+ --without-bearssl
+ $(use_with brotli)
+ --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
+ $(use_with http2 nghttp2)
+ --without-hyper
+ $(use_with idn libidn2)
+ $(use_with kerberos gssapi "${EPREFIX}"/usr)
+ --without-libgsasl
+ $(use_with psl libpsl)
+ --without-msh3
+ $(use_with nghttp3)
+ $(use_with nghttp3 ngtcp2)
+ --without-quiche
+ $(use_with rtmp librtmp)
+ --without-schannel
+ --without-secure-transport
+ --without-test-caddy
+ --without-test-httpd
+ --without-test-nghttpx
+ $(use_enable websockets)
+ --without-winidn
+ --without-wolfssl
+ --with-zlib
+ $(use_with zstd)
+ --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
+ )
+
+ if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
+ myconf+=(
+ --with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
+ )
+ fi
+
+ if [[ ${CHOST} == *mingw* ]] ; then
+ myconf+=(
+ --disable-pthreads
+ )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+ if ! multilib_is_native_abi; then
+ # Avoid building the client (we just want libcurl for multilib)
+ sed -i -e '/SUBDIRS/s:src::' Makefile || die
+ sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+ fi
+
+ # Fix up the pkg-config file to be more robust.
+ # https://github.com/curl/curl/issues/864
+ local priv=() libs=()
+ # We always enable zlib.
+ libs+=( "-lz" )
+ priv+=( "zlib" )
+ if use http2; then
+ libs+=( "-lnghttp2" )
+ priv+=( "libnghttp2" )
+ fi
+ if use nghttp3; then
+ libs+=( "-lnghttp3" "-lngtcp2" )
+ priv+=( "libnghttp3" "libngtcp2" )
+ fi
+ if use ssl && use curl_ssl_openssl; then
+ libs+=( "-lssl" "-lcrypto" )
+ priv+=( "openssl" )
+ fi
+ grep -q Requires.private libcurl.pc && die "need to update ebuild"
+ libs=$(printf '|%s' "${libs[@]}")
+ sed -i -r \
+ -e "/^Libs.private/s:(${libs#|})( |$)::g" \
+ libcurl.pc || die
+ echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi; then
+ # Shell completions
+ ! tc-is-cross-compiler && emake -C scripts
+ fi
+}
+
+# There is also a pytest harness that tests for bugs in some very specific
+# situations; we can rely on upstream for this rather than adding additional test deps.
+multilib_src_test() {
+ # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+ # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+ # -v: verbose
+ # -a: keep going on failure (so we see everything which breaks, not just 1st test)
+ # -k: keep test files after completion
+ # -am: automake style TAP output
+ # -p: print logs if test fails
+ # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
+ # or just read https://github.com/curl/curl/tree/master/tests#run.
+ # Note: we don't run the testsuite for cross-compilation.
+ # Upstream recommend 7*nproc as a starting point for parallel tests, but
+ # this ends up breaking when nproc is huge (like -j80).
+ # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
+ # as most gentoo users don't have an 'ip6-localhost'
+ # Required deps for 1477 are not included in the release tarball for 8.5.0
+ # 1474 is flaky and has been removed upstream after the 8.5.0 release.
+ multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083 !1477 !1474"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi; then
+ # Shell completions
+ ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
+ rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/curl/curl-8.3.0-r2.ebuild b/net-misc/curl/curl-8.6.0-r2.ebuild
index 350d4acf5b7c..c31bf46b91d8 100644
--- a/net-misc/curl/curl-8.3.0-r2.ebuild
+++ b/net-misc/curl/curl-8.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,15 +17,15 @@ else
https://curl.se/download/${P}.tar.xz
verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
LICENSE="BSD curl ISC test? ( BSD-4 )"
SLOT="0"
-IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
+IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
# These select the default SSL implementation
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-IUSE+=" nghttp3"
RESTRICT="!test? ( test )"
# Only one default ssl provider can be enabled
@@ -44,34 +44,38 @@ REQUIRED_USE="
curl_ssl_mbedtls? ( mbedtls )
curl_ssl_openssl? ( openssl )
curl_ssl_rustls? ( rustls )
- nghttp3? ( !openssl )
+ nghttp3? (
+ !openssl
+ alt-svc )
"
# cURL's docs and CI/CD are great resources for confirming supported versions
# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md
-# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
+# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
# However 'supported' vs 'works' are two entirely different things; be sane but
# don't be afraid to require a later version.
RDEPEND="
- sys-libs/zlib[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] )
+ ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
nghttp3? (
>=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
>=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
)
+ psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
ssl? (
gnutls? (
app-misc/ca-certificates
- net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
+ >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
dev-libs/nettle:=[${MULTILIB_USEDEP}]
)
mbedtls? (
@@ -79,10 +83,10 @@ RDEPEND="
net-libs/mbedtls:=[${MULTILIB_USEDEP}]
)
openssl? (
- dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+ >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
)
rustls? (
- net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+ ~net-libs/rustls-ffi-0.10.0:=[${MULTILIB_USEDEP}]
)
)
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
@@ -120,14 +124,14 @@ QA_CONFIG_IMPL_DECL_SKIP=(
IoctlSocket
mach_absolute_time
setmode
+ _fseeki64
)
PATCHES=(
"${FILESDIR}"/${PN}-prefix.patch
"${FILESDIR}"/${PN}-respect-cflags-3.patch
- "${FILESDIR}"/${P}-tests-arm-musl.patch
- "${FILESDIR}"/${P}-CVE-2023-38545.patch
- "${FILESDIR}"/${P}-CVE-2023-38546.patch
+ "${FILESDIR}"/${P}-vtls-revert-receive-max-buffer-add-test-case.patch
+ "${FILESDIR}"/${P}-rustls-fixes.patch
)
src_prepare() {
@@ -253,7 +257,7 @@ multilib_src_configure() {
$(use_with idn libidn2)
$(use_with kerberos gssapi "${EPREFIX}"/usr)
--without-libgsasl
- --without-libpsl
+ $(use_with psl libpsl)
--without-msh3
$(use_with nghttp3)
$(use_with nghttp3 ngtcp2)
diff --git a/net-misc/curl/curl-8.4.0.ebuild b/net-misc/curl/curl-8.7.1-r1.ebuild
index 2635b9c9be42..f81f4b76f480 100644
--- a/net-misc/curl/curl-8.4.0.ebuild
+++ b/net-misc/curl/curl-8.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,13 +17,13 @@ else
https://curl.se/download/${P}.tar.xz
verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
LICENSE="BSD curl ISC test? ( BSD-4 )"
SLOT="0"
IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
# These select the default SSL implementation
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
RESTRICT="!test? ( test )"
@@ -69,6 +69,7 @@ RDEPEND="
>=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
>=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
)
+ psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
ssl? (
@@ -84,8 +85,8 @@ RDEPEND="
openssl? (
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
)
- rustls? (
- net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+ rustls? ( >=net-libs/rustls-ffi-0.12.1:=[${MULTILIB_USEDEP}]
+ <net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
)
)
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
@@ -123,11 +124,13 @@ QA_CONFIG_IMPL_DECL_SKIP=(
IoctlSocket
mach_absolute_time
setmode
+ _fseeki64
)
PATCHES=(
"${FILESDIR}"/${PN}-prefix.patch
"${FILESDIR}"/${PN}-respect-cflags-3.patch
+ "${FILESDIR}"/${PN}-8.7.1-rustls-fixes.patch
)
src_prepare() {
@@ -253,7 +256,7 @@ multilib_src_configure() {
$(use_with idn libidn2)
$(use_with kerberos gssapi "${EPREFIX}"/usr)
--without-libgsasl
- --without-libpsl
+ $(use_with psl libpsl)
--without-msh3
$(use_with nghttp3)
$(use_with nghttp3 ngtcp2)
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 7d87477bc1f1..df12594ad066 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,7 +23,7 @@ fi
LICENSE="BSD curl ISC test? ( BSD-4 )"
SLOT="0"
IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
# These select the default SSL implementation
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
RESTRICT="!test? ( test )"
@@ -69,6 +69,7 @@ RDEPEND="
>=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
>=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
)
+ psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
ssl? (
@@ -123,6 +124,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
IoctlSocket
mach_absolute_time
setmode
+ _fseeki64
)
PATCHES=(
@@ -253,7 +255,7 @@ multilib_src_configure() {
$(use_with idn libidn2)
$(use_with kerberos gssapi "${EPREFIX}"/usr)
--without-libgsasl
- --without-libpsl
+ $(use_with psl libpsl)
--without-msh3
$(use_with nghttp3)
$(use_with nghttp3 ngtcp2)
diff --git a/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch b/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch
deleted file mode 100644
index 04603a8c01dc..000000000000
--- a/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-https://bugs.gentoo.org/915195
-
-From 1e1f915b73ab0895a68348ad1f96a5283a44ffd7 Mon Sep 17 00:00:00 2001
-From: Jay Satiro <raysatiro@yahoo.com>
-Date: Mon, 9 Oct 2023 17:45:07 -0400
-Subject: [PATCH] socks: return error if hostname too long for remote resolve
-
-Prior to this change the state machine attempted to change the remote
-resolve to a local resolve if the hostname was longer than 255
-characters. Unfortunately that did not work as intended and caused a
-security issue.
-
-This patch applies to curl versions 8.2.0 - 8.3.0. Other versions
-that are affected take a different patch. Refer to the CVE advisory
-for more information.
-
-Bug: https://curl.se/docs/CVE-2023-38545.html
----
- lib/socks.c | 8 +++----
- tests/data/Makefile.inc | 2 +-
- tests/data/test728 | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 69 insertions(+), 5 deletions(-)
- create mode 100644 tests/data/test728
-
-diff --git a/lib/socks.c b/lib/socks.c
-index 25a3578..3d41c93 100644
---- a/lib/socks.c
-+++ b/lib/socks.c
-@@ -588,9 +588,9 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
-
- /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */
- if(!socks5_resolve_local && hostname_len > 255) {
-- infof(data, "SOCKS5: server resolving disabled for hostnames of "
-- "length > 255 [actual len=%zu]", hostname_len);
-- socks5_resolve_local = TRUE;
-+ failf(data, "SOCKS5: the destination hostname is too long to be "
-+ "resolved remotely by the proxy.");
-+ return CURLPX_LONG_HOSTNAME;
- }
-
- if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI))
-@@ -904,7 +904,7 @@ CONNECT_RESOLVE_REMOTE:
- }
- else {
- socksreq[len++] = 3;
-- socksreq[len++] = (char) hostname_len; /* one byte address length */
-+ socksreq[len++] = (unsigned char) hostname_len; /* one byte length */
- memcpy(&socksreq[len], sx->hostname, hostname_len); /* w/o NULL */
- len += hostname_len;
- }
-diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
-index 8ee1394..3e2094e 100644
---- a/tests/data/Makefile.inc
-+++ b/tests/data/Makefile.inc
-@@ -100,7 +100,7 @@ test679 test680 test681 test682 test683 test684 test685 test686 \
- \
- test700 test701 test702 test703 test704 test705 test706 test707 test708 \
- test709 test710 test711 test712 test713 test714 test715 test716 test717 \
--test718 test719 test720 test721 \
-+test718 test719 test720 test721 test728 \
- \
- test799 test800 test801 test802 test803 test804 test805 test806 test807 \
- test808 test809 test810 test811 test812 test813 test814 test815 test816 \
-diff --git a/tests/data/test728 b/tests/data/test728
-new file mode 100644
-index 0000000..05bcf28
---- /dev/null
-+++ b/tests/data/test728
-@@ -0,0 +1,64 @@
-+<testcase>
-+<info>
-+<keywords>
-+HTTP
-+HTTP GET
-+SOCKS5
-+SOCKS5h
-+followlocation
-+</keywords>
-+</info>
-+
-+#
-+# Server-side
-+<reply>
-+# The hostname in this redirect is 256 characters and too long (> 255) for
-+# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case.
-+<data>
-+HTTP/1.1 301 Moved Permanently
-+Location: http://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/
-+Content-Length: 0
-+Connection: close
-+
-+</data>
-+</reply>
-+
-+#
-+# Client-side
-+<client>
-+<features>
-+proxy
-+</features>
-+<server>
-+http
-+socks5
-+</server>
-+ <name>
-+SOCKS5h with HTTP redirect to hostname too long
-+ </name>
-+ <command>
-+--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-+</command>
-+</client>
-+
-+#
-+# Verify data after the test has been "shot"
-+<verify>
-+<protocol crlf="yes">
-+GET /%TESTNUMBER HTTP/1.1
-+Host: %HOSTIP:%HTTPPORT
-+User-Agent: curl/%VERSION
-+Accept: */*
-+
-+</protocol>
-+<errorcode>
-+97
-+</errorcode>
-+# the error message is verified because error code CURLE_PROXY (97) may be
-+# returned for any number of reasons and we need to make sure it is
-+# specifically for the reason below so that we know the check is working.
-+<stderr mode="text">
-+curl: (97) SOCKS5: the destination hostname is too long to be resolved remotely by the proxy.
-+</stderr>
-+</verify>
-+</testcase>
---
-2.7.4
-
diff --git a/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch b/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch
deleted file mode 100644
index 615ab26cb2a8..000000000000
--- a/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-https://bugs.gentoo.org/915195
-https://github.com/curl/curl/commit/61275672b46d9abb3285740467b882e22ed75da8
-
-From 61275672b46d9abb3285740467b882e22ed75da8 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 14 Sep 2023 23:28:32 +0200
-Subject: [PATCH] cookie: remove unnecessary struct fields
-
-Plus: reduce the hash table size from 256 to 63. It seems unlikely to
-make much of a speed difference for most use cases but saves 1.5KB of
-data per instance.
-
-Closes #11862
----
- lib/cookie.c | 13 +------------
- lib/cookie.h | 13 ++++---------
- lib/easy.c | 4 +---
- 3 files changed, 6 insertions(+), 24 deletions(-)
-
-diff --git a/lib/cookie.c b/lib/cookie.c
-index 4345a84c6fd9d..e39c89a94a960 100644
---- a/lib/cookie.c
-+++ b/lib/cookie.c
-@@ -119,7 +119,6 @@ static void freecookie(struct Cookie *co)
- free(co->name);
- free(co->value);
- free(co->maxage);
-- free(co->version);
- free(co);
- }
-
-@@ -718,11 +717,7 @@ Curl_cookie_add(struct Curl_easy *data,
- }
- }
- else if((nlen == 7) && strncasecompare("version", namep, 7)) {
-- strstore(&co->version, valuep, vlen);
-- if(!co->version) {
-- badcookie = TRUE;
-- break;
-- }
-+ /* just ignore */
- }
- else if((nlen == 7) && strncasecompare("max-age", namep, 7)) {
- /*
-@@ -1160,7 +1155,6 @@ Curl_cookie_add(struct Curl_easy *data,
- free(clist->path);
- free(clist->spath);
- free(clist->expirestr);
-- free(clist->version);
- free(clist->maxage);
-
- *clist = *co; /* then store all the new data */
-@@ -1224,9 +1218,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
- c = calloc(1, sizeof(struct CookieInfo));
- if(!c)
- return NULL; /* failed to get memory */
-- c->filename = strdup(file?file:"none"); /* copy the name just in case */
-- if(!c->filename)
-- goto fail; /* failed to get memory */
- /*
- * Initialize the next_expiration time to signal that we don't have enough
- * information yet.
-@@ -1378,7 +1369,6 @@ static struct Cookie *dup_cookie(struct Cookie *src)
- CLONE(name);
- CLONE(value);
- CLONE(maxage);
-- CLONE(version);
- d->expires = src->expires;
- d->tailmatch = src->tailmatch;
- d->secure = src->secure;
-@@ -1595,7 +1585,6 @@ void Curl_cookie_cleanup(struct CookieInfo *c)
- {
- if(c) {
- unsigned int i;
-- free(c->filename);
- for(i = 0; i < COOKIE_HASH_SIZE; i++)
- Curl_cookie_freelist(c->cookies[i]);
- free(c); /* free the base struct as well */
-diff --git a/lib/cookie.h b/lib/cookie.h
-index b3c0063b2cfb2..41e9e7a6914e0 100644
---- a/lib/cookie.h
-+++ b/lib/cookie.h
-@@ -36,11 +36,7 @@ struct Cookie {
- char *domain; /* domain = <this> */
- curl_off_t expires; /* expires = <this> */
- char *expirestr; /* the plain text version */
--
-- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */
-- char *version; /* Version = <value> */
- char *maxage; /* Max-Age = <value> */
--
- bool tailmatch; /* whether we do tail-matching of the domain name */
- bool secure; /* whether the 'secure' keyword was used */
- bool livecookie; /* updated from a server, not a stored file */
-@@ -56,17 +52,16 @@ struct Cookie {
- #define COOKIE_PREFIX__SECURE (1<<0)
- #define COOKIE_PREFIX__HOST (1<<1)
-
--#define COOKIE_HASH_SIZE 256
-+#define COOKIE_HASH_SIZE 63
-
- struct CookieInfo {
- /* linked list of cookies we know of */
- struct Cookie *cookies[COOKIE_HASH_SIZE];
-- char *filename; /* file we read from/write to */
-- long numcookies; /* number of cookies in the "jar" */
-+ curl_off_t next_expiration; /* the next time at which expiration happens */
-+ int numcookies; /* number of cookies in the "jar" */
-+ int lastct; /* last creation-time used in the jar */
- bool running; /* state info, for cookie adding information */
- bool newsession; /* new session, discard session cookies on load */
-- int lastct; /* last creation-time used in the jar */
-- curl_off_t next_expiration; /* the next time at which expiration happens */
- };
-
- /* The maximum sizes we accept for cookies. RFC 6265 section 6.1 says
-diff --git a/lib/easy.c b/lib/easy.c
-index 16bbd35251d40..03195481f9780 100644
---- a/lib/easy.c
-+++ b/lib/easy.c
-@@ -925,9 +925,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
- if(data->cookies) {
- /* If cookies are enabled in the parent handle, we enable them
- in the clone as well! */
-- outcurl->cookies = Curl_cookie_init(data,
-- data->cookies->filename,
-- outcurl->cookies,
-+ outcurl->cookies = Curl_cookie_init(data, NULL, outcurl->cookies,
- data->set.cookiesession);
- if(!outcurl->cookies)
- goto fail;
diff --git a/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch b/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch
deleted file mode 100644
index e07c13a04766..000000000000
--- a/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-https://github.com/curl/curl/issues/11900
-https://github.com/curl/curl/commit/b226bd679a68b8bf94cbb6d58837f00251560e63
-https://github.com/curl/curl/commit/9c7165e96a3a9a2d0b7059c87c699b5ca8cdae93
-
-From b226bd679a68b8bf94cbb6d58837f00251560e63 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 25 Sep 2023 13:03:26 +0200
-Subject: [PATCH] configure: sort AC_CHECK_FUNCS
-
-No functional changes.
----
- configure.ac | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2fc9f2f01783c..a6f9066a133a4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3583,8 +3583,10 @@ AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Se
- #include <sys/types.h>]])
-
-
--AC_CHECK_FUNCS([fnmatch \
-+AC_CHECK_FUNCS([\
-+ arc4random \
- fchmod \
-+ fnmatch \
- fork \
- geteuid \
- getpass_r \
-@@ -3604,7 +3606,6 @@ AC_CHECK_FUNCS([fnmatch \
- snprintf \
- utime \
- utimes \
-- arc4random
- ],[
- ],[
- func="$ac_func"
-
-From 9c7165e96a3a9a2d0b7059c87c699b5ca8cdae93 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 22 Sep 2023 13:58:49 +0000
-Subject: [PATCH] lib: use wrapper for curl_mime_data fseek callback
-
-fseek uses long offset which does not match with curl_off_t. This leads
-to undefined behavior when calling the callback and caused failure on
-arm 32 bit.
-
-Use a wrapper to solve this and use fseeko which uses off_t instead of
-long.
-
-Thanks to the nice people at Libera IRC #musl for helping finding this
-out.
-
-Fixes #11882
-Fixes #11900
-Closes #11918
----
- configure.ac | 2 ++
- lib/formdata.c | 17 +++++++++++++++--
- 3 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a6f9066a133a4..5fa7c45c47430 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3584,10 +3584,12 @@ AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Se
-
-
- AC_CHECK_FUNCS([\
-+ _fseeki64 \
- arc4random \
- fchmod \
- fnmatch \
- fork \
-+ fseeko \
- geteuid \
- getpass_r \
- getppid \
-diff --git a/lib/formdata.c b/lib/formdata.c
-index 8984b63223cc0..f370ce6854b5f 100644
---- a/lib/formdata.c
-+++ b/lib/formdata.c
-@@ -789,6 +789,20 @@ static CURLcode setname(curl_mimepart *part, const char *name, size_t len)
- return res;
- }
-
-+/* wrap call to fseeko so it matches the calling convetion of callback */
-+static int fseeko_wrapper(void *stream, curl_off_t offset, int whence)
-+{
-+#if defined(HAVE_FSEEKO)
-+ return fseeko(stream, (off_t)offset, whence);
-+#elif defined(HAVE__FSEEKI64)
-+ return _fseeki64(stream, (__int64)offset, whence);
-+#else
-+ if(offset > LONG_MAX)
-+ return -1;
-+ return fseek(stream, (long)offset, whence);
-+#endif
-+}
-+
- /*
- * Curl_getformdata() converts a linked list of "meta data" into a mime
- * structure. The input list is in 'post', while the output is stored in
-@@ -874,8 +888,7 @@ CURLcode Curl_getformdata(struct Curl_easy *data,
- compatibility: use of "-" pseudo file name should be avoided. */
- result = curl_mime_data_cb(part, (curl_off_t) -1,
- (curl_read_callback) fread,
-- CURLX_FUNCTION_CAST(curl_seek_callback,
-- fseek),
-+ fseeko_wrapper,
- NULL, (void *) stdin);
- }
- else
-
diff --git a/net-misc/curl/files/curl-8.5.0-ipv6-configure-c99.patch b/net-misc/curl/files/curl-8.5.0-ipv6-configure-c99.patch
new file mode 100644
index 000000000000..68830f8f4717
--- /dev/null
+++ b/net-misc/curl/files/curl-8.5.0-ipv6-configure-c99.patch
@@ -0,0 +1,31 @@
+https://github.com/curl/curl/commit/ae75db3527461248b0a7b1686df52200d28d83b9
+
+From ae75db3527461248b0a7b1686df52200d28d83b9 Mon Sep 17 00:00:00 2001
+From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
+Date: Fri, 29 Dec 2023 05:43:33 +0000
+Subject: [PATCH] configure: fix no default int compile error in ipv6 detection
+
+Closes #12607
+--- a/configure.ac
++++ b/configure.ac
+@@ -1655,15 +1655,12 @@ AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]),
+ # include <netinet/in6.h>
+ #endif
+ #endif
+-#include <stdlib.h> /* for exit() */
+-main()
++
++int main(void)
+ {
+ struct sockaddr_in6 s;
+ (void)s;
+- if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+- exit(1);
+- else
+- exit(0);
++ return socket(AF_INET6, SOCK_STREAM, 0) < 0;
+ }
+ ]])
+ ],
+
+
diff --git a/net-misc/curl/files/curl-8.5.0-mpd-stream-http-adjust_pollset.patch b/net-misc/curl/files/curl-8.5.0-mpd-stream-http-adjust_pollset.patch
new file mode 100644
index 000000000000..79a16a2cc7b4
--- /dev/null
+++ b/net-misc/curl/files/curl-8.5.0-mpd-stream-http-adjust_pollset.patch
@@ -0,0 +1,69 @@
+https://github.com/MusicPlayerDaemon/MPD/issues/1952
+https://github.com/curl/curl/issues/12632
+https://github.com/curl/curl/commit/8e2d7b9fa4264b94bd1d9838c84d16e4cd33fbea
+
+From 8e2d7b9fa4264b94bd1d9838c84d16e4cd33fbea Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <stefan@eissing.org>
+Date: Thu, 4 Jan 2024 10:06:17 +0100
+Subject: [PATCH] http: adjust_pollset fix
+
+do not add a socket for POLLIN when the transfer does not want to send
+(for example is paused).
+
+Follow-up to 47f5b1a
+
+Reported-by: bubbleguuum on github
+Fixes #12632
+Closes #12633
+--- a/lib/cf-socket.c
++++ b/lib/cf-socket.c
+@@ -1243,7 +1243,7 @@ static void cf_socket_adjust_pollset(struct Curl_cfilter *cf,
+ if(ctx->sock != CURL_SOCKET_BAD) {
+ if(!cf->connected)
+ Curl_pollset_set_out_only(data, ps, ctx->sock);
+- else
++ else if(CURL_WANT_RECV(data))
+ Curl_pollset_add_in(data, ps, ctx->sock);
+ CURL_TRC_CF(data, cf, "adjust_pollset -> %d socks", ps->num);
+ }
+--- a/lib/http2.c
++++ b/lib/http2.c
+@@ -2341,8 +2341,8 @@ static void cf_h2_adjust_pollset(struct Curl_cfilter *cf,
+ bool c_exhaust, s_exhaust;
+
+ CF_DATA_SAVE(save, cf, data);
+- c_exhaust = !nghttp2_session_get_remote_window_size(ctx->h2);
+- s_exhaust = stream && stream->id >= 0 &&
++ c_exhaust = want_send && !nghttp2_session_get_remote_window_size(ctx->h2);
++ s_exhaust = want_send && stream && stream->id >= 0 &&
+ !nghttp2_session_get_stream_remote_window_size(ctx->h2,
+ stream->id);
+ want_recv = (want_recv || c_exhaust || s_exhaust);
+--- a/lib/vquic/curl_ngtcp2.c
++++ b/lib/vquic/curl_ngtcp2.c
+@@ -1166,9 +1166,10 @@ static void cf_ngtcp2_adjust_pollset(struct Curl_cfilter *cf,
+ bool c_exhaust, s_exhaust;
+
+ CF_DATA_SAVE(save, cf, data);
+- c_exhaust = !ngtcp2_conn_get_cwnd_left(ctx->qconn) ||
+- !ngtcp2_conn_get_max_data_left(ctx->qconn);
+- s_exhaust = stream && stream->id >= 0 && stream->quic_flow_blocked;
++ c_exhaust = want_send && (!ngtcp2_conn_get_cwnd_left(ctx->qconn) ||
++ !ngtcp2_conn_get_max_data_left(ctx->qconn));
++ s_exhaust = want_send && stream && stream->id >= 0 &&
++ stream->quic_flow_blocked;
+ want_recv = (want_recv || c_exhaust || s_exhaust);
+ want_send = (!s_exhaust && want_send) ||
+ !Curl_bufq_is_empty(&ctx->q.sendbuf);
+--- a/lib/vquic/curl_quiche.c
++++ b/lib/vquic/curl_quiche.c
+@@ -1189,7 +1189,7 @@ static void cf_quiche_adjust_pollset(struct Curl_cfilter *cf,
+
+ c_exhaust = FALSE; /* Have not found any call in quiche that tells
+ us if the connection itself is blocked */
+- s_exhaust = stream && stream->id >= 0 &&
++ s_exhaust = want_send && stream && stream->id >= 0 &&
+ (stream->quic_flow_blocked || !stream_is_writeable(cf, data));
+ want_recv = (want_recv || c_exhaust || s_exhaust);
+ want_send = (!s_exhaust && want_send) ||
+
diff --git a/net-misc/curl/files/curl-8.6.0-rustls-fixes.patch b/net-misc/curl/files/curl-8.6.0-rustls-fixes.patch
new file mode 100644
index 000000000000..4f713668fd35
--- /dev/null
+++ b/net-misc/curl/files/curl-8.6.0-rustls-fixes.patch
@@ -0,0 +1,252 @@
+From a59683a3607bc0167ff702352d15eee1c0d658a6 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <Matt.Jolly@footclan.ninja>
+Date: Mon, 1 Apr 2024 08:49:27 +1000
+Subject: [PATCH] m4: fix rustls builds
+
+This patch consolidates the following commits to do with rustls
+detection using pkg-config:
+
+- https://github.com/curl/curl/commit/9c4209837094781d5eef69ae6bcad0e86b64bf99
+- https://github.com/curl/curl/commit/5a50cb5a18a141a463148562dab83fa3be1a3b90
+---
+ m4/curl-rustls.m4 | 210 ++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 146 insertions(+), 64 deletions(-)
+
+diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4
+index 75542e4..8082cf9 100644
+--- a/m4/curl-rustls.m4
++++ b/m4/curl-rustls.m4
+@@ -28,84 +28,166 @@ dnl check for rustls
+ dnl ----------------------------------------------------
+
+ if test "x$OPT_RUSTLS" != xno; then
+- _cppflags=$CPPFLAGS
+- _ldflags=$LDFLAGS
+ ssl_msg=
+
+- if test X"$OPT_RUSTLS" != Xno; then
++ dnl backup the pre-ssl variables
++ CLEANLDFLAGS="$LDFLAGS"
++ CLEANCPPFLAGS="$CPPFLAGS"
+
+- if test "$OPT_RUSTLS" = "yes"; then
+- OPT_RUSTLS=""
+- fi
++ case $host_os in
++ darwin*)
++ LDFLAGS="$LDFLAGS -framework Security"
++ ;;
++ *)
++ ;;
++ esac
++ ## NEW CODE
+
+- case $host_os in
+- darwin*)
+- LDFLAGS="$LDFLAGS -framework Security"
+- ;;
+- *)
+- ;;
+- esac
+-
+- if test -z "$OPT_RUSTLS" ; then
+- dnl check for lib first without setting any new path
+-
+- AC_CHECK_LIB(rustls, rustls_client_session_read,
+- dnl librustls found, set the variable
+- [
+- AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
+- AC_SUBST(USE_RUSTLS, [1])
+- RUSTLS_ENABLED=1
+- USE_RUSTLS="yes"
+- ssl_msg="rustls"
+- test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+- ], [], -lpthread -ldl -lm)
+- fi
++ dnl use pkg-config unless we have been given a path
++ dnl even then, try pkg-config first
+
+- if test "x$USE_RUSTLS" != "xyes"; then
+- dnl add the path and test again
+- addld=-L$OPT_RUSTLS/lib$libsuff
+- addcflags=-I$OPT_RUSTLS/include
+- rustlslib=$OPT_RUSTLS/lib$libsuff
++ case "$OPT_RUSTLS" in
++ yes)
++ dnl --with-rustls (without path) used
++ PKGTEST="yes"
++ PREFIX_RUSTLS=
++ ;;
++ *)
++ dnl check the provided --with-rustls path
++ PKGTEST="no"
++ PREFIX_RUSTLS=$OPT_RUSTLS
+
+- LDFLAGS="$LDFLAGS $addld"
+- if test "$addcflags" != "-I/usr/include"; then
+- CPPFLAGS="$CPPFLAGS $addcflags"
++ dnl Try pkg-config even when cross-compiling. Since we
++ dnl specify PKG_CONFIG_LIBDIR we are only looking where
++ dnl the user told us to look
++
++ RUSTLS_PCDIR="$PREFIX_RUSTLS/lib/pkgconfig"
++ if test -f "$RUSTLS_PCDIR/rustls.pc"; then
++ AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$RUSTLS_PCDIR"])
++ PKGTEST="yes"
+ fi
+
+- AC_CHECK_LIB(rustls, rustls_connection_read,
+- [
+- AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
+- AC_SUBST(USE_RUSTLS, [1])
+- RUSTLS_ENABLED=1
+- USE_RUSTLS="yes"
+- ssl_msg="rustls"
+- test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+- ],
+- AC_MSG_ERROR([--with-rustls was specified but could not find rustls.]),
+- -lpthread -ldl -lm)
+- fi
++ if test "$PKGTEST" != "yes"; then
++ # try lib64 instead
++ RUSTLS_PCDIR="$PREFIX_RUSTLS/lib64/pkgconfig"
++ if test -f "$RUSTLS_PCDIR/rustls.pc"; then
++ AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$RUSTLS_PCDIR"])
++ PKGTEST="yes"
++ fi
++ fi
++
++ if test "$PKGTEST" != "yes"; then
++ dnl pkg-config came up empty, use what we got
++ dnl via --with-rustls
+
+- if test "x$USE_RUSTLS" = "xyes"; then
+- AC_MSG_NOTICE([detected rustls])
+- check_for_ca_bundle=1
+-
+- LIBS="-lrustls -lpthread -ldl -lm $LIBS"
+-
+- if test -n "$rustlslib"; then
+- dnl when shared libs were found in a path that the run-time
+- dnl linker doesn't search through, we need to add it to
+- dnl CURL_LIBRARY_PATH to prevent further configure tests to fail
+- dnl due to this
+- if test "x$cross_compiling" != "xyes"; then
+- CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$rustlslib"
+- export CURL_LIBRARY_PATH
+- AC_MSG_NOTICE([Added $rustlslib to CURL_LIBRARY_PATH])
++ addld=-L$PREFIX_RUSTLS/lib$libsuff
++ addcflags=-I$PREFIX_RUSTLS/include
++
++ LDFLAGS="$LDFLAGS $addld"
++ if test "$addcflags" != "-I/usr/include"; then
++ CPPFLAGS="$CPPFLAGS $addcflags"
++ fi
++
++ AC_CHECK_LIB(rustls, rustls_connection_read,
++ [
++ AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
++ AC_SUBST(USE_RUSTLS, [1])
++ RUSTLS_ENABLED=1
++ USE_RUSTLS="yes"
++ ssl_msg="rustls"
++ test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
++ ],
++ AC_MSG_ERROR([--with-rustls was specified but could not find rustls.]),
++ -lpthread -ldl -lm)
++
++ USE_RUSTLS="yes"
++ ssl_msg="rustls"
++
++ LIB_RUSTLS="$PREFIX_RUSTLS/lib$libsuff"
++ if test "$PREFIX_RUSTLS" != "/usr" ; then
++ SSL_LDFLAGS="-L$LIB_RUSTLS"
++ SSL_CPPFLAGS="-I$PREFIX_RUSTLS/include"
+ fi
+ fi
++ ;;
++ esac
++
++ if test "$PKGTEST" = "yes"; then
++
++ CURL_CHECK_PKGCONFIG(rustls, [$RUSTLS_PCDIR])
++
++ if test "$PKGCONFIG" != "no" ; then
++ SSL_LIBS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
++ $PKGCONFIG --libs-only-l --libs-only-other rustls 2>/dev/null`
++
++ SSL_LDFLAGS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
++ $PKGCONFIG --libs-only-L rustls 2>/dev/null`
++
++ SSL_CPPFLAGS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
++ $PKGCONFIG --cflags-only-I rustls 2>/dev/null`
++
++ AC_SUBST(SSL_LIBS)
++ AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"])
++ AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"])
++ AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"])
++
++ LIB_RUSTLS=`echo $SSL_LDFLAGS | sed -e 's/^-L//'`
++
++ dnl use the values pkg-config reported. This is here
++ dnl instead of below with CPPFLAGS and LDFLAGS because we only
++ dnl learn about this via pkg-config. If we only have
++ dnl the argument to --with-rustls we don't know what
++ dnl additional libs may be necessary. Hope that we
++ dnl don't need any.
++ LIBS="$SSL_LIBS $LIBS"
++ USE_RUSTLS="yes"
++ ssl_msg="rustls"
++ AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
++ AC_SUBST(USE_RUSTLS, [1])
++ USE_RUSTLS="yes"
++ RUSTLS_ENABLED=1
++ test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
++ else
++ AC_MSG_ERROR([pkg-config: Could not find rustls])
+ fi
+
+- fi dnl rustls not disabled
++ else
++ dnl we did not use pkg-config, so we need to add the
++ dnl rustls lib to LIBS
++ LIBS="-lrustls -lpthread -ldl -lm $LIBS"
++ fi
++
++ dnl finally, set flags to use this TLS backend
++ CPPFLAGS="$CLEAN_CPPFLAGS $SSL_CPPFLAGS"
++ LDFLAGS="$CLAN_LDFLAGS $SSL_LDFLAGS"
++
++ if test "x$USE_RUSTLS" = "xyes"; then
++ AC_MSG_NOTICE([detected rustls])
++ check_for_ca_bundle=1
++
++ if test -n "$LIB_RUSTLS"; then
++ dnl when shared libs were found in a path that the run-time
++ dnl linker does not search through, we need to add it to
++ dnl CURL_LIBRARY_PATH so that further configure tests do not
++ dnl fail due to this
++ if test "x$cross_compiling" != "xyes"; then
++ CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$LIB_RUSTLS"
++ export CURL_LIBRARY_PATH
++ AC_MSG_NOTICE([Added $LIB_RUSTLS to CURL_LIBRARY_PATH])
++ fi
++ fi
++ fi
+
+ test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
++
++ if test X"$OPT_RUSTLS" != Xno &&
++ test "$RUSTLS_ENABLED" != "1"; then
++ AC_MSG_NOTICE([OPT_RUSTLS: $OPT_RUSTLS])
++ AC_MSG_NOTICE([RUSTLS_ENABLED: $RUSTLS_ENABLED])
++ AC_MSG_ERROR([--with-rustls was given but Rustls could not be detected])
++ fi
+ fi
+ ])
++
++
++RUSTLS_ENABLED
+--
+2.44.0
+
diff --git a/net-misc/curl/files/curl-8.6.0-vtls-revert-receive-max-buffer-add-test-case.patch b/net-misc/curl/files/curl-8.6.0-vtls-revert-receive-max-buffer-add-test-case.patch
new file mode 100644
index 000000000000..66e8399370a2
--- /dev/null
+++ b/net-misc/curl/files/curl-8.6.0-vtls-revert-receive-max-buffer-add-test-case.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/924017
+https://github.com/curl/curl/pull/12848
+
+From ed09a99af57200643d5ae001e815eeab9ffe3f84 Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <stefan@eissing.org>
+Date: Thu, 1 Feb 2024 18:15:50 +0100
+Subject: [PATCH] vtls: revert "receive max buffer" + add test case
+
+- add test_05_04 for requests using http/1.0, http/1.1 and h2 against an
+ Apache resource that does an unclean TLS shutdown.
+- revert special workarund in openssl.c for suppressing shutdown errors
+ on multiplexed connections
+- vlts.c restore to its state before 9a90c9dd64d2f03601833a70786d485851bd1b53
+
+Fixes #12885
+Fixes #12844
+
+Closes #12848
+---
+ lib/vtls/vtls.c | 27 ++++++---------------------
+ 1 file changed, 6 insertions(+), 21 deletions(-)
+
+diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
+index e928ba5d0..f654a9749 100644
+--- a/lib/vtls/vtls.c
++++ b/lib/vtls/vtls.c
+@@ -1715,32 +1715,17 @@ static ssize_t ssl_cf_recv(struct Curl_cfilter *cf,
+ {
+ struct cf_call_data save;
+ ssize_t nread;
+- size_t ntotal = 0;
+
+ CF_DATA_SAVE(save, cf, data);
+ *err = CURLE_OK;
+- /* Do receive until we fill the buffer somehwhat or EGAIN, error or EOF */
+- while(!ntotal || (len - ntotal) > (4*1024)) {
++ nread = Curl_ssl->recv_plain(cf, data, buf, len, err);
++ if(nread > 0) {
++ DEBUGASSERT((size_t)nread <= len);
++ }
++ else if(nread == 0) {
++ /* eof */
+ *err = CURLE_OK;
+- nread = Curl_ssl->recv_plain(cf, data, buf + ntotal, len - ntotal, err);
+- if(nread < 0) {
+- if(*err == CURLE_AGAIN && ntotal > 0) {
+- /* we EAGAINed after having reed data, return the success amount */
+- *err = CURLE_OK;
+- break;
+- }
+- /* we have a an error to report */
+- goto out;
+- }
+- else if(nread == 0) {
+- /* eof */
+- break;
+- }
+- ntotal += (size_t)nread;
+- DEBUGASSERT((size_t)ntotal <= len);
+ }
+- nread = (ssize_t)ntotal;
+-out:
+ CURL_TRC_CF(data, cf, "cf_recv(len=%zu) -> %zd, %d", len,
+ nread, *err);
+ CF_DATA_RESTORE(cf, save);
+--
+2.43.0
+
diff --git a/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch b/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch
new file mode 100644
index 000000000000..81bcb0734339
--- /dev/null
+++ b/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch
@@ -0,0 +1,49 @@
+From a866b062b17ab94b16b817ab9969c561364a4d72 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <Matt.Jolly@footclan.ninja>
+Date: Mon, 1 Apr 2024 08:36:51 +1000
+Subject: [PATCH] m4: fix rustls builds
+
+This patch consolidates the following commits to do with rustls
+detection using pkg-config:
+
+- https://github.com/curl/curl/commit/9c4209837094781d5eef69ae6bcad0e86b64bf99
+- https://github.com/curl/curl/commit/5a50cb5a18a141a463148562dab83fa3be1a3b90
+---
+ m4/curl-rustls.m4 | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4
+index 7c55230..8082cf9 100644
+--- a/m4/curl-rustls.m4
++++ b/m4/curl-rustls.m4
+@@ -142,6 +142,11 @@ if test "x$OPT_RUSTLS" != xno; then
+ LIBS="$SSL_LIBS $LIBS"
+ USE_RUSTLS="yes"
+ ssl_msg="rustls"
++ AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
++ AC_SUBST(USE_RUSTLS, [1])
++ USE_RUSTLS="yes"
++ RUSTLS_ENABLED=1
++ test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+ else
+ AC_MSG_ERROR([pkg-config: Could not find rustls])
+ fi
+@@ -174,5 +179,15 @@ if test "x$OPT_RUSTLS" != xno; then
+ fi
+
+ test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
++
++ if test X"$OPT_RUSTLS" != Xno &&
++ test "$RUSTLS_ENABLED" != "1"; then
++ AC_MSG_NOTICE([OPT_RUSTLS: $OPT_RUSTLS])
++ AC_MSG_NOTICE([RUSTLS_ENABLED: $RUSTLS_ENABLED])
++ AC_MSG_ERROR([--with-rustls was given but Rustls could not be detected])
++ fi
+ fi
+ ])
++
++
++RUSTLS_ENABLED
+--
+2.44.0
+
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 7f3ef922ed92..d79a1ed4affd 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>Matt.Jolly@footclan.ninja</email>
+ <maintainer type="person">
+ <email>kangie@gentoo.org</email>
<name>Matt Jolly</name>
</maintainer>
<maintainer type="project">
@@ -15,13 +15,13 @@
<flag name="gnutls">Enable gnutls ssl backend</flag>
<flag name="gopher">Enable Gopher protocol support</flag>
<flag name="hsts">Enable HTTP Strict Transport Security</flag>
- <flag name="http2">Enable HTTP/2.0 support</flag>
<flag name="imap">Enable Internet Message Access Protocol support</flag>
<flag name="mbedtls">Enable mbedtls ssl backend</flag>
<flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag>
<flag name="openssl">Enable openssl ssl backend</flag>
<flag name="pop3">Enable Post Office Protocol 3 support</flag>
<flag name="progress-meter">Enable the progress meter</flag>
+ <flag name="psl">Enable Public Suffix List (PSL) support. See https://daniel.haxx.se/blog/2024/01/10/psl-in-curl/.</flag>
<flag name="rtmp">Enable RTMP Streaming Media support</flag>
<flag name="rustls">Enable Rustls ssl backend</flag>
<flag name="smtp">Enable Simple Mail Transfer Protocol support</flag>
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
deleted file mode 100644
index 39bdb6ec81be..000000000000
--- a/net-misc/dahdi-tools/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
-DIST dahdi-tools-3.2.0.tar.gz 729392 BLAKE2B 77667a16fd18fa5b6ffd67d9bd267c4ea5e6ff3841938de64704b7e6f1818b23feff196701c62ceb0a56c677614b4c2a4d4d1f4f533020559e8b3b3c12785bf5 SHA512 29df9a768c6db872bd51926dac11178400a03e2e1d0771ae163433ce300af71691f5c7a60f8756c0e6cef8a43f1331944cb4e44393f04a0ff8dee19bc9e7cf16
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild
deleted file mode 100644
index 49903c27e61a..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 perl-functions udev
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="ppp"
-PATCHES=(
- "${FILESDIR}/dahdi-nondigium-blacklist.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch"
-)
-
-DEPEND="dev-libs/newt
- net-misc/dahdi
- sys-kernel/linux-headers
- virtual/libusb:0
- ppp? ( net-dialup/ppp:= )"
-RDEPEND="${DEPEND}
- dev-lang/perl:=
- dev-perl/CGI"
-BDEPEND="dev-lang/perl
- sys-apps/file"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
- sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed."
- sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed."
-}
-
-src_install() {
- local bashcompdir="$(get_bashcompdir)"
- local bashcmd bashcmdtarget
-
- emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install
- emake DESTDIR="${ED}" install-config
-
- dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-
- # install init scripts
- newinitd "${FILESDIR}"/dahdi.init2 dahdi
- newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
- newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
-
- bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
- die "Error parsing dahdi bash completion file for commands")
-
- rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install."
- # Delete *if* the libtool file exists, bug #778380
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- udev_reload
-}
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild
deleted file mode 100644
index 4ccf762c64d7..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 perl-functions udev
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ppp"
-PATCHES=(
- "${FILESDIR}/dahdi-nondigium-blacklist.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch"
-)
-
-DEPEND="dev-libs/newt
- net-misc/dahdi
- sys-kernel/linux-headers
- virtual/libusb:0
- ppp? ( net-dialup/ppp:= )"
-RDEPEND="${DEPEND}
- dev-lang/perl:=
- dev-perl/CGI"
-BDEPEND="dev-lang/perl
- sys-apps/file"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
- sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed."
- sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed."
-}
-
-src_install() {
- local bashcompdir="$(get_bashcompdir)"
- local bashcmd bashcmdtarget
-
- emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install
- emake DESTDIR="${ED}" install-config
-
- dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-
- # install init scripts
- newinitd "${FILESDIR}"/dahdi.init2 dahdi
- newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf
- newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
-
- bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
- die "Error parsing dahdi bash completion file for commands")
-
- rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install."
- # Delete *if* the libtool file exists, bug #778380
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild
deleted file mode 100644
index 773d22263bd4..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 perl-functions udev
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ppp"
-PATCHES=(
- "${FILESDIR}/dahdi-nondigium-blacklist.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch"
- "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch"
- "${FILESDIR}/dahdi-tools-3.2.0-lto.patch"
-)
-
-DEPEND="dev-libs/newt
- net-misc/dahdi
- sys-kernel/linux-headers
- virtual/libusb:1
- ppp? ( net-dialup/ppp:= )"
-RDEPEND="${DEPEND}
- dev-lang/perl:=
- dev-perl/CGI"
-BDEPEND="dev-lang/perl
- sys-apps/file"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
- sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed."
- sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed."
-}
-
-src_install() {
- local bashcompdir="$(get_bashcompdir)"
- local bashcmd bashcmdtarget
-
- emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install
- emake DESTDIR="${ED}" install-config
-
- dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-
- # install init scripts
- newinitd "${FILESDIR}"/dahdi.init2 dahdi
- newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf
- newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
-
- bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
- die "Error parsing dahdi bash completion file for commands")
-
- # Delete *if* the libtool file exists, bug #778380
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 b/net-misc/dahdi-tools/files/dahdi-autoconf.conf2
deleted file mode 100644
index a46545231911..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2
+++ /dev/null
@@ -1,40 +0,0 @@
-# Global settings
-# Set this to your country code.
-DAHDI_ZONE=za
-DAHDI_ECHOCAN=oslec # mg2,jpah,kb1,sec,sec2 (there may be more, we recommend oslec)
-
-# Settings for analog
-#Analog signal types, one of:
-# ks - KewlStart (recommended, default)
-# ls - LoopStart
-# gs - GroundStart
-
-# Signalling to be used on FXO ports
-DAHDI_FXO_SIGNALLING=ks
-
-# Signalling to be used on FXS ports
-DAHDI_FXS_SIGNALLING=ks
-
-# Whether or not to echocan:
-DAHDI_FXO_ECHOCAN=yes
-DAHDI_FXS_ECHOCAN=yes
-
-# These settings will be used for BRI cards.
-# Known options: B8ZS,AMI,HDB3
-DAHDI_BRI_CODING=AMI
-
-# Known options: ESF,D4,CCS,CRC4
-DAHDI_BRI_FRAMING=CCS
-
-# Our experience is that it's not required (still defaults to yes)
-DAHDI_BRI_NT_ECHOCAN=yes
-DAHDI_BRI_TE_ECHOCAN=yes
-
-# These settings are for PRI cards. Note that only E1 currently supported.
-DAHDI_E1_CPE_ECHOCAN=yes
-DAHDI_E1_NET_ECHOCAN=yes
-
-# PRI will default to CPE mode (remote end provides signalling).
-# If you really want to provide signalling set the appropriate spans
-# here (eg, set span 1 to NET mode).
-#PRI_SPAN_1_NET=yes
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4
deleted file mode 100644
index 73ab07b8904f..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Ultimate Linux Solutions CC
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- before dahdi
-}
-
-dahdi_load_modules() {
- local hwlist loc status mod mod_vname pciid desc
-
- hwlist=$(/usr/sbin/dahdi_hardware)
-
- if [ -z "${hwlist}" ]; then
- einfo "No digium hardware found."
- ebegin "Loading module dahdi_dummy"
- /sbin/modprobe dahdi_dummy
- eend $?
- return
- fi
-
- echo "${hwlist}" | while read loc mod pciid desc; do
- status="${mod:${#mod}-1:1}"
- mod="${mod%[+-]}"
- mod_vname="mod_${mod}"
-
- einfo "Found $desc at $loc (module: $mod)"
-
- if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then
- ebegin "Loading module $mod"
- /sbin/modprobe $mod
- eend
-
- [ $? -eq 0 ] && eval "$mod_vname=loaded"
- fi
- done
-}
-
-dahdi_module_unload() {
- local mod=$1 s
- [ -d /sys/module/${mod} ] || return 0
-
- for s in $(find /sys/module/${mod}/holders -type l); do
- dahdi_module_unload $(basename $s)
- done
-
- ebegin "Removing dahdi module: $mod"
- /sbin/rmmod $mod
- eend $?
-}
-
-dahdi_gen_fxo_config() {
- local port=$1
-
- echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}"
- [ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_fxs_config() {
- local port=$1
-
- echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}"
- [ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_bri_te_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
- echo "bchan=${basechan}-$(( basechan + 1 ))"
- echo "hardhdlc=$(( basechan + 2 ))"
- [ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_bri_nt_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
- echo "bchan=${basechan}-$(( basechan + 1 ))"
- echo "hardhdlc=$(( basechan + 2 ))"
- [ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_e1_cpe_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
- bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
- echo "bchan=${bchans}"
- echo "dchan=$(( basechan + 15 ))"
- [ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_e1_net_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
- bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
- echo "bchan=${bchans}"
- echo "dchan=$(( basechan + 15 ))"
- [ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_t1_cpe_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},${port},0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}"
- bchans="${basechan}-$(( basechan + 22 ))"
- echo "bchan=${bchans}"
- echo "dchan=$(( basechan + 23 ))"
- [ "${DAHDI_T1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_t1_net_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},0,0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}"
- bchans="${basechan}-$(( basechan + 22 ))"
- echo "bchan=${bchans}"
- echo "dchan=$(( basechan + 23 ))"
- [ "${DAHDI_T1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_conf_span() {
- local span=$1
- local type=$2
- local desc=$3
- local port=$4
- local basechan=$5
- local vname="PRI_SPAN_${span}_NET"
- local cfunc="dahdi_gen_"
-
- # Analog we need to deal with on a port-by-port basis.
- [ "${type}" = "analog" ] && return 0
-
- echo ""
- echo "# ${desc}"
-
- case "${type}" in
- digital-TE)
- cfunc="${cfunc}bri_te"
- ;;
- digital-NT)
- cfunc="${cfunc}bri_nt"
- ;;
- digital-[TE]1)
- cfunc="${cfunc}$(echo "${type##*-}" | tr 'TE' 'te')"
- # Use CPE by default. Unfortunately there is no easy
- # way to detect CPE vs NET as far as I know and specifying
- # in a config that you want NET mode seems the sanest way.
- if yesno "${vname}"; then
- cfunc="${cfunc}_net"
- else
- cfunc="${cfunc}_cpe"
- fi
- ;;
- *)
- echo "# Don't know how to configure this (type=${type})."
- echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC."
- return 1
- ;;
- esac
-
- "${cfunc}_config" "${span}" "${port}" "${basechan}"
-}
-
-dahdi_gen_config() {
- local type manufacturer devicetype basechan aport atype
- local span=
- local tfile="$(mktemp)"
- local sfile="$(mktemp)"
- local plocation=""
- local isdnport=0
-
- /usr/sbin/dahdi_scan > "${sfile}"
- exec 3<"${sfile}"
- exec 4>"${tfile}"
-
- echo "# Automatically dahdi-autoconf generated file ($(date))." >&4
- echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >&4
-
- while read LINE <&3; do
- case "$LINE" in
- \[*\])
- if [ -n "${span}" ]; then
- ebegin "Configuring ${manufacturer} ${devicetype} (${name})"
- dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4
- eend $?
- fi
- span="${LINE%?}"
- span="${span#?}"
- ;;
- type=*|manufacturer=*|devicetype=*|basechan=*|name=*)
- eval "${LINE%%=*}='${LINE#*=}'"
- ;;
- location=*)
- eval "${LINE%%=*}='${LINE#*=}'"
- if [ "${location}" = "${plocation}" ]; then
- isdnport=$(( isdnport + 1 ))
- else
- plocation="${location}"
- isdnport=1
- fi
- ;;
- port=*)
- # For analog cards only.
- aport="${LINE#*=}"; aport="${aport%,*}"
- atype="${LINE#*,}"
- if [ "${aport}" -eq "${basechan}" ]; then
- echo "" >&4
- echo "# ${manufacturer} ${devicetype} (${name})" >&4
- fi
- case "${atype}" in
- FXO)
- dahdi_gen_fxo_config $aport >&4
- ;;
- FXS)
- dahdi_gen_fxs_config $aport >&4
- ;;
- esac
- ;;
- esac
- done
-
- if [ -n "${span}" ]; then
- ebegin "Configuring ${manufacturer} ${devicetype} (${name})"
- dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4
- eend $?
- fi
-
- echo "" >&4
- echo "loadzone = ${DAHDI_ZONE}" >&4
- echo "defaultzone = ${DAHDI_ZONE}" >&4
- echo "## END OF AUTOCONFIGURED FILE ##" >&4
-
- exec 3<&-
- exec 4<&-
-
- rm -f "${sfile}"
- [ -r /etc/dahdi/system.conf ] && mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck
- mv "${tfile}" /etc/dahdi/system.conf
-}
-
-start() {
- dahdi_load_modules
-
- if [ ! -r /dev/dahdi/ctl ]; then
- eerror "No DAHDI compatible cards detected."
- return 1
- fi
-
- ebegin "Generating DAHDI Configuration"
- dahdi_gen_config
- eend $?
-}
-
-stop() {
- dahdi_module_unload dahdi
-}
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init2 b/net-misc/dahdi-tools/files/dahdi-autoconf.init2
deleted file mode 100644
index 9e3de84bac26..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.init2
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Ultimate Linux Solutions CC
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- before dahdi
-}
-
-dahdi_load_modules() {
- local hwlist loc status mod mod_vname pciid desc
-
- hwlist=$(/usr/sbin/dahdi_hardware)
-
- if [ -z "${hwlist}" ]; then
- einfo "No digium hardware found."
- ebegin "Loading module dahdi_dummy"
- /sbin/modprobe dahdi_dummy
- eend $?
- return
- fi
-
- echo "${hwlist}" | while read loc mod pciid desc; do
- status="${mod:${#mod}-1:1}"
- mod="${mod%[+-]}"
- mod_vname="mod_${mod}"
-
- einfo "Found $desc at $loc (module: $mod)"
-
- if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then
- ebegin "Loading module $mod"
- /sbin/modprobe $mod
- eend
-
- [ $? -eq 0 ] && eval "$mod_vname=loaded"
- fi
- done
-}
-
-dahdi_module_unload() {
- local mod=$1 s
- [ -d /sys/module/${mod} ] || return 0
-
- for s in $(find /sys/module/${mod}/holders -type l); do
- dahdi_module_unload $(basename $s)
- done
-
- ebegin "Removing dahdi module: $mod"
- /sbin/rmmod $mod
- eend $?
-}
-
-dahdi_gen_fxo_config() {
- local port=$1
-
- echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}"
- [ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_fxs_config() {
- local port=$1
-
- echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}"
- [ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_bri_te_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
- echo "bchan=${basechan}-$(( basechan + 1 ))"
- echo "hardhdlc=$(( basechan + 2 ))"
- [ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_bri_nt_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
- echo "bchan=${basechan}-$(( basechan + 1 ))"
- echo "hardhdlc=$(( basechan + 2 ))"
- [ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_e1_cpe_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
- bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
- echo "bchan=${bchans}"
- echo "dchan=$(( basechan + 15 ))"
- [ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_e1_net_config() {
- span=$1
- port=$2
- basechan=$3
-
- echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
- bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
- echo "bchan=${bchans}"
- echo "dchan=$(( basechan + 15 ))"
- [ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_conf_span() {
- local span=$1
- local type=$2
- local desc=$3
- local port=$4
- local basechan=$5
- local vname=""
-
- # Analog we need to deal with on a port-by-port basis.
- [ "${type}" = "analog" ] && return 0
-
- echo -e "\n# ${desc}"
- case "${type}" in
- digital-TE)
- dahdi_gen_bri_te_config "${span}" "${port}" "${basechan}"
- ;;
- digital-NT)
- dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}"
- ;;
- digital-E1)
- # Use CPE by default. Unfortunately there is no easy
- # way to detect CPE vs NET as far as I know and specifying
- # in a config that you want NET mode seems the sanest way.
- vname="PRI_SPAN_${span}_NET"
- if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then
- dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}"
- else
- dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}"
- fi
- ;;
- *)
- echo "# Don't know how to configure this (type=${type})."
- echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC."
- ;;
- esac
-}
-
-dahdi_gen_config() {
- local type manufacturer devicetype basechan aport atype
- local span=
- local tfile="$(mktemp)"
- local sfile="$(mktemp)"
- local plocation=""
- local isdnport=0
-
- /usr/sbin/dahdi_scan > "${sfile}"
- exec 3<"${sfile}"
-
- echo "# Automatically dahdi-autoconf generated file ($(date))." >> "${tfile}"
- echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >> "${tfile}"
-
- while read LINE <&3; do
- case "$LINE" in
- [[]*[]])
- [ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
- span="${LINE%?}"
- span="${span#?}"
- ;;
- type=*|manufacturer=*|devicetype=*|basechan=*|name=*)
- eval "${LINE%%=*}='${LINE#*=}'"
- ;;
- location=*)
- eval "${LINE%%=*}='${LINE#*=}'"
- if [ "${location}" == "${plocation}" ]; then
- (( ++isdnport ))
- else
- plocation="${location}"
- isdnport=1
- fi
- ;;
- port=*)
- # For analog cards only.
- aport="${LINE#*=}"; aport="${aport%,*}"
- atype="${LINE#*,}"
- [ "${aport}" -eq "${basechan}" ] && echo -e "\n# ${manufacturer} ${devicetype} (${name})" >> "${tfile}"
- case "${atype}" in
- FXO)
- dahdi_gen_fxo_config $aport >> "${tfile}"
- ;;
- FXS)
- dahdi_gen_fxs_config $aport >> "${tfile}"
- ;;
- esac
- ;;
- esac
- done
-
- [ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
-
- echo -e "\nloadzone = ${DAHDI_ZONE}\ndefaultzone = ${DAHDI_ZONE}\n## END OF AUTOCONFIGURED FILE ##" >> "${tfile}"
-
- exec 3<&-
-
- rm -f "${sfile}"
- mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck
- mv "${tfile}" /etc/dahdi/system.conf
-}
-
-start() {
- dahdi_load_modules
-
- if [ ! -r /dev/dahdi/ctl ]; then
- eerror "No DAHDI compatible cards detected."
- return 1
- fi
-
- ebegin "Generating DAHDI Configuration"
- dahdi_gen_config
- eend $?
-}
-
-stop() {
- dahdi_module_unload dahdi
-}
diff --git a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch b/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch
deleted file mode 100644
index 3df8f166a56c..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dahdi-tools-2.8.0.ORIG/blacklist.sample dahdi-tools-2.8.0/blacklist.sample
---- dahdi-tools-2.8.0/blacklist.sample.ORIG 2009-04-02 10:34:32.000000000 +0200
-+++ dahdi-tools-2.8.0/blacklist.sample 2010-05-24 20:46:05.000000000 +0200
-@@ -14,6 +14,8 @@
- blacklist wcb4xxp
- blacklist wcaxx
- blacklist wcte43x
-+blacklist wcopenpci
-+blacklist zaphfc
-
- # Some mISDN drivers may try to attach to cards supported by DAHDI. If you
- # have a card which is *not* supported by DAHDI but supported by one of the
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch
deleted file mode 100644
index 37d1402c404f..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/./dahdi-tools-3.1.0/xpp/hexfile.h.o b/./dahdi-tools-3.1.0/xpp/hexfile.h
-index 33ff50d..3d03f98 100644
---- a/xpp/hexfile.h
-+++ b/xpp/hexfile.h
-@@ -70,7 +70,9 @@ struct hexdata {
- };
-
-
--__BEGIN_DECLS
-+#ifdef __cpluplus
-+extern "C" {
-+#endif
-
- typedef void (*parse_hexfile_report_func_t)(int level, const char *msg, ...)
- #ifdef __GNUC__
-@@ -86,6 +88,9 @@ int dump_hexfile2(struct hexdata *hexdata, const char *outfile, uint8_t maxwidth
- void dump_binary(struct hexdata *hexdata, const char *outfile);
- void gen_hexline(const uint8_t *data, uint16_t addr, size_t len, FILE *output);
- int bsd_checksum(struct hexdata *hexdata);
--__END_DECLS
-+
-+#ifdef __cpluplus
-+}
-+#endif
-
- #endif
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch
deleted file mode 100644
index b222a85d8cb9..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/configure.ac 2020-03-28 22:28:35.614340050 +0200
-+++ b/configure.ac 2020-03-28 22:28:55.084181570 +0200
-@@ -161,6 +161,7 @@
- # Checks for header files.
- AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h])
- AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
-+AC_CHECK_HEADERS([execinfo.h])
-
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_INLINE
---- a/xpp/xtalk/debug.c 2020-03-28 22:41:43.507810560 +0200
-+++ b/xpp/xtalk/debug.c 2020-03-28 22:41:10.538087608 +0200
-@@ -27,8 +27,10 @@
- #include <stdarg.h>
- #include <syslog.h>
--#include <execinfo.h>
- #include <xtalk/debug.h>
- #include <autoconfig.h>
-+#ifdef HAVE_EXECINFO_H
-+#include <execinfo.h>
-+#endif
-
- int verbose = LOG_INFO;
- int debug_mask;
-@@ -61,6 +63,7 @@
- /* from glibc info(1) */
- void print_backtrace(FILE *fp)
- {
-+#ifdef HAVE_EXECINFO_H
- void *array[10];
- size_t size;
- char **strings;
-@@ -71,4 +74,7 @@
- for (i = 0; i < size; i++)
- fprintf(fp, "%s\n", strings[i]);
- free(strings);
-+#else
-+ fprintf(fp, "backtrace information only available if execinfo.h is available.\n");
-+#endif
- }
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch
deleted file mode 100644
index 3ca5bd2aa09b..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c
-index fdb34f1..8fb3687 100644
---- a/xpp/mpptalk.c
-+++ b/xpp/mpptalk.c
-@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) {
- MEMBER(MPP, TWS_PORT_GET_REPLY);
- MEMBER(MPP, TWS_PWR_GET);
- MEMBER(MPP, TWS_PWR_GET_REPLY);
--} PACKED members;
-+} PACKED;
-
- /*
- * Statuses
-diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c
-index 49e47d5..251a502 100644
---- a/xpp/xtalk/xtalk_raw.c
-+++ b/xpp/xtalk/xtalk_raw.c
-@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK,
-
- union XTALK_PDATA(XTALK) {
- MEMBER(XTALK, ACK);
--} PACKED members;
-+} PACKED;
-
- const struct xtalk_protocol xtalk_raw_proto = {
- .name = "XTALK-RAW",
-diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c
-index 18a5cad..ffa79d2 100644
---- a/xpp/xtalk/xtalk_sync.c
-+++ b/xpp/xtalk/xtalk_sync.c
-@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) {
- MEMBER(XTALK, ACK);
- MEMBER(XTALK, PROTO_GET);
- MEMBER(XTALK, PROTO_GET_REPLY);
--} PACKED members;
-+} PACKED;
-
- const struct xtalk_protocol xtalk_sync_proto = {
- .name = "XTALK-SYNC",
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch
deleted file mode 100644
index 9575966435e7..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- dahdi-tools-3.1.0/Makefile.am.o 2020-01-09 12:23:37.943059915 +0200
-+++ dahdi-tools-3.1.0/Makefile.am 2020-01-09 12:23:58.863036654 +0200
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I m4
-
- LEGACY_MAKE = \
-- $(MAKE) -f $(srcdir)/Makefile.legacy \
-+ +$(MAKE) -f $(srcdir)/Makefile.legacy \
- top_srcdir=$(top_srcdir) \
- srcdir=$(srcdir)
-
-@@ -131,7 +131,6 @@
- install -m644 init.conf.sample $(DESTDIR)$(dahdiconfdir)/init.conf
- install -m644 blacklist.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi-blacklist.conf
- install -m644 modprobe.conf.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi.conf
-- $(LEGACY_MAKE) config
-
- dahdiconfdir = @sysconfdir@/dahdi
- dahdiconf_DATA = \
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch
deleted file mode 100644
index 75f6c1a93eee..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From bc45d96413902e0ded093908bc3a02410d799e24 Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@uls.co.za>
-Date: Thu, 11 May 2023 17:28:02 +0200
-Subject: [PATCH] Fix compilation with LTO.
-
----
- xpp/echo_loader.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/xpp/echo_loader.c b/xpp/echo_loader.c
-index 827f6ef..adfb1f4 100644
---- a/xpp/echo_loader.c
-+++ b/xpp/echo_loader.c
-@@ -409,7 +409,7 @@ UINT32 Oct6100UserGetTime(tPOCT6100_GET_TIME f_pTime)
- struct timeval tv;
- unsigned long long total_usecs;
- unsigned int mask = ~0;
--
-+
- gettimeofday(&tv, 0);
- total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) +
- (((unsigned long long)(tv.tv_usec)));
-@@ -564,7 +564,7 @@ UINT32 Oct6100UserDriverReadBurstApi(tPOCT6100_READ_BURST_PARAMS f_pBurstParams)
- return cOCT6100_ERR_OK;
- }
-
--inline int get_ver(struct astribank *astribank)
-+static inline int get_ver(struct astribank *astribank)
- {
- return spi_send(astribank, 0, 0, 1, 1);
- }
-@@ -647,7 +647,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe
- /* General parameters */
- OpenChip.fEnableChannelRecording = TRUE;
-
-- /* Chip ID.*/
-+ /* Chip ID.*/
- OpenChip.ulUserChipId = 1;
-
- /* Set the max number of accesses to 1024 to speed things up */
-@@ -775,7 +775,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe
- ChannelOpen.VqeConfig.fRinDcOffsetRemoval = TRUE;
- ChannelOpen.VqeConfig.fSinDcOffsetRemoval = TRUE;
-
-- ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL;
-+ ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL;
- /* cOCT6100_COMFORT_NOISE_NORMAL
- cOCT6100_COMFORT_NOISE_EXTENDED,
- cOCT6100_COMFORT_NOISE_OFF,
-@@ -824,7 +824,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe
- ChannelOpen.VqeConfig.fRinDcOffsetRemoval = TRUE;
- ChannelOpen.VqeConfig.fSinDcOffsetRemoval = TRUE;
-
-- ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL;
-+ ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL;
- /* cOCT6100_COMFORT_NOISE_NORMAL
- cOCT6100_COMFORT_NOISE_EXTENDED,
- cOCT6100_COMFORT_NOISE_OFF,
---
-2.39.3
-
diff --git a/net-misc/dahdi-tools/files/dahdi.init2 b/net-misc/dahdi-tools/files/dahdi.init2
deleted file mode 100644
index d3abf3c4e61e..000000000000
--- a/net-misc/dahdi-tools/files/dahdi.init2
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-checkconfig() {
- if [ ! -f /etc/dahdi/system.conf ]; then
- eerror "/etc/dahdi/system.conf not found. Nothing to do."
- return 1
- fi
-
- return 0
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting DAHDI"
- /usr/sbin/dahdi_cfg
- eend $?
-
- if [ $? -eq 0 -a -r /etc/fxotune.conf ]; then
- ebegin "Loading DAHDI fxotune.conf"
- /usr/sbin/fxotune -s
- eend $?
- fi
-}
-
-stop() {
- ebegin "Stopping DAHDI"
- /usr/sbin/dahdi_cfg -s
- eend
-}
diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml
deleted file mode 100644
index 41312228e19d..000000000000
--- a/net-misc/dahdi-tools/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>jaco@uls.co.za</email>
- <name>Jaco Kroon</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <use>
- <flag name="ppp">Enables PPP/DAHDIRAS support</flag>
- </use>
- <upstream>
- <remote-id type="github">asterisk/dahdi-tools</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
deleted file mode 100644
index 856dd7fb9c7e..000000000000
--- a/net-misc/dahdi/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
-DIST dahdi-fw-a4a-a0017.tar.gz 181429 BLAKE2B fb1285eb7d06c8bca5c91b421c408c7f494c05e4ccb89eb0703457059efef78f248a471e0d5ca03fdca97882531eb3b7e0c52e3231b7ef7a90b58c33882772db SHA512 e42cb83e05edb359949acd888a743c665d228cd3b9424fc8f3b60676d6799f4455e65cc269d1e2ac0e3bb5613607dad4fb37c433067832fb68b15bfddf6f4a2a
-DIST dahdi-fw-a4b-d001e.tar.gz 239591 BLAKE2B f09c2ee17c9d14b95d5bc90de84cdb57a49c33d44e21c66b8ea29908d9ac58b979a0d0eb3cae80efc5e96de19226a850b2ca36aa2b462af66e02043bc8c3def1 SHA512 ab72cf6d469e44f3a8b9dda5e7acae9ae435b6f12b1491079155b8df4c9cf83aed48ccbda4acb4a9943dd6228846f5b82998a0bf575d454ac3b81b72c585d58c
-DIST dahdi-fw-a8a-1d0017.tar.gz 181958 BLAKE2B f7955ba62a94a1edd0c859e71c4f820ab789e098e2fd2c48e3fb453fee6ca5b056fe4144f83bd926f61e8f48fa223b84ce6912bf4a384ee9068fbe63538c1047 SHA512 2f80d24170f0efdebc318f238abb04664dfa97e3ca47a330b5a5e1d695c8ba5c535ad1302bf338667912b46cd5b4bbb76ab5bdbe6e736edd4f0e9239d818d05d
-DIST dahdi-fw-a8b-1f001e.tar.gz 236508 BLAKE2B 830cc01cc14eca0367e92e5d6dc10b019e42072da5a69b18095c52633d7dcddade920fd2cf2c43f101effc2319c43a803f433faad244e096fc9854d3d652da7a SHA512 68041e5cb53d8ff6beb9f667abca5a5a1c752357c224f5c7cfcb81732bd417671cf6dc03b5c5bafd6a0864f6c5451165c0f26908b0f40ed3408961f448f2a9a4
-DIST dahdi-fw-hx8-2.06.tar.gz 29252 BLAKE2B f3c635108032ff06b51a140f2f665a6a41638eb027d88c33822da9d47fe907eecfaab937ce6199f0d9eeeafbd36919366e039b0bc1a1be605c339055a8b6843b SHA512 d113d2bd10d5a851087e04fadb3427ec07634960d47e2292320f0d195c65075fb24ab173e0985c257eaf8e46f595f29af034fb380382cdbff7bfbc7381dff4ae
-DIST dahdi-fw-oct6114-032-1.05.01.tar.gz 165866 BLAKE2B 527d49f66924e91b6689cf905f365804be02707476d425e563db763bb158431f0e8bccc8ed38cbe3f4ec91747e53769ab5526cb3949218fc3b8041839796fcbc SHA512 ec47a7aac6a6abc73fe0c7ec3b31eebc868c516aeb1bb584f145f36c28abec21afa12dcec554bceb914c058c83255e32fb8d967ef4d8a5d0161b6053af464a24
-DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 BLAKE2B 9b21e9a5a9bf85ac18db67b14a457676d32958e1a2316fbf33fb802c1393ef2759a3637a80eafb77e2c496002c76f49705ac9eb2d427b8e079503a31bf930893 SHA512 6dcc6a3413c6c0561b08c4949a746cbebc58b8a068481f568007fdc663cfc6ef90417fbd81398055a781367e7db57f0a694745cddcd3c697a4f857be15981549
-DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 BLAKE2B 8621538d16e028eb2de64fa61c7475874525a302af5603f07a8a948a3c2cc1bd776feeeaf51c4d0c2edc4577156addc27905ecb06c9db6f43400258905cad6bf SHA512 17e83aa57ea8e9d3353027184adb48f664b177a528006d67112a53127fcb19c1011d4f44c2980ab77d27b3bf7f7a74d44f15aaf115e05fa3df8e16d3c30fc267
-DIST dahdi-fw-oct6114-256-1.05.01.tar.gz 171685 BLAKE2B 2f831da3043c6c73a4a38085d1c2b685acae94d92deba776e47a4d292f1ae65e5686ec3e8c73f0672ea8f390404717662f106b084083af4a8635447cd2f539fe SHA512 e447fe8d24963892339d895450cf7a04da3bdcf1de22630dea68119dbd9da84878478adf8ce0e5ef859e6d677c2a051aa6272de4e0692f5ce0e8b5d0fba4096b
-DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 BLAKE2B b16a2c77dc0222851af25a11e64e40f2648ec870444373ad2310b8b5157b2a2d5a4a4bf2850551758080e87f43371ff55a11f5f381bd08b060f5062f0faa7587 SHA512 88a986d22ead41a3dabc320e13f7a3e6e6ab9e2752aca2cc940ad9c1ec570d4f01e82c46d0ec1b6dc1a87a1df7e94cfb8aa638b44b4fe2254af8962f1fdbac86
-DIST dahdi-fw-te133-7a001e.tar.gz 242987 BLAKE2B f6e5fedc742061b0ee26b33c20cb16a7a5efd68de827963dbb5fe3ddeed5bb491643e20818d39c8d0876ab3971c339ce43f03e97af3aff2286b70e020d2e05a4 SHA512 acd273bcf9b8e009b986e2c9f068121fad8b9cf8f500b79fd5456225ec4ef81d22f32960246a1e9b49ca7f47efb2f7d346c8727fe3b7b80c700d2dc609784acc
-DIST dahdi-fw-te134-780017.tar.gz 185478 BLAKE2B c301362e7433f9c3c9991ae50c0536ad4315fe966dced38fd2be7a9c3b01ce4829d4ecb8ef9756f4ad05b507bb4b6739a861264eb6975512ce8aa5b89b1ca14c SHA512 b6f93ff060512b15bb8462805d8f8a435e56a83be362770d2c3b39b876d2171c5e1e6c1bc42c893eaa382ccd2f19534536612618c4ef4ff8c25976cf3719d4fb
-DIST dahdi-fw-te435-13001e.tar.gz 238504 BLAKE2B c348a1e0d187ac4008254c78680dcd2b2ccce3f1af92bced190936c8ace88973e7d6854ed6de0480869ccd687d398958193ad90a648c8fe90464c3d1b5ddf974 SHA512 1cd5c191db62f87f87c9f6913bcbc3ed9f3d77a51578cd0bc5fdb9d17e128bcaf66d04c5a9e6417e9d7543fc8f18b6f635f0e8c1cb1bc19b11bc8ddffaa6be08
-DIST dahdi-fw-te436-10017.tar.gz 210601 BLAKE2B 8aceaa093b457a374db89599779315458a91af3d6f58e74a35ee08d3c91a556b64f78244a9e3e05d9bc8b200be2b3be83d159eb85681f3afb20329f16b2f2445 SHA512 56e8a26a737ac45e137324b635e5f489fe05a5939324af038f881b64ddabf486eb3830ff0ada1561ffedb3d6bc8338b11f4dccbc9b2ca9e00cd2bcc85abf83c0
-DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43dd21170fc16669de064e92615e5b049cf5cdf49f9c9d03d9e795172eafad83cd3b0636fb1491df5612358757a2e9d5 SHA512 3189df3dd680353d5520773ac8ea7fe638ea05e3c656379c1a245bd3ab8a6ae0c8a1c22c2068be9c758996e5993b0d19376b159b4e868ebc3d817dcce3b9aec7
-DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3
-DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
-DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
-DIST dahdi-linux-3.2.0.tar.gz 1617958 BLAKE2B 1a35ba69719e7cebf7cf471f901a3280e1558b8e8e4f615fcc974a08a83f62e71ee653b47f3a09e85e96a0447e4516996ef254497746492fe50eebef5515e217 SHA512 cb4b06d5a83aae7ce54049137d989fa6275367debc77a1df64cc36ba1bda08a058ea92f01bb873bcd83c3c7d58ff4c5da42c67bbbe8a02b8f4f0e12348c4a072
-DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157
-DIST gentoo-dahdi-patches-3.2.0.tar.bz2 6947 BLAKE2B 8e4d2245d966a14c6eec7045c74788decc52c5dec562e7d09670766f169e6890a7fae2bf245ab198276780210564e891fe5d16b6e0d44ff5be876f218c23f2fb SHA512 c47a092d17abb0070cebfae540363a01bb8a9927e05524c3d50e76d69249115b3caf83d436469153b7a519e6c6952baab14d6bf898a440373f90d02359fbb4ae
-DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
-DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762
-DIST gentoo-dahdi-sources-3.2.0.tar.bz2 87595 BLAKE2B 18a2f007581ac653e0a1a50c77b36b0b2065e1dfd5c32ffe754cbb66b7aaf6df52dc4f856f8a9e0440f6ecf193c56e7506db24ab2b0ede43d9a1185ef84e0036 SHA512 4f13597914427f2e6cea08c6dce9e9bedf5d35a62c8d5dc545e8fb1268ffeb5dece84a27c2a50a8d55a7b8eda1d4fe2bfe18465b0492b45a3684170c5a600072
-DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
deleted file mode 100644
index 5dc1b0089be5..000000000000
--- a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod linux-info toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=3.1.0-r3
-S="${WORKDIR}/${MY_P}"
-
-JNET_DRIVERS="cwain qozap ztgsm"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
- https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
- https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="flash oslec"
-
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
-
-pkg_pretend() {
- use oslec && CONFIG_CHECK+=" ECHO"
- check_extra_config
-}
-
-src_unpack() {
- unpack ${A}
- # Copy the firmware tarballs over, the makefile will try and download them otherwise
- for file in ${A} ; do
- [[ "${file}" = dahdi-fw* ]] || continue
- cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
- die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
- done
- # But without the .bin's it'll still fall over and die, so copy those too.
- mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
- die "Error moving firmware files into the right folders."
-
- for drv in ${JNET_DRIVERS}; do
- ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
- die "Error linking ${drv}.c from jnet to DAHDI."
- ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
- die "Error linking ${drv}.h from jnet to DAHDI."
- done
-}
-
-src_prepare() {
- if use flash; then
- sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
- die "Failed to define FXSFLASH"
- sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
- include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
- fi
- if use oslec; then
- sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
- drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
- fi
- default
-}
-
-src_compile() {
- unset ARCH
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
- DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
- LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
- einfo "Installing kernel module"
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
- DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
- LDFLAGS="$(raw-ldflags)" install
-
- # Remove the blank "version" files (these files are all empty, and root owned).
- find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
-
- # If the kernel sources have a System.map, and there a suitable depmod
- # available (seemingly when we're not cross-compiling), then the kernel
- # sources depmod kicks in. Remove the files caused by that.
- find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
-}
diff --git a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
deleted file mode 100644
index 05ae21da55a6..000000000000
--- a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO_PATCHVERSION=3.1.0-r4
-GENTOO_SOURCEVERSION=3.1.0-r4
-S="${WORKDIR}/${MY_P}"
-
-JNET_DRIVERS="cwain qozap ztgsm"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
- https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
- https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2
- https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="flash oslec"
-
-PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" )
-
-CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
-
-pkg_setup() {
- use oslec && CONFIG_CHECK+=" ECHO"
- linux-mod_pkg_setup
-}
-
-src_unpack() {
- local file drv
-
- unpack ${A}
- # Copy the firmware tarballs over, the makefile will try and download them otherwise
- for file in ${A} ; do
- [[ "${file}" = dahdi-fw* ]] || continue
- cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
- die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
- done
- # But without the .bin's it'll still fall over and die, so copy those too.
- mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
- die "Error moving firmware files into the right folders."
-
- for drv in ${JNET_DRIVERS}; do
- ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
- die "Error linking ${drv}.c from jnet to DAHDI."
- ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
- die "Error linking ${drv}.h from jnet to DAHDI."
- done
-
- # Find the stuff from gentoo-sources (ie, modules that has been removed by
- # upstream and we're re-adding).
- DAHDI_GENTOO_MODULES=""
- for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do
- [[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/"
- [[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o"
- mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed."
- done
-}
-
-src_prepare() {
- if use flash; then
- sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
- die "Failed to define FXSFLASH"
- sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
- include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
- fi
- if use oslec; then
- sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
- drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
- fi
- default
-}
-
-src_compile() {
- unset ARCH
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
- DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
- LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
- einfo "Installing kernel module"
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
- DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \
- LDFLAGS="$(raw-ldflags)" install
-
- # Remove the blank "version" files (these files are all empty, and root owned).
- find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
-
- # If the kernel sources have a System.map, and there a suitable depmod
- # available (seemingly when we're not cross-compiling), then the kernel
- # sources depmod kicks in. Remove the files caused by that.
- find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
-}
diff --git a/net-misc/dahdi/dahdi-3.2.0.ebuild b/net-misc/dahdi/dahdi-3.2.0.ebuild
deleted file mode 100644
index 8b59341edcee..000000000000
--- a/net-misc/dahdi/dahdi-3.2.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO_PATCHVERSION=3.2.0
-GENTOO_SOURCEVERSION=3.2.0
-S="${WORKDIR}/${MY_P}"
-
-JNET_DRIVERS="cwain qozap ztgsm"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
- https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
- https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2
- https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
- https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="flash oslec"
-
-PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" )
-
-CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
-
-pkg_setup() {
- use oslec && CONFIG_CHECK+=" ECHO"
- linux-mod_pkg_setup
-}
-
-src_unpack() {
- local file drv
-
- unpack ${A}
- # Copy the firmware tarballs over, the makefile will try and download them otherwise
- for file in ${A} ; do
- [[ "${file}" = dahdi-fw* ]] || continue
- cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
- die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
- done
- # But without the .bin's it'll still fall over and die, so copy those too.
- mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
- die "Error moving firmware files into the right folders."
-
- for drv in ${JNET_DRIVERS}; do
- ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
- die "Error linking ${drv}.c from jnet to DAHDI."
- ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
- die "Error linking ${drv}.h from jnet to DAHDI."
- done
-
- # Find the stuff from gentoo-sources (ie, modules that has been removed by
- # upstream and we're re-adding).
- DAHDI_GENTOO_MODULES=""
- for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do
- [[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/"
- [[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o"
- mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed."
- done
-}
-
-src_prepare() {
- if use flash; then
- sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
- die "Failed to define FXSFLASH"
- sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
- include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
- fi
- if use oslec; then
- sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
- drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
- fi
- default
-}
-
-src_compile() {
- unset ARCH
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
- DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
- LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
- einfo "Installing kernel module"
- emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
- DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \
- LDFLAGS="$(raw-ldflags)" install
-
- # Remove the blank "version" files (these files are all empty, and root owned).
- find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
-
- # If the kernel sources have a System.map, and there a suitable depmod
- # available (seemingly when we're not cross-compiling), then the kernel
- # sources depmod kicks in. Remove the files caused by that.
- find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
-}
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
deleted file mode 100644
index 2bd89c9cbc5a..000000000000
--- a/net-misc/dahdi/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>jaco@uls.co.za</email>
- <name>Jaco Kroon</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <use>
- <flag name="flash">Support (short) flash on FXS</flag>
- <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag>
- </use>
- <upstream>
- <remote-id type="github">asterisk/dahdi-linux</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 565f763ef590..47b71db74f8f 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1 +1,2 @@
DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
+DIST dhcp-4.4.3-patches.tar.xz 15276 BLAKE2B 4750833f986eccdc60b63de55f0b0633039806d75e1bbb79ea6974990399f2ec33836fd22ec3a0981aaeffc3fcfd914deff96d139f4ea3c2ad1b9010ec737d06 SHA512 c8071f48e4074a7a83e74706868a782c7dc4bcb6df4b9035411e419a95bf90de66ece2b2aacc8f8f3ca517287599cb178704402ff276a4620c941733ce03c57b
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
index 48fb12a0f5d6..f7cc414209db 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit systemd toolchain-funcs flag-o-matic tmpfiles
@@ -13,18 +13,18 @@ MY_P="${PN}-${MY_PV}"
DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="
+ https://downloads.isc.org/isc/dhcp/${MY_P}.tar.gz
+ https://downloads.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/dhcp-4.4.3-patches.tar.xz
+"
+S="${WORKDIR}/${MY_P}"
LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
-BDEPEND="
- acct-group/dhcp
- acct-user/dhcp"
-
DEPEND="
sys-libs/zlib:=
client? (
@@ -41,44 +41,50 @@ RDEPEND="
${BDEPEND}
${DEPEND}
selinux? ( sec-policy/selinux-dhcp )
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
+ vim-syntax? ( app-vim/dhcpd-syntax )
+"
+BDEPEND="
+ acct-group/dhcp
+ acct-user/dhcp
+"
PATCHES=(
# Gentoo patches - these will probably never be accepted upstream
# Fix some permission issues
- "${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-fix-perms.patch"
# Enable dhclient to equery NTP servers
- "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
- "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-ntp.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-resolvconf.patch"
# Enable dhclient to get extra configuration from stdin
- "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-stdin-conf.patch"
# bug #265531
- "${FILESDIR}/${PN}-4.4.3-nogateway.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-nogateway.patch"
# bug #296921
- "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-quieter-ping.patch"
# bug #437108
- "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-always-accept-4.patch"
# bug #480636
- "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-iproute2-path.patch"
# bug #471142
- "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-bindtodevice-inet6.patch"
# bug #559832
- "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-ldap-ipv6-client-id.patch"
+ # bug #908986
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-infiniband.patch"
# Possible upstream candidates
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-configure-clang16.patch"
)
+src_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind || die
+ unpack ./bind.tar.gz
+}
+
src_prepare() {
default
@@ -133,7 +139,7 @@ src_prepare() {
binddir=${binddir}
GMAKE=${MAKE:-gmake}
EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch
+ eapply -p2 "${WORKDIR}"/dhcp-4.4.3-patches/${PN}-4.4.3-bind-disable.patch
# Only use the relevant subdirs now that ISC
#removed the lib/export structure in bind.
sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
@@ -173,9 +179,7 @@ src_configure() {
append-flags -fno-strict-aliasing
# bug #720806, bug #801592
- if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
- append-libs -latomic
- fi
+ append-atomic-flags
local myeconfargs=(
--enable-paranoia
@@ -205,11 +209,14 @@ src_compile() {
emake -C bind/bind-*/lib install
# then build standard dhcp code
emake AR="$(tc-getAR)"
+ emake -C keama AR="$(tc-getAR)"
}
src_install() {
default
+ emake -C keama DESTDIR="${D}" install
+
dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
docinto html
dodoc doc/References.html
diff --git a/net-misc/dhcp/files/dhcpd.conf2 b/net-misc/dhcp/files/dhcpd.conf2
index 5cd2eeca3f71..ac173f8a3576 100644
--- a/net-misc/dhcp/files/dhcpd.conf2
+++ b/net-misc/dhcp/files/dhcpd.conf2
@@ -16,7 +16,9 @@
# All file paths below are relative to the chroot.
# You can specify a different chroot directory but MAKE SURE it's empty.
-# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf
+# Specify a configuration file - the default is based on the service name,
+# so dhcpd would use /etc/dhcp/dhcpd.conf and dhcpd.foo would use
+# /etc/dhcp/dhcpd.foo.conf
# DHCPD_CONF="/etc/dhcp/dhcpd.conf"
# Configure which interface or interfaces to for dhcpd to listen on.
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
index 66b29cd3bb00..8e05625e6345 100644
--- a/net-misc/dhcp/files/dhcpd.init5
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -1,8 +1,11 @@
#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+description="ISC DHCP server"
+
extra_commands="configtest"
+description_configtest="Test the syntax of the configuration file"
: ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf}
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild
index b29581f35d00..52148a4f3933 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NetworkConfiguration/dhcpcd-ui/releases/download/v${
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug gtk libnotify ncurses qt5"
# Qt handles notifications separately, no need for libnotify there
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 1cc1689a8ca7..c7b8244a032f 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,4 +1,4 @@
DIST dhcpcd-10.0.3.tar.xz 268872 BLAKE2B c063fbb44b4a6928ffd84c109c1ed8ae0345c81b732fc75ce1c1aebc51c190fa512de9822c1c6865794db126f4ad2aceef97c4da28d6922cca082b1aeedb4760 SHA512 f4437e9aa094ab38f077c455b012f46cc84a39f97a19eae896a0954f24f2064e91407dc7f7be7fae00faf3455a8e50695e94c406f476f88a61b980169a778560
-DIST dhcpcd-10.0.4.tar.xz 269212 BLAKE2B 770ee398eccff20cd4a37f89b841f8d580d9a42b456d93673ab3bf6ddf1ed0e49feda47ea8c1206a8a8582bccde80f45c3efbf2e1d0e493b06f04e2c6df876af SHA512 8af26c4a42ce63e9cae72de68774807b8739aabd19cc2a0260148f3baa25c587bf34a5a0b80239b54d8ab9b79661744e61b0e316d2c510c4da65615268d3e8cf
DIST dhcpcd-10.0.5.tar.xz 269696 BLAKE2B 52435e2afa4fa5563b629af3f69b149b87de75097d20819423429741e8f2d16df136409180c509ff08b28fd060ad74da4d73057556349b8041c716dbeb7dbcc3 SHA512 f8213eee93e83c174ce5d2487364400fe07b39bb0f052d072518e12f7189136704f65e1f4467432b477f195d64eebe6ca167aec160aed1575ea9ef551b43eb43
+DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004
DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild
index 437899bb6d47..0702947d5bac 100644
--- a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild
index a320e843768a..cd313329537c 100644
--- a/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
@@ -34,6 +34,21 @@ RDEPEND="
)
"
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # These don't exist on Linux/glibc (bug #900264)
+ memset_explicit
+ memset_s
+ setproctitle
+ strtoi
+ consttime_memequal
+ SHA256_Init
+ hmac
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0.6-rebinding.patch
+)
+
src_configure() {
local myeconfargs=(
--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild
new file mode 100644
index 000000000000..fe79878a3bbe
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
+else
+ MY_P="${P/_alpha/-alpha}"
+ MY_P="${MY_P/_beta/-beta}"
+ MY_P="${MY_P/_rc/-rc}"
+ SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}"
+
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
+
+LICENSE="BSD-2 BSD ISC MIT"
+SLOT="0"
+IUSE="debug +embedded ipv6 privsep +udev"
+
+DEPEND="udev? ( virtual/udev )"
+RDEPEND="
+ ${DEPEND}
+ privsep? (
+ acct-group/dhcpcd
+ acct-user/dhcpcd
+ )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # These don't exist on Linux/glibc (bug #900264)
+ memset_explicit
+ memset_s
+ setproctitle
+ strtoi
+ consttime_memequal
+ SHA256_Init
+ hmac
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0.6-rebinding.patch
+ "${FILESDIR}"/${PN}-10.0.6-crash.patch
+)
+
+src_configure() {
+ local myeconfargs=(
+ --dbdir="${EPREFIX}/var/lib/dhcpcd"
+ --libexecdir="${EPREFIX}/lib/dhcpcd"
+ --localstatedir="${EPREFIX}/var"
+ --prefix="${EPREFIX}"
+ --with-hook=ntp.conf
+ $(use_enable debug)
+ $(use_enable embedded)
+ $(use_enable ipv6)
+ $(use_enable privsep)
+ $(usex elibc_glibc '--with-hook=yp.conf' '')
+ --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+ $(usex privsep '--privsepuser=dhcpcd' '')
+ $(usex udev '' '--without-dev --without-udev')
+ CC="$(tc-getCC)"
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ keepdir /var/lib/dhcpcd
+ newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+ systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+ local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+ local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+ local old_duid="${EROOT}"/etc/dhcpcd.duid
+ local new_duid="${dbdir}"/duid
+ if [[ -e "${old_old_duid}" ]] ; then
+ # Upgrade the duid file to the new format if needed
+ if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+ sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+ fi
+
+ # Move the duid to /etc, a more sensible location
+ if [[ ! -e "${old_duid}" ]] ; then
+ cp -p "${old_old_duid}" "${new_duid}"
+ fi
+ old_files+=( "${old_old_duid}" )
+ fi
+
+ # dhcpcd-7 moves the files out of /etc
+ if [[ -e "${old_duid}" ]] ; then
+ if [[ ! -e "${new_duid}" ]] ; then
+ cp -p "${old_duid}" "${new_duid}"
+ fi
+ old_files+=( "${old_duid}" )
+ fi
+ local old_secret="${EROOT}"/etc/dhcpcd.secret
+ local new_secret="${dbdir}"/secret
+ if [[ -e "${old_secret}" ]] ; then
+ if [[ ! -e "${new_secret}" ]] ; then
+ cp -p "${old_secret}" "${new_secret}"
+ fi
+ old_files+=( "${old_secret}" )
+ fi
+
+ # dhcpcd-7 renames some files in /var/lib/dhcpcd
+ local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+ local new_rdm="${dbdir}"/rdm_monotonic
+ if [[ -e "${old_rdm}" ]] ; then
+ if [[ ! -e "${new_rdm}" ]] ; then
+ cp -p "${old_rdm}" "${new_rdm}"
+ fi
+ old_files+=( "${old_rdm}" )
+ fi
+ local lease=
+ for lease in "${dbdir}"/dhcpcd-*.lease*; do
+ [[ -f "${lease}" ]] || continue
+ old_files+=( "${lease}" )
+ local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+ [[ -e "${dbdir}/${new_lease}" ]] && continue
+ cp "${lease}" "${dbdir}/${new_lease}"
+ done
+
+ # Warn about removing stale files
+ if [[ -n "${old_files[@]}" ]] ; then
+ elog
+ elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+ elog "${EROOT}/etc to ${dbdir}"
+ elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+ elog "prefix dropped."
+ elog
+ elog "You should remove these files if you don't plan on reverting"
+ elog "to an older version:"
+ local old_file=
+ for old_file in ${old_files[@]}; do
+ elog " ${old_file}"
+ done
+ fi
+
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog
+ elog "dhcpcd has zeroconf support active by default."
+ elog "This means it will always obtain an IP address even if no"
+ elog "DHCP server can be contacted, which will break any existing"
+ elog "failover support you may have configured in your net configuration."
+ elog "This behaviour can be controlled with the noipv4ll configuration"
+ elog "file option or the -L command line switch."
+ elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+ elog
+ elog "Dhcpcd has duid enabled by default, and this may cause issues"
+ elog "with some dhcp servers. For more information, see"
+ elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+ fi
+
+ if ! has_version net-dns/bind-tools; then
+ elog
+ elog "If you activate the lookup-hostname hook to look up your hostname"
+ elog "using the dns, you need to install net-dns/bind-tools."
+ fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6.ebuild
index a320e843768a..914373137e7d 100644
--- a/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.0.6.ebuild
@@ -34,6 +34,17 @@ RDEPEND="
)
"
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # These don't exist on Linux/glibc (bug #900264)
+ memset_explicit
+ memset_s
+ setproctitle
+ strtoi
+ consttime_memequal
+ SHA256_Init
+ hmac
+)
+
src_configure() {
local myeconfargs=(
--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index a320e843768a..914373137e7d 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -34,6 +34,17 @@ RDEPEND="
)
"
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # These don't exist on Linux/glibc (bug #900264)
+ memset_explicit
+ memset_s
+ setproctitle
+ strtoi
+ consttime_memequal
+ SHA256_Init
+ hmac
+)
+
src_configure() {
local myeconfargs=(
--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch
new file mode 100644
index 000000000000..5b61e3ca37ef
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch
@@ -0,0 +1,46 @@
+https://github.com/NetworkConfiguration/dhcpcd/issues/179
+https://github.com/NetworkConfiguration/dhcpcd/issues/283
+https://bugzilla.redhat.com/2262996
+https://github.com/NetworkConfiguration/dhcpcd/commit/727c78f503d456875e2a3cee7609288b537d9d25
+
+From 727c78f503d456875e2a3cee7609288b537d9d25 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Fri, 16 Feb 2024 17:15:35 +0100
+Subject: [PATCH] Move dhcp(v4) packet size check earlier (#295)
+
+dhcp_handlebootp handled zero sized packets correctly, but
+dhcp_redirect_dhcp did not have such protection. Move size check before
+both of them. Size when called from dhcp_packet is checked by
+is_packet_udp_bootp call. Only dhcp_recvmsg needs earlier checking to be
+added.
+
+Fixes #283
+--- a/src/dhcp.c
++++ b/src/dhcp.c
+@@ -3532,12 +3532,6 @@ dhcp_handlebootp(struct interface *ifp, struct bootp *bootp, size_t len,
+ {
+ size_t v;
+
+- if (len < offsetof(struct bootp, vend)) {
+- logerrx("%s: truncated packet (%zu) from %s",
+- ifp->name, len, inet_ntoa(*from));
+- return;
+- }
+-
+ /* Unlikely, but appeases sanitizers. */
+ if (len > FRAMELEN_MAX) {
+ logerrx("%s: packet exceeded frame length (%zu) from %s",
+@@ -3670,6 +3664,13 @@ dhcp_recvmsg(struct dhcpcd_ctx *ctx, struct msghdr *msg)
+ logerr(__func__);
+ return;
+ }
++
++ if (iov->iov_len < offsetof(struct bootp, vend)) {
++ logerrx("%s: truncated packet (%zu) from %s",
++ ifp->name, iov->iov_len, inet_ntoa(from->sin_addr));
++ return;
++ }
++
+ state = D_CSTATE(ifp);
+ if (state == NULL) {
+ /* Try re-directing it to another interface. */
diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch
new file mode 100644
index 000000000000..6457368f1150
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/920652#c2
+https://github.com/NetworkConfiguration/dhcpcd/commit/8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663
+
+From 8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Sun, 24 Dec 2023 12:07:25 +0000
+Subject: [PATCH] DHCP: DECLINE address on ARP defend failure
+
+Also, drop the lease.
+This should get us a new address from the DHCP server when we
+re-enter DISCOVER to avoid looping on the same address and fail
+again.
+---
+ src/dhcp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/dhcp.c b/src/dhcp.c
+index 014ce6cf..a58e1db2 100644
+--- a/src/dhcp.c
++++ b/src/dhcp.c
+@@ -1944,7 +1944,11 @@ dhcp_expire(void *arg)
+ static void
+ dhcp_decline(struct interface *ifp)
+ {
++ struct dhcp_state *state = D_STATE(ifp);
+
++ // Set the expired state so we send over BPF as this could be
++ // an address defence failure.
++ state->added |= STATE_EXPIRED;
+ send_message(ifp, DHCP_DECLINE, NULL);
+ }
+ #endif
+@@ -2098,8 +2102,12 @@ static void
+ dhcp_arp_defend_failed(struct arp_state *astate)
+ {
+ struct interface *ifp = astate->iface;
++ struct dhcp_state *state = D_STATE(ifp);
+
++ if (!(ifp->options->options & (DHCPCD_INFORM | DHCPCD_STATIC)))
++ dhcp_decline(ifp);
+ dhcp_drop(ifp, "EXPIRED");
++ dhcp_unlink(ifp->ctx, state->leasefile);
+ dhcp_start1(ifp);
+ }
+ #endif
+
diff --git a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild
index b6fa854d515d..fb3201a46045 100644
--- a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild
+++ b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild
@@ -33,7 +33,9 @@ src_configure() {
# Uses removed 'register' keyword
append-cxxflags -std=c++14
- econf $(use_enable resolvconf)
+ econf \
+ --cache-file="${S}"/config.cache \
+ $(use_enable resolvconf)
}
src_compile() {
diff --git a/net-misc/downloader-cli/Manifest b/net-misc/downloader-cli/Manifest
index 68d573893923..c8987c2f78c8 100644
--- a/net-misc/downloader-cli/Manifest
+++ b/net-misc/downloader-cli/Manifest
@@ -1,2 +1 @@
-DIST downloader_cli-0.3.3.tar.gz 10881 BLAKE2B 489e49d679be3570ee348ec73091cc3458953d4b37c552a9a417af2421e9c032624214300418ff8c93decda6bad7622e6208a08dc216f40d1195f849dc11d0d3 SHA512 4210cc3c09f4c9d07c3ea7335b6ea356393f539ef26e3a231b3278359e853165b8145c1f6186b657e2cee02b515748f7ffc87966cc30e082b0d2b282b9557c72
DIST downloader_cli-0.3.4.tar.gz 14479 BLAKE2B d45ec6399b6ccd76141a85440faeac040b11565c1d7db6316c23026008238e11601346ff433ec2f18516fef2f34f2e87d94460b64bfe875569c6da236e4ba63e SHA512 ace252bc6129b463c644ef7c34d07cd37759030fc4b4b853e049a2377226cdc73a6661f4e8ca7721b7af11f9daf548c81f25f73fde405e633091d614a05ed4f6
diff --git a/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild b/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
deleted file mode 100644
index 12f30759df62..000000000000
--- a/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple downloader with an customizable progressbar"
-HOMEPAGE="
- https://github.com/deepjyoti30/downloader-cli/
- https://pypi.org/project/downloader-cli/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild b/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild
index d380311907f1..75b02a2b00c8 100644
--- a/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild
+++ b/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,13 +9,20 @@ PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 pypi
DESCRIPTION="Simple downloader with an customizable progressbar"
-HOMEPAGE="
- https://github.com/deepjyoti30/downloader-cli/
- https://pypi.org/project/downloader-cli/
-"
+HOMEPAGE="https://github.com/deepjyoti30/downloader-cli/
+ https://pypi.org/project/downloader-cli/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+ dev-python/urllib3[${PYTHON_USEDEP}]
+"
+
+EPYTEST_DESELECT=(
+ tests/test_download.py::test__preprocess_conn
+ tests/test_download.py::test_file_integrity
+)
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
+distutils_enable_tests pytest
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index c762d488c638..34b3afeaf523 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,2 +1,4 @@
DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422
DIST dropbear-2022.83.tar.bz2.asc 833 BLAKE2B 7dfcf13804738aed3136c264412f8c2f96cd3ff71482815af736346c9441c8f00adef26f4e8f89082cbbb4033249501adbc545c08f678e1cac4afc88a8fc9ed0 SHA512 e5cbd01dcbaeabb04dc473bd11933a422fda03ceb5bc02fb5c99abafd0841e3ac1f436cc1798500b33fbbc81923fa03c2a28c971fa26794ed5888d496fb7e2ad
+DIST dropbear-2024.84.tar.bz2 2306278 BLAKE2B ba5a433f2a313aeeabc8e3e3696c4d79e96095dfc5cf045f15e6de5912f2f44bdddee103d86f659ee58fe8013fc9c2fb8c3af9cba089ee415e2f28179a365dca SHA512 254daea819c5aeaa65bb43449386fb964f4aa13e3b3037fe11064120205c6e265925e7ef2d84f7ebe66c6a00cf0a22e6010314c065ed49a3815f47137b7aca44
+DIST dropbear-2024.84.tar.bz2.asc 833 BLAKE2B 0b8c9fdf8c24836b03f36d3e98b6b906a3aaeda9bd283b3d2001b9b1e363a19e02a536febfe19c3c851c378d32a3efb067910a68dd4a7b2174b96fd8faedf1b3 SHA512 69ce84ea8f6ba2c7f7718578befa301c3a0342b7f6acb3ecb5d6ac4b82710fb22d0bc11f5632ae00f222c1cc2b50f48e50d16eee4ebb93bf08069774769ebb13
diff --git a/net-misc/dropbear/dropbear-2024.84.ebuild b/net-misc/dropbear/dropbear-2024.84.ebuild
new file mode 100644
index 000000000000..85944fe6b816
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2024.84.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc
+inherit pam python-any-r1 savedconfig verify-sig
+
+DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+ https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+SRC_URI+=" verify-sig? (
+ https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
+ https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
+ )"
+
+LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+ virtual/libcrypt[static-libs(+)]
+ zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="
+ acct-group/sshd
+ acct-user/sshd
+ !static? (
+ >=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
+ >=dev-libs/libtommath-1.2.0
+ ${LIB_DEPEND//\[static-libs(+)]}
+ )
+ pam? ( sys-libs/pam )
+"
+DEPEND="
+ ${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+BDEPEND="
+ test? (
+ sys-libs/nss_wrapper
+ $(python_gen_any_dep '
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/iniconfig[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pluggy[${PYTHON_USEDEP}]
+ dev-python/py[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ ')
+ )
+ verify-sig? ( sec-keys/openpgp-keys-dropbear )
+"
+
+REQUIRED_USE="pam? ( !static )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2024.84-dbscp.patch
+ "${FILESDIR}"/${PN}-2022.82-tests.patch
+ "${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch
+ "${FILESDIR}"/${PN}-2024.84-fix-channels-tests.patch
+ "${FILESDIR}"/${PN}-2024.84-test-bg-sleep.patch
+)
+
+set_options() {
+ progs=(
+ dropbear dbclient dropbearkey
+ $(usev !minimal "dropbearconvert scp")
+ )
+ makeopts=(
+ MULTI=$(usex multicall 1 0)
+ )
+}
+
+python_check_deps() {
+ python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
+ if use static ; then
+ ewarn "Using bundled copies of libtommath and libtomcrypt"
+ fi
+}
+
+src_prepare() {
+ default
+ sed \
+ -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+ -e '/DROPBEAR_X11FWD/s:0:1:' \
+ src/default_options.h > localoptions.h || die
+ sed \
+ -e '/pam_start/s:sshd:dropbear:' \
+ -i src/svr-authpam.c || die
+ restore_config localoptions.h
+
+ # remove tests that fail
+ rm test/test_aslr.py || die
+
+ # dropbearconver is not build with USE minimal
+ if use minimal; then
+ rm test/test_dropbearconvert.py || die
+ fi
+}
+
+src_configure() {
+ # Notes:
+ # 1) We use bundled libtom* when static build is enabled because
+ # libtomcrypt lacks it and we don't particularly want to add it.
+ # 2) We disable the hardening flags as our compiler already enables them
+ # by default as is appropriate for the target.
+ local myeconfargs=(
+ --disable-harden
+
+ # bug #836900
+ $(use_enable !elibc_musl lastlog)
+ $(use_enable !elibc_musl wtmp)
+
+ $(use_enable static bundled-libtom)
+ $(use_enable zlib)
+ $(use_enable pam)
+ $(use_enable !bsdpty openpty)
+ $(use_enable shadow)
+ $(use_enable static)
+ $(use_enable syslog)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ set_options
+ emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+
+ # need symlinks for tests
+ if use multicall && use test; then
+ local x
+ for x in "${progs[@]}" ; do
+ ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+ done
+ fi
+}
+
+src_install() {
+ set_options
+ emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+ doman manpages/*.8
+ newinitd "${FILESDIR}"/dropbear.init.d dropbear
+ newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+ dodoc CHANGES README.md SMALL.md MULTI.md
+
+ # The multi install target does not install the links right.
+ if use multicall ; then
+ pushd "${ED}"/usr/bin &> /dev/null || die
+ local x
+ for x in "${progs[@]}" ; do
+ ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+ done
+ rm -f dropbear
+ dodir /usr/sbin
+ dosym -r /usr/bin/dropbearmulti /usr/sbin/dropbear
+ popd &> /dev/null || die
+ fi
+ save_config localoptions.h
+
+ if ! use minimal ; then
+ mv "${ED}"/usr/bin/{,db}scp || die
+ fi
+
+ if use pam; then
+ pamd_mimic system-remote-login dropbear auth account password session
+ fi
+}
diff --git a/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch b/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch
new file mode 100644
index 000000000000..52095e1427de
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch
@@ -0,0 +1,20 @@
+--- a/src/dbmulti.c
++++ b/src/dbmulti.c
+@@ -60,7 +60,7 @@
+ }
+ #endif
+ #ifdef DBMULTI_scp
+- if (strcmp(progname, "scp") == 0) {
++ if ((strcmp(progname, "scp") == 0) || (strcmp(progname, "dbscp") == 0)) {
+ return scp_main(argc, argv);
+ }
+ #endif
+@@ -81,7 +81,7 @@
+ "'dropbearconvert' - the key converter\n"
+ #endif
+ #ifdef DBMULTI_scp
+- "'scp' - secure copy\n"
++ "'dbscp' - secure copy\n"
+ #endif
+ ,
+ DROPBEAR_VERSION);
diff --git a/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch
new file mode 100644
index 000000000000..0db292da8332
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch
@@ -0,0 +1,36 @@
+dbclient obeys $HOME, but dropbear (the server) resolves HOME using getpwnam.
+Use sys-libs/nss_wrapper to fake it during tests.
+
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -4,7 +4,15 @@ SHELL=bash
+
+ all: test
+
++uid:=$(shell id -u)
++gid:=$(shell id -g)
+ test: fakekey
++ mkdir -p ~/.ssh
++ ../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear
++ ../dropbearkey -y -f ~/.ssh/id_dropbear | grep ^ecdsa > ~/.ssh/authorized_keys
++ echo "$(LOGNAME)::$(uid):$(gid):$(USER):$(HOME):/bin/bash" >> ~/passwd
++ echo "$(LOGNAME)::$(gid):" >> ~/group
++ chmod 0700 ~ ~/.ssh ~/.ssh/authorized_keys ~/passwd ~/group
+ pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir)
+
+ one: fakekey
+--- a/test/test_dropbear.py
++++ b/test/test_dropbear.py
+@@ -27,7 +27,11 @@ def dropbear(request):
+ ]
+ print("subprocess args: ", args)
+
+- p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True)
++ env = os.environ
++ env['LD_PRELOAD'] = 'libnss_wrapper.so'
++ env['NSS_WRAPPER_PASSWD'] = env['HOME'] + '/passwd'
++ env['NSS_WRAPPER_GROUP'] = env['HOME'] + '/group'
++ p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True, env=env)
+ # Wait until it has started listening
+ for l in p.stderr:
+ if "Not backgrounding" in l:
diff --git a/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch
new file mode 100644
index 000000000000..84314f5fd7fa
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch
@@ -0,0 +1,13 @@
+Force tests to be non-interactive
+
+--- a/test/test_dropbear.py
++++ b/test/test_dropbear.py
+@@ -23,7 +23,7 @@
+ args = opt.dropbear.split() + [
+ "-p", LOCALADDR + ":" + opt.port, # bind locally only
+ "-r", opt.hostkey,
+- "-F", "-E",
++ "-F", "-E", "-s",
+ ]
+ print("subprocess args: ", args)
+
diff --git a/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch b/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch
new file mode 100644
index 000000000000..a078eb2e68b6
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch
@@ -0,0 +1,14 @@
+One test passes when run with ebuild ... test, but fails when run by portage.
+Mark it as xfail.
+
+--- a/test/test_channels.py
++++ b/test/test_channels.py
+@@ -45,7 +45,7 @@
+ r.check_returncode()
+ assert r.stdout.decode() == dat
+
+-@pytest.mark.parametrize("fd", [1, 2])
++@pytest.mark.parametrize("fd", [1, pytest.param(2, marks=pytest.mark.xfail(reason="Fails sometimes"))])
+ def test_bg_sleep(request, fd, dropbear):
+ # https://lists.ucc.asn.au/pipermail/dropbear/2006q1/000362.html
+ # Rob Landley "Is this a bug?" 24 Mar 2006
diff --git a/net-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml
index 4491864b760d..80473cbd3d8f 100644
--- a/net-misc/dropbear/metadata.xml
+++ b/net-misc/dropbear/metadata.xml
@@ -27,5 +27,6 @@
</use>
<upstream>
<remote-id type="cpe">cpe:/a:matt_johnston:dropbear_ssh_server</remote-id>
+ <remote-id type="github">mkj/dropbear</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index bf534b1fdbb6..6805cc564f55 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1 +1,2 @@
DIST dropbox-cli-2023.py.xz 14308 BLAKE2B e0e1f28c911e5744f26bc3854e1283884f7daa57c247f0a13cd5f571124edca1f11e61ea487bccae294b34c4ce30884758662f95d0438efd1e0e3e64ead6a819 SHA512 c11928de24c6ab10c142eedfa244a903795b37bb75e7e805dbf28fe5b18f524db210eb432bf43eb3c99d67b0caca51c85bbe533b3d7d877cfdc7595925483294
+DIST dropbox-cli-2024.01.22.py.xz 14316 BLAKE2B c2bc33a6d1f74103a3685340747c8d9c974f75e0deec4cd97690333b7697730aa61beef1b315f1375a29d02c6bdf2609464b8ff41cffe7b7ec6efd5978762207 SHA512 272ad65476c8ebd55154feb848e1027b891c91252ca3fa3f50c7db84a7c71697843ae999716a671f697b891721b5c536927c2e63fd2c2afd298a37770aebf123
diff --git a/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild b/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild
new file mode 100644
index 000000000000..d2c3eb6fe937
--- /dev/null
+++ b/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit python-r1 bash-completion-r1
+
+DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
+HOMEPAGE="https://www.dropbox.com/"
+# https://linux.dropbox.com/packages/dropbox.py
+# https://www.dropbox.com/download?dl=packages/dropbox.py
+# https://raw.githubusercontent.com/dropbox/nautilus-dropbox/master/dropbox.in
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
+S=${WORKDIR}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gpg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="net-misc/dropbox
+ ${PYTHON_DEPS}
+ gpg? ( app-crypt/gpgme[python] )
+ dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+src_install() {
+ newbin ${P}.py ${PN}
+ python_replicate_script "${D}"/usr/bin/${PN}
+ newbashcomp "${FILESDIR}"/${PN}-19-completion ${PN}
+}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 97b1190d72af..65582d99871d 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,5 +1,5 @@
DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-186.4.6207.tar.gz 112963615 BLAKE2B 4fc315f224c3d198ccbc4c489f28263643be99832d0319b22c760fe7fa95e6525283870544e5a1496ce982bbcc5daffed91ba93ff15717e37eba7ecd721b45b8 SHA512 4508781d4e8a33c455b2617cccae777f0837fd0cf131b6ed0f0128f7855f99998c135a36f84abe7ea6a6641e069d0c930c31fe40d45cf50742b7cfd1f64fee83
-DIST dropbox-lnx.x86-187.4.5691.tar.gz 113372020 BLAKE2B 48733ca8db7c3394de67db9b7a62f48287f79d1ca9dca6a566be6cd2d138a777598e01a286b42b9de0855e4b6c8ce323beb25aefdca0d5ae23b1766e9f68fa7c SHA512 d7e18e19784c59299eec42b07c37ce7727e683d79d63c42f659239586366f4e1492ff52b9a77e4e3b3bd264004e97e3a23a0440632b9a2a903ac1082855916a1
-DIST dropbox-lnx.x86_64-186.4.6207.tar.gz 114657435 BLAKE2B 43c7eb102367143c01cdd0e1e83fdb7d5f19fff43923001aa123cf3cc90a67d9f606bda504ecde11a3dbe7c9eb31b835780738b77e207c2cf1a18a54015bd4f7 SHA512 851b902fae583e8154b77a3c2fd1b212a146e5a11aef71ab5c3231bba4d38964244f1edde4637840dfe4bdd2c4776c592c31c9e54a0d98346933784322a773fb
-DIST dropbox-lnx.x86_64-187.4.5691.tar.gz 115019595 BLAKE2B 6368557a5370fc54f8ac36c365f79693ad91b2d0ce6094be7c7c7e6ec29af4c1d386947de4892b18c583caf6bc15c2c9e8b818cbcfaf3238b7f966e419525c2f SHA512 de7461dc7fe51c9f968dec06733d800842454ed2af3c9959ddadd8019d694d60b88e175982d03034030d0047f70923c304a3e0a389e58354ed4e56b8c9da6234
+DIST dropbox-lnx.x86-195.4.4995.tar.gz 113305439 BLAKE2B 87dc38715189e06e98e5895389909f45a38208c8471ec92b9fb278c054ee5711d2acf95bdad01d34c097b96c8e3fe47d230af6bec8d3d2ff6782b1b477e23b61 SHA512 bf9ed46f1a34d96155b0d8f0c9d4a3583344d9eb06585e8e6c04e93dfcae7c55585861f31c2d70e79ba41f0141491aaf2b2c6b28b2baa9faf213ecdd97542fa8
+DIST dropbox-lnx.x86-196.4.6900.tar.gz 113848883 BLAKE2B 05ef3a79d3bbc67a15cd6ede011883424686b7302761ed49a9456735718c05f80a9a273e431283d1b32790b52ec3c6bdbce0253a5a570bdfd47c21f9d02e12be SHA512 652adbace0abbcbfa2729e9e5af11bafd1459924d67180f5be82e3c0feb81b8333307c3cfeb7e528cdcc576062783a1275bba82217bf3761b62b89775d0d3155
+DIST dropbox-lnx.x86_64-195.4.4995.tar.gz 115954161 BLAKE2B 86f349f6813e160eea71a6c32e37ee8213639dfaa6c69b0a560bfee8e90dae6a95fd0f3b822d6c029e3046d73aa088fb097ce9246c1c0786df9c292b40091adc SHA512 e4ad740d873dbdad995f05fcfda824f57a8ed4707acab66576284c97c00329ef1dbe2d55980694f2edc8a00fbc6ab20a08ca7afcc12488d9fb188cddc0c3501f
+DIST dropbox-lnx.x86_64-196.4.6900.tar.gz 116604283 BLAKE2B 5398f43c33e488d346c9991952673b607e88f93467915ac7e341e29de6e66cb4f60bcc6311a0e261075df38834e53da7a38ac10b20bd4cf5d41f70394668ba13 SHA512 a43cdee6cb192085c484cbaf1aa54691ce8dc24eb682c3f2fb8f8ff7135f7590e4dbfeed33ec3afbd5dbfe2bb6fd72a8c136329ebd9e8223fcd5c63819d25429
diff --git a/net-misc/dropbox/dropbox-186.4.6207.ebuild b/net-misc/dropbox/dropbox-195.4.4995.ebuild
index b0b4cee9bbeb..e90baaad900e 100644
--- a/net-misc/dropbox/dropbox-186.4.6207.ebuild
+++ b/net-misc/dropbox/dropbox-195.4.4995.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop pax-utils systemd xdg
diff --git a/net-misc/dropbox/dropbox-187.4.5691.ebuild b/net-misc/dropbox/dropbox-196.4.6900.ebuild
index e1949fb60f88..7d9715a71882 100644
--- a/net-misc/dropbox/dropbox-187.4.5691.ebuild
+++ b/net-misc/dropbox/dropbox-196.4.6900.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop pax-utils systemd xdg
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
deleted file mode 100644
index b1cf22dd457d..000000000000
--- a/net-misc/econnman/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST econnman-1.1_p20160305.tar.xz 240428 BLAKE2B 6417b30fd110416f6339b4dfad9edaff2888e9fb9562451ffb13661664c1e51d45f513a192f7850f8030caab13ebd914a138ff6cd596ed09c7210940c98ce748 SHA512 c50155a286e8a8d20deb4d5bf30ce91cc97e7323bc6dd209a16c767c3a1d6f30aab0d3b60c3a14df091d086fc10c2584d7bf56c59c95af684af3d2af7eff726c
diff --git a/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild b/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild
deleted file mode 100644
index 8b5bc55fe2dc..000000000000
--- a/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="ConnMan User Interface written with EFL & python"
-HOMEPAGE="https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/"
-SRC_URI="https://dev.gentoo.org/~juippis/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- dev-libs/efl[X,connman]
- $(python_gen_cond_dep '
- dev-python/python-efl[${PYTHON_USEDEP}]
- ')"
-
-src_prepare() {
- default
- python_fix_shebang econnman-bin.in
- eautoreconf
-}
-
-src_install() {
- default
- rm -r "${ED}"/var/ || die
-}
diff --git a/net-misc/econnman/metadata.xml b/net-misc/econnman/metadata.xml
deleted file mode 100644
index a1fbf3c0c993..000000000000
--- a/net-misc/econnman/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>juippis@gentoo.org</email>
- <name>Joonas Niilola</name>
- </maintainer>
-</pkgmetadata>
diff --git a/net-misc/electron-cash/electron-cash-4.2.11.ebuild b/net-misc/electron-cash/electron-cash-4.2.11.ebuild
index 8028eb404b26..993cd0db3cc4 100644
--- a/net-misc/electron-cash/electron-cash-4.2.11.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.2.11.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
PYTHON_REQ_USE="ncurses?"
@@ -32,6 +33,8 @@ REQUIRED_USE="
vkb? ( qt5 )
"
+BDEPEND="${DISTUTILS_DEPS}"
+
RDEPEND="
dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/ecdsa[${PYTHON_USEDEP}]
@@ -65,7 +68,9 @@ src_prepare() {
eapply "${FILESDIR}/3.3.6-no-user-root.patch"
# Prevent icon from being installed in the wrong location
- sed -i '/icons/d' setup.py || die
+ sed -e '/icons/d' \
+ -e "s:\\(os.path.join(\\)share_dir:\\1'share':" \
+ -i setup.py || die
if use qt5; then
pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die
diff --git a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild
index 64c650229a76..bc67b230cfc0 100644
--- a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild
+++ b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ RDEPEND="
dev-libs/libsecp256k1
dev-python/scrypt[${PYTHON_USEDEP}]
>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
- =dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
+ =dev-python/aiorpcx-0.22*[${PYTHON_USEDEP}]
>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
dev-python/bitstring[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 37e638aaaf9c..fac2490a9d79 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1 +1 @@
-DIST electrum-4.4.6.gh.tar.gz 5637532 BLAKE2B c6b7667c7699f9eb11013c446e203ac4205df1d78e2fb8d44309bd6340c85bd9b4f6aef364f9bf9da4f262b58c74a7830c290c0659cd388b4a50863926dffa67 SHA512 e643a7119a8746d0f9ae02888bcdcf5ab4216ea19483113cf270b2cf23c8c615f0013a2aaf2c5f488655bf52cd190ab76761fa54f4b851039bc7add0c05ad320
+DIST electrum-4.5.4.gh.tar.gz 4911082 BLAKE2B 89a58966426b705e0ddfadd75d4c2996976abb66695edd5d426c0232f58a2da701f20112f31a2498858c61a4a1cd9e048b44072bad128b54651929b96341c1c3 SHA512 3fda9a931067e35d8bc11da8855553a1208428975fe65b0fc20eb26bdd2c3840b5c3ed4261e60344c7256461887d286e432568ef385d9c6b1216e708e099b34b
diff --git a/net-misc/electrum/electrum-4.4.6.ebuild b/net-misc/electrum/electrum-4.5.4.ebuild
index 78458a0ccfd1..2c984c185636 100644
--- a/net-misc/electrum/electrum-4.4.6.ebuild
+++ b/net-misc/electrum/electrum-4.5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="ncurses?"
inherit distutils-r1 xdg-utils
@@ -28,12 +28,13 @@ REQUIRED_USE="|| ( cli ncurses qt5 )"
RDEPEND="
${PYTHON_DEPS}
<dev-libs/libsecp256k1-0.4
- >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
- =dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
- >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-socks-0.8.4[${PYTHON_USEDEP}]
+ =dev-python/aiorpcx-0.22*[${PYTHON_USEDEP}]
+ >=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
dev-python/bitstring[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+ dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/pbkdf2[${PYTHON_USEDEP}]
dev-python/pyperclip[${PYTHON_USEDEP}]
dev-python/PySocks[${PYTHON_USEDEP}]
@@ -57,6 +58,11 @@ BDEPEND="
distutils_enable_tests pytest
+EPYTEST_IGNORE=(
+ # test for qml/PyQt6 GUI that doesn't work anyway
+ tests/test_qml_types.py
+)
+
src_prepare() {
# use backwards-compatible cryptodome API
sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index 005748ccc618..3d1ca19deac3 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -1,3 +1,2 @@
-DIST ena-driver-2.10.0-linux.tar.gz 1215248 BLAKE2B 625be1635ef5bd8094d277f196187126bf7cf2900002eca2dc5d292befd38ed0577fc0978ef699654584e01f9e03e3ef6055aecaada61401d5fe819fc3f48934 SHA512 0a4b40a7989bed2435124da854a47c4bad8ae079058d49b4140a8fb581fc58481be912907df2ec33e4d788eaf61eb92521aced0113cc19a1bb545e01d64bb533
-DIST ena-driver-2.8.9-linux.tar.gz 1205931 BLAKE2B 9ea92eadb53b38b717a26652f386609d279616e153836ad7b2d88ccf4f7647b7db98ce9029fc117a79389b002bf4c427e689f3ed52f572fab5d8ba02a9f0c1aa SHA512 be3f647ed54326b8d585e9c5e85b002fbdced5ef037940ed21d3cbaebbcd36745d1baccfd9e35bd32e297d6f1d25aa2a0af30d9fee372df81bd7eb2a49d7a0f8
-DIST ena-driver-2.9.1-linux.tar.gz 1209574 BLAKE2B 4d7d577882d2a4e97a43efb1ccc1dfec5b978685367f010bb07685f812f3d95b262229be480e4b92c7855466ee48ff6da81bfe4f48af4f48bb5bb7f9f813eafa SHA512 df312a0b034247266eb7ecb8ae9900b991a9a5fcace1f06e00b28502ec43e90b3979c62bbfecc4ab224ec564fe57a5ea0c4fa44c5af1393224bdc30e283051df
+DIST ena-driver-2.11.1-linux.tar.gz 1441591 BLAKE2B 39db9d21efd0d7f810304a1be0be13dd0c944419a9e5aee5a60c3dee310f990af9787cb297e36e718aa3f62ff3a7e9ce4e8302a19efcc3b151438869827b540d SHA512 f27c556a902ee276022ddafec7cda70790280587f470968f233e3de09a7dac3b49f43a2b7dba1018489c9ff5f0f554201fe63b82533c6a627b7f533c2b4910c5
+DIST ena-driver-2.12.0-linux.tar.gz 1443210 BLAKE2B f8e13e6c8cbaa6946221c9ca09fdda1a1233b5c7b728bac92a26b8afcb19e5187f9fafd00cad795d3815b399fc7421c50efde08b0684ea31e4a9cea363766263 SHA512 34871c46a907c868dbe511761c43104fc00965850011ac8d9efe4103460858dd79ae57576cd5dea038f84901cf23c4dad00c49a167333d60743b84cf2169125c
diff --git a/net-misc/ena-driver/ena-driver-2.9.1.ebuild b/net-misc/ena-driver/ena-driver-2.11.1.ebuild
index eb8ed9525827..098c3b683de7 100644
--- a/net-misc/ena-driver/ena-driver-2.9.1.ebuild
+++ b/net-misc/ena-driver/ena-driver-2.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/ena-driver/ena-driver-2.10.0.ebuild b/net-misc/ena-driver/ena-driver-2.12.0.ebuild
index eb8ed9525827..098c3b683de7 100644
--- a/net-misc/ena-driver/ena-driver-2.10.0.ebuild
+++ b/net-misc/ena-driver/ena-driver-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/ena-driver/ena-driver-2.8.9.ebuild b/net-misc/ena-driver/ena-driver-2.8.9.ebuild
deleted file mode 100644
index e7f73db785b4..000000000000
--- a/net-misc/ena-driver/ena-driver-2.8.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver"
-HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html"
-SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena"
-
-CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB"
-DOCS=(
- README.rst
- RELEASENOTES.md
-)
-
-src_compile() {
- local modlist=( ena=net )
- local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" )
- linux-mod-r1_src_compile
-}
diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest
index b4852cf947ee..2560fb8bb15c 100644
--- a/net-misc/etherdfs/Manifest
+++ b/net-misc/etherdfs/Manifest
@@ -1,2 +1,2 @@
-DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439
+DIST etherdfs-tsr-0.8.3.zip 13139 BLAKE2B 5907974d9c4c2f97f737ead66ab5a3f0934d5086a07cfdc2483e7ef236d993d784a3686811bdf615f85a6112647e9d538de463d6453536e13c04a5ae7c082393 SHA512 489d61f13a1233ce94ce8ce4b0ad7400cceab3fd4b864efff94fe142f0703b6d76713a66ebd941b979af2d515192ed196ba1b33ae283647b5181dfbed27a8d97
DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e
diff --git a/net-misc/etherdfs/etherdfs-20180203-r4.ebuild b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild
index 9a85cc57a896..6dae1d2c447e 100644
--- a/net-misc/etherdfs/etherdfs-20180203-r4.ebuild
+++ b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
MY_PN="ethersrv-linux"
-MY_PV_TSR="0.8.2"
+MY_PV_TSR="0.8.3"
MY_P="${MY_PN}-${PV}"
inherit systemd toolchain-funcs
@@ -13,7 +13,7 @@ DESCRIPTION="An ethernet-based file system for DOS"
HOMEPAGE="http://etherdfs.sourceforge.net/"
SRC_URI="
mirror://sourceforge/${PN}/${MY_P}.tar.xz
- tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${P}.zip )
+ tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${PN}-tsr-${MY_PV_TSR}.zip )
"
S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/etherdfs/metadata.xml b/net-misc/etherdfs/metadata.xml
index d9337e277c43..24fb39b58029 100644
--- a/net-misc/etherdfs/metadata.xml
+++ b/net-misc/etherdfs/metadata.xml
@@ -11,7 +11,7 @@
to a local drive letter, using raw ethernet frames to communicate.
</longdescription>
<use>
- <flag name="tsr">Build the TSR program for DOS, which acts as a client.</flag>
+ <flag name="tsr">Install the precompiled TSR program for DOS, which acts as a client.</flag>
</use>
<upstream>
<remote-id type="sourceforge">etherdfs</remote-id>
diff --git a/net-misc/eventd/metadata.xml b/net-misc/eventd/metadata.xml
index 8f637f01963e..d6a2d2e180c9 100644
--- a/net-misc/eventd/metadata.xml
+++ b/net-misc/eventd/metadata.xml
@@ -8,7 +8,6 @@
(Note: not required for local notifications via <pkg>net-misc/eventd</pkg>)</flag>
<flag name="notification">Enable plugin to display on-screen notifications</flag>
<flag name="purple">Enable plugin for IM notifications via libpurple</flag>
- <flag name="speech">Enable plugin for Text-To-Speech support</flag>
<flag name="webhook">Enable plugin to send payloads to webhook handlers</flag>
<flag name="websocket">Enable support for WebSocket protocol</flag>
</use>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 6190d97c3e83..798a7bb5dc53 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,5 +1,2 @@
-DIST freerdp-2.10.0.tar.gz 7321489 BLAKE2B 92b4b45670a5ed3b41713d1e036d41a9ef5714ddf9273a4b88fadf5c8435a467a53144f42bd969a44e641995a7f94b6c7b43b85f0ede738b1a1213e3bada9788 SHA512 a5749e3140d74c66d51869b405852bdaa776ca7d82e50a1e3ed19ccf56ed91a4ad9c3ce2c8ee6ff0abbb29d915c2e7278a1fcea04d73fd5ba4014f6590484477
-DIST freerdp-2.11.0.tar.gz 7325731 BLAKE2B 7cf2805065b870d959461a41b2b5cc7a5d00121078c0a5f51db0f2d83c4a5eb64aba75d0c1e184edf3546b4df87150b30f81ad88b301366ccaeaec59120085ca SHA512 97ce19f392e2b197830e22f12870e787fce85a7d9342cd7b7043c1efc45f5773410901b27de11bf1b70ca36dd6d7d102b3dd34eace813892a72d44dc290a8703
-DIST freerdp-2.11.1.tar.gz 7325835 BLAKE2B 2b6e62cd46627c60c3e815216711d3c5c9839d232aa5cb8653d92870bb46d93c40f2f44e0abf7ef6e5f44d92239541ae44d37366f343a1992fdbc8f09452fba0 SHA512 efd9d44bdc15047322600046fdcd17e37f14c84d75badc77e8ea53da6e065f33725be2f3c03e02031867124b62b32ad9deeabf8cc8f79321e7a866f552e63f2d
-DIST freerdp-2.11.2.tar.gz 7326213 BLAKE2B 5d044d660df1e5115ffde13389be79e852711161ad1969017a9ba662e5f278fc98b86efbc59a24c3ea32a137c24ed308ef5c9eb89db1c24f37f1b8b41bfd3c45 SHA512 2e0e74cba22ed0b33fd6453dd76f6a1ffb3107d1868276faf3eea25bd58d3d869c2ce7c6c467896ecc94ca71c0582beb029a0d44f50df38cc26661f85d0822fb
-DIST freerdp-3.0.0-beta3.tar.gz 8950651 BLAKE2B f5171d76da635bd05b4a267383ffb150b4c214820b79624b1988d297e44a4bfd3d7b34fbc4ac88f79d973e6eb4372700fe53910078eaf36ea7fc553cc6ed6e4f SHA512 a9e61c30254ba5e894c70b981fae4d6311d20546d4352e5a584361b3b7232f6cc075bf7d7c1e9e5a52c820c36a185120f095306ec36ff72489f7dce0cb7e0fbb
+DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
+DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5
diff --git a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
deleted file mode 100644
index 586ae641b58e..000000000000
--- a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/901003
-https://github.com/FreeRDP/FreeRDP/issues/8686
-https://github.com/FreeRDP/FreeRDP/commit/7f55c97d60453738323e0ecafe6d357019528227
-
-From 7f55c97d60453738323e0ecafe6d357019528227 Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Tue, 14 Feb 2023 07:48:54 +0100
-Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API
-
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP
- }
- }
-
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
- if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
- mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
-+#endif
-
- return TRUE;
- }
---- a/libfreerdp/codec/h264_ffmpeg.c
-+++ b/libfreerdp/codec/h264_ffmpeg.c
-@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264)
- goto EXCEPTION;
- }
-
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
- if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
- {
- sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED;
- }
-+#endif
-
- #ifdef WITH_VAAPI
-
diff --git a/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch
new file mode 100644
index 000000000000..8d45331bd95b
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch
@@ -0,0 +1,329 @@
+https://github.com/FreeRDP/FreeRDP/issues/9616
+
+From 8b349f4f2b5d14e28a6a73e9c2b9860d7f275bc4 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 7 Dec 2023 15:54:38 -0500
+Subject: [PATCH] Revert "[codec] encode messages considering endianness"
+
+This reverts commit e3ef8a02ddf079bcf6dfa58888db69a709ce50c9.
+---
+ libfreerdp/codec/nsc_encode.c | 76 +++++++++++++----------------------
+ libfreerdp/codec/rfx_encode.c | 74 +++++++++++++---------------------
+ 2 files changed, 58 insertions(+), 92 deletions(-)
+
+diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c
+index 477318cc1..fd9626a6d 100644
+--- a/libfreerdp/codec/nsc_encode.c
++++ b/libfreerdp/codec/nsc_encode.c
+@@ -119,8 +119,6 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI
+ UINT16 rw;
+ BYTE ccl;
+ const BYTE* src;
+- const UINT32* src_32;
+- const UINT16* src_16;
+ BYTE* yplane = NULL;
+ BYTE* coplane = NULL;
+ BYTE* cgplane = NULL;
+@@ -142,85 +140,69 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI
+ coplane = context->priv->PlaneBuffers[1] + y * rw;
+ cgplane = context->priv->PlaneBuffers[2] + y * rw;
+ aplane = context->priv->PlaneBuffers[3] + y * context->width;
+- src_32 = (UINT32*)src;
+- src_16 = (UINT16*)src;
+
+ for (x = 0; x < context->width; x++)
+ {
+ switch (context->format)
+ {
+ case PIXEL_FORMAT_BGRX32:
+- b_val = (INT16)(*src_32 & 0xFF);
+- g_val = (INT16)((*src_32 >> 8) & 0xFF);
+- r_val = (INT16)((*src_32 >> 16) & 0xFF);
++ b_val = *src++;
++ g_val = *src++;
++ r_val = *src++;
++ src++;
+ a_val = 0xFF;
+- src_32++;
+ break;
+
+ case PIXEL_FORMAT_BGRA32:
+- b_val = (INT16)(*src_32 & 0xFF);
+- g_val = (INT16)((*src_32 >> 8) & 0xFF);
+- r_val = (INT16)((*src_32 >> 16) & 0xFF);
+- a_val = (INT16)((*src_32 >> 24) & 0xFF);
+- src_32++;
++ b_val = *src++;
++ g_val = *src++;
++ r_val = *src++;
++ a_val = *src++;
+ break;
+
+ case PIXEL_FORMAT_RGBX32:
+- r_val = (INT16)(*src_32 & 0xFF);
+- g_val = (INT16)((*src_32 >> 8) & 0xFF);
+- b_val = (INT16)((*src_32 >> 16) & 0xFF);
++ r_val = *src++;
++ g_val = *src++;
++ b_val = *src++;
++ src++;
+ a_val = 0xFF;
+- src_32++;
+ break;
+
+ case PIXEL_FORMAT_RGBA32:
+- r_val = (INT16)(*src_32 & 0xFF);
+- g_val = (INT16)((*src_32 >> 8) & 0xFF);
+- b_val = (INT16)((*src_32 >> 16) & 0xFF);
+- a_val = (INT16)((*src_32 >> 24) & 0xFF);
+- src_32++;
++ r_val = *src++;
++ g_val = *src++;
++ b_val = *src++;
++ a_val = *src++;
+ break;
+
+ case PIXEL_FORMAT_BGR24:
+-#ifdef __LITTLE_ENDIAN__
+ b_val = *src++;
+ g_val = *src++;
+ r_val = *src++;
+-#else
+- r_val = *src++;
+- g_val = *src++;
+- b_val = *src++;
+-#endif
+ a_val = 0xFF;
+ break;
+
+ case PIXEL_FORMAT_RGB24:
+-#ifdef __LITTLE_ENDIAN__
+ r_val = *src++;
+ g_val = *src++;
+ b_val = *src++;
+-#else
+- b_val = *src++;
+- g_val = *src++;
+- r_val = *src++;
+-#endif
+ a_val = 0xFF;
+ break;
+
+ case PIXEL_FORMAT_BGR16:
+- b_val = (INT16)((*src_16) & 0x1F);
+- g_val = (INT16)((*src_16 >> 5) & 0x3F);
+- r_val = (INT16)((*src_16 >> 11) & 0x1F);
++ b_val = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5));
++ g_val = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3));
++ r_val = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07));
+ a_val = 0xFF;
+- src_16++;
++ src += 2;
+ break;
+
+ case PIXEL_FORMAT_RGB16:
+- r_val = (INT16)((*src_16) & 0x1F);
+- g_val = (INT16)((*src_16 >> 5) & 0x3F);
+- b_val = (INT16)((*src_16 >> 11) & 0x1F);
++ r_val = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5));
++ g_val = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3));
++ b_val = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07));
+ a_val = 0xFF;
+- src_16++;
++ src += 2;
+ break;
+
+ case PIXEL_FORMAT_A4:
+@@ -228,17 +210,17 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI
+ int shift;
+ BYTE idx;
+ shift = (7 - (x % 8));
+- idx = (BYTE)(((*src_32 & 0xFF) >> shift) & 1);
+- idx |= (BYTE)(((((*src_32 >> 8) & 0xFF) >> shift) & 1) << 1);
+- idx |= (BYTE)(((((*src_32 >> 16) & 0xFF) >> shift) & 1) << 2);
+- idx |= (BYTE)(((((*src_32 >> 24) & 0xFF) >> shift) & 1) << 3);
++ idx = ((*src) >> shift) & 1;
++ idx |= (((*(src + 1)) >> shift) & 1) << 1;
++ idx |= (((*(src + 2)) >> shift) & 1) << 2;
++ idx |= (((*(src + 3)) >> shift) & 1) << 3;
+ idx *= 3;
+ r_val = (INT16)context->palette[idx];
+ g_val = (INT16)context->palette[idx + 1];
+ b_val = (INT16)context->palette[idx + 2];
+
+ if (shift == 0)
+- src_32++;
++ src += 4;
+ }
+
+ a_val = 0xFF;
+diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c
+index 355f74340..b4f393605 100644
+--- a/libfreerdp/codec/rfx_encode.c
++++ b/libfreerdp/codec/rfx_encode.c
+@@ -49,8 +49,6 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ int x_exceed;
+ int y_exceed;
+ const BYTE* src;
+- const UINT32* src_32;
+- const UINT16* src_16;
+ INT16 r, g, b;
+ INT16 *r_last, *g_last, *b_last;
+ x_exceed = 64 - width;
+@@ -59,8 +57,6 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ for (y = 0; y < height; y++)
+ {
+ src = rgb_data + y * rowstride;
+- src_32 = (UINT32*)src;
+- src_16 = (UINT16*)src;
+
+ switch (pixel_format)
+ {
+@@ -68,10 +64,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ case PIXEL_FORMAT_BGRA32:
+ for (x = 0; x < width; x++)
+ {
+- *b_buf++ = (INT16)(*src_32 & 0xFF);
+- *g_buf++ = (INT16)((*src_32 >> 8) & 0xFF);
+- *r_buf++ = (INT16)((*src_32 >> 16) & 0xFF);
+- src_32++;
++ *b_buf++ = (INT16)(*src++);
++ *g_buf++ = (INT16)(*src++);
++ *r_buf++ = (INT16)(*src++);
++ src++;
+ }
+
+ break;
+@@ -80,10 +76,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ case PIXEL_FORMAT_ABGR32:
+ for (x = 0; x < width; x++)
+ {
+- *b_buf++ = (INT16)((*src_32 >> 8) & 0xFF);
+- *g_buf++ = (INT16)((*src_32 >> 16) & 0xFF);
+- *r_buf++ = (INT16)((*src_32 >> 24) & 0xFF);
+- src_32++;
++ src++;
++ *b_buf++ = (INT16)(*src++);
++ *g_buf++ = (INT16)(*src++);
++ *r_buf++ = (INT16)(*src++);
+ }
+
+ break;
+@@ -92,10 +88,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ case PIXEL_FORMAT_RGBA32:
+ for (x = 0; x < width; x++)
+ {
+- *r_buf++ = (INT16)(*src_32 & 0xFF);
+- *g_buf++ = (INT16)((*src_32 >> 8) & 0xFF);
+- *b_buf++ = (INT16)((*src_32 >> 16) & 0xFF);
+- src_32++;
++ *r_buf++ = (INT16)(*src++);
++ *g_buf++ = (INT16)(*src++);
++ *b_buf++ = (INT16)(*src++);
++ src++;
+ }
+
+ break;
+@@ -104,10 +100,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ case PIXEL_FORMAT_ARGB32:
+ for (x = 0; x < width; x++)
+ {
+- *r_buf++ = (INT16)((*src_32 >> 8) & 0xFF);
+- *g_buf++ = (INT16)((*src_32 >> 16) & 0xFF);
+- *b_buf++ = (INT16)((*src_32 >> 24) & 0xFF);
+- src_32++;
++ src++;
++ *r_buf++ = (INT16)(*src++);
++ *g_buf++ = (INT16)(*src++);
++ *b_buf++ = (INT16)(*src++);
+ }
+
+ break;
+@@ -115,15 +111,9 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ case PIXEL_FORMAT_BGR24:
+ for (x = 0; x < width; x++)
+ {
+-#ifdef __LITTLE_ENDIAN__
+ *b_buf++ = (INT16)(*src++);
+ *g_buf++ = (INT16)(*src++);
+ *r_buf++ = (INT16)(*src++);
+-#else
+- *r_buf++ = (INT16)(*src++);
+- *g_buf++ = (INT16)(*src++);
+- *b_buf++ = (INT16)(*src++);
+-#endif
+ }
+
+ break;
+@@ -131,15 +121,9 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ case PIXEL_FORMAT_RGB24:
+ for (x = 0; x < width; x++)
+ {
+-#ifdef __LITTLE_ENDIAN__
+ *r_buf++ = (INT16)(*src++);
+ *g_buf++ = (INT16)(*src++);
+ *b_buf++ = (INT16)(*src++);
+-#else
+- *b_buf++ = (INT16)(*src++);
+- *g_buf++ = (INT16)(*src++);
+- *r_buf++ = (INT16)(*src++);
+-#endif
+ }
+
+ break;
+@@ -147,10 +131,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ case PIXEL_FORMAT_BGR16:
+ for (x = 0; x < width; x++)
+ {
+- *b_buf++ = (INT16)((*src_16) & 0x1F);
+- *g_buf++ = (INT16)((*src_16 >> 5) & 0x3F);
+- *r_buf++ = (INT16)((*src_16 >> 11) & 0x1F);
+- src_16++;
++ *b_buf++ = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5));
++ *g_buf++ = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3));
++ *r_buf++ = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07));
++ src += 2;
+ }
+
+ break;
+@@ -158,10 +142,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ case PIXEL_FORMAT_RGB16:
+ for (x = 0; x < width; x++)
+ {
+- *r_buf++ = (INT16)((*src_16 & 0x1F));
+- *g_buf++ = (INT16)((*src_16 >> 5) & 0x3F);
+- *b_buf++ = (INT16)((*src_16 >> 11) & 0x1F);
+- src_16++;
++ *r_buf++ = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5));
++ *g_buf++ = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3));
++ *b_buf++ = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07));
++ src += 2;
+ }
+
+ break;
+@@ -175,17 +159,17 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
+ int shift;
+ BYTE idx;
+ shift = (7 - (x % 8));
+- idx = (BYTE)(((*src_32 & 0xFF) >> shift) & 1);
+- idx |= (BYTE)(((((*src_32 >> 8) & 0xFF) >> shift) & 1) << 1);
+- idx |= (BYTE)(((((*src_32 >> 16) & 0xFF) >> shift) & 1) << 2);
+- idx |= (BYTE)(((((*src_32 >> 24) & 0xFF) >> shift) & 1) << 3);
++ idx = ((*src) >> shift) & 1;
++ idx |= (((*(src + 1)) >> shift) & 1) << 1;
++ idx |= (((*(src + 2)) >> shift) & 1) << 2;
++ idx |= (((*(src + 3)) >> shift) & 1) << 3;
+ idx *= 3;
+ *r_buf++ = (INT16)palette[idx];
+ *g_buf++ = (INT16)palette[idx + 1];
+ *b_buf++ = (INT16)palette[idx + 2];
+
+ if (shift == 0)
+- src_32++;
++ src += 4;
+ }
+
+ break;
+--
+2.43.0
+
diff --git a/net-misc/freerdp/files/freerdp-2.11.2-clang.patch b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch
new file mode 100644
index 000000000000..b05492a3effd
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch
@@ -0,0 +1,29 @@
+https://github.com/FreeRDP/FreeRDP/pull/9373
+https://bugs.gentoo.org/916515
+
+From 88dd68153c834e1d5f59beb59496bfd1bf9697a8 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@cn.fujitsu.com>
+Date: Mon, 11 Sep 2023 00:31:54 +0000
+Subject: [PATCH] Fixes clang error error: incompatible function pointer types
+ assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const
+ void *)' [-Wincompatible-function-pointer-types] | obj->fnObjectNew =
+ uwac_event_clone; | ^ ~~~~~~~~~~~~~~~~
+
+Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
+---
+ client/Wayland/wlfreerdp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c
+index 5be10aae2c1b..ef3539383f55 100644
+--- a/client/Wayland/wlfreerdp.c
++++ b/client/Wayland/wlfreerdp.c
+@@ -598,7 +598,7 @@ static void wlf_client_free(freerdp* instance, rdpContext* context)
+ DeleteCriticalSection(&wlf->critical);
+ }
+
+-static void* uwac_event_clone(const void* val)
++static void* uwac_event_clone(void* val)
+ {
+ UwacEvent* copy;
+ const UwacEvent* ev = (const UwacEvent*)val;
diff --git a/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch
new file mode 100644
index 000000000000..549c813f774b
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch
@@ -0,0 +1,279 @@
+https://github.com/FreeRDP/FreeRDP/pull/9992
+https://bugs.gentoo.org/921252
+
+From 0242240ba7a61945607b835f378ff077e4582780 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:05:30 +0100
+Subject: [PATCH 1/8] [winpr,clipboard] fix incompatible WCHAR pointer
+
+---
+ winpr/libwinpr/clipboard/synthetic_file.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c
+index 14219806c76e..e748f8bea399 100644
+--- a/winpr/libwinpr/clipboard/synthetic_file.c
++++ b/winpr/libwinpr/clipboard/synthetic_file.c
+@@ -276,7 +276,13 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l
+ const WCHAR* remote_name, wArrayList* files)
+ {
+ BOOL result = FALSE;
+- const WCHAR* wildcard = "/\0*\0\0\0";
++ union
++ {
++ const char* c;
++ const WCHAR* w;
++ } wildcard;
++ const char buffer[4] = "/\0*\0\0\0";
++ wildcard.c = buffer;
+ const size_t wildcardLen = 3;
+
+ WINPR_ASSERT(clipboard);
+@@ -290,7 +296,7 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l
+ return FALSE;
+
+ _wcsncat(namebuf, local_name, len);
+- _wcsncat(namebuf, wildcard, wildcardLen);
++ _wcsncat(namebuf, wildcard.w, wildcardLen);
+
+ result = do_add_directory_contents_to_list(clipboard, local_name, remote_name, namebuf, files);
+
+
+From b1f60a1d117da2a6775dc12ab7e9b62c95615550 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:07:17 +0100
+Subject: [PATCH 2/8] [winpr,smartcard] fix incompatible PCSC_SCardListReaders
+ pointer
+
+---
+ winpr/libwinpr/smartcard/smartcard_pcsc.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c
+index fb04d5684aa0..c94b4caafe1e 100644
+--- a/winpr/libwinpr/smartcard/smartcard_pcsc.c
++++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c
+@@ -992,8 +992,14 @@ static LONG WINAPI PCSC_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGrou
+ return SCARD_E_NO_MEMORY;
+ }
+
+- status =
+- PCSC_SCardListReaders_Internal(hContext, mszGroupsA, (LPSTR*)&mszReadersA, pcchReaders);
++ union
++ {
++ LPSTR* ppc;
++ LPSTR pc;
++ } cnv;
++ cnv.ppc = &mszReadersA;
++
++ status = PCSC_SCardListReaders_Internal(hContext, mszGroupsA, cnv.pc, pcchReaders);
+ if (status == SCARD_S_SUCCESS)
+ {
+ size_t size = 0;
+
+From 48eaca08048918260d4dca05e9522118657e8210 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:10:39 +0100
+Subject: [PATCH 3/8] [core,license] fix incompatible WCHAR pointer
+
+---
+ libfreerdp/core/license.c | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c
+index 99d4fa25fc84..e6c622a6b087 100644
+--- a/libfreerdp/core/license.c
++++ b/libfreerdp/core/license.c
+@@ -2802,18 +2802,25 @@ BOOL license_server_send_request(rdpLicense* license)
+ return license_set_state(license, LICENSE_STATE_REQUEST);
+ }
+
+-static BOOL license_set_string(const char* what, const char* value, WCHAR** dst, UINT32* dstLen)
++static BOOL license_set_string(const char* what, const char* value, BYTE** bdst, UINT32* dstLen)
+ {
+ WINPR_ASSERT(what);
+ WINPR_ASSERT(value);
+- WINPR_ASSERT(dst);
++ WINPR_ASSERT(bdst);
+ WINPR_ASSERT(dstLen);
+
++ union
++ {
++ WCHAR** w;
++ BYTE** b;
++ } cnv;
++ cnv.b = bdst;
++
+ size_t len = 0;
+- *dst = (BYTE*)ConvertUtf8ToWCharAlloc(value, &len);
+- if (!*dst || (len > UINT32_MAX / sizeof(WCHAR)))
++ *cnv.w = ConvertUtf8ToWCharAlloc(value, &len);
++ if (!*cnv.w || (len > UINT32_MAX / sizeof(WCHAR)))
+ {
+- WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *dst,
++ WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *cnv.w,
+ len);
+ return FALSE;
+ }
+
+From 0717b4de1549390a3404af823bd36db66772abd2 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:10:59 +0100
+Subject: [PATCH 4/8] [winpr,crt] fix incompatible WCHAR pointer
+
+---
+ winpr/libwinpr/crt/test/TestUnicodeConversion.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c
+index a5c4c75e8f71..187a068aedaa 100644
+--- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c
++++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c
+@@ -24,10 +24,12 @@ typedef struct
+ // TODO: The unit tests do not check for valid code points, so always end the test
+ // strings with a simple ASCII symbol for now.
+ static const testcase_t unit_testcases[] = {
+- { "foo", 3, "f\x00o\x00o\x00\x00\x00", 3 },
+- { "foo", 4, "f\x00o\x00o\x00\x00\x00", 4 },
++ { "foo", 3, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 3 },
++ { "foo", 4, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 4 },
+ { "✊🎅ęʥ꣸𑗊a", 19,
+- "\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00\x00", 9 }
++ (const WCHAR*)"\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00"
++ "\x00",
++ 9 }
+ };
+
+ static void create_prefix(char* prefix, size_t prefixlen, size_t buffersize, SSIZE_T rc,
+
+From cab7b59fccabc0f09d659bd499c03dab7e911ffa Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:13:40 +0100
+Subject: [PATCH 5/8] [codec,rfx] explicitly cast return
+
+cast to avoid compilation issues with incompatible-pointer-types
+---
+ libfreerdp/codec/rfx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
+index c83cfd5c1ac3..66ed1e04aea2 100644
+--- a/libfreerdp/codec/rfx.c
++++ b/libfreerdp/codec/rfx.c
+@@ -1368,7 +1368,7 @@ const RFX_TILE** rfx_message_get_tiles(const RFX_MESSAGE* message, UINT16* numTi
+ WINPR_ASSERT(message);
+ if (numTiles)
+ *numTiles = message->numTiles;
+- return message->tiles;
++ return (const RFX_TILE**)message->tiles;
+ }
+
+ UINT16 rfx_message_get_tile_count(const RFX_MESSAGE* message)
+
+From 86966912502a3667c111d35dc9ba577a8b209a6d Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:17:29 +0100
+Subject: [PATCH 6/8] [client,common] fix incompatible-pointer-types
+
+use a union to cast to expected types.
+---
+ client/common/file.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/client/common/file.c b/client/common/file.c
+index feb37967fc5a..39b08f18c916 100644
+--- a/client/common/file.c
++++ b/client/common/file.c
+@@ -2299,9 +2299,15 @@ BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSett
+ if (~file->RedirectLocation)
+ {
+ size_t count = 0;
+- char** str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count);
+- const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, str);
+- free(str);
++ union
++ {
++ void* pv;
++ char** str;
++ const char** cstr;
++ } cnv;
++ cnv.str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count);
++ const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, cnv.cstr);
++ free(cnv.pv);
+ if (!rc)
+ return FALSE;
+ }
+
+From dfdb8a849ef78a6e5d1530489ad7f899c62c9c22 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:18:09 +0100
+Subject: [PATCH 7/8] [channels,drive] fix wrong function usage
+
+_wcslen is for WCHAR, wcslen for wchar_t
+---
+ channels/drive/client/drive_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c
+index 0fdc2e08ff50..04f8d837fa6b 100644
+--- a/channels/drive/client/drive_main.c
++++ b/channels/drive/client/drive_main.c
+@@ -511,7 +511,7 @@ static UINT drive_process_irp_query_volume_information(DRIVE_DEVICE* drive, IRP*
+ /* http://msdn.microsoft.com/en-us/library/cc232101.aspx */
+ const WCHAR* diskType =
+ InitializeConstWCharFromUtf8("FAT32", LabelBuffer, ARRAYSIZE(LabelBuffer));
+- const size_t diskTypeLen = (wcslen(diskType) + 1) * sizeof(WCHAR);
++ const size_t diskTypeLen = (_wcslen(diskType) + 1) * sizeof(WCHAR);
+ const size_t length = 12ul + diskTypeLen;
+ Stream_Write_UINT32(output, length); /* Length */
+
+
+From 00ec91dc16724f7aad8866b4f988baad4c1216a8 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:25:00 +0100
+Subject: [PATCH 8/8] [server,shadow] cast incompatible pointer
+
+the context pointer to WTSOpenServerA is intentional, cast to LPSTR to
+match definition
+---
+ server/shadow/shadow_client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c
+index 0fd52363eb6d..f2a5f63cb188 100644
+--- a/server/shadow/shadow_client.c
++++ b/server/shadow/shadow_client.c
+@@ -252,7 +252,7 @@ static BOOL shadow_client_context_new(freerdp_peer* peer, rdpContext* context)
+ goto fail;
+
+ region16_init(&(client->invalidRegion));
+- client->vcm = WTSOpenServerA(peer->context);
++ client->vcm = WTSOpenServerA((LPSTR)peer->context);
+
+ if (!client->vcm || client->vcm == INVALID_HANDLE_VALUE)
+ goto fail;
+From 00f4c9612a924f1b87a7dcdd2a5728d9e9616ee6 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 19:57:02 +0100
+Subject: [PATCH] [winpr,clipboard] fix WCHAR buffer size
+
+---
+ winpr/libwinpr/clipboard/synthetic_file.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c
+index e748f8bea399..ce70e1efc26e 100644
+--- a/winpr/libwinpr/clipboard/synthetic_file.c
++++ b/winpr/libwinpr/clipboard/synthetic_file.c
+@@ -281,9 +281,9 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l
+ const char* c;
+ const WCHAR* w;
+ } wildcard;
+- const char buffer[4] = "/\0*\0\0\0";
++ const char buffer[6] = "/\0*\0\0\0";
+ wildcard.c = buffer;
+- const size_t wildcardLen = 3;
++ const size_t wildcardLen = ARRAYSIZE(buffer) / sizeof(WCHAR);
+
+ WINPR_ASSERT(clipboard);
+ WINPR_ASSERT(local_name);
diff --git a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
deleted file mode 100644
index ca7d9504ea65..000000000000
--- a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
- case ${PV} in
- 2.*) EGIT_BRANCH="stable-2.0";;
- esac
-else
- MY_P=${P/_/-}
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/openssl:0=
- sys-libs/zlib:0
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- usb? (
- virtual/libudev:0=
- sys-apps/util-linux:0=
- dev-libs/dbus-glib:0=
- virtual/libusb:1=
- )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
- ffmpeg? ( media-video/ffmpeg:0= )
- !ffmpeg? (
- x11-libs/cairo:0=
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- x11-libs/libXrandr
- )
- jpeg? ( media-libs/libjpeg-turbo:0= )
- kerberos? ( virtual/krb5 )
- openh264? ( media-libs/openh264:0= )
- pulseaudio? ( media-libs/libpulse )
- server? (
- X? (
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- xinerama? ( x11-libs/libXinerama )
- )
- )
- smartcard? ( sys-apps/pcsc-lite )
- systemd? ( sys-apps/systemd:0= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
- )
- X? (
- x11-libs/libX11
- x11-libs/libxkbfile
- )
-"
-DEPEND="
- ${RDEPEND}
- valgrind? ( dev-util/valgrind )
-"
-BDEPEND="
- virtual/pkgconfig
- X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ffmpeg-6.patch
-)
-
-src_configure() {
- # bug #881695
- filter-lto
-
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
- -DCHANNEL_URBDRC=$(usex usb ON OFF)
- -DWITH_ALSA=$(usex alsa ON OFF)
- -DWITH_CCACHE=OFF
- -DWITH_CUPS=$(usex cups ON OFF)
- -DWITH_DEBUG_ALL=$(usex debug ON OFF)
- -DWITH_MANPAGES=$(usex doc ON OFF)
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
- -DWITH_CAIRO=$(usex ffmpeg OFF ON)
- -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
- -DWITH_JPEG=$(usex jpeg ON OFF)
- -DWITH_GSSAPI=$(usex kerberos ON OFF)
- -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
- -DWITH_OPENH264=$(usex openh264 ON OFF)
- -DWITH_PULSE=$(usex pulseaudio ON OFF)
- -DWITH_SERVER=$(usex server ON OFF)
- -DWITH_PCSC=$(usex smartcard ON OFF)
- -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
- -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
- -DWITH_X11=$(usex X ON OFF)
- -DWITH_XINERAMA=$(usex xinerama ON OFF)
- -DWITH_XV=$(usex xv ON OFF)
- -DWITH_WAYLAND=$(usex wayland ON OFF)
- )
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=()
- use elibc_musl && myctestargs+=( -E TestBacktrace )
- cmake_src_test
-}
diff --git a/net-misc/freerdp/freerdp-2.11.1.ebuild b/net-misc/freerdp/freerdp-2.11.1.ebuild
deleted file mode 100644
index c02216b06c7b..000000000000
--- a/net-misc/freerdp/freerdp-2.11.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
- case ${PV} in
- 2.*) EGIT_BRANCH="stable-2.0";;
- esac
-else
- MY_P=${P/_/-}
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/openssl:0=
- sys-libs/zlib:0
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- usb? (
- virtual/libudev:0=
- sys-apps/util-linux:0=
- dev-libs/dbus-glib:0=
- virtual/libusb:1=
- )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
- ffmpeg? ( media-video/ffmpeg:0= )
- !ffmpeg? (
- x11-libs/cairo:0=
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- x11-libs/libXrandr
- )
- icu? ( dev-libs/icu:0= )
- jpeg? ( media-libs/libjpeg-turbo:0= )
- kerberos? ( virtual/krb5 )
- openh264? ( media-libs/openh264:0= )
- pulseaudio? ( media-libs/libpulse )
- server? (
- X? (
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- xinerama? ( x11-libs/libXinerama )
- )
- )
- smartcard? ( sys-apps/pcsc-lite )
- systemd? ( sys-apps/systemd:0= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
- )
- X? (
- x11-libs/libX11
- x11-libs/libxkbfile
- )
-"
-DEPEND="
- ${RDEPEND}
- valgrind? ( dev-util/valgrind )
-"
-BDEPEND="
- virtual/pkgconfig
- X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) )
-"
-
-src_configure() {
- # bug #881695
- filter-lto
-
- local mycmakeargs=(
- -Wno-dev
- -DBUILD_TESTING=$(usex test ON OFF)
- -DCHANNEL_URBDRC=$(usex usb ON OFF)
- -DWITH_ALSA=$(usex alsa ON OFF)
- -DWITH_CCACHE=OFF
- -DWITH_CUPS=$(usex cups ON OFF)
- -DWITH_DEBUG_ALL=$(usex debug ON OFF)
- -DWITH_MANPAGES=$(usex doc ON OFF)
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
- -DWITH_CAIRO=$(usex ffmpeg OFF ON)
- -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
- -DWITH_ICU=$(usex icu ON OFF)
- -DWITH_JPEG=$(usex jpeg ON OFF)
- -DWITH_GSSAPI=$(usex kerberos ON OFF)
- -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
- -DWITH_OPENH264=$(usex openh264 ON OFF)
- -DWITH_OSS=OFF
- -DWITH_PULSE=$(usex pulseaudio ON OFF)
- -DWITH_SERVER=$(usex server ON OFF)
- -DWITH_PCSC=$(usex smartcard ON OFF)
- -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
- -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
- -DWITH_X11=$(usex X ON OFF)
- -DWITH_XINERAMA=$(usex xinerama ON OFF)
- -DWITH_XV=$(usex xv ON OFF)
- -DWITH_WAYLAND=$(usex wayland ON OFF)
- )
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=()
- use elibc_musl && myctestargs+=( -E TestBacktrace )
- cmake_src_test
-}
diff --git a/net-misc/freerdp/freerdp-2.11.2.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
index 2a906f8c6a0d..3d4aabfb96d7 100644
--- a/net-misc/freerdp/freerdp-2.11.2.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,11 +22,17 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol"
HOMEPAGE="https://www.freerdp.com/"
LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
+SLOT="2"
+IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
RESTRICT="!test? ( test )"
-RDEPEND="
+BDEPEND="
+ virtual/pkgconfig
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+"
+
+COMMON_DEPEND="
dev-libs/openssl:0=
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
@@ -72,60 +78,78 @@ RDEPEND="
)
smartcard? ( sys-apps/pcsc-lite )
systemd? ( sys-apps/systemd:0= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
+ client? (
+ wayland? (
+ dev-libs/wayland
+ x11-libs/libxkbcommon
+ )
)
X? (
x11-libs/libX11
x11-libs/libxkbfile
)
"
-DEPEND="
- ${RDEPEND}
- valgrind? ( dev-util/valgrind )
+DEPEND="${COMMON_DEPEND}
+ valgrind? ( dev-debug/valgrind )
"
-BDEPEND="
- virtual/pkgconfig
- X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) )
+RDEPEND="${COMMON_DEPEND}
+ !net-misc/freerdp:0
+ client? ( !net-misc/freerdp:3[client] )
+ server? ( !net-misc/freerdp:3[server] )
"
+PATCHES=(
+ "${FILESDIR}/freerdp-2.11.2-clang.patch"
+ "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
+)
+
+option() {
+ usex "$1" ON OFF
+}
+
+option_client() {
+ if use client; then
+ option "$1"
+ else
+ echo OFF
+ fi
+}
+
src_configure() {
# bug #881695
filter-lto
local mycmakeargs=(
-Wno-dev
- -DBUILD_TESTING=$(usex test ON OFF)
- -DCHANNEL_URBDRC=$(usex usb ON OFF)
- -DWITH_ALSA=$(usex alsa ON OFF)
+ -DBUILD_TESTING=$(option test)
+ -DCHANNEL_URBDRC=$(option usb)
+ -DWITH_ALSA=$(option alsa)
-DWITH_CCACHE=OFF
- -DWITH_CUPS=$(usex cups ON OFF)
- -DWITH_DEBUG_ALL=$(usex debug ON OFF)
- -DWITH_MANPAGES=$(usex doc ON OFF)
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
- -DWITH_CAIRO=$(usex ffmpeg OFF ON)
- -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
- -DWITH_ICU=$(usex icu ON OFF)
- -DWITH_JPEG=$(usex jpeg ON OFF)
- -DWITH_GSSAPI=$(usex kerberos ON OFF)
- -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
- -DWITH_OPENH264=$(usex openh264 ON OFF)
+ -DWITH_CUPS=$(option cups)
+ -DWITH_CLIENT=$(option client)
+ -DWITH_DEBUG_ALL=$(option debug)
+ -DWITH_MANPAGES=ON
+ -DWITH_FFMPEG=$(option ffmpeg)
+ -DWITH_SWSCALE=$(option ffmpeg)
+ -DWITH_CAIRO=$(option !ffmpeg)
+ -DWITH_DSP_FFMPEG=$(option ffmpeg)
+ -DWITH_GSTREAMER_1_0=$(option gstreamer)
+ -DWITH_ICU=$(option icu)
+ -DWITH_JPEG=$(option jpeg)
+ -DWITH_GSSAPI=$(option kerberos)
+ -DWITH_NEON=$(option cpu_flags_arm_neon)
+ -DWITH_OPENH264=$(option openh264)
-DWITH_OSS=OFF
- -DWITH_PULSE=$(usex pulseaudio ON OFF)
- -DWITH_SERVER=$(usex server ON OFF)
- -DWITH_PCSC=$(usex smartcard ON OFF)
- -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
- -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
- -DWITH_X11=$(usex X ON OFF)
- -DWITH_XINERAMA=$(usex xinerama ON OFF)
- -DWITH_XV=$(usex xv ON OFF)
- -DWITH_WAYLAND=$(usex wayland ON OFF)
+ -DWITH_PULSE=$(option pulseaudio)
+ -DWITH_SERVER=$(option server)
+ -DWITH_PCSC=$(option smartcard)
+ -DWITH_LIBSYSTEMD=$(option systemd)
+ -DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+ -DWITH_X11=$(option X)
+ -DWITH_XINERAMA=$(option xinerama)
+ -DWITH_XV=$(option xv)
+ -DWITH_WAYLAND=$(option_client wayland)
+ -DWITH_WINPR_TOOLS=$(option server)
)
cmake_src_configure
}
@@ -135,3 +159,8 @@ src_test() {
use elibc_musl && myctestargs+=( -E TestBacktrace )
cmake_src_test
}
+
+src_install() {
+ cmake_src_install
+ mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die
+}
diff --git a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild b/net-misc/freerdp/freerdp-2.11.5-r2.ebuild
index 2a906f8c6a0d..dfd5ba988b49 100644
--- a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ else
MY_P=${P/_/-}
S="${WORKDIR}/${MY_P}"
SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
fi
DESCRIPTION="Free implementation of the Remote Desktop Protocol"
@@ -26,7 +26,14 @@ 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="
+BDEPEND="
+ virtual/pkgconfig
+ X? ( doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+ ) )
+"
+COMMON_DEPEND="
dev-libs/openssl:0=
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
@@ -52,7 +59,7 @@ RDEPEND="
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- x11-libs/libXrandr
+ X? ( x11-libs/libXrandr )
)
icu? ( dev-libs/icu:0= )
jpeg? ( media-libs/libjpeg-turbo:0= )
@@ -81,18 +88,19 @@ RDEPEND="
x11-libs/libxkbfile
)
"
-DEPEND="
- ${RDEPEND}
- valgrind? ( dev-util/valgrind )
+DEPEND="${COMMON_DEPEND}
+ valgrind? ( dev-debug/valgrind )
"
-BDEPEND="
- virtual/pkgconfig
- X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) )
+RDEPEND="${COMMON_DEPEND}
+ !net-misc/freerdp:2
+ !net-misc/freerdp:3
"
+PATCHES=(
+ "${FILESDIR}/freerdp-2.11.2-clang.patch"
+ "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
+)
+
src_configure() {
# bug #881695
filter-lto
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index 2a906f8c6a0d..6a6c319f26f5 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,11 +22,17 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol"
HOMEPAGE="https://www.freerdp.com/"
LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
+SLOT="2"
+IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
RESTRICT="!test? ( test )"
-RDEPEND="
+BDEPEND="
+ virtual/pkgconfig
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+"
+
+COMMON_DEPEND="
dev-libs/openssl:0=
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
@@ -52,7 +58,7 @@ RDEPEND="
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- x11-libs/libXrandr
+ X? ( x11-libs/libXrandr )
)
icu? ( dev-libs/icu:0= )
jpeg? ( media-libs/libjpeg-turbo:0= )
@@ -72,60 +78,73 @@ RDEPEND="
)
smartcard? ( sys-apps/pcsc-lite )
systemd? ( sys-apps/systemd:0= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
+ client? (
+ wayland? (
+ dev-libs/wayland
+ x11-libs/libxkbcommon
+ )
)
X? (
x11-libs/libX11
x11-libs/libxkbfile
)
"
-DEPEND="
- ${RDEPEND}
- valgrind? ( dev-util/valgrind )
+DEPEND="${COMMON_DEPEND}
+ valgrind? ( dev-debug/valgrind )
"
-BDEPEND="
- virtual/pkgconfig
- X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) )
+RDEPEND="${COMMON_DEPEND}
+ !net-misc/freerdp:0
+ client? ( !net-misc/freerdp:3[client] )
+ server? ( !net-misc/freerdp:3[server] )
"
+option() {
+ usex "$1" ON OFF
+}
+
+option_client() {
+ if use client; then
+ option "$1"
+ else
+ echo OFF
+ fi
+}
+
src_configure() {
# bug #881695
filter-lto
local mycmakeargs=(
-Wno-dev
- -DBUILD_TESTING=$(usex test ON OFF)
- -DCHANNEL_URBDRC=$(usex usb ON OFF)
- -DWITH_ALSA=$(usex alsa ON OFF)
+ -DBUILD_TESTING=$(option test)
+ -DCHANNEL_URBDRC=$(option usb)
+ -DWITH_ALSA=$(option alsa)
-DWITH_CCACHE=OFF
- -DWITH_CUPS=$(usex cups ON OFF)
- -DWITH_DEBUG_ALL=$(usex debug ON OFF)
- -DWITH_MANPAGES=$(usex doc ON OFF)
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
- -DWITH_CAIRO=$(usex ffmpeg OFF ON)
- -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
- -DWITH_ICU=$(usex icu ON OFF)
- -DWITH_JPEG=$(usex jpeg ON OFF)
- -DWITH_GSSAPI=$(usex kerberos ON OFF)
- -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
- -DWITH_OPENH264=$(usex openh264 ON OFF)
+ -DWITH_CUPS=$(option cups)
+ -DWITH_CLIENT=$(option client)
+ -DWITH_DEBUG_ALL=$(option debug)
+ -DWITH_MANPAGES=ON
+ -DWITH_FFMPEG=$(option ffmpeg)
+ -DWITH_SWSCALE=$(option ffmpeg)
+ -DWITH_CAIRO=$(option !ffmpeg)
+ -DWITH_DSP_FFMPEG=$(option ffmpeg)
+ -DWITH_GSTREAMER_1_0=$(option gstreamer)
+ -DWITH_ICU=$(option icu)
+ -DWITH_JPEG=$(option jpeg)
+ -DWITH_GSSAPI=$(option kerberos)
+ -DWITH_NEON=$(option cpu_flags_arm_neon)
+ -DWITH_OPENH264=$(option openh264)
-DWITH_OSS=OFF
- -DWITH_PULSE=$(usex pulseaudio ON OFF)
- -DWITH_SERVER=$(usex server ON OFF)
- -DWITH_PCSC=$(usex smartcard ON OFF)
- -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
- -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
- -DWITH_X11=$(usex X ON OFF)
- -DWITH_XINERAMA=$(usex xinerama ON OFF)
- -DWITH_XV=$(usex xv ON OFF)
- -DWITH_WAYLAND=$(usex wayland ON OFF)
+ -DWITH_PULSE=$(option pulseaudio)
+ -DWITH_SERVER=$(option server)
+ -DWITH_PCSC=$(option smartcard)
+ -DWITH_LIBSYSTEMD=$(option systemd)
+ -DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+ -DWITH_X11=$(option X)
+ -DWITH_XINERAMA=$(option xinerama)
+ -DWITH_XV=$(option xv)
+ -DWITH_WAYLAND=$(option_client wayland)
+ -DWITH_WINPR_TOOLS=$(option server)
)
cmake_src_configure
}
@@ -135,3 +154,8 @@ src_test() {
use elibc_musl && myctestargs+=( -E TestBacktrace )
cmake_src_test
}
+
+src_install() {
+ cmake_src_install
+ mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die
+}
diff --git a/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild b/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild
deleted file mode 100644
index f5fc7c8b622a..000000000000
--- a/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
- case ${PV} in
- 2.*) EGIT_BRANCH="stable-2.0";;
- esac
-else
- MY_P=${P/_/-}
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
- #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/openssl:0=
- sys-libs/zlib:0
- aad? ( dev-libs/cJSON )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- usb? (
- virtual/libudev:0=
- sys-apps/util-linux:0=
- dev-libs/dbus-glib:0=
- virtual/libusb:1=
- )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
- ffmpeg? ( media-video/ffmpeg:0= )
- !ffmpeg? (
- x11-libs/cairo:0=
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- x11-libs/libXrandr
- )
- icu? ( dev-libs/icu:0= )
- jpeg? ( media-libs/libjpeg-turbo:0= )
- kerberos? ( virtual/krb5 )
- openh264? ( media-libs/openh264:0= )
- pulseaudio? ( media-libs/libpulse )
- sdl? (
- media-libs/libsdl2
- media-libs/sdl2-ttf
- )
- server? (
- X? (
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- xinerama? ( x11-libs/libXinerama )
- )
- )
- smartcard? (
- dev-libs/pkcs11-helper
- sys-apps/pcsc-lite
- )
- systemd? ( sys-apps/systemd:0= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
- )
- X? (
- x11-libs/libX11
- x11-libs/libxkbfile
- )
-"
-DEPEND="
- ${RDEPEND}
- valgrind? ( dev-util/valgrind )
-"
-BDEPEND="
- virtual/pkgconfig
- X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) )
-"
-
-src_configure() {
- # bug #881695
- filter-lto
-
- local mycmakeargs=(
- -Wno-dev
- -DBUILD_TESTING=$(usex test ON OFF)
- -DCHANNEL_URBDRC=$(usex usb ON OFF)
- -DWITH_AAD=$(usex aad ON OFF)
- -DWITH_ALSA=$(usex alsa ON OFF)
- -DWITH_CCACHE=OFF
- -DWITH_CLIENT_SDL=$(usex sdl ON OFF)
- -DWITH_CUPS=$(usex cups ON OFF)
- -DWITH_DEBUG_ALL=$(usex debug ON OFF)
- -DWITH_MANPAGES=$(usex doc ON OFF)
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
- -DWITH_CAIRO=$(usex ffmpeg OFF ON)
- -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
- -DWITH_JPEG=$(usex jpeg ON OFF)
- -DWITH_KRB5=$(usex kerberos ON OFF)
- -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
- -DWITH_OPENH264=$(usex openh264 ON OFF)
- -DWITH_OSS=OFF
- -DWITH_PCSC=$(usex smartcard ON OFF)
- -DWITH_PKCS11=$(usex smartcard ON OFF)
- -DWITH_PULSE=$(usex pulseaudio ON OFF)
- -DWITH_SERVER=$(usex server ON OFF)
- -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
- -DWITH_UNICODE_BUILTIN=$(usex icu OFF ON)
- -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
- -DWITH_X11=$(usex X ON OFF)
- -DWITH_XINERAMA=$(usex xinerama ON OFF)
- -DWITH_XV=$(usex xv ON OFF)
- -DWITH_WAYLAND=$(usex wayland ON OFF)
- -DWITH_WEBVIEW=OFF
- )
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=()
- use elibc_musl && myctestargs+=( -E TestBacktrace )
- cmake_src_test
-}
diff --git a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
new file mode 100644
index 000000000000..7768efd323b8
--- /dev/null
+++ b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
@@ -0,0 +1,188 @@
+# Copyright 2011-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+ case ${PV} in
+ 2.*) EGIT_BRANCH="stable-2.0";;
+ esac
+else
+ MY_P=${P/_/-}
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="https://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+"
+COMMON_DEPEND="
+ dev-libs/openssl:0=
+ sys-libs/zlib:0
+ aad? ( dev-libs/cJSON )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ usb? (
+ virtual/libudev:0=
+ sys-apps/util-linux:0=
+ dev-libs/dbus-glib:0=
+ virtual/libusb:1=
+ )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )
+ )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ !ffmpeg? (
+ x11-libs/cairo:0=
+ )
+ fuse? ( sys-fs/fuse:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ X? ( x11-libs/libXrandr )
+ )
+ icu? ( dev-libs/icu:0= )
+ jpeg? ( media-libs/libjpeg-turbo:0= )
+ kerberos? ( virtual/krb5 )
+ openh264? ( media-libs/openh264:0= )
+ pulseaudio? ( media-libs/libpulse )
+ sdl? (
+ media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)]
+ media-libs/sdl2-ttf
+ )
+ server? (
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ xinerama? ( x11-libs/libXinerama )
+ )
+ )
+ smartcard? (
+ dev-libs/pkcs11-helper
+ sys-apps/pcsc-lite
+ )
+ systemd? ( sys-apps/systemd:0= )
+ client? (
+ wayland? (
+ dev-libs/wayland
+ x11-libs/libxkbcommon
+ )
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ !net-misc/freerdp:0
+ client? ( !net-misc/freerdp:2[client] )
+ server? ( !net-misc/freerdp:2[server] )
+"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/freerdp-3.4.0-incompatible-pointer.patch"
+ )
+ cmake_src_prepare
+}
+
+option() {
+ usex "$1" ON OFF
+}
+
+option_client() {
+ if use client; then
+ option "$1"
+ else
+ echo OFF
+ fi
+}
+
+src_configure() {
+ # bug #881695
+ filter-lto
+
+ local mycmakeargs=(
+ -Wno-dev
+
+ # https://bugs.gentoo.org/927037
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
+
+ -DBUILD_TESTING=$(option test)
+ -DCHANNEL_URBDRC=$(option usb)
+ -DWITH_AAD=$(option aad)
+ -DWITH_ALSA=$(option alsa)
+ -DWITH_CCACHE=OFF
+ -DWITH_CLIENT=$(option client)
+ -DWITH_CLIENT_SDL=$(option sdl)
+ -DWITH_SAMPLE=OFF
+ -DWITH_CUPS=$(option cups)
+ -DWITH_DEBUG_ALL=$(option debug)
+ -DWITH_MANPAGES=ON
+ -DWITH_FFMPEG=$(option ffmpeg)
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_SWSCALE=$(option ffmpeg)
+ -DWITH_CAIRO=$(option !ffmpeg)
+ -DWITH_DSP_FFMPEG=$(option ffmpeg)
+ -DWITH_FUSE=$(option fuse)
+ -DWITH_GSTREAMER_1_0=$(option gstreamer)
+ -DWITH_JPEG=$(option jpeg)
+ -DWITH_KRB5=$(option kerberos)
+ -DWITH_NEON=$(option cpu_flags_arm_neon)
+ -DWITH_OPENH264=$(option openh264)
+ -DWITH_OSS=OFF
+ -DWITH_PCSC=$(option smartcard)
+ -DWITH_PKCS11=$(option smartcard)
+ -DWITH_PULSE=$(option pulseaudio)
+ -DWITH_SERVER=$(option server)
+ -DWITH_LIBSYSTEMD=$(option systemd)
+ -DWITH_UNICODE_BUILTIN=$(option !icu)
+ -DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+ -DWITH_X11=$(option X)
+ -DWITH_XINERAMA=$(option xinerama)
+ -DWITH_XV=$(option xv)
+ -DWITH_WAYLAND=$(option_client wayland)
+ -DWITH_WEBVIEW=OFF
+ -DWITH_WINPR_TOOLS=$(option server)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ local myctestargs=()
+ use elibc_musl && myctestargs+=( -E TestBacktrace )
+ has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
+}
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index ba1f26353110..8285a658a86c 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,11 +22,16 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol"
HOMEPAGE="https://www.freerdp.com/"
LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
+SLOT="3"
+IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
RESTRICT="!test? ( test )"
-RDEPEND="
+BDEPEND="
+ virtual/pkgconfig
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+"
+COMMON_DEPEND="
dev-libs/openssl:0=
sys-libs/zlib:0
aad? ( dev-libs/cJSON )
@@ -54,7 +59,7 @@ RDEPEND="
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- x11-libs/libXrandr
+ X? ( x11-libs/libXrandr )
)
icu? ( dev-libs/icu:0= )
jpeg? ( media-libs/libjpeg-turbo:0= )
@@ -62,7 +67,7 @@ RDEPEND="
openh264? ( media-libs/openh264:0= )
pulseaudio? ( media-libs/libpulse )
sdl? (
- media-libs/libsdl2
+ media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)]
media-libs/sdl2-ttf
)
server? (
@@ -81,65 +86,84 @@ RDEPEND="
sys-apps/pcsc-lite
)
systemd? ( sys-apps/systemd:0= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
+ client? (
+ wayland? (
+ dev-libs/wayland
+ x11-libs/libxkbcommon
+ )
)
X? (
x11-libs/libX11
x11-libs/libxkbfile
)
"
-DEPEND="
- ${RDEPEND}
- valgrind? ( dev-util/valgrind )
+DEPEND="${COMMON_DEPEND}
+ valgrind? ( dev-debug/valgrind )
"
-BDEPEND="
- virtual/pkgconfig
- X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) )
+RDEPEND="${COMMON_DEPEND}
+ !net-misc/freerdp:0
+ client? ( !net-misc/freerdp:2[client] )
+ server? ( !net-misc/freerdp:2[server] )
"
+option() {
+ usex "$1" ON OFF
+}
+
+option_client() {
+ if use client; then
+ option "$1"
+ else
+ echo OFF
+ fi
+}
+
src_configure() {
# bug #881695
filter-lto
local mycmakeargs=(
-Wno-dev
- -DBUILD_TESTING=$(usex test ON OFF)
- -DCHANNEL_URBDRC=$(usex usb ON OFF)
- -DWITH_AAD=$(usex aad ON OFF)
- -DWITH_ALSA=$(usex alsa ON OFF)
+
+ # https://bugs.gentoo.org/927037
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
+
+ -DBUILD_TESTING=$(option test)
+ -DCHANNEL_URBDRC=$(option usb)
+ -DWITH_AAD=$(option aad)
+ -DWITH_ALSA=$(option alsa)
-DWITH_CCACHE=OFF
- -DWITH_CLIENT_SDL=$(usex sdl ON OFF)
- -DWITH_CUPS=$(usex cups ON OFF)
- -DWITH_DEBUG_ALL=$(usex debug ON OFF)
- -DWITH_MANPAGES=$(usex doc ON OFF)
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
- -DWITH_CAIRO=$(usex ffmpeg OFF ON)
- -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_FUSE=$(usex fuse ON OFF)
- -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
- -DWITH_JPEG=$(usex jpeg ON OFF)
- -DWITH_KRB5=$(usex kerberos ON OFF)
- -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
- -DWITH_OPENH264=$(usex openh264 ON OFF)
+ -DWITH_CLIENT=$(option client)
+ -DWITH_CLIENT_SDL=$(option sdl)
+ -DWITH_SAMPLE=OFF
+ -DWITH_CUPS=$(option cups)
+ -DWITH_DEBUG_ALL=$(option debug)
+ -DWITH_MANPAGES=ON
+ -DWITH_FFMPEG=$(option ffmpeg)
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_SWSCALE=$(option ffmpeg)
+ -DWITH_CAIRO=$(option !ffmpeg)
+ -DWITH_DSP_FFMPEG=$(option ffmpeg)
+ -DWITH_FUSE=$(option fuse)
+ -DWITH_GSTREAMER_1_0=$(option gstreamer)
+ -DWITH_JPEG=$(option jpeg)
+ -DWITH_KRB5=$(option kerberos)
+ -DWITH_NEON=$(option cpu_flags_arm_neon)
+ -DWITH_OPENH264=$(option openh264)
-DWITH_OSS=OFF
- -DWITH_PCSC=$(usex smartcard ON OFF)
- -DWITH_PKCS11=$(usex smartcard ON OFF)
- -DWITH_PULSE=$(usex pulseaudio ON OFF)
- -DWITH_SERVER=$(usex server ON OFF)
- -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
- -DWITH_UNICODE_BUILTIN=$(usex icu OFF ON)
- -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
- -DWITH_X11=$(usex X ON OFF)
- -DWITH_XINERAMA=$(usex xinerama ON OFF)
- -DWITH_XV=$(usex xv ON OFF)
- -DWITH_WAYLAND=$(usex wayland ON OFF)
+ -DWITH_PCSC=$(option smartcard)
+ -DWITH_PKCS11=$(option smartcard)
+ -DWITH_PULSE=$(option pulseaudio)
+ -DWITH_SERVER=$(option server)
+ -DWITH_LIBSYSTEMD=$(option systemd)
+ -DWITH_UNICODE_BUILTIN=$(option !icu)
+ -DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+ -DWITH_X11=$(option X)
+ -DWITH_XINERAMA=$(option xinerama)
+ -DWITH_XV=$(option xv)
+ -DWITH_WAYLAND=$(option_client wayland)
-DWITH_WEBVIEW=OFF
+ -DWITH_WINPR_TOOLS=$(option server)
)
cmake_src_configure
}
@@ -147,5 +171,11 @@ src_configure() {
src_test() {
local myctestargs=()
use elibc_musl && myctestargs+=( -E TestBacktrace )
+ has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
cmake_src_test
}
+
+src_install() {
+ cmake_src_install
+ mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
+}
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index 0fc989abd6dc..ff51b9ab1df0 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="aad">Enable login via Azure AD</flag>
+ <flag name="client">Build client binaries</flag>
<flag name="fuse">Clipboard with FUSE file copy support</flag>
<flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag>
<flag name="server">Build server binaries</flag>
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index d91332d2ffe3..33080fee8f38 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1 @@
-DIST frr-9.0.1.tar.gz 10334150 BLAKE2B c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b SHA512 fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9
-DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25
+DIST frr-9.0.2.tar.gz 10341186 BLAKE2B e9c32bf48dc0adc7dd6c23ad1a2779065c762dc6e461a3f86d6b7afbef245345dc65b33d9dd5b499d4c4a7fb3b80a4416bdec9b42e7d15f2864d80c088e2ad4f SHA512 2cfd1a63cf073b8767fd67d9992d9a775d856234a532b13699304b6b1f15eb68bf1301f2f4c503b151fd5c8191bff67aeac9c7a4dc4a3ddb06f9a5db081423b9
diff --git a/net-misc/frr/frr-9.0.1.ebuild b/net-misc/frr/frr-9.0.1.ebuild
deleted file mode 100644
index 3e71c240c475..000000000000
--- a/net-misc/frr/frr-9.0.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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/frr-9.0.ebuild b/net-misc/frr/frr-9.0.2.ebuild
index 73df8c4dd6f6..87227382bd64 100644
--- a/net-misc/frr/frr-9.0.ebuild
+++ b/net-misc/frr/frr-9.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,7 +37,7 @@ COMMON_DEPEND="
"
BDEPEND="
~dev-util/clippy-${PV}
- sys-devel/flex
+ app-alternatives/lex
app-alternatives/yacc
doc? ( dev-python/sphinx )
"
@@ -49,7 +49,6 @@ DEPEND="
RDEPEND="
${COMMON_DEPEND}
$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
- !net-misc/quagga
"
PATCHES=(
diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index 872896f7668c..9cd33eb40e66 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -5,10 +5,6 @@
<name>Alarig Le Lay</name>
<email>alarig@swordarmor.fr</email>
</maintainer>
- <maintainer type="person">
- <email>jsmolic@gentoo.org</email>
- <name>Jakov Smolić</name>
- </maintainer>
<maintainer type="person" proxied="yes">
<email>jaco@uls.co.za</email>
<name>Jaco Kroon</name>
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 2a6057d69bc5..b311af478894 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,3 +1,2 @@
-DIST gallery-dl-1.26.1.gh.tar.gz 604212 BLAKE2B 980e7b8b3c8ec966bb77db7c4312398490add75580e557f4654ca3aeb62ab287599f85dc401ed5bfae4dc6124e5a87b9254904b442b3a0cc2b10acdf5ce6695a SHA512 60d32ac82df5dd837399b778c118d8f944b7f35c5dfbbe8168841f0ff76471016b6049b617fef4825b3e21b37237c58bbc9f44be3e4e7ddb9bdf97cba11154bb
-DIST gallery-dl-1.26.2.gh.tar.gz 607389 BLAKE2B 9bacfa4ba4019dbd8abd87ad868b1f6d2c56eab165633a07ba99c569962f26df6d82c96ef12c0c033792ece2084e4f5b7a2121483d51d765b828d4997780edc1 SHA512 08f0caa07f1e3fddf003658e9261e711b2a5fc0049447f36794c441f37ba01b74cc091f90378d5a649196ceba487d5dff541dbfcd86ca8c1b0551a972dc1f848
-DIST gallery-dl-1.26.3.gh.tar.gz 621229 BLAKE2B d85be6e8f3e21d5f8e18bcf70fb51f46d5672d48115bf88fb5fa3316b6e8cddca8c8c6f540f3b1529e6607d746aba98097aa95f692e98effa4e51ba4578d16aa SHA512 43891d40de26527b7195c064fda6c8303461c5e4107b0482ca535f06b8fe923513acc212bd75b4d8d82fa12e19ef214e1ee395ced1525eceda7a433d3d05fef3
+DIST gallery-dl-1.26.8.gh.tar.gz 659327 BLAKE2B f0d394c077fefda91fce494fa8bd6ef369a634f06f3303c4f91009b3d5d381a40aa8918e639ed6faddc9000d5a3091a569124d62b794d727c46354bc144c8b63 SHA512 f8093d8e51c815333a182d1cdf5134d2e54d10b44067a0130943993d63e49d4e51d5bb9eb1704b7999639e73ae8ab4cadb6a8d0fb444abbe26ffdc445e5cdb5f
+DIST gallery-dl-1.26.9.gh.tar.gz 670467 BLAKE2B 849d20ff6fd802915b3bc4f6bb11d638d1e8f24f1dbdcfd5946461798044d59bf9243faa370cdddcdffe40a24d39d44a43abc79b4c8e89e7c60b40e5e204603a SHA512 54c2a86a67c53b7d5c62e6c23c549fd89503386549dc9d2f9c7de058b52ecb60b5089555e97dd0b63d33686e1bd08a3be940152715a6d26647e6949e641df9cb
diff --git a/net-misc/gallery-dl/gallery-dl-1.26.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.3.ebuild
deleted file mode 100644
index b3da2a9c870f..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.26.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
- SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_compile_all() {
- emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
- optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
- optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.26.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild
index e83e798733f1..310c7066bc74 100644
--- a/net-misc/gallery-dl/gallery-dl-1.26.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild
@@ -1,37 +1,46 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="sqlite,ssl,xml(+)"
inherit distutils-r1 optfeature
DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
+HOMEPAGE="https://github.com/mikf/gallery-dl/"
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999* ]]; then
inherit git-r3
+
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
else
- SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+ SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
-RESTRICT="test"
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+RDEPEND="
+ >=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
-distutils_enable_tests setup.py
+src_prepare() {
+ # Tests against real servers, some tests always fail and some are subject to change.
+ rm test/test_results.py || die
+
+ distutils-r1_src_prepare
+}
python_compile_all() {
- emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+ emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
}
pkg_postinst() {
diff --git a/net-misc/gallery-dl/gallery-dl-1.26.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild
index b3da2a9c870f..1e6696f28666 100644
--- a/net-misc/gallery-dl/gallery-dl-1.26.2.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild
@@ -1,37 +1,46 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="sqlite,ssl,xml(+)"
inherit distutils-r1 optfeature
DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
+HOMEPAGE="https://github.com/mikf/gallery-dl/"
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999* ]]; then
inherit git-r3
+
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
else
- SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+ SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
-RESTRICT="test"
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+RDEPEND="
+ >=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
-distutils_enable_tests setup.py
+src_prepare() {
+ # Tests against real servers, some tests always fail and some are subject to change.
+ rm test/test_results.py || die
+
+ distutils-r1_src_prepare
+}
python_compile_all() {
- emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+ emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
}
pkg_postinst() {
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index b3da2a9c870f..1e6696f28666 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -1,37 +1,46 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="sqlite,ssl,xml(+)"
inherit distutils-r1 optfeature
DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
+HOMEPAGE="https://github.com/mikf/gallery-dl/"
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999* ]]; then
inherit git-r3
+
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
else
- SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+ SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
-RESTRICT="test"
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+RDEPEND="
+ >=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
-distutils_enable_tests setup.py
+src_prepare() {
+ # Tests against real servers, some tests always fail and some are subject to change.
+ rm test/test_results.py || die
+
+ distutils-r1_src_prepare
+}
python_compile_all() {
- emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+ emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
}
pkg_postinst() {
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 2906a9477455..2a432023cafd 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,2 +1,6 @@
-DIST geoipupdate-4.9.0-deps.tar.xz 2894004 BLAKE2B 2995d4f2f8632d232b156294cca8bd76f40373c948df9ca5b4813bf630923168063eb094de52582af5221950343b998afb50c97bfe9077cf952951b00e5b3349 SHA512 c83c05cd5063199b21b8eb621a80da8679ddac2881da53b6914a7cb1419a1a6ef8cabd62562722d61b7e5d05d93f430a707d4e082e126514bfad27537f4e3ff7
+DIST geoipupdate-4.9.0-deps.tar.xz 911156 BLAKE2B 136df3a0e94ab0934b48e8860b152edacffae093d26bdbe9593c24f540ce0d6cff215e4cf4ea158bd8dc9a9f3157d5634fea4d66315c5dbc537b42041d0625e6 SHA512 88579ba0e804d7dd9f6cab24d2ac01186f39c47f1ae79d395a77b0725d25e8675928ce34532506f164157cbce4fb2e947efbd2e66c23ed18d61bc67be74ce74d
DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c
+DIST geoipupdate-6.0.0-deps.tar.xz 864256 BLAKE2B 6f9a7adf4bfef6c38a06b3f5e8b49362218dd8b698eec29921ac1d587094c49b26bc307924327600cb06327aae7171a6865cc79134eddee9e08004a82dfcbb84 SHA512 678ecb798b9b736a82d3e2b64c426e966408bbf3858a32e84dd142f0392444248c34c78dec07a5f8c0f04752c965c5cfb1602d96a541462e40a4c84039c71237
+DIST geoipupdate-6.0.0.tar.gz 46523 BLAKE2B ff14026acf39797f69b7cde527c826b78740a65ac4e0914cdffc6276473e3f4367e87e962dfa4634114b7f5b02c33a4a8e675518f4de85238a2342cb367c9f25 SHA512 2b2a6573b6af30ad1ad4c8ed3b97df41bba96212a0e6d90e4a92bd0615f02c9e989168ad56a651d8f35a7d2534e223de5a6f8a34d587f3c8a7a8e19f3b913ca4
+DIST geoipupdate-6.1.0-deps.tar.xz 866588 BLAKE2B aabda8132d0f8866e3450b5c2f07dccc7b1555cac0a987fea48ffe3f07a8c66c72bb41ca1478d47f03cb61bd29a6183bd0621126222decc4e29b8525c3ba991e SHA512 4a03b35258dc77659471299fe119da1e435b1360df08b0b8a19f6374e3880c1c6153fcdb5146f74900ebf540c2c66a3007228f05b702f526ed9e75e01f51f98d
+DIST geoipupdate-6.1.0.tar.gz 47557 BLAKE2B ef33058f8504c06dc2c2a350421866cd88a6b87624874cf6bd29d99c77637c3b99468a6ba615d71310e0c5d49d6ee2820d9a3841c1127437fa602864a014d77d SHA512 b20a3101fb055ed71fe999fe924b71f6d0eb76da8bc4444f7281a3deceac1ee7d1854f3d672b93edabf152cc69551933dd951419ab484259d47f56b243e568eb
diff --git a/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch b/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch
new file mode 100644
index 000000000000..aa48a97ef155
--- /dev/null
+++ b/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch
@@ -0,0 +1,26 @@
+From 250049909d1f9ed3c8ab06e07fcb10487942953a Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Wed, 13 Dec 2023 18:59:31 +0200
+Subject: [PATCH] Use go-md2man instead of perl script with pandoc
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/Makefile
++++ b/Makefile
+@@ -53,10 +53,11 @@ $(BUILDDIR)/GeoIP.conf.md: $(BUILDDIR) doc/GeoIP.conf.md
+ $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdate.md
+ sed -e 's|CONFFILE|$(CONFFILE)|g' -e 's|DATADIR|$(DATADIR)|g' -e 's|$$|$(MAYBE_CR)|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md
+
+-$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md $(BUILDDIR)/geoipupdate.md
+- dev-bin/make-man-pages.pl "$(BUILDDIR)"
++$(BUILDDIR)/GeoIP.conf.5: %.5 : %.md
++ go-md2man -in $< -out $@
+
+-$(BUILDDIR)/geoipupdate.1: $(BUILDDIR)/GeoIP.conf.5
++$(BUILDDIR)/geoipupdate.1: %.1: %.md
++ go-md2man -in $< -out $@
+
+ clean:
+ rm -rf $(BUILDDIR)/GeoIP.conf \
+--
+2.43.0
+
diff --git a/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild
new file mode 100644
index 000000000000..eeedc3970bee
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
+
+PATCHES=(
+ "${FILESDIR}/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch"
+)
+
+src_compile() {
+ # Do not let these leak from outside into the package
+ unset GOBIN GOPATH GOCODE
+
+ # the horror, the horror ... but it's all automagic
+ export CONFFILE=/etc/GeoIP.conf
+ export DATADIR=/usr/share/GeoIP
+ export VERSION=${PV}
+
+ default
+}
+
+src_install() {
+ dobin build/geoipupdate
+
+ keepdir /usr/share/GeoIP
+
+ insinto /etc
+ doins build/GeoIP.conf
+
+ doman build/GeoIP.conf.5 build/geoipupdate.1
+
+ einstalldocs
+}
diff --git a/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild
new file mode 100644
index 000000000000..c0e08724e787
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~s390 ~x86"
+
+DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
+
+src_compile() {
+ # Do not let these leak from outside into the package
+ unset GOBIN GOPATH GOCODE
+
+ # requires pandoc but the information is still in the distributed md files
+ sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
+ #sed -i -e 's/go build/go build -x/' Makefile || die
+
+ # the horror, the horror ... but it's all automagic
+ export CONFFILE=/etc/GeoIP.conf
+ export DATADIR=/usr/share/GeoIP
+ export VERSION=${PV}
+
+ default
+}
+
+src_install() {
+ dobin build/geoipupdate
+
+ keepdir /usr/share/GeoIP
+
+ insinto /etc
+ doins build/GeoIP.conf
+
+ einstalldocs
+}
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index 6463221bb5fe..cf60dbc1bf7e 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/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>christian.tietz@mailbox.org</email>
- <name>Christian Tietz</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
<use>
<flag name="curl">Support HTTP media sources (e.g. internet radio)</flag>
diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest
index 98e1e21d1893..a6090987ecdf 100644
--- a/net-misc/gnome-connections/Manifest
+++ b/net-misc/gnome-connections/Manifest
@@ -1,2 +1 @@
-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-44.1.ebuild b/net-misc/gnome-connections/gnome-connections-44.1.ebuild
deleted file mode 100644
index 325726aeadc2..000000000000
--- a/net-misc/gnome-connections/gnome-connections-44.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson 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="
- $(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-45.0.ebuild b/net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild
index b6330f5a7f91..de42f7e3e3c6 100644
--- a/net-misc/gnome-connections/gnome-connections-45.0.ebuild
+++ b/net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ DEPEND="
>=dev-libs/libxml2-2.7.8
app-crypt/libsecret[vala]
- >=net-misc/freerdp-2.0.0:0=
+ >=net-misc/freerdp-2.0.0:2=
"
RDEPEND="${DEPEND}"
BDEPEND="
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index fbb24933da9c..8535efbfff27 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1 @@
-DIST gnome-remote-desktop-44.2.tar.xz 199876 BLAKE2B a959e6ca1f72660138640c4f6edfd5ee8bb4185d27d55456fcdee2eaa38e09ac5a76b0bfbf6395c9725f2cb4fa857f3064379d9824810657ea9c046738803411 SHA512 2e310cd926e0ed6fd28406a56e4d4ba239b9817b035231f66b648a98e08a5c7a7d810a2b786292aa39a7c67ca17af3de92dce4a6031a4f72166d667b8f498bd0
-DIST gnome-remote-desktop-45.0.tar.xz 212232 BLAKE2B 381429a7ddc6d7aa299754d42481577046ee2e89e4199bb307d4e13c58bef329ec0a56640ab84d9c1ef97eb04d72720fa061d43294e85925b17374c09bf05e60 SHA512 257548da2dffe1ed403708dba955fee5a1cd3219e82dd9db8914da603de89a28bfd7b60bcb5667fb47f6de1e590c68ea53d7df689b49d62a216a418d5b72c0d6
DIST gnome-remote-desktop-45.1.tar.xz 213504 BLAKE2B 78dd348cf15b677f52ca327ac824b2bd5276d53e7b6578bef0634e00e81993c1a1802ee861a31527af03351e6640cc9fcdc5f86fd44f20ec56138837dd9f05b6 SHA512 4572fefa03ee433783c822cf0405bd17b645f3aa08e8d88c04165859fd30643d612e5d7516a64ded8c1a0d2007026d6df877930b5ea127d7e1e939c1bb60f379
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.ebuild
deleted file mode 100644
index 595e4cdbee2a..000000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="aac doc +rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
- x11-libs/cairo
- x11-libs/libdrm
- >=media-libs/libepoxy-1.4
- >=dev-libs/glib-2.68:2
- x11-libs/libnotify
- app-crypt/libsecret
- >=media-video/pipewire-0.3.49:=
- app-crypt/tpm2-tss:=
- rdp? (
- >=media-libs/nv-codec-headers-11.1.5.0
- >=net-misc/freerdp-2.10.0:=[server]
- >=sys-fs/fuse-3.9.1:3
- >=x11-libs/libxkbcommon-1.0.0
-
- aac? (
- media-libs/fdk-aac:=
- )
- )
- vnc? (
- net-libs/libvncserver
- )
-"
-RDEPEND="${DEPEND}
- x11-wm/mutter[screencast]
-"
-BDEPEND="
- dev-util/gdbus-codegen
- dev-util/glib-utils
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- )
-"
-
-src_configure() {
- local emesonargs=(
- $(meson_use doc man)
- $(meson_use aac fdk_aac)
- $(meson_use rdp)
- $(meson_use vnc)
- $(meson_use systemd)
- -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild
deleted file mode 100644
index d7c4a7f43cf6..000000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="aac doc +rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
- x11-libs/cairo
- x11-libs/libdrm
- >=media-libs/libepoxy-1.4
- >=dev-libs/glib-2.68:2
- >=dev-libs/libei-1.0.901
- x11-libs/libnotify
- app-crypt/libsecret
- >=media-video/pipewire-0.3.49:=
- app-crypt/tpm2-tss:=
- rdp? (
- >=media-libs/nv-codec-headers-11.1.5.0
- >=net-misc/freerdp-2.10.0:=[server]
- >=sys-fs/fuse-3.9.1:3
- >=x11-libs/libxkbcommon-1.0.0
-
- aac? (
- media-libs/fdk-aac:=
- )
- )
- vnc? (
- net-libs/libvncserver
- )
-"
-RDEPEND="${DEPEND}
- x11-wm/mutter[screencast]
-"
-BDEPEND="
- dev-libs/glib
- dev-util/gdbus-codegen
- dev-util/glib-utils
- virtual/pkgconfig
- doc? (
- app-text/asciidoc
- )
-"
-
-src_configure() {
- local emesonargs=(
- $(meson_use doc man)
- $(meson_use aac fdk_aac)
- $(meson_use rdp)
- $(meson_use vnc)
- $(meson_use systemd)
- -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
- -Dtests=false # Tests run xvfb-run directly
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild
index d7c4a7f43cf6..61bc7a28c45c 100644
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1.ebuild
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
IUSE="aac doc +rdp systemd +vnc"
REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
RESTRICT="test" # Tests run xvfb-run directly
@@ -27,7 +27,7 @@ DEPEND="
app-crypt/tpm2-tss:=
rdp? (
>=media-libs/nv-codec-headers-11.1.5.0
- >=net-misc/freerdp-2.10.0:=[server]
+ >=net-misc/freerdp-2.10.0:2=[server]
>=sys-fs/fuse-3.9.1:3
>=x11-libs/libxkbcommon-1.0.0
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 3b2dece1b459..35098da2bc35 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,2 +1,2 @@
-DIST gns3-gui-2.2.42.tar.gz 5048413 BLAKE2B 19c4f1977797af0a3c2bbed926cc8f9361840658dbdc25ad9a2972bec21749c84d5cdc477079f01b8c354e21e9663b27bcbc09f974c914c188f98ec151b7bd67 SHA512 19940857308da3810047cec9285c34b0011e4dc44a1316bf2fe5042e0f255546e8e3d2d4788a1f70baedb498a295223916633f4950ef9dbfa19b8e72c7545176
-DIST gns3-gui-2.2.43.tar.gz 5055465 BLAKE2B 21e21d1b1e77151d385d210270dc909e3ed938c2220360e038820d9e30a1ca126122ccfe0f582e392143aeac364274bc96dbed1a3ea23cd29e0d9dbc858af5a5 SHA512 167961caa13e7bc7abea3753c69e883e864e5fbf543f12117a0653f203ef92d46214f083c715c1fad3ab4a52504fa714a2901d0caa4c0048e26cae9fa7ee5a31
+DIST gns3-gui-2.2.44.1.tar.gz 5056513 BLAKE2B ac9004771dea320dd24db905ae556c47c5950f95f6871272339223e019da804b97f3238677a0758426ec550ec354052196a4b30cbd4cc1cc154a3a437a3b006f SHA512 e9ae8604f6675ce7edc3e491dc5217b985ca948eaf0df69b59d60b236deee6e0d34e245b4779295d28a05b35eb01f93534a2da070817ace36a2d259525a606de
+DIST gns3-gui-2.2.45.tar.gz 5057093 BLAKE2B 0e5f92a5450f8bd87c67ef3916a949d12d3ba2222b9c894260fe4c486236455c5b0214350e6144081049a6e7a85a9fc60c596b5932dd3f6fa07c7f94cc5d31f5 SHA512 2122dbf88625ea8fbc7eae20d7d1406a72f8dc8a5fea2c9577218127c54c10b9db7b154010c519a170ea9067e1ea774181e0e56936129c091800dab615cb8b3b
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.44.1.ebuild
index 5834bf62b463..c0d753adc2e4 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.44.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_{11..12} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 virtualx xdg
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-python/distro-1.8.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.9.6[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.34.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.43.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.45.ebuild
index 0dfa014133d2..44aa2812d8c3 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.43.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.45.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_{11..12} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 virtualx xdg
@@ -14,14 +14,15 @@ SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
#net-misc/gns3-server version should always match gns3-gui version
RDEPEND="
>=dev-python/distro-1.8.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.31.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.9.6[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}]
+ >=dev-python/truststore-0.8.0[${PYTHON_USEDEP}]
~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
"
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 1d056bc4280b..6e6ff3bc059d 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,2 +1,2 @@
-DIST gns3-server-2.2.42.tar.gz 10735078 BLAKE2B 424f73fcb7377a518873b4880b77b6e057d8293fb96073eca59224b0e5e5c1e50114f30c564b861e91769380d9d15b3c2c28a8f4cec3358282902af09eeccd30 SHA512 9982fabcdd587b090833b9137124a0accb2990cee91ca5d19d8ee691f807d547670a38b2168d0f71465088a3971eac73e101cc284922732b5132ac47b84d84f6
-DIST gns3-server-2.2.43.tar.gz 10734029 BLAKE2B c417557823c94bb62a08ab2401e7d6a6e46ea83961cfee87f5b134139f7f0237ff5c214661a2abd30d62a8806c1ea556db9fa9d7ff1e608cfa84142409315832 SHA512 3b086f6c14b4258f4f0eb72e9839c6499530b6f0866ba6adc72a8fd301c99919bf4fc36b7d64e61035d81f193faee8b161c304f1a445a2cab5ca9c42739796f4
+DIST gns3-server-2.2.44.1.tar.gz 10739635 BLAKE2B 8f9cc5affce48b95ef5ceee452d643f450594f1f5710ceace830ccd5a30281c6a04458a6864c65bcb3b023190b2aebe00d2f4316c80596a4c443616cad161cb6 SHA512 60c66f07242ba64a9bbc9471ee71fc975a95f36fced440798c8076b968a2e29cacccb889928f22b878d5928feb9024b26da854a03e3610b1ba36fa09826023fc
+DIST gns3-server-2.2.45.tar.gz 10747348 BLAKE2B bb8f45347f9ea2e05e199a5128f73fe7fad6d7b3bebf30dcae009c761934e5d2ee986623fa82bb328db31b43cd39da05f52ac9a3f534d223fbf46ca585f3b433 SHA512 570bac3aab8c0f31144f8ac34f27b04a16efadd02e93faf949d4fe0078bf87c59e479b17ead8feec774b3907703cddeae9a434b9abc7fbd459cc060636478a2e
diff --git a/net-misc/gns3-server/gns3-server-2.2.43.ebuild b/net-misc/gns3-server/gns3-server-2.2.44.1.ebuild
index c76329a46375..ec1573e4269f 100644
--- a/net-misc/gns3-server/gns3-server-2.2.43.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.44.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_{11..12} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 optfeature systemd
@@ -27,9 +27,9 @@ RDEPEND="
>=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/psutil-5.9.6[${PYTHON_USEDEP}]
>=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.31.0[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}]
net-misc/ubridge
sys-apps/busybox[static]
"
diff --git a/net-misc/gns3-server/gns3-server-2.2.42.ebuild b/net-misc/gns3-server/gns3-server-2.2.45.ebuild
index de2185845ca4..b2d0d6fc0267 100644
--- a/net-misc/gns3-server/gns3-server-2.2.42.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.45.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_{11..12} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 optfeature systemd
@@ -20,16 +20,16 @@ RDEPEND="
acct-group/gns3
acct-user/gns3
app-emulation/dynamips
- >=dev-python/aiofiles-23.1.0[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
+ >=dev-python/aiofiles-23.2.1[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}]
>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
>=dev-python/distro-1.8.0[${PYTHON_USEDEP}]
>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.9.6[${PYTHON_USEDEP}]
>=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}]
net-misc/ubridge
sys-apps/busybox[static]
"
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 4c9c9d7ecf73..2db805085bc1 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,2 +1,3 @@
DIST gsasl-2.0.1.tar.gz 3279632 BLAKE2B a25d121a5043455ed827a6bdc776c10d467a49b4dc6b73d2f4b08fecbf1ca5f423ffdcfd39e0d2bf71f724ed8302ffd8acda4fda3ef10ceadece60509ac73500 SHA512 01c6f6bd9f986c942a25b89fee0052aef8c10bf914ead29983abdf0cc8fcaa7223fd9d9eeafb4be07e4bc318f087f6f6258facaaeb7f83bca8de512406812be5
DIST gsasl-2.2.0.tar.gz 3290469 BLAKE2B ca57765f299939a6f9457aac3d51132f7b5a0e2f0788523349083a65e5de0b780573000c378e0fff844cf9f882239e7ff6e0b520ae66a60f3e928c16d6f74857 SHA512 0ae318a8616fe675e9718a3f04f33731034f9a7ba03d83ccb1a72954ded54ced35dc7c7e173fdcb6fa0f0813f8891c6cbcedf8bf70b37d00b8ec512eb9f07f5f
+DIST gsasl-2.2.1.tar.gz 3344807 BLAKE2B 3bb1f7dee8510c19215dc8fdc5efd8e53318ab967b4d4af9e48474857a112b0e08872016a5c5bcbd6b1b340f29fbd77623efc6c41a1f87fb734623e2f173e1bf SHA512 161b8a315862a79807ba067c5ae840175b0d8ec14806aceafc3f92d571713b94d1b8c1a5b188c47bf94a79b9a1f133065f96b087baa5e7f360ae7fb8336381ab
diff --git a/net-misc/gsasl/gsasl-2.2.0.ebuild b/net-misc/gsasl/gsasl-2.2.0.ebuild
index ff825515aa75..17ade65eed5d 100644
--- a/net-misc/gsasl/gsasl-2.2.0.ebuild
+++ b/net-misc/gsasl/gsasl-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
SLOT="0"
# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
# if it's a stable release or not!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
REQUIRED_USE="|| ( client server )"
diff --git a/net-misc/gsasl/gsasl-2.2.1.ebuild b/net-misc/gsasl/gsasl-2.2.1.ebuild
new file mode 100644
index 000000000000..35e903c6643b
--- /dev/null
+++ b/net-misc/gsasl/gsasl-2.2.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL client, server, and library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
+# if it's a stable release or not!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND="
+ !net-libs/libgsasl
+ sys-libs/readline:=
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gnutls? ( net-libs/gnutls:= )
+ idn? ( net-dns/libidn:= )
+ kerberos? ( >=net-libs/libgssglue-0.5-r1 )
+ nls? ( >=sys-devel/gettext-0.18.1 )
+ ntlm? ( >=net-libs/libntlm-0.3.5 )
+"
+RDEPEND="${DEPEND}"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # gnulib FPs
+ unreachable
+ MIN
+ alignof
+ static_assert
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/gl_WARN_ADD(\[-Werror/d' \
+ -e 's/ -Werror//' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local krb5_impl="--with-gssapi-impl=no"
+
+ # See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/
+ if use kerberos; then
+ krb5_impl="--with-gssapi-impl=gssglue"
+ fi
+
+ local myeconfargs=(
+ --disable-gcc-warnings
+ --disable-valgrind-tests
+ --disable-rpath
+
+ --with-packager="Gentoo Linux"
+ --with-packager-bug-reports="https://bugs.gentoo.org"
+ --with-packager-version="r${PR}"
+
+ $(use_enable client)
+ $(use_enable server)
+
+ $(use_enable kerberos gssapi)
+ ${krb5_impl}
+ $(use_enable kerberos gs2)
+
+ $(use_with gcrypt libgcrypt)
+ $(use_with gnutls)
+ $(use_enable nls)
+ $(use_with idn stringprep)
+ $(use_enable ntlm)
+ $(use_enable static-libs static)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/lib*/lib*.la || die
+ fi
+
+ doman doc/gsasl.1 doc/man/*.3
+}
+
+pkg_postinst() {
+ ewarn "For USE=kerberos, ${PN} now uses libgssglue to allow choosing"
+ ewarn "the Kerberos implementation at runtime."
+ elog "See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/"
+ elog "for more details."
+}
diff --git a/net-misc/htail/htail-1.5.ebuild b/net-misc/htail/htail-1.5.ebuild
index 3125e0a4d3ad..cb7f47746b65 100644
--- a/net-misc/htail/htail-1.5.ebuild
+++ b/net-misc/htail/htail-1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 pypi
@@ -14,3 +14,4 @@ HOMEPAGE="https://github.com/vpelletier/htail"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+BDEPEND="${DISTUTILS_DEPS}"
diff --git a/net-misc/httpstat/Manifest b/net-misc/httpstat/Manifest
index 6c21f9db0e5c..24e6d33804cc 100644
--- a/net-misc/httpstat/Manifest
+++ b/net-misc/httpstat/Manifest
@@ -1,2 +1 @@
DIST httpstat-1.3.1.gh.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46
-DIST httpstat-1.3.1.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46
diff --git a/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch b/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
index 0fcb6523e6e1..37985a3241a0 100644
--- a/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
+++ b/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
@@ -8,24 +8,24 @@
@@ -19,8 +19,7 @@ function title() {
http_url="google.com"
https_url="https://http2.akamai.com"
-
+
-for pybin in python python3; do
-#for pybin in python; do
-+for pybin in python; do
++for pybin in ${EPYTHON}; do
echo
echo "# Test in $pybin"
-
+
@@ -40,9 +39,9 @@ for pybin in python python3; do
main_silent $https_url
assert_exit 0
-
+
- title "comma decimal language (ru_RU)"
- LC_ALL=ru_RU main_silent $http_url
- assert_exit 0
+ #title "comma decimal language (ru_RU)"
+ #LC_ALL=ru_RU main_silent $http_url
+ #assert_exit 0
-
+
title "HTTPSTAT_DEBUG"
HTTPSTAT_DEBUG=true main $http_url | grep -q 'HTTPSTAT_DEBUG=true'
-
+
diff --git a/net-misc/httpstat/httpstat-1.3.1-r1.ebuild b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild
index cdd345b94cba..7c8ead845af8 100644
--- a/net-misc/httpstat/httpstat-1.3.1-r1.ebuild
+++ b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
inherit distutils-r1
DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity"
@@ -24,5 +24,5 @@ PROPERTIES="test_network"
PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch )
python_test() {
- ./httpstat_test.sh || die
+ ./httpstat_test.sh || die "Tests failed with ${EPYTHON}"
}
diff --git a/net-misc/httpstat/httpstat-1.3.1.ebuild b/net-misc/httpstat/httpstat-1.3.1.ebuild
deleted file mode 100644
index 381ef2db3345..000000000000
--- a/net-misc/httpstat/httpstat-1.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity"
-HOMEPAGE="https://github.com/reorx/httpstat"
-SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="net-misc/curl:*"
-
-# Requires access to google.com and http2.akamai.com
-RESTRICT="test"
-PROPERTIES="test_network"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch )
-
-python_test() {
- ./httpstat_test.sh || die
-}
diff --git a/net-misc/hurl/hurl-4.1.0.ebuild b/net-misc/hurl/hurl-4.1.0.ebuild
index f2d88a3a70e6..f180dcb7aa7a 100644
--- a/net-misc/hurl/hurl-4.1.0.ebuild
+++ b/net-misc/hurl/hurl-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Autogenerated by pycargoebuild 0.10
@@ -195,7 +195,8 @@ QA_FLAGS_IGNORED=(
QA_PRESTRIPPED="${QA_FLAGS_IGNORED[*]}"
src_install() {
- dobin target/release/hurl{,fmt}
+ local target_dir="$(usex debug debug release)"
+ dobin target/"${target_dir}"/hurl{,fmt}
doman docs/manual/hurl{,fmt}.1
dodoc CHANGELOG.md README.md LICENSE
diff --git a/net-misc/inetutils/Manifest b/net-misc/inetutils/Manifest
index 81c1302e7a72..9294329b8da4 100644
--- a/net-misc/inetutils/Manifest
+++ b/net-misc/inetutils/Manifest
@@ -1 +1 @@
-DIST inetutils-2.4.tar.xz 1558308 BLAKE2B 1f7a33f313b736b305f62587c727ba843659621fbd89610dea81a0acf0e74aca8d3005cca2e3451fe30517880678023d4949bf1b1276bb660b80802e97c06bc8 SHA512 e7e6a5d7e2e02f07a2a6cfc09694e3c0a4e4a8ef8a435eed41902eba13caeed329ae6d6ba94b0de8f789e307f04656d12c48c1c0217b69d162bc5efb0ff6adee
+DIST inetutils-2.5.tar.xz 1670424 BLAKE2B 80ab4f4287328ceb75c33b8794ec21209ea95206a205ea60fbd8f1d7e7fa01eec228ea50d61c8bb37a88cd3144b58ecfecd0af440ba85d43d5ea19565d88a6d4 SHA512 dc11ad6eeb5ea2c85edddbfc77630b5b09e4e1ac643629edf13b0ac0828c13cdb0885275153c072ae13a798427c96bc461037822ad646f7210369192c35bb04c
diff --git a/net-misc/inetutils/inetutils-2.4.ebuild b/net-misc/inetutils/inetutils-2.5.ebuild
index e7e723de8d59..adc14e092684 100644
--- a/net-misc/inetutils/inetutils-2.4.ebuild
+++ b/net-misc/inetutils/inetutils-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}
traceroute? ( !net-analyzer/traceroute )
"
-QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert alignof )
+QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert alignof unreachable )
src_configure() {
local myconf=(
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index b4708ff13b08..6bfe5652d14d 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,4 +1,3 @@
DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
-DIST iperf-3.13.tar.gz 648754 BLAKE2B 8b08ae0e67ed066c7dabd115b757fefff03196aa2d732b6d88e20cf82ea3a5431b9be753fcc7b331932a5e59dc3e24ff4b929a7a1af5b500704cdd5094bf6859 SHA512 067147edffa1d7482a9fc5d54638091f8bc099b9c45d9a471f4e33730463548fb2350749620f2ca3ff509cd7a9c4f63bf01f84cab36718edd8784ce7a15ca368
-DIST iperf-3.14.tar.gz 650626 BLAKE2B 3809689964721ec2f58d29985c1767bc12473f9b659fd8bd430adb00558ceda2519276dbc0df5cb9634ef96d3d98708b8413a712cdb372bd34a28a330049349f SHA512 a90fbaddd73e5b721a84cee71cefb63391c13f64107f5785e954e7c44e9a8c5072e402b6fe45434966d3cc58ac97227c608ca9719161fc23459c5e5efcf8232b
DIST iperf-3.15.tar.gz 649330 BLAKE2B f086d506d1de8e8b333a7ad46a94279aa5b42800ded7cc6724c3400e479a6523b336c74b5956d07117a178b5f89934553535824a05daafcdb2eb8d31754680e1 SHA512 988bc558f40a16c3d94df3956705712829c1c529efd577db16213783846c84bc3edbad19a4d7890b7aba08fbc4e1c6807105df29931e9b45981066b609d87aa2
+DIST iperf-3.16.tar.gz 664751 BLAKE2B 4ca930b58c54d5ae5b0c8b14aca2556224ff2c7b943d32e65486dc2a7e1abd2d26b229e9f759358c326be8754e88a203e11a3ab0f029daa982375a880c3f1cbd SHA512 9ba97e03f17f3b939343b07ed3d508fbf57489e2b984b77a3dc3ada535f981350e56495154bdd108a83b3c507ccbed599b2b7b25de0d1778912d2c01b4ad4e7c
diff --git a/net-misc/iperf/iperf-3.14.ebuild b/net-misc/iperf/iperf-3.14.ebuild
deleted file mode 100644
index a136b4ecd132..000000000000
--- a/net-misc/iperf/iperf-3.14.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_/}
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="sctp"
-
-DEPEND="
- >=dev-libs/cJSON-1.7.15
- dev-libs/openssl:=
- sctp? ( net-misc/lksctp-tools )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.md RELNOTES.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
- "${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch
-)
-
-src_prepare() {
- default
-
- # Drop bundled cjson
- rm src/cjson.{c,h} || die
-
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with sctp)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/iperf.confd iperf3
- newinitd "${FILESDIR}"/iperf3.initd iperf3
- systemd_dounit contrib/iperf3.service
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-misc/iperf/iperf-3.13.ebuild b/net-misc/iperf/iperf-3.16.ebuild
index a136b4ecd132..4edfb6439687 100644
--- a/net-misc/iperf/iperf-3.13.ebuild
+++ b/net-misc/iperf/iperf-3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,7 @@ inherit autotools systemd
DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
HOMEPAGE="https://github.com/esnet/iperf"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz"
S="${WORKDIR}"/${P/_/}
LICENSE="BSD"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index eeedf8998123..2863ec7dbc8d 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,3 +1,4 @@
DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f
+DIST iputils-20240117.tar.xz 445684 BLAKE2B 635943e12010aef8c1291b407bfbe284e0179391fca76197b77037ae1ffc219fa1d8e36abcea5fb7fff10d55ab40eed7c081e5d92b29f0916a4b4dd806945491 SHA512 c45822c5641f194dc07cba919c13a4b7a79d050bb53957a894ebb6ccc1f71bac1f26489e13d18ef1ce235982f5fa1824e677f95037a0f5cce6bcb94be4c2e2de
DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
diff --git a/net-misc/iputils/iputils-20240117.ebuild b/net-misc/iputils/iputils-20240117.ebuild
new file mode 100644
index 000000000000..30d11a82c612
--- /dev/null
+++ b/net-misc/iputils/iputils-20240117.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="de fr ja pt_BR tr uk zh_CN"
+
+inherit fcaps meson plocale systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+# We install ping unconditionally so BSD is listed by itself
+# See LICENSE on each release, it summaries per-component
+LICENSE="
+ BSD
+ arping? ( GPL-2+ )
+ clockdiff? ( BSD )
+ tracepath? ( GPL-2+ )
+"
+SLOT="0"
+IUSE="+arping caps clockdiff doc idn nls test tracepath"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ caps? ( sys-libs/libcap )
+ idn? ( net-dns/libidn2:= )
+ nls? ( virtual/libintl )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/os-headers
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-ns-stylesheets
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+ test? ( sys-apps/iproute2 )
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ default
+
+ plocale_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -DUSE_CAP=$(usex caps true false)
+ -DUSE_IDN=$(usex idn true false)
+ -DBUILD_ARPING=$(usex arping true false)
+ -DBUILD_CLOCKDIFF=$(usex clockdiff true false)
+ -DBUILD_PING=true
+ -DBUILD_TRACEPATH=$(usex tracepath true false)
+ -DNO_SETCAP_OR_SUID=true
+ -Dsystemdunitdir=$(systemd_get_systemunitdir)
+ -DUSE_GETTEXT=$(usex nls true false)
+ $(meson_use !test SKIP_TESTS)
+ -DBUILD_HTML_MANS=$(usex doc true false)
+ -DBUILD_MANS=true
+ )
+
+ meson_src_configure
+}
+
+src_compile() {
+ tc-export CC
+
+ meson_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} != 0 ]] ; then
+ einfo "Tests require root privileges. Skipping ..."
+ return
+ fi
+
+ meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ FILECAPS=( cap_net_raw usr/bin/ping )
+ use arping && FILECAPS+=( usr/bin/arping )
+ use clockdiff && FILECAPS+=( usr/bin/clockdiff )
+
+ dosym ping /usr/bin/ping4
+ dosym ping /usr/bin/ping6
+
+ if use tracepath ; then
+ dosym tracepath /usr/bin/tracepath4
+ dosym tracepath /usr/bin/tracepath6
+ dosym tracepath.8 /usr/share/man/man8/tracepath4.8
+ dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+ fi
+
+ if use doc ; then
+ mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
+ fi
+}
+
+pkg_preinst() {
+ local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
+ if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
+ HAD_TFTPD_VERSION=1
+ fi
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
+ ewarn "This upstream version (>= 20211215) drops two tools:"
+ ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
+ ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
+ ewarn "Please install one of the listed alternatives if needed!"
+ fi
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index f1fd401dbdc4..9ea33b7d9ce9 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
inherit git-r3
else
- SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
diff --git a/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch b/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch
new file mode 100644
index 000000000000..542c9fdd1fc2
--- /dev/null
+++ b/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch
@@ -0,0 +1,37 @@
+From 96fdd331c21421a313b6b97cb62e0c775ddc061c Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 10 Jan 2023 12:36:30 +0100
+Subject: [PATCH 2/2] <utils.h>: Add timeout_init prototype
+
+So that it can be called from the main function. This avoids a
+compilation error with future compilers.
+---
+ include/utils.h | 1 +
+ src/utils.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/utils.h b/include/utils.h
+index 754ddff..cd98b29 100644
+--- a/include/utils.h
++++ b/include/utils.h
+@@ -28,6 +28,7 @@ char *create_string(const char *fmt, ...);
+ int split_host_from_query(struct s_whois_query *wq);
+ int make_connect(const char *, int);
+ int add_text_to_buffer(char **, const char *);
++void timeout_init(void);
+
+
+ #endif
+diff --git a/src/utils.c b/src/utils.c
+index ab01c2c..f82bd1c 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -348,7 +348,7 @@ split_host_from_query(struct s_whois_query *wq)
+ * file.
+ */
+ void
+-timeout_init()
++timeout_init(void)
+ {
+ int iret;
+ char *ret = "75", *ret2;
diff --git a/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch b/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch
new file mode 100644
index 000000000000..fca5dd4cdd38
--- /dev/null
+++ b/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch
@@ -0,0 +1,44 @@
+From c7c344302d81a36b20d3d26a3d13367c8ed2c80d Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 10 Jan 2023 12:31:03 +0100
+Subject: [PATCH 1/2] configure.in: C99 compatibility fix
+
+Avoid implicit declarations of inet_pton, exit. Include <arpa/inet.h>
+for the glibc declaration. Return from main instead of calling exit.
+This avoids compilation errors with future compilers.
+---
+ configure.in | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f1cdd10..678fe7d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,7 +119,7 @@ AC_CHECK_LIB(inet6, main,
+ AC_CHECK_FUNCS(memcpy strtol)
+ AC_CHECK_FUNCS(strcasecmp strncasecmp getopt_long)
+ AC_HEADER_STDC([])
+-AC_CHECK_HEADERS(sys/types.h sys/socket.h netinet/in.h netdb.h sys/time.h sys/stat.h sys/fcntl.h malloc.h locale.h stdint.h inttypes.h idna.h)
++AC_CHECK_HEADERS(sys/types.h sys/socket.h netinet/in.h netdb.h sys/time.h sys/stat.h sys/fcntl.h malloc.h locale.h stdint.h inttypes.h idna.h arpa/inet.h)
+ AC_HEADER_TIME
+
+
+@@ -139,13 +139,16 @@ AC_TRY_RUN(
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
+ int main()
+ {
+ struct in6_addr addr6;
+ if (inet_pton(AF_INET6, "::1", &addr6) < 1)
+- exit(1);
++ return 1;
+ else
+- exit(0);
++ return 0;
+ }
+ ], [
+ AC_MSG_RESULT(yes)
diff --git a/net-misc/jwhois/jwhois-4.0-r2.ebuild b/net-misc/jwhois/jwhois-4.0-r2.ebuild
new file mode 100644
index 000000000000..ecfef500523f
--- /dev/null
+++ b/net-misc/jwhois/jwhois-4.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
+HOMEPAGE="https://github.com/jonasob/jwhois/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="idn nls"
+
+RDEPEND="idn? ( net-dns/libidn )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ # bug 208875
+ "${FILESDIR}"/${P}-connect-logic.patch
+ "${FILESDIR}"/${P}-avoid-implicit-declarations.patch
+ "${FILESDIR}"/${P}-add-timeout_init-prototype.patch
+)
+
+src_configure() {
+ econf \
+ --localstatedir="${EPREFIX}"/var/cache \
+ --without-cache \
+ $(use_enable nls) \
+ $(use_with idn libidn)
+ eautoreconf
+}
+
+src_compile(){
+ emake AR="$(tc-getAR)"
+}
diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml
index 05e015a7ce25..e8a24cb81ff8 100644
--- a/net-misc/jwhois/metadata.xml
+++ b/net-misc/jwhois/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="savannah">jwhois</remote-id>
+ <remote-id type="github">jonasob/jwhois</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 72422573e8de..0e32629d5afc 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -1,3 +1,3 @@
-DIST kafka_2.13-3.4.1.tgz 106613091 BLAKE2B c75bc59291f2030e34bad8d5401a65603b1ef9f570784c382874807741ee97ed4812a114f8a0dbcfbc9d3abe278f103a4dfca53d5a1a0be6f7ebc1d9c00c8565 SHA512 875308e9b0a3597ea4a1088788f4040f257c3b825730572b038ede0fee3bc5336559f7ef0ab4d78b9512ac71385f84698180a2026ca81f1221ef65811bed6bce
-DIST kafka_2.13-3.5.1.tgz 106748875 BLAKE2B daba54058f8b26dcf622bcf09df3c1abc79886bca0ae1f4221ad593021c329640689408803bac9e62b419e332633f7643354b5168a30c0360f178642c11ae112 SHA512 b6ceb010a5fe1791843cbc53d34d35993e97e03f9518344b4b5bdf7146d0a4e866cd2d4760cab319d8b3323a5bf53037a78fed88c9384381aea2cd0366877763
-DIST kafka_2.13-3.6.0.tgz 113257079 BLAKE2B db5f0bafbbaef256d03a80e27adbcaffc8463cd5fffcba937cdfc418c4ab931770d87424eeff96cdc41e79217954c0885e26bab72e68b9d9c3f905a1991e7865 SHA512 98d20f475bccc11eb3cf05362112c788eea7bfc88abddba66cfcfb48880d3bb97918a90d44eb7c1720527bebca93dd231002b5159876f6ee8b7fcd91cc1b0644
+DIST kafka_2.13-3.5.2.tgz 110420856 BLAKE2B fd59e7fcb22a944f6fdee4ecda7d418f3818c42b23a0b8a02ef629781ed8a34c95e4ad75560f9e3fb9bbc32933f7960f086c39d2294c336b8ab520c887aa8a22 SHA512 229ccc5e3e6b3b9845f59f6e829d70711c5a5a2293f32b6bcabc37350666f874bc7d8f08130f712a1b32915205c10f2847f04908c20d5f7fdb4b62d058c9defe
+DIST kafka_2.13-3.6.1.tgz 113466638 BLAKE2B 1142459c2810cf4df8785afc9fab57440357000a97b23cfec8b6c59d886706d4fd13120388e9473917106c1cb237f65671bb1258de1343ef7818b3b97617f0b4 SHA512 1f063cd67463dd3bb5a5e06e7a1c2278db84bfc836a634fac7c9a005de66a42ac00b32f5e9bbdd22086605f73659efd4ce5bd1185196b02a743be0898daac55d
+DIST kafka_2.13-3.7.0.tgz 119028138 BLAKE2B 5d366f5d9456668f4914da30fa32f7104816ec721379f88c5e77946f01256e02a7a6465e6865cb957af5bdf6a77e3ae16cf9e715f3b13ce00e1debd0ce34d4f3 SHA512 b8679283a2d8dab86e7c636b2c688fe9d9e64ac437241f65ef7a1733f4d26a2bd415eefa04f09f1911373bcd2a5dbc3838c76347f68656425c09202cd290ce91
diff --git a/net-misc/kafka-bin/kafka-bin-3.5.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.5.2.ebuild
index 62f5d3c5f537..750555119b44 100644
--- a/net-misc/kafka-bin/kafka-bin-3.5.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/kafka-bin/kafka-bin-3.4.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild
index 62f5d3c5f537..62f5d3c5f537 100644
--- a/net-misc/kafka-bin/kafka-bin-3.4.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild
diff --git a/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.7.0.ebuild
index 62f5d3c5f537..750555119b44 100644
--- a/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index a29210d24713..313b52da604e 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,3 +1,2 @@
-DIST kea-2.0.2.tar.gz 9796557 BLAKE2B a859c4cc3f6686db2dcf640738b421499a816700d134ee9322290051c3a192bab482be4a4bdb2630113594a3af1cafe2b95abce4a463815a6404fe87fac227ad SHA512 edb7de227898fb7bd76dd8b503d02e07b4ba512b907b53399a5c45bd216820b342f00c1834858848ce8ff94aa3c228ceead0e2946cbcb1f75a03ca579630be83
-DIST kea-2.2.0.tar.gz 9999074 BLAKE2B 10b4bca1a135c6d146490f8c4c7bd4d56c1c03e2b4cc88a6888fcad5d1a5c2ee2d2c0215cb345b53a2a4262dbd02516d75d5778835d45384a7d69a062b8696b9 SHA512 82cd44efea8c968ef097de242e1ca59e0183c80df25050017fd45538d35da64a9a0d2f4a5249ad3bd3d30b1f8895c360d301518bc22e60dfddd966fe020dc773
DIST kea-2.4.0.tar.gz 10462721 BLAKE2B 07a4424c01872142b85446ee881afbdc9d8b3a0bc7879226463dd0ba20eba6d3d6db3dfd5fff88cd54af05c4f58183032c7df90d24a969a7ae63200822b6f35f SHA512 b0bdb6b6af88e322145ffeb742a818d6e225846ff981ecc4925d311870db94e0c5a4eb0e1140f146624f64b636c9b24148b5efbc32e62a19b99bba0810b54654
+DIST kea-2.4.1.tar.gz 10487415 BLAKE2B 21037d28f812ebbc65ae34f5151a209e9c74f6aa005e96ed7cbbf6e4250e6c40eecf5d257b852bf01663a0982b5401008dd6a51a16d861b30a83549f827538b6 SHA512 b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224
diff --git a/net-misc/kea/files/ax_gtest.m4 b/net-misc/kea/files/ax_gtest.m4
index acd887c2d3ab..7f7d0bb7aa65 100644
--- a/net-misc/kea/files/ax_gtest.m4
+++ b/net-misc/kea/files/ax_gtest.m4
@@ -1,56 +1,13 @@
AC_DEFUN([AX_ISC_GTEST], [
-AC_ARG_WITH([lcov],
- [AS_HELP_STRING([--with-lcov[[=PROGRAM]]],
- [enable gtest and coverage target using the specified lcov])],
- [lcov="$withval"],
- [lcov="no"])
-
USE_LCOV="no"
-if test "$lcov" != "no"; then
- # force gtest if not set
- if test "$enable_gtest" = "no"; then
-# AC_MSG_ERROR("lcov needs gtest for test coverage report")
- AC_MSG_NOTICE([gtest support is now enabled, because used by coverage tests])
- enable_gtest="yes"
- fi
- if test "$lcov" != "yes"; then
- LCOV=$lcov
- else
- AC_PATH_PROG([LCOV], [lcov])
- fi
- if test -x "${LCOV}"; then
- USE_LCOV="yes"
- else
- AC_MSG_ERROR([Cannot find lcov.])
- fi
- # is genhtml always in the same directory?
- GENHTML=`echo "$LCOV" | ${SED} s/lcov$/genhtml/`
- if test ! -x $GENHTML; then
- AC_MSG_ERROR([genhtml not found, needed for lcov])
- fi
- # GCC specific?
- CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
- LIBS=" $LIBS -lgcov"
- AC_SUBST(CPPFLAGS)
- AC_SUBST(LIBS)
- AC_SUBST(LCOV)
- AC_SUBST(GENHTML)
-fi
AC_SUBST(USE_LCOV)
-#
-# Check availability of gtest, which will be used for unit tests.
-#
-DISTCHECK_GTEST_CONFIGURE_FLAG=
-
-AS_IF([test "x$enable_gtest" = "xyes"], [
- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
- PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])])
- GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest`
- GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest`
- GTEST_VERSION=`${PKG_CONFIG} --modversion gtest`
-])
+DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
+PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])])
+GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest`
+GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest`
+GTEST_VERSION=`${PKG_CONFIG} --modversion gtest`
AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no")
AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes")
diff --git a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch b/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch
deleted file mode 100644
index fec0fcc30f4b..000000000000
--- a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc
-+++ kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc
-@@ -9,6 +9,7 @@
- #include <asiolink/io_service.h>
- #include <dhcpsrv/dhcpsrv_log.h>
- #include <dhcpsrv/timer_mgr.h>
-+#include <map>
- #include <exceptions/exceptions.h>
-
- #include <functional>
diff --git a/net-misc/kea/files/kea-1.9.10-gtest.patch b/net-misc/kea/files/kea-1.9.10-gtest.patch
deleted file mode 100644
index f3e8cd7af4cc..000000000000
--- a/net-misc/kea/files/kea-1.9.10-gtest.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/m4macros/ax_gtest.m4
-+++ b/m4macros/ax_gtest.m4
-@@ -1,17 +1,8 @@
- AC_DEFUN([AX_ISC_GTEST], [
-
--enable_gtest="no"
--GTEST_INCLUDES=
--
--AC_ARG_WITH([gtest-source],
-- [AS_HELP_STRING([--with-gtest-source=PATH],
-- [location of the Googletest source])],
-- [enable_gtest="yes" ; GTEST_SOURCE="$withval"])
--
--AC_ARG_WITH([gtest],
-- [AS_HELP_STRING([--with-gtest=PATH],
-- [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
-- [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
-+AC_ARG_ENABLE([gtest],
-+ [AS_HELP_STRING([--enable-gtest],
-+ [enable testing via Googletest [default=no]])])
-
- AC_ARG_WITH([lcov],
- [AS_HELP_STRING([--with-lcov=PROGRAM],
-@@ -55,111 +46,22 @@
- #
- # Check availability of gtest, which will be used for unit tests.
- #
--GTEST_LDFLAGS=
--GTEST_LDADD=
- DISTCHECK_GTEST_CONFIGURE_FLAG=
--GTEST_VERSION="unknown"
--
--if test "x$enable_gtest" = "xyes" ; then
--
-- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path"
--
-- if test -n "$with_gtest_source" ; then
-
-- if test "x$GTEST_SOURCE" = "xyes" ; then
-+AS_IF([test "x$enable_gtest" = "xyes"], [
-+ DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
-+ PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])])
-+ GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest`
-+ GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest`
-+ GTEST_VERSION=`${PKG_CONFIG} --modversion gtest`
-+])
-
-- AC_MSG_CHECKING([for gtest source])
-- # If not specified, try some common paths.
-- GTEST_SOURCE=
-- for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do
-- if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then
-- GTEST_SOURCE=$d
-- AC_MSG_RESULT([$GTEST_SOURCE])
-- break
-- fi
-- done
-- if test -z $GTEST_SOURCE ; then
-- AC_MSG_ERROR([no gtest source but it was selected])
-- fi
-- else
-- if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then
-- GTEST_SOURCE=$GTEST_SOURCE/googletest
-- fi
-- if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then
-- have_gtest_source=yes
-- else
-- AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])
-- fi
-- fi
-- have_gtest_source=yes
--
-- GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a"
-- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
-- GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
-- GTEST_VERSION="`basename $GTEST_SOURCE`"
--
--# Versions starting from 1.8.0 are put in the googletest directory. If the basename
--# returns googletest string, we need to cut it off and try baseline again.
-- if test "$GTEST_VERSION" = "googletest"; then
-- GTEST_VERSION=${GTEST_SOURCE%"/googletest"}
-- GTEST_VERSION=`basename $GTEST_VERSION`
-- fi
-- GTEST_VERSION="${GTEST_VERSION#googletest-release-}"
-- GTEST_VERSION="${GTEST_VERSION#gtest-}"
-- fi
--
-- if test "$gtest_path" != "no" ; then
-- if test "$gtest_path" != "yes"; then
-- GTEST_PATHS=$gtest_path
-- if test -x "${gtest_path}/bin/gtest-config" ; then
-- GTEST_CONFIG="${gtest_path}/bin/gtest-config"
-- fi
-- else
-- AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
-- fi
-- if test -x "${GTEST_CONFIG}" ; then :
-- # using cppflags instead of cxxflags
-- GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags`
-- GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
-- GTEST_LDADD=`${GTEST_CONFIG} --libs`
-- GTEST_VERSION=`${GTEST_CONFIG} --version`
-- GTEST_FOUND="true"
-- else
-- AC_MSG_WARN([Unable to locate Google Test gtest-config.])
-- if test -z "${GTEST_PATHS}" ; then
-- GTEST_PATHS="/usr /usr/local"
-- fi
-- GTEST_FOUND="false"
-- fi
-- if test "${GTEST_FOUND}" != "true"; then
-- GTEST_FOUND="false"
-- for dir in $GTEST_PATHS; do
-- if test -f "$dir/include/gtest/gtest.h"; then
-- if test -f "$dir/lib/libgtest.a" || \
-- test -f "$dir/lib/libgtest.so"; then