summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/anydesk/metadata.xml5
-rw-r--r--net-misc/apt-cacher-ng/Manifest1
-rw-r--r--net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild105
-rw-r--r--net-misc/arpsponge/arpsponge-3.17.11-r1.ebuild (renamed from net-misc/arpsponge/arpsponge-3.17.11.ebuild)15
-rw-r--r--net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild4
-rw-r--r--net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild4
-rw-r--r--net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild4
-rw-r--r--net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild4
-rw-r--r--net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild4
-rw-r--r--net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild4
-rw-r--r--net-misc/asterisk/Manifest3
-rw-r--r--net-misc/asterisk/asterisk-16.26.1.ebuild370
-rw-r--r--net-misc/asterisk/asterisk-16.27.0.ebuild370
-rw-r--r--net-misc/asterisk/asterisk-18.10.0-r1.ebuild2
-rw-r--r--net-misc/asterisk/asterisk-18.13.0.ebuild369
-rw-r--r--net-misc/asterisk/asterisk-18.8.0-r1.ebuild2
-rw-r--r--net-misc/asterisk/asterisk-18.9.0-r1.ebuild2
-rw-r--r--net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1202
-rw-r--r--net-misc/asterisk/files/confd-16.26.1-18.12.1169
-rw-r--r--net-misc/asterisk/files/initd-16.26.1-18.12.1309
-rw-r--r--net-misc/axel/Manifest3
-rw-r--r--net-misc/axel/axel-2.17.11.ebuild (renamed from net-misc/axel/axel-2.17.8.ebuild)2
-rw-r--r--net-misc/axel/axel-2.17.9.ebuild38
-rw-r--r--net-misc/batctl/Manifest2
-rw-r--r--net-misc/batctl/batctl-2022.2.ebuild (renamed from net-misc/batctl/batctl-2021.4.ebuild)2
-rw-r--r--net-misc/bridge-utils/Manifest1
-rw-r--r--net-misc/bridge-utils/bridge-utils-1.6.ebuild55
-rw-r--r--net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild2
-rw-r--r--net-misc/bridge-utils/bridge-utils-1.7.1.ebuild55
-rw-r--r--net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch16
-rw-r--r--net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild4
-rw-r--r--net-misc/chrome-remote-desktop/Manifest2
-rw-r--r--net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild (renamed from net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild)2
-rw-r--r--net-misc/chrony/Manifest2
-rw-r--r--net-misc/chrony/chrony-4.3_pre1.ebuild251
-rw-r--r--net-misc/chrony/chrony-9999.ebuild17
-rw-r--r--net-misc/clusterssh/clusterssh-4.16.ebuild8
-rw-r--r--net-misc/clusterssh/clusterssh-9999.ebuild10
-rw-r--r--net-misc/cmst/Manifest1
-rw-r--r--net-misc/cmst/cmst-2022.03.13.ebuild46
-rw-r--r--net-misc/cmst/cmst-2022.05.01.ebuild2
-rw-r--r--net-misc/cni-plugins/Manifest4
-rw-r--r--net-misc/cni-plugins/cni-plugins-0.8.6.ebuild31
-rw-r--r--net-misc/cni-plugins/cni-plugins-0.8.7.ebuild31
-rw-r--r--net-misc/cni-plugins/cni-plugins-0.9.0.ebuild32
-rw-r--r--net-misc/cni-plugins/cni-plugins-0.9.1.ebuild32
-rw-r--r--net-misc/cni-plugins/files/cni-dhcp.initd20
-rw-r--r--net-misc/cni-plugins/metadata.xml11
-rw-r--r--net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild38
-rw-r--r--net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild4
-rw-r--r--net-misc/connman/Manifest1
-rw-r--r--net-misc/connman/connman-1.42_pre20220801.ebuild106
-rw-r--r--net-misc/croc/Manifest2
-rw-r--r--net-misc/croc/croc-9.5.6.ebuild (renamed from net-misc/croc/croc-9.5.3.ebuild)0
-rw-r--r--net-misc/curl/Manifest10
-rw-r--r--net-misc/curl/curl-7.80.0-r1.ebuild278
-rw-r--r--net-misc/curl/curl-7.81.0-r1.ebuild278
-rw-r--r--net-misc/curl/curl-7.82.0-r2.ebuild279
-rw-r--r--net-misc/curl/curl-7.84.0.ebuild (renamed from net-misc/curl/curl-7.83.0.ebuild)6
-rw-r--r--net-misc/curl/files/curl-7.82.0-certs-processing.patch27
-rw-r--r--net-misc/curl/files/curl-7.83.0-http2.patch30
-rw-r--r--net-misc/curl/files/curl-7.84.0-easylock.patch30
-rw-r--r--net-misc/curl/files/curl-7.84.0-include-sched.patch24
-rw-r--r--net-misc/curl/metadata.xml1
-rw-r--r--net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild74
-rw-r--r--net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4271
-rw-r--r--net-misc/dahdi/Manifest3
-rw-r--r--net-misc/dahdi/dahdi-3.1.0-r4.ebuild (renamed from net-misc/dahdi/dahdi-3.1.0-r2.ebuild)29
-rw-r--r--net-misc/dhcpcd/Manifest1
-rw-r--r--net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild160
-rw-r--r--net-misc/dhcpcd/dhcpcd-9.4.1.ebuild2
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch36
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch40
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch55
-rw-r--r--net-misc/dropbox-cli/Manifest1
-rw-r--r--net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild31
-rw-r--r--net-misc/dropbox-cli/dropbox-cli-2022.ebuild2
-rw-r--r--net-misc/dropbox/Manifest10
-rw-r--r--net-misc/dropbox/dropbox-152.4.4880.ebuild (renamed from net-misc/dropbox/dropbox-147.4.4800.ebuild)0
-rw-r--r--net-misc/dropbox/dropbox-153.4.3932.ebuild (renamed from net-misc/dropbox/dropbox-148.4.4519.ebuild)0
-rw-r--r--net-misc/dropbox/dropbox-154.4.5363.ebuild110
-rw-r--r--net-misc/electron-cash/Manifest1
-rw-r--r--net-misc/electron-cash/electron-cash-4.2.10.ebuild157
-rw-r--r--net-misc/electron-cash/electron-cash-4.2.9.ebuild5
-rw-r--r--net-misc/electron-cash/metadata.xml1
-rw-r--r--net-misc/electrum/Manifest3
-rw-r--r--net-misc/electrum/electrum-4.2.2.ebuild (renamed from net-misc/electrum/electrum-4.2.1-r2.ebuild)0
-rw-r--r--net-misc/electrum/electrum-4.3.0.ebuild95
-rw-r--r--net-misc/exabgp/Manifest5
-rw-r--r--net-misc/exabgp/exabgp-4.2.11-r1.ebuild60
-rw-r--r--net-misc/exabgp/exabgp-4.2.11-r2.ebuild64
-rw-r--r--net-misc/exabgp/exabgp-4.2.19-r1.ebuild (renamed from net-misc/exabgp/exabgp-4.2.17.ebuild)2
-rw-r--r--net-misc/exabgp/exabgp-4.2.21.ebuild (renamed from net-misc/exabgp/exabgp-4.2.16.ebuild)11
-rw-r--r--net-misc/exabgp/files/exabgp.initd-r164
-rw-r--r--net-misc/felix/felix-3.1.3.ebuild4
-rw-r--r--net-misc/freerdp/Manifest1
-rw-r--r--net-misc/freerdp/freerdp-2.8.0.ebuild124
-rw-r--r--net-misc/frr/Manifest1
-rw-r--r--net-misc/frr/frr-8.1-r1.ebuild148
-rw-r--r--net-misc/frr/frr-8.2.2.ebuild2
-rw-r--r--net-misc/gallery-dl/Manifest4
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.21.1.ebuild2
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.21.2.ebuild2
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.22.2.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.21.0.ebuild)2
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.22.3.ebuild38
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.22.4.ebuild38
-rw-r--r--net-misc/gallery-dl/gallery-dl-9999.ebuild2
-rw-r--r--net-misc/gerbera/gerbera-1.11.0.ebuild2
-rw-r--r--net-misc/gerbera/gerbera-9999.ebuild2
-rw-r--r--net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild39
-rw-r--r--net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild2
-rw-r--r--net-misc/gnome-remote-desktop/Manifest6
-rw-r--r--net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild62
-rw-r--r--net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild64
-rw-r--r--net-misc/gnome-remote-desktop/gnome-remote-desktop-42.3.ebuild (renamed from net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild)2
-rw-r--r--net-misc/gnome-remote-desktop/gnome-remote-desktop-42.4.ebuild (renamed from net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild)2
-rw-r--r--net-misc/gns3-gui/Manifest2
-rw-r--r--net-misc/gns3-gui/gns3-gui-2.2.33.1.ebuild (renamed from net-misc/gns3-gui/gns3-gui-2.2.29.ebuild)8
-rw-r--r--net-misc/gns3-server/Manifest2
-rw-r--r--net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild2
-rw-r--r--net-misc/gns3-server/gns3-server-2.2.31.ebuild2
-rw-r--r--net-misc/gns3-server/gns3-server-2.2.33.1-r1.ebuild74
-rw-r--r--net-misc/gns3-server/gns3-server-2.2.33.1.ebuild (renamed from net-misc/gns3-server/gns3-server-2.2.29.ebuild)14
-rw-r--r--net-misc/gsasl/Manifest2
-rw-r--r--net-misc/gsasl/gsasl-2.0.0.ebuild90
-rw-r--r--net-misc/gsasl/gsasl-2.0.1-r2.ebuild92
-rw-r--r--net-misc/gsasl/gsasl-2.0.1.ebuild91
-rw-r--r--net-misc/gsasl/metadata.xml25
-rw-r--r--net-misc/gsutil/Manifest1
-rw-r--r--net-misc/gsutil/gsutil-5.9.ebuild91
-rw-r--r--net-misc/gupnp-tools/Manifest1
-rw-r--r--net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild35
-rw-r--r--net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild2
-rw-r--r--net-misc/hashcash/metadata.xml9
-rw-r--r--net-misc/htpdate/Manifest1
-rw-r--r--net-misc/htpdate/htpdate-1.3.5.ebuild55
-rw-r--r--net-misc/htpdate/htpdate-9999.ebuild13
-rw-r--r--net-misc/htpdate/metadata.xml7
-rw-r--r--net-misc/httpstat/metadata.xml5
-rw-r--r--net-misc/icaclient/Manifest2
-rw-r--r--net-misc/icaclient/icaclient-22.5.0.16.ebuild7
-rw-r--r--net-misc/icaclient/icaclient-22.7.0.20-r1.ebuild238
-rw-r--r--net-misc/icaclient/metadata.xml10
-rw-r--r--net-misc/icecast/metadata.xml5
-rw-r--r--net-misc/iputils/Manifest2
-rw-r--r--net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch47
-rw-r--r--net-misc/iputils/files/iputils-20210722-optional-tests.patch202
-rw-r--r--net-misc/iputils/iputils-20210722-r1.ebuild186
-rw-r--r--net-misc/iputils/iputils-20211215.ebuild2
-rw-r--r--net-misc/iputils/iputils-99999999.ebuild2
-rw-r--r--net-misc/iputils/metadata.xml32
-rw-r--r--net-misc/ipv6calc/ipv6calc-4.0.1.ebuild1
-rw-r--r--net-misc/kea/metadata.xml4
-rw-r--r--net-misc/keychain/keychain-2.8.5-r1.ebuild20
-rw-r--r--net-misc/kio-zeroconf/Manifest1
-rw-r--r--net-misc/kio-zeroconf/kio-zeroconf-22.04.3.ebuild26
-rw-r--r--net-misc/kio-zeroconf/metadata.xml11
-rw-r--r--net-misc/linuxptp/linuxptp-2.0-r1.ebuild6
-rw-r--r--net-misc/lldpd/Manifest1
-rw-r--r--net-misc/lldpd/lldpd-1.0.14.ebuild100
-rw-r--r--net-misc/memcached/Manifest1
-rw-r--r--net-misc/memcached/memcached-1.6.16.ebuild106
-rw-r--r--net-misc/miniupnpd/miniupnpd-2.3.0-r1.ebuild2
-rw-r--r--net-misc/mobile-broadband-provider-info/Manifest3
-rw-r--r--net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild22
-rw-r--r--net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild2
-rw-r--r--net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild (renamed from net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild)4
-rw-r--r--net-misc/modemmanager/Manifest2
-rw-r--r--net-misc/modemmanager/metadata.xml1
-rw-r--r--net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild (renamed from net-misc/modemmanager/modemmanager-1.18.6.ebuild)22
-rw-r--r--net-misc/modemmanager/modemmanager-1.18.8.ebuild4
-rw-r--r--net-misc/mosh/Manifest1
-rw-r--r--net-misc/mosh/metadata.xml4
-rw-r--r--net-misc/mosh/mosh-1.3.2.95_rc1.ebuild89
-rw-r--r--net-misc/mptcpd/Manifest2
-rw-r--r--net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch197
-rw-r--r--net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch21
-rw-r--r--net-misc/mptcpd/mptcpd-0.10-r1.ebuild (renamed from net-misc/mptcpd/mptcpd-0.9.ebuild)18
-rw-r--r--net-misc/mptcpd/mptcpd-9999.ebuild15
-rw-r--r--net-misc/ndisc6/ndisc6-1.0.5.ebuild4
-rw-r--r--net-misc/netkit-fingerd/Manifest2
-rw-r--r--net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild4
-rw-r--r--net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild2
-rw-r--r--net-misc/netopeer2/netopeer2-2.1.23.ebuild2
-rw-r--r--net-misc/networkmanager/Manifest6
-rw-r--r--net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild400
-rw-r--r--net-misc/networkmanager/networkmanager-1.36.2.ebuild408
-rw-r--r--net-misc/networkmanager/networkmanager-1.38.2.ebuild (renamed from net-misc/networkmanager/networkmanager-1.38.0.ebuild)21
-rw-r--r--net-misc/networkmanager/networkmanager-1.38.4.ebuild (renamed from net-misc/networkmanager/networkmanager-1.36.4.ebuild)25
-rw-r--r--net-misc/nextcloud-client/Manifest5
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild96
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild (renamed from net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild)35
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild (renamed from net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild)19
-rw-r--r--net-misc/ntp/files/ntpd.rc-r223
-rw-r--r--net-misc/ntp/ntp-4.2.8_p15-r1.ebuild143
-rw-r--r--net-misc/ntpsec/files/ntpd.rc-r323
-rw-r--r--net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch34
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild2
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild177
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild178
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild169
-rw-r--r--net-misc/ntpsec/ntpsec-9999.ebuild42
-rw-r--r--net-misc/oidc-agent/Manifest1
-rw-r--r--net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch59
-rw-r--r--net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch11
-rw-r--r--net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch11
-rw-r--r--net-misc/oidc-agent/oidc-agent-4.3.1.ebuild86
-rw-r--r--net-misc/omniORB/Manifest1
-rw-r--r--net-misc/omniORB/metadata.xml15
-rw-r--r--net-misc/omniORB/omniORB-4.3.0.ebuild93
-rw-r--r--net-misc/openntpd/metadata.xml3
-rw-r--r--net-misc/openssh/Manifest1
-rw-r--r--net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch54
-rw-r--r--net-misc/openssh/metadata.xml41
-rw-r--r--net-misc/openssh/openssh-9.0_p1-r2.ebuild485
-rw-r--r--net-misc/openvswitch/Manifest2
-rw-r--r--net-misc/openvswitch/files/ovs-delete-transient-ports.service10
-rw-r--r--net-misc/openvswitch/files/ovs-vswitchd.service15
-rw-r--r--net-misc/openvswitch/files/ovsdb-server.service14
-rw-r--r--net-misc/openvswitch/files/ovsdb-server_conf16
-rw-r--r--net-misc/openvswitch/metadata.xml3
-rw-r--r--net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild (renamed from net-misc/openvswitch/openvswitch-2.14.1.ebuild)59
-rw-r--r--net-misc/owncloud-client/Manifest2
-rw-r--r--net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch93
-rw-r--r--net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild15
-rw-r--r--net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild (renamed from net-misc/owncloud-client/owncloud-client-2.9.2.6206.ebuild)17
-rw-r--r--net-misc/pssh/pssh-2.3.4-r1.ebuild4
-rw-r--r--net-misc/pulseaudio-dlna/Manifest1
-rw-r--r--net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild69
-rw-r--r--net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild36
-rw-r--r--net-misc/putty/Manifest1
-rw-r--r--net-misc/putty/metadata.xml4
-rw-r--r--net-misc/putty/putty-0.76.ebuild2
-rw-r--r--net-misc/putty/putty-0.77-r1.ebuild96
-rw-r--r--net-misc/putty/putty-9999.ebuild68
-rw-r--r--net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild6
-rw-r--r--net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild6
-rw-r--r--net-misc/r8125/Manifest2
-rw-r--r--net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch31
-rw-r--r--net-misc/r8125/r8125-9.008.00.ebuild1
-rw-r--r--net-misc/r8125/r8125-9.009.01.ebuild40
-rw-r--r--net-misc/r8125/r8125-9.009.02.ebuild36
-rw-r--r--net-misc/r8168/Manifest2
-rw-r--r--net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch51
-rw-r--r--net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch23
-rw-r--r--net-misc/r8168/r8168-8.050.03.ebuild (renamed from net-misc/r8168/r8168-8.050.00.ebuild)5
-rw-r--r--net-misc/rabbitmq-server/Manifest2
-rw-r--r--net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild10
-rw-r--r--net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild84
-rw-r--r--net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild84
-rw-r--r--net-misc/radvd/metadata.xml1
-rw-r--r--net-misc/rclone/Manifest1422
-rw-r--r--net-misc/rclone/rclone-1.53.3.ebuild835
-rw-r--r--net-misc/rclone/rclone-1.57.0.ebuild1240
-rw-r--r--net-misc/rclone/rclone-1.58.1.ebuild2
-rw-r--r--net-misc/rclone/rclone-1.59.0.ebuild41
-rw-r--r--net-misc/rclone/rclone-9999.ebuild835
-rw-r--r--net-misc/rdate/rdate-1.11.ebuild2
-rw-r--r--net-misc/rdesktop/metadata.xml1
-rw-r--r--net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild4
-rw-r--r--net-misc/remmina/Manifest5
-rw-r--r--net-misc/remmina/remmina-1.4.23-r1.ebuild104
-rw-r--r--net-misc/remmina/remmina-1.4.24.ebuild104
-rw-r--r--net-misc/remmina/remmina-1.4.25.ebuild104
-rw-r--r--net-misc/remmina/remmina-1.4.26.ebuild104
-rw-r--r--net-misc/remmina/remmina-1.4.27.ebuild (renamed from net-misc/remmina/remmina-1.4.26-r1.ebuild)5
-rw-r--r--net-misc/rsync/Manifest4
-rw-r--r--net-misc/rsync/files/rsync-3.2.3-cross.patch129
-rw-r--r--net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch58
-rw-r--r--net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch26
-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/metadata.xml1
-rw-r--r--net-misc/rsync/rsync-3.2.4-r1.ebuild2
-rw-r--r--net-misc/rsync/rsync-3.2.4-r3.ebuild174
-rw-r--r--net-misc/rsync/rsync-3.2.5_pre1.ebuild (renamed from net-misc/rsync/rsync-3.2.3-r5.ebuild)83
-rw-r--r--net-misc/rygel/Manifest2
-rw-r--r--net-misc/rygel/rygel-0.40.4.ebuild (renamed from net-misc/rygel/rygel-0.40.3.ebuild)0
-rw-r--r--net-misc/s6-networking/Manifest1
-rw-r--r--net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild (renamed from net-misc/s6-networking/s6-networking-2.5.1.0.ebuild)8
-rw-r--r--net-misc/s6-networking/s6-networking-2.5.1.1.ebuild55
-rw-r--r--net-misc/seafile-client/Manifest1
-rw-r--r--net-misc/seafile-client/seafile-client-8.0.7.ebuild52
-rw-r--r--net-misc/seafile/Manifest1
-rw-r--r--net-misc/seafile/seafile-8.0.7.ebuild60
-rw-r--r--net-misc/shmux/Manifest1
-rw-r--r--net-misc/shmux/files/shmux-1.0.3-tinfo.patch11
-rw-r--r--net-misc/shmux/shmux-1.0.3.ebuild43
-rw-r--r--net-misc/smb4k/Manifest1
-rw-r--r--net-misc/smb4k/smb4k-3.1.3.ebuild78
-rw-r--r--net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch46
-rw-r--r--net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch99
-rw-r--r--net-misc/smbc/files/smbc-1.2.2-tinfo.patch18
-rw-r--r--net-misc/smbc/smbc-1.2.2-r3.ebuild18
-rw-r--r--net-misc/spice-gtk/Manifest3
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild153
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.40.ebuild148
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.41.ebuild148
-rw-r--r--net-misc/spice-gtk/spice-gtk-9999.ebuild73
-rw-r--r--net-misc/streamlink/Manifest2
-rw-r--r--net-misc/streamlink/streamlink-4.1.0-r2.ebuild53
-rw-r--r--net-misc/streamlink/streamlink-4.2.0.ebuild53
-rw-r--r--net-misc/streamlink/streamlink-9999.ebuild45
-rw-r--r--net-misc/stunnel/Manifest1
-rw-r--r--net-misc/stunnel/stunnel-5.64-r1.ebuild105
-rw-r--r--net-misc/stunnel/stunnel-5.65-r1.ebuild (renamed from net-misc/stunnel/stunnel-5.64.ebuild)2
-rw-r--r--net-misc/suite3270/files/suite3270-4.1-musl-wint-t-fix.patch12
-rw-r--r--net-misc/suite3270/suite3270-4.1_p11.ebuild4
-rw-r--r--net-misc/sysrepo/Manifest1
-rw-r--r--net-misc/sysrepo/sysrepo-2.1.42.ebuild40
-rw-r--r--net-misc/sysrepo/sysrepo-2.1.64.ebuild2
-rw-r--r--net-misc/taylor-uucp/taylor-uucp-1.07-r5.ebuild (renamed from net-misc/taylor-uucp/taylor-uucp-1.07-r4.ebuild)6
-rw-r--r--net-misc/teamviewer/Manifest16
-rw-r--r--net-misc/teamviewer/teamviewer-15.30.3.ebuild (renamed from net-misc/teamviewer/teamviewer-15.23.9.ebuild)11
-rw-r--r--net-misc/teamviewer/teamviewer-15.31.5.ebuild (renamed from net-misc/teamviewer/teamviewer-15.21.4.ebuild)13
-rw-r--r--net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild (renamed from net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild)6
-rw-r--r--net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild2
-rw-r--r--net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch57
-rw-r--r--net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch57
-rw-r--r--net-misc/tigervnc/metadata.xml1
-rw-r--r--net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild6
-rw-r--r--net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild (renamed from net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild)34
-rw-r--r--net-misc/tigervnc/tigervnc-9999.ebuild34
-rw-r--r--net-misc/turbovnc/Manifest1
-rw-r--r--net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch20
-rw-r--r--net-misc/turbovnc/turbovnc-3.0.ebuild102
-rw-r--r--net-misc/vconfig/vconfig-1.9.ebuild4
-rw-r--r--net-misc/vde/metadata.xml17
-rw-r--r--net-misc/websocat/Manifest47
-rw-r--r--net-misc/websocat/websocat-1.10.0.ebuild250
-rw-r--r--net-misc/wget/files/wget-1.21.3-hsts-type.patch211
-rw-r--r--net-misc/wget/metadata.xml27
-rw-r--r--net-misc/wget/wget-1.21.2.ebuild2
-rw-r--r--net-misc/wget/wget-1.21.3-r1.ebuild114
-rw-r--r--net-misc/wget/wget-1.21.3.ebuild4
-rw-r--r--net-misc/wget2/Manifest2
-rw-r--r--net-misc/wget2/metadata.xml6
-rw-r--r--net-misc/wget2/wget2-2.0.1-r2.ebuild (renamed from net-misc/wget2/wget2-2.0.0-r1.ebuild)18
-rw-r--r--net-misc/wget2/wget2-2.0.1.ebuild126
-rw-r--r--net-misc/wget2/wget2-9999.ebuild57
-rw-r--r--net-misc/whois/Manifest1
-rw-r--r--net-misc/whois/whois-5.5.11.ebuild78
-rw-r--r--net-misc/whois/whois-5.5.13-r1.ebuild (renamed from net-misc/whois/whois-5.5.13.ebuild)5
-rw-r--r--net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild12
-rw-r--r--net-misc/xmrig/Manifest1
-rw-r--r--net-misc/xmrig/xmrig-6.18.0.ebuild65
-rw-r--r--net-misc/xmrig/xmrig-9999.ebuild4
-rw-r--r--net-misc/you-get/Manifest1
-rw-r--r--net-misc/you-get/you-get-0.4.1620.ebuild24
-rw-r--r--net-misc/youtube-viewer/Manifest2
-rw-r--r--net-misc/youtube-viewer/youtube-viewer-3.10.1.ebuild (renamed from net-misc/youtube-viewer/youtube-viewer-3.9.7.ebuild)3
-rw-r--r--net-misc/youtube-viewer/youtube-viewer-9999.ebuild5
-rw-r--r--net-misc/yt-dlp/Manifest4
-rw-r--r--net-misc/yt-dlp/yt-dlp-2022.7.18.ebuild (renamed from net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild)17
-rw-r--r--net-misc/yt-dlp/yt-dlp-2022.8.8.ebuild (renamed from net-misc/yt-dlp/yt-dlp-2022.5.18.ebuild)2
-rw-r--r--net-misc/ytfzf/Manifest2
-rw-r--r--net-misc/ytfzf/ytfzf-2.4.1.ebuild (renamed from net-misc/ytfzf/ytfzf-2.3.ebuild)9
357 files changed, 9815 insertions, 9577 deletions
diff --git a/net-misc/anydesk/metadata.xml b/net-misc/anydesk/metadata.xml
index f5bf7cbcdb2..6dad389402e 100644
--- a/net-misc/anydesk/metadata.xml
+++ b/net-misc/anydesk/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jmbsvicetto@gentoo.org</email>
- <name>Jorge Manuel B. S. Vicetto</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<changelog>https://download.anydesk.com/changelog.txt</changelog>
<bugs-to>mailto:support@anydesk.com</bugs-to>
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index f208121fab4..14a5618b82d 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1 +1,2 @@
+DIST apt-cacher-ng-debian-3.7.4-1.tar.gz 524480 BLAKE2B ebb450af29439910fe35a558ae6f7ea02337bfbbe5a8efcb20a803e779deedd7901358a71b69745a53036fb8db9db3c9112fc09b47055f07dfe225f3df95202d SHA512 a2aa3218d8cf216cef7177f30bfb90b9961460add2a90823e15952e38d19b0dd527e3cecd029bbf1f10abcfcfd11d406bc9019919d1efccf0d9d69bb7cc1a173
DIST apt-cacher-ng_3.6.3.orig.tar.xz 334620 BLAKE2B 7e77edb966f0732f392a3fb243cda547dca7d4f878e44c6c000491ccb0a3115ad58a553706ef02834d25366b09d24ee6af2dafad76f97cd1978dc5a4d35f3380 SHA512 57d991c71f6d0bb9d43b4645ee7be2fb38ccbf73581206e01b6ca389bd8591d5e9f425350e3aff053527125c95caefe9ab1217dedff812162cf6bd4cdfdef792
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild
new file mode 100644
index 00000000000..290c31128e2
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake tmpfiles
+
+MY_PV="${PV/_p/-}"
+MY_P="${PN}-debian-${MY_PV}"
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
+ https://packages.qa.debian.org/a/apt-cacher-ng.html"
+SRC_URI="https://salsa.debian.org/blade/${PN}/-/archive/debian/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+DEPEND="acct-user/apt-cacher-ng
+ acct-group/apt-cacher-ng
+ app-arch/bzip2
+ dev-libs/libevent:=[threads]
+ dev-libs/openssl:0=
+ net-dns/c-ares:=
+ sys-libs/zlib
+ fuse? ( sys-fs/fuse:0 )
+ systemd? ( sys-apps/systemd )
+ tcpd? ( sys-apps/tcp-wrappers )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+ dev-lang/perl"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.1-flags.patch"
+ "${FILESDIR}/${PN}-3.5-perl-syntax.patch"
+ "${FILESDIR}/${PN}-3.6-optional-systemd.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fixup systemd/CMakeLists.txt cmake version requirement
+ sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die
+
+ # Make sure we install everything the same way it used to be after
+ # switching from mostly custom src_install to relying on build system
+ # installation
+ sed -e "/install/s/LIBDIR/CFGDIR/" \
+ -e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \
+ -e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die
+ sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DHAVE_FUSE_25=$(usex fuse)"
+ "-DHAVE_LIBWRAP=$(usex tcpd)"
+ "-DSDINSTALL=$(usex systemd)"
+ )
+
+ cmake_src_configure
+
+ sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+ # README is a symlink to doc/README and README automatically gets
+ # installed, leading to a broken symlink installed. Fix this by removing
+ # the symlink then installing the actual README. https://bugs.gentoo.org/770046
+ rm README || die
+ dodoc doc/README
+
+ newinitd "${FILESDIR}/initd-r3" "${PN}"
+ newconfd "${FILESDIR}/confd-r2" "${PN}"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotate" "${PN}"
+
+ insinto /etc/cron.daily
+ newins "${FILESDIR}/cron.daily" "${PN}"
+
+ # USE=fuse installs acngfs, don't install manpage without the bin
+ if use !fuse; then
+ rm doc/man/acngfs.8 || die
+ fi
+
+ if use !doc; then
+ rm -r doc/html || die
+ fi
+
+ dosbin scripts/expire-caller.pl
+
+ keepdir "/var/log/${PN}"
+ fowners -R ${PN}:${PN} "/var/log/${PN}"
+
+ cmake_src_install
+}
+
+pkg_postinst() {
+ tmpfiles_process "${PN}.conf"
+}
diff --git a/net-misc/arpsponge/arpsponge-3.17.11.ebuild b/net-misc/arpsponge/arpsponge-3.17.11-r1.ebuild
index 5e23076d980..e7e6ac97a60 100644
--- a/net-misc/arpsponge/arpsponge-3.17.11.ebuild
+++ b/net-misc/arpsponge/arpsponge-3.17.11-r1.ebuild
@@ -1,15 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+
inherit perl-module
DESCRIPTION="Sweeps up stray ARP queries from a peering LAN"
HOMEPAGE="https://github.com/AMS-IX/arpsponge"
SRC_URI="https://github.com/AMS-IX/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
LICENSE="|| ( GPL-1+ Artistic )"
SLOT="0"
KEYWORDS="~amd64"
+# bug #692912
+RESTRICT="test"
RDEPEND="
dev-lang/perl
@@ -27,13 +31,11 @@ RDEPEND="
virtual/perl-Sys-Syslog
virtual/perl-Time-HiRes
"
-
-DEPEND="${RDEPEND}
- sys-devel/make
-"
+DEPEND="${RDEPEND}"
src_install() {
perl_set_version
+
insinto ${VENDOR_LIB}/M6
doins lib/M6/ReadLine.pm
@@ -56,6 +58,7 @@ src_install() {
newinitd "${FILESDIR}/arpsponge.initd" arpsponge
newconfd "${FILESDIR}/arpsponge.confd" arpsponge
+
dosbin sbin/asctl sbin/arpsponge sbin/aslogtail
doman man/asctl.8 man/arpsponge.8 man/aslogtail.8
dodoc doc/command_mapping.txt doc/arpsponge_architecture.txt
diff --git a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
index 01114a23c86..5f5eeeb743d 100644
--- a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,7 @@ amd64? (
LICENSE="Digium"
SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
index 01114a23c86..5f5eeeb743d 100644
--- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,7 @@ amd64? (
LICENSE="Digium"
SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
index 01114a23c86..5f5eeeb743d 100644
--- a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,7 @@ amd64? (
LICENSE="Digium"
SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
diff --git a/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild
index e2160958919..9d705969059 100644
--- a/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild
+++ b/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -18,7 +18,7 @@ x86? (
LICENSE="Digium"
SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
RDEPEND="=net-misc/asterisk-${PV%%.*}*"
diff --git a/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild
index e2160958919..9d705969059 100644
--- a/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild
+++ b/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -18,7 +18,7 @@ x86? (
LICENSE="Digium"
SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
RDEPEND="=net-misc/asterisk-${PV%%.*}*"
diff --git a/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild
index e2160958919..9d705969059 100644
--- a/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild
+++ b/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -18,7 +18,7 @@ x86? (
LICENSE="Digium"
SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
RDEPEND="=net-misc/asterisk-${PV%%.*}*"
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 474c6a7a271..1f0bd3611e8 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -2,6 +2,9 @@ DIST asterisk-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b68
DIST asterisk-16.22.0.tar.gz 27925083 BLAKE2B ce700f8924fb2c7c8fc521879c0768595eb7462bb3aa78dd8b64c8a268b357e522ece17c6c4a02a4e17c16bad5141d5c2c15b602d335567be5a3df49f67300ca SHA512 7032da647f4063320fb2ea9c3cd7b0079fbb907e5c8f9d5cdc4197c82d07c99c75bfdcace5c74a593573cd0d9a1b9eb73b2030dc0b13604abb481a311a742173
DIST asterisk-16.23.0.tar.gz 27960909 BLAKE2B 60aa12e41c199da7c052555f5716fd7325de66d0821c8f285635c8ad01435a182c670b12c9d3959ce8206b1bad255e61eeea199bf23b9dd49915da84487e2ce2 SHA512 d9f6cc083afb858ce48b090bea6a8479679ff840eb35dbc6af7d88ded17539c6e906547a7d936de31b3a50d692df1ccce2fe40b81bba1dc6a82a78c94e1198c4
DIST asterisk-16.24.0.tar.gz 27987904 BLAKE2B 2a179366d3853afd6528b7b61c33b6683e924ae62bb4cbfd04b3e6717b4d73345b893632164396a5587d633d60338615f69a02d1f8b7f7ac3903131e209825ea SHA512 0c770264fad5a5f4c8cc6572b524349337635f0a8def26391897776d7ba4ec8f0cf595f588abc75f9f37ba941a56b7d3704b3ef3ddb4b67d3e4e341992e8f815
+DIST asterisk-16.26.1.tar.gz 28001023 BLAKE2B d426566827bd3466720f94eed04a654edac3566fd7cdd77e0a1596d4536b5612e24d48e8dc6891a89f2f63feef938a5c1fd6898c5a5efcd56d1a11500fa9e00b SHA512 cc8c72c8167210bc506ee224f83208d1c0f983a9e061465a25b133fce526fdf56693a9e5cbb1f65d13cb9c9515619663748b332c704d17e21d90ef37a697948a
+DIST asterisk-16.27.0.tar.gz 28014649 BLAKE2B 785650674bb2762ab898118cf49aa2cddde60f7e42df0a882751e36053f3cfb7de94475acf6bd484a1998c04b1edd1dca2ee4e9895bf9e411d9b09f91f7a4743 SHA512 ae016a79f8c38c5ae0069d0fa7434a564c8a72efa69135ce17dc7febf220a189ef47aba064ab39a2f49be0f7d5138b36e29f2d004ba51aa3724708efce645d1e
DIST asterisk-18.10.0.tar.gz 28071071 BLAKE2B 750cebfdb8ae0485e29b9b92c652e7e1aaea6701e2dd14679b271e22360aac5a6aa5f7570c7a8255999c60cebcf9fae118a6e949ee2413adc250fd47ad214ef1 SHA512 d0746431d87d7c5ce0b76b935cf144ea6a8f759f0dbc012f9a4d7a838ac8f811c3ffde539de5f44d4298c752e3a3242e00c9cf02824207c09c72f90f58898d2e
+DIST asterisk-18.13.0.tar.gz 28127627 BLAKE2B 24e030d5226fb3cad8e2fedce951fab047afbdf5556821bc246acc3731f25398d47eac7b7e0a97f019d9e97cc6f8990967019db62845f21f3b3459a2c3fced02 SHA512 085dfcf15f99d7d96b49a720156678c4de5a88b55375257a9a1234f9dd83f21eed1685d4177dae5978272608e690582367c6c34fdef91bbad54299594d0ce9df
DIST asterisk-18.8.0.tar.gz 28007752 BLAKE2B d5feb2a03003869ee304cd38bc3abcd77a13614c4f1f0a871d517c972f661c17de3da7f452345aaa11e23526a612c1805325ac5a3e902fea1070f63c993ef3fa SHA512 aa06077c6e33e35c35bbaf7dcee13782197f2d9f61e159741ade20050a7bd0dd9a7f6a69d539ee3789af950e8c03518d6186abc99d93ace38dd7e9a1e5dcd337
DIST asterisk-18.9.0.tar.gz 28045278 BLAKE2B 776be9ee6481dbaf38ff617dc5cc2525b226d57fd93a7ec180c20795af3a7905c5239b1e452628cca463f9d8e077ead794afde6425d39043eb4c3dda3ceba7a6 SHA512 514f806ac93c2975101133e897c20e4483ad97141b125de5b6fcb96b8acd3248bd0d4fc638381fe9e9be7b504a35ddae24d8437c33ed10c88a37565577af52b6
diff --git a/net-misc/asterisk/asterisk-16.26.1.ebuild b/net-misc/asterisk/asterisk-16.26.1.ebuild
new file mode 100644
index 00000000000..a2765b2dde1
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.26.1.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ +voicemail_storage_file
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.9:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( virtual/imap-c-client )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_misdn menuselect.makeopts
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ _menuselect --enable chan_mgcp menuselect.makeopts
+ _menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select alsa chan_alsa
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select deprecated app_macro
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql app_mysql cdr_mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select oss chan_oss
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select syslog cdr_syslog
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper
+ newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk
+ newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
+
+ systemd_dounit "${FILESDIR}"/asterisk.service
+ newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
+ systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ # install the upgrade documentation
+ dodoc UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # install logrotate snippet; bug #329281
+ #
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ tmpfiles_process asterisk.conf
+
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if use deprecated; then
+ ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+ ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-16.27.0.ebuild b/net-misc/asterisk/asterisk-16.27.0.ebuild
new file mode 100644
index 00000000000..a2765b2dde1
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.27.0.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ +voicemail_storage_file
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.9:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( virtual/imap-c-client )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_misdn menuselect.makeopts
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ _menuselect --enable chan_mgcp menuselect.makeopts
+ _menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select alsa chan_alsa
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select deprecated app_macro
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql app_mysql cdr_mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select oss chan_oss
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select syslog cdr_syslog
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper
+ newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk
+ newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
+
+ systemd_dounit "${FILESDIR}"/asterisk.service
+ newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
+ systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ # install the upgrade documentation
+ dodoc UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # install logrotate snippet; bug #329281
+ #
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ tmpfiles_process asterisk.conf
+
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if use deprecated; then
+ ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+ ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-18.10.0-r1.ebuild b/net-misc/asterisk/asterisk-18.10.0-r1.ebuild
index 3884d5cea3f..e9039223c4c 100644
--- a/net-misc/asterisk/asterisk-18.10.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-18.10.0-r1.ebuild
@@ -66,7 +66,7 @@ DEPEND="acct-user/asterisk
mysql? ( dev-db/mysql-connector-c:= )
newt? ( dev-libs/newt )
odbc? ( dev-db/unixODBC )
- pjproject? ( >=net-libs/pjproject-2.9:= )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
portaudio? ( media-libs/portaudio )
postgres? ( dev-db/postgresql:* )
radius? ( net-dialup/freeradius-client )
diff --git a/net-misc/asterisk/asterisk-18.13.0.ebuild b/net-misc/asterisk/asterisk-18.13.0.ebuild
new file mode 100644
index 00000000000..1b1230192ff
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.13.0.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+ voicemail_storage_odbc
+ voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ lua? ( ${LUA_REQUIRED_USE} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+ acct-group/asterisk
+ dev-db/sqlite:3
+ dev-libs/popt
+ >=dev-libs/jansson-2.11:=
+ dev-libs/libedit
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libcrypt:=
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez:= )
+ calendar? (
+ net-libs/neon:=
+ dev-libs/libical:=
+ dev-libs/iksemel
+ )
+ caps? ( sys-libs/libcap )
+ blocks? ( sys-libs/blocksruntime )
+ cluster? ( sys-cluster/corosync )
+ codec2? ( media-libs/codec2:= )
+ curl? ( net-misc/curl )
+ dahdi? (
+ net-libs/libpri
+ net-misc/dahdi-tools
+ )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( media-libs/libilbc )
+ ldap? ( net-nds/openldap:= )
+ lua? ( ${LUA_DEPS} )
+ mysql? ( dev-db/mysql-connector-c:= )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp:= )
+ span? ( media-libs/spandsp )
+ speex? (
+ media-libs/libogg
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ srtp? ( net-libs/libsrtp:0 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ !systemd? ( !sys-apps/systemd )
+ unbound? ( net-dns/unbound )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ voicemail_storage_imap? ( virtual/imap-c-client )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+ net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+ virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+ "NOISY_BUILD=yes"
+ "ASTDBDIR=\$(ASTDATADIR)/astdb"
+ "ASTVARRUNDIR=/run/asterisk"
+ "ASTCACHEDIR=/var/cache/asterisk"
+ "OPTIMIZE="
+ "DEBUG="
+ "DESTDIR=${D}"
+ "CONFIG_SRC=configs/samples"
+ "CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ [[ "${MERGE_TYPE}" == binary ]] && return
+
+ if tc-is-clang; then
+ use blocks || die "CC=clang requires USE=blocks"
+ else
+ use blocks && die "USE=blocks can only be used with CC=clang"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+ local vmst
+ local copt cstate
+
+ econf \
+ LUA_VERSION="${ELUA#lua}" \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-z \
+ --with-libedit \
+ --without-jansson-bundled \
+ --without-pjproject-bundled \
+ $(use_with caps cap) \
+ $(use_with codec2) \
+ $(use_with lua lua) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with pjproject) \
+ $(use_with portaudio) \
+ $(use_with ssl) \
+ $(use_with unbound)
+
+ _menuselect() {
+ menuselect/menuselect "$@" || die "menuselect $* failed."
+ }
+
+ _use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ _menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake "${_make_args[@]}" menuselect.makeopts
+
+ # Disable BUILD_NATIVE (bug #667498)
+ _menuselect --disable build_native menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ _menuselect --disable chan_misdn menuselect.makeopts
+ _menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ _menuselect --enable smsq menuselect.makeopts
+ _menuselect --enable streamplayer menuselect.makeopts
+ _menuselect --enable aelparse menuselect.makeopts
+ _menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ _menuselect --enable chan_mgcp menuselect.makeopts
+ _menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ _menuselect --enable pbx_dundi menuselect.makeopts
+ _menuselect --enable func_aes menuselect.makeopts
+ _menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ _menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # Disable conversion tools (which fails to compile in some cases).
+ _menuselect --disable astdb2bdb menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ _use_select alsa chan_alsa
+ _use_select bluetooth chan_mobile
+ _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ _use_select cluster res_corosync
+ _use_select codec2 codec_codec2
+ _use_select curl func_curl res_config_curl res_curl
+ _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ _use_select deprecated app_macro
+ _use_select freetds {cdr,cel}_tds
+ _use_select gtalk chan_motif
+ _use_select http res_http_post
+ _use_select iconv func_iconv
+ _use_select ilbc codec_ilbc format_ilbc
+ _use_select ldap res_config_ldap
+ _use_select lua pbx_lua
+ _use_select mysql app_mysql cdr_mysql res_config_mysql
+ _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ _use_select oss chan_oss
+ _use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ _use_select radius {cdr,cel}_radius
+ _use_select snmp res_snmp
+ _use_select span res_fax_spandsp
+ _use_select speex {codec,func}_speex
+ _use_select speex format_ogg_speex
+ _use_select srtp res_srtp
+ _use_select statsd res_statsd res_{endpoint,chan}_stats
+ _use_select syslog cdr_syslog
+ _use_select vorbis format_ogg_vorbis
+ _use_select xmpp res_xmpp
+
+ # Voicemail storage ...
+ _menuselect --enable app_voicemail menuselect.makeopts
+ for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+ if use "${vmst#+}"; then
+ _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+ _menuselect --enable "${o}" menuselect.makeopts
+ done
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+ cstate=--enable
+ [[ "${copt}" == -* ]] && cstate=--disable
+ ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+ _menuselect ${cstate} "${copt#[-+]}"
+ eend $?
+ done
+ fi
+}
+
+src_compile() {
+ emake "${_make_args[@]}"
+}
+
+src_install() {
+ local d
+
+ dodir "/usr/$(get_libdir)/pkgconfig"
+
+ diropts -m 0750 -o root -g asterisk
+ dodir /etc/asterisk
+
+ emake "${_make_args[@]}" install install-headers install-configs
+
+ fowners asterisk: /var/lib/asterisk/astdb
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+
+ # keep directories
+ diropts -m 0750 -o asterisk -g root
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper
+ newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk
+ newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
+
+ systemd_dounit "${FILESDIR}"/asterisk.service
+ newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
+ systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+ # Reset diropts else dodoc uses it for doc installations.
+ diropts -m0755
+
+ # install the upgrade documentation
+ dodoc UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ use doc && dodoc doc/*.{txt,pdf}
+
+ # install logrotate snippet; bug #329281
+ #
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+ # Asterisk installs a few folders that's empty by design,
+ # but still required. This finds them, and marks them for
+ # portage.
+ while read d <&3; do
+ keepdir "${d#${ED}}"
+ done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+ tmpfiles_process asterisk.conf
+
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+ elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+ elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+ fi
+
+ if use deprecated; then
+ ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+ ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+ fi
+
+ if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+ ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+ ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+ fi
+
+ if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+ ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+ ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set"
+ ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+ ewarn "steps to migrate:"
+ ewarn "1. /etc/init.d/asterisk stop"
+ ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+ ewarn "3. /etc/init.d/asterisk start"
+ ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-18.8.0-r1.ebuild b/net-misc/asterisk/asterisk-18.8.0-r1.ebuild
index 267d44d3b96..bc3f597e95a 100644
--- a/net-misc/asterisk/asterisk-18.8.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-18.8.0-r1.ebuild
@@ -66,7 +66,7 @@ DEPEND="acct-user/asterisk
mysql? ( dev-db/mysql-connector-c:= )
newt? ( dev-libs/newt )
odbc? ( dev-db/unixODBC )
- pjproject? ( >=net-libs/pjproject-2.9:= )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
portaudio? ( media-libs/portaudio )
postgres? ( dev-db/postgresql:* )
radius? ( net-dialup/freeradius-client )
diff --git a/net-misc/asterisk/asterisk-18.9.0-r1.ebuild b/net-misc/asterisk/asterisk-18.9.0-r1.ebuild
index 3884d5cea3f..e9039223c4c 100644
--- a/net-misc/asterisk/asterisk-18.9.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-18.9.0-r1.ebuild
@@ -66,7 +66,7 @@ DEPEND="acct-user/asterisk
mysql? ( dev-db/mysql-connector-c:= )
newt? ( dev-libs/newt )
odbc? ( dev-db/unixODBC )
- pjproject? ( >=net-libs/pjproject-2.9:= )
+ pjproject? ( >=net-libs/pjproject-2.12:= )
portaudio? ( media-libs/portaudio )
postgres? ( dev-db/postgresql:* )
radius? ( net-dialup/freeradius-client )
diff --git a/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1 b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
new file mode 100644
index 00000000000..477812171a8
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
@@ -0,0 +1,202 @@
+#! /bin/bash
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+progname="$(basename "$0")"
+
+T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")"
+eval set -- "${T}"
+
+rundir=/run/asterisk
+restartdelay=5
+nicelevel=0
+maxfd=4096
+dumpcore=0
+unset tty instance syslog corecompress corerename crashemail
+
+function usage() {
+ cat <<USAGE
+USAGE: $progname [options] -- asterisk options"
+OPTIONS:
+ -h|--help
+ Output this text and exit.
+ --corecompress[=tool]
+ asterisk's address space can get quite large, compressing the core dumps can
+ save significant space, especially if asterisk core dumps frequently.
+ --corerename pattern
+ It's assumed core files (if enabled) will go into PWD, this specifies a
+ rename pattern. The following % codes are recognised:
+ %h - hostname
+ %D - date in format YYYYMMDD
+ %T - time in format HHMMSS
+ It must be mentioned that if kernel.core_pattern (sysctl) is modified
+ from the default 'core' value this option is unlikely to work.
+ --crashemail email@address
+ This will send an email whenver asterisk crashes (does not terminate
+ cleanly with a zero exit code). You need a working sendmail binary.
+ --dumpcore sizelimit
+ Maximum size of core limit, or the word unlimited. Default is disabled
+ (sizelimit of 0).
+ --instance name
+ Updated label for sylog logger.
+ --maxfd maxfd
+ Sets the maximum number of file descriptors (default 4096).
+ --nicelevel nicelevel
+ Will set the asterisk nice level to the specified value.
+ --restartdelay delay_in_seconds
+ Number of seconds to wait before attempting to restart asterisk. This helps
+ to avoid tight-loop crashes. Defaults to 5s. Minimum 1.
+ --rundir path
+ Where to store the asterisk asterisk_wrapper.pid file. In order to terminate the
+ wrapper (when asterisk next terminates), remove this file.
+ --syslog
+ Pass to redirect output to syslog rather than using stdout and stderr.
+ --tty tty
+ If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8.
+ Use of this is not recommended in general.
+
+NOTE: There are some quirks with bash getopt shunting non-options prior to --
+ to asterisk options, so be careful of this. Typically stuff will break.
+USAGE
+}
+
+while [ "$1" != "--" ]; do
+ case "$1" in
+ --corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty)
+ eval "${1:2}=\"\${2}\""
+ shift 2
+ ;;
+ --syslog)
+ eval "${1:2}=1"
+ shift
+ ;;
+ --help|-h)
+ usage
+ exit 0
+ ;;
+ *)
+ echo "BUG: Don't know how to process option $1." >&2
+ usage >&2
+ exit 1
+ ;;
+ esac
+done
+shift # --
+
+ast_opts=("$@")
+
+if ! [[ "${restartdelay}" =~ ^[1-9][0-9]*$ ]]; then
+ echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2
+ restartdelay=5
+fi
+
+if [[ -n "${corecompress}" && ! -x "${corecompress}" ]]; then
+ corecompress=$(which "${corecompress}" 2>/dev/null)
+ [[ -z "${corecompress}" ]] && echo "Error locating core compression tool, disabling core compression." >&2
+fi
+
+# Before here will still be output (potentially munged, to the terminal).
+if [[ -n "${syslog}" ]]; then
+ exec 1> >(logger -t "asterisk_wrapper${instance:+:}${instance}" &>/dev/null)
+ exec 2>&1
+fi
+
+echo "Initializing ${progname}"
+
+function cleanup(){
+ # There is a tiny race here, if this gets replaced inbetween the read and the rm.
+ # To fix this is quite complex in that we need to keep an fd, compare inode numbers
+ # and manage flock's.
+ [[ -r "${rundir}/${progname}.pid" ]] && \
+ [[ "$(<"${rundir}/${progname}.pid")" = $$ ]] && \
+ rm "${rundir}/${progname}.pid"
+}
+trap cleanup EXIT
+
+# We could be clobbering an old version's pid, in which case it'll just terminate on
+# it's next iteration. Towards this end, if asterisk.pid exists, attempt to find it's
+# config file and request a core stop when convenient so that we can take over.
+echo $$ > "${rundir}/${progname}.pid"
+if [[ -r "${rundir}/asterisk.pid" ]]; then
+ ast_pid="$(<"${rundir}/asterisk.pid")"
+ [[ -r "/proc/${ast_pid}/cmdline" ]] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient"
+ # We may hit a few (depending on how busy the server is a great many number) loop failures still ...
+fi
+
+ulimit -c "${dumpcore}"
+ulimit -n "${maxfd}"
+
+ast_cmd=()
+if [ -n "${nicelevel}" ]; then
+ ast_cmd+=(nice -n "${nicelevel}")
+fi
+ast_cmd+=(/usr/sbin/asterisk "${ast_opts[@]}")
+
+while [[ -r "${rundir}/${progname}.pid" ]]; do
+ # Another instance is looking to replace us, so terminate.
+ if [[ "$(<"${rundir}/${progname}.pid")" != $$ ]]; then
+ break
+ fi
+
+ echo "Starting asterisk with ${ast_opts[*]}"
+ if [ -n "${tty+yes}" ]; then
+ /bin/stty -F "${tty}" sane
+ "${ast_cmd[@]}" >"${tty}" 2>&1 <"${tty}"
+ result=$?
+ else
+ # Purposefully leave stderr alone, this will under certain odd cases (like exceptions,
+ # and other odd cases logged from glibc) result in those logs at least being captured
+ # in syslog.
+ "${ast_cmd[@]}" </dev/null >/dev/null
+ result=$?
+ fi
+
+ if [ "$result" -eq 0 ]; then
+ echo "Asterisk terminated normally."
+ break
+ fi
+
+ if [ "$result" -gt 128 ]; then
+ signal="$(( result - 128 ))"
+ signame="$(kill -l $signal 2>/dev/null)"
+ MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})"
+
+ # TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using
+ # that, chances are they're already dealing with what we want here.
+ if [[ -r core ]]; then
+ if [[ -n "${corerename+yes}" ]]; then
+ core_target="${core_pattern}"
+ core_target="${core_target//%h/$(hostname)}"
+ core_target="${core_target//%D/$(date +%Y%m%d)}"
+ core_target="${core_target//%T/$(date +%H%M%S)}"
+ mv core "${core_target}"
+ core_target=$(readlink -f "${core_target}")
+ else
+ core_target=$(readlink -f core)
+ fi
+
+ if [[ -n "${corecompress}" && -x "${corecompress}" ]]; then
+ "${corecompress}" "${core_target}"
+ # TODO: Figure out a way to tag the extension onto core_target.
+ fi
+
+ MSG="${MSG}\r\nCore dumped: ${core_target}"
+ fi
+ else
+ MSG="Asterisk terminated with return code: $result"
+ fi
+
+ [ -n "${tty+yes}" ] \
+ && echo "${MSG}" >"${tty}" \
+ || echo "${MSG}"
+
+ if [[ -n "${crashemail+yes}" && -x /usr/sbin/sendmail ]]; then
+ echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+ /usr/sbin/sendmail "${crashemail}"
+ fi
+ echo "Restarting asterisk after ${restartdelay}s ..."
+ sleep "${restartdelay}"
+done
+
+echo "Terminating $progname."
+exit 0
diff --git a/net-misc/asterisk/files/confd-16.26.1-18.12.1 b/net-misc/asterisk/files/confd-16.26.1-18.12.1
new file mode 100644
index 00000000000..c350b7e9161
--- /dev/null
+++ b/net-misc/asterisk/files/confd-16.26.1-18.12.1
@@ -0,0 +1,169 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+# No default.
+#
+#ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+# "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+# ":asterisk" to run as user "root" and group "asterisk"
+#
+# Default: asterisk
+#
+#ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+# No default (leave scheduling to be system default).
+#
+#ASTERISK_NICE="19"
+
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+# No default.
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+# No default.
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes/no
+#
+# Default: no
+#
+#ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files.
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+#
+# Default: do not generate core dumps
+#
+#ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant).
+#
+# Default: /tmp
+#
+#ASTERISK_CORE_DIR="/var/lib/asterisk/core"
+
+#
+# Max number of filedescriptors. asterisk can trivially run out of
+# descriptors. In most (SIP) cases it uses at least four descriptors per call,
+# and this is a conservative value.
+#
+# Value: Number of descriptors
+#
+# Default: leave system default in place.
+#
+ASTERISK_MAX_FD="4096"
+
+#
+# Delay time before restarting asterisk after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+# Default: 5
+#
+#ASTERISK_RESTART_DELAY=5
+
+#
+# The stop mechanism to use. Asterisk can do gracefully, when convenient or now.
+# By default we expect you to want to stop as soon as possible, so we default
+#
+# Default: gracefully
+#
+#ASTERISK_STOP_METHOD="when convenient"
+
+#
+# By default the init script waits two minutes for asterisk to stop. This allows
+# you to change that, or even completely disable and go into wait for ever mode (-1).
+# The value here is in seconds.
+#
+# Default: 120
+#
+#ASTERISK_STOP_TIMEOUT=-1
+
+#
+# ASTERISK_CONFDIR
+#
+# If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used
+# (typically /etc/asterisk) to be used for configuration.
+#
+# Default: /etc/${RC_SVCNAME}
+#
+#ASTERISK_CONFDIR="/etc/foo/bar"
+
+# ASTERISK_CACHEDIR
+#
+# Value: Directory to which astcachedir in asterisk.conf is set.
+#
+# Default: /var/cache/asterisk
+#
+#ASTERISK_CACHEDIR="/var/cache/asterisk"
+
+
+#
+# Normally the init script will not wait for asterisk to fully boot. With this
+# setting set to yes/true/1 it will issue a "core waitfullybooted" directly
+# after starting asterisk, and wait for asterisk to start up completely. This
+# is useful in certain conditions where other software requires asterisk to be
+# properly started before they themselves can be started.
+#
+# Default: no
+#
+#ASTERISK_WAITBOOTED=yes
+
+#
+# When core-dumping, the default was to generate core-$(date +%Y%m%d-%H%M%S).
+# In certain highly unusual configurations it's helpful to also get the
+# hostname into this filename. By enabling this option the wrapper loop will
+# adjust the core file to be named core-$(hostname)-$(date ...).
+#
+# Default: no
+#
+#ASTERISK_CORE_USEHOSTNAME=yes
+
+#
+# When core-dumping, the default is to not compress these files. However, as it turns
+# out, compressing these core files can save significant amount of space, so if you
+# want them compressed, specify the tool to use here.
+#
+# Default: do not compress
+#
+#ASTERISK_CORE_COMPRESS=bzip2
diff --git a/net-misc/asterisk/files/initd-16.26.1-18.12.1 b/net-misc/asterisk/files/initd-16.26.1-18.12.1
new file mode 100644
index 00000000000..cc6a3dee575
--- /dev/null
+++ b/net-misc/asterisk/files/initd-16.26.1-18.12.1
@@ -0,0 +1,309 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop reload"
+
+depend() {
+ need net
+ use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+ [ -r "${ast_rundir}/asterisk.pid" ] || return 1
+ PID="$(cat "${ast_rundir}/asterisk.pid")"
+ [ -d "/proc/${PID}" ] || return 1
+ EXE="$(readlink -f /proc/${PID}/exe)"
+ EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+ [ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+ # PID reported in pidfile is active, and is still an asterisk instance.
+ return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+setup_svc_variables()
+{
+ local t
+
+ ast_instancename=asterisk
+ ast_rundir=/run/${RC_SVCNAME}
+ ast_logdir=/var/log/${RC_SVCNAME}
+ ast_confdir=/etc/${RC_SVCNAME}
+ ast_cachedir=/var/cache/asterisk
+ ast_stop_timeout=120
+ ast_stop_method="gracefully"
+
+ if [ "${RC_SVCNAME}" != "asterisk" ]; then
+ t="${RC_SVCNAME#asterisk.}"
+ if [ "${RC_SVCNAME}" = "${t}" ]; then
+ eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+ return 1
+ fi
+ ast_instancename="${ast_instancename}(${t})"
+ fi
+
+ [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+ [ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+ [ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+ [ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}"
+ [ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
+ case "${ASTERISK_STOP_METHOD}" in
+ gracefully|when\ convenient|now)
+ ast_stop_method="${ASTERISK_STOP_METHOD}"
+ ;;
+ esac
+ ast_group=
+ if [ -n "${ASTERISK_USER}" ]; then
+ ast_user="${ASTERISK_USER%%:*}"
+ if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
+ ast_group="${ASTERISK_USER#*:}"
+ ast_group="${ast_group%%:*}"
+ fi
+ fi
+
+ [ -z "${ast_user}" ] && ast_user=asterisk
+
+ ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
+
+ return 0
+}
+
+start() {
+ local OPTS PID
+ local tmp x
+
+ local OPTS ARGS WRAPPER_OPTS
+
+ setup_svc_variables || return $?
+
+ ebegin "Starting ${ast_instancename} PBX"
+
+ eindent
+
+ # filter (redundant) arguments
+ OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+ # default options
+ OPTS="${OPTS}${OPTS:+ }-C ${ast_confdir}/asterisk.conf -f" # don't fork / detach breaks wrapper script...
+
+ WRAPPER_OPTS="--syslog"
+ if [ "${RC_SVCNAME}" != "asterisk" ]; then
+ WRAPPER_OPTS="${WRAPPER_OPTS} --instance ${RC_SVCNAME#asterisk.}"
+ fi
+ WRAPPER_OPTS="${WRAPPER_OPTS} --rundir ${ast_rundir}"
+
+ # ensure that ASTERISK_RESTART_DELAY is integer.
+ ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+ [ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+ WRAPPER_OPTS="${WRAPPER_OPTS} --restartdelay ${ASTERISK_RESTART_DELAY}"
+
+ if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+ [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+ WRAPPER_OPTS="${WRAPPER_OPTS} --dumpcore ${ASTERISK_CORE_SIZE}"
+ OPTS="${OPTS} -g"
+
+ if [ -n "${ASTERISK_CORE_DIR}" ] && \
+ [ ! -d "${ASTERISK_CORE_DIR}" ]
+ then
+ checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
+ fi
+ ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+ cd "${ASTERISK_CORE_DIR}"
+ einfo "Core dump size : ${ASTERISK_CORE_SIZE}"
+ einfo "Core dump location : ${ASTERISK_CORE_DIR}"
+
+ if [ -n "${ASTERISK_CORE_COMPRESS}" ]; then
+ einfo "Core compression tool : ${ASTERISK_CORE_COMPRESS}"
+ WRAPPER_OPTS="${WRAPPER_OPTS} --corecompress ${ASTERISK_CORE_COMPRESS}"
+ fi
+
+ if yesno "${ASTERISK_CORE_USEHOSTNAME}"; then
+ WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%H-%D-%T"
+ else
+ WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%D-%T"
+ fi
+ fi
+
+ if [ -n "${ASTERISK_MAX_FD}" ]; then
+ WRAPPER_OPTS="${WRAPPER_OPTS} --maxfd ${ASTERISK_MAX_FD}"
+ einfo "Max open filedescriptors : ${ASTERISK_MAX_FD}"
+ fi
+
+ if [ -n "${ASTERISK_NICE}" ]; then
+ if [ ${ASTERISK_NICE} -ge -20 ] && \
+ [ ${ASTERISK_NICE} -le 19 ]; then
+ einfo "Nice level : ${ASTERISK_NICE}"
+ WRAPPER_OPTS="${WRAPPER_OPTS} --nicelevel ${ASTERISK_NICE}"
+ else
+ eerror "Nice value must be between -20 and 19"
+ return 1
+ fi
+ fi
+
+ if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+ if [ -x /usr/sbin/sendmail ]; then
+ einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+ WRAPPER_OPTS="${WRAPPER_OPTS} --crashemail ${ASTERISK_NOTIFY_EMAIL}"
+ else
+ ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+ fi
+ fi
+
+ if [ -n "${ASTERISK_TTY}" ]; then
+ for x in "${ASTERISK_TTY}" \
+ "/dev/tty${ASTERISK_TTY}" \
+ "/dev/vc/${ASTERISK_TTY}"
+ do
+ if [ -c "${x}" ]; then
+ TTY="${x}"
+ fi
+ done
+ if [ -n "${TTY}" ]; then
+ einfo "Messages are sent to : ${TTY}"
+ WRAPPER_OPTS="${WRAPPER_OPTS} --tty ${TTY}"
+ else
+ ewarn "ASTERISK_TTY=${TTY} ignored, not valid."
+ fi
+ fi
+
+ if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
+ einfo "Starting Asterisk console : Yes"
+ OPTS="${OPTS} -c"
+ fi
+
+ if ! getent passwd "${ast_user}" >/dev/null 2>&1; then
+ eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
+ return 1
+ fi
+ OPTS="${OPTS} -U ${ast_user}"
+
+ if [ -n "${ast_group}" ] && ! getent group "${ast_group}" >/dev/null 2>&1; then
+ eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
+ return 1
+ fi
+ [ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
+
+ if [ "${ast_user}" = root ]; then
+ ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+ elif [ "${ast_group}" = root ]; then
+ ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+ fi
+
+ checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
+ checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}"
+
+ einfo "Starting asterisk as : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
+ einfo "Wrapper options : ${WRAPPER_OPTS}"
+ einfo "Asterisk options : ${OPTS}"
+
+ /usr/sbin/asterisk_wrapper ${WRAPPER_OPTS} -- ${OPTS} &
+ result=$?
+
+ if [ $result -eq 0 ]; then
+ # 2 seconds should be enough for asterisk to start
+ sleep 2
+ is_running
+ result=$?
+
+ [ $result -eq 0 ] || wrapperstop
+ fi
+
+ eoutdent
+ eend $result
+
+ if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
+ if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
+ # asterisk can crash during startup ...
+ ebegin "Waiting for ctl file to appear"
+ while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
+ sleep 1
+ done
+ is_running
+ result=$?
+ eend $result
+ fi
+ if [ $result -eq 0 ]; then
+ ebegin "Waiting for ${ast_instancename} to fully boot"
+ /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" >/dev/null 2>&1
+ eend $?
+ fi
+ fi
+
+ return $result
+}
+
+wrapperstop() {
+ # Older path.
+ if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+ ebegin "Signalling ${ast_instancename} wrapper script to terminate"
+ rm "${ast_rundir}/wrapper_loop.running"
+ eend $?
+ fi
+
+ if [ -r "${ast_rundir}/asterisk_wrapper.pid" ]; then
+ ebegin "Signalling ${ast_instancename} wrapper script to terminate"
+ rm "${ast_rundir}/asterisk_wrapper.pid"
+ eend $?
+ fi
+
+ return 0
+}
+
+forcestop() {
+ setup_svc_variables || return $?
+
+ # Just to be sure - when we want to forcestop we should make it all tear down.
+ wrapperstop
+
+ ebegin "Stopping ${ast_instancename} PBX"
+ start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid
+ eend $?
+}
+
+stop() {
+ setup_svc_variables || return $?
+
+ wrapperstop
+
+ if ! is_running; then
+ eerror "${ast_instancename} is not running!"
+ return 0
+ fi
+
+ ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
+ /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" >/dev/null 2>&1
+ # Now we have to wait until asterisk has _really_ stopped.
+ sleep 1
+ if is_running; then
+ einfon "Waiting for ${ast_instancename} to shutdown ."
+ local cnt=0
+ while is_running; do
+ cnt="$(expr $cnt + 2)"
+ if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
+ echo
+ eend 1 "Failed waiting for ${ast_instancename} to stop."
+ return 1
+ fi
+ sleep 2
+ printf "."
+ done
+ echo
+ fi
+ eend 0
+}
+
+reload() {
+ setup_svc_variables || return $?
+
+ if is_running; then
+ ebegin "Requesting ${ast_instancename} to reload configuration"
+ /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" >/dev/null 2>&1
+ eend $?
+ else
+ eerror "${ast_instancename} is not running!"
+ fi
+}
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 82743b9d4ce..270463f6930 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,3 +1,2 @@
DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
-DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
-DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01
+DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1
diff --git a/net-misc/axel/axel-2.17.8.ebuild b/net-misc/axel/axel-2.17.11.ebuild
index c2b94b904b2..f9fabe3a83d 100644
--- a/net-misc/axel/axel-2.17.8.ebuild
+++ b/net-misc/axel/axel-2.17.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="debug nls ssl"
CDEPEND="
diff --git a/net-misc/axel/axel-2.17.9.ebuild b/net-misc/axel/axel-2.17.9.ebuild
deleted file mode 100644
index 1a4eb679c27..00000000000
--- a/net-misc/axel/axel-2.17.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug nls ssl"
-
-CDEPEND="
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${CDEPEND}
- nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
- nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_with ssl)
-}
-
-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/batctl/Manifest b/net-misc/batctl/Manifest
index 70e940ef922..39b260e8fa6 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1 +1 @@
-DIST batctl-2021.4.tar.gz 116743 BLAKE2B 74dfecd1e07c5f6555fba9e184e887ecdb3c73d423f26af70ff5324acf2477e4ef0768197822e2fdd3e2626564d3b4e637c15a8af628f8e0d70ba48746c1186c SHA512 0a629ab6a52e503fc63b022abf5ada491e7ffd61e2ebda7a169b556b2362943452285d6a0177122634b8c7c0fafedc712d3d6fee82c03e6fd4e2d42d890f87da
+DIST batctl-2022.2.tar.gz 116876 BLAKE2B e12773fce61bbe26ce6c80dc0842cd35f0207ceeaed36ff56e0f468f2bcf9c84867cdea17256ec489283b59c74c3c38040c76d5da7d6ca8d04acc99ea0c4a2ae SHA512 4a9dbc6a005fa2ecc657e1a03c7fa1e2eaf68f0cb41fdb7e8c6d832cc23f8ba8c0afd46839a281d1c8f3a15370e90302fab4b4b65890364de51a0304fcb2ce2e
diff --git a/net-misc/batctl/batctl-2021.4.ebuild b/net-misc/batctl/batctl-2022.2.ebuild
index 6dcab8083ac..03a22398411 100644
--- a/net-misc/batctl/batctl-2021.4.ebuild
+++ b/net-misc/batctl/batctl-2022.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 08ad577c85d..c3d505c0182 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,2 +1 @@
-DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
deleted file mode 100644
index 273624c416b..00000000000
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
-SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND="virtual/os-headers"
-RDEPEND="selinux? ( sec-policy/selinux-brctl )"
-
-CONFIG_CHECK="~BRIDGE"
-WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
-
-get_headers() {
- CTARGET=${CTARGET:-${CHOST}}
- dir=/usr/include
- tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include
- echo "${dir}"
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch
- )
- default
- eautoreconf
-}
-
-src_configure() {
- # use santitized headers and not headers from /usr/src
- local myeconfargs=(
- --prefix=/
- --libdir=/usr/$(get_libdir)
- --includedir=/usr/include
- --with-linux-headers="$(get_headers)"
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc AUTHORS ChangeLog README THANKS TODO \
- doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
- [ -f "${ED%/}"/sbin/brctl ] || die "upstream makefile failed to install binary"
-}
diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
index 1ca3e88935d..d668c78e802 100644
--- a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="selinux"
DEPEND="virtual/os-headers"
diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
deleted file mode 100644
index b3ea6ff1a70..00000000000
--- a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info toolchain-funcs
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND="virtual/os-headers"
-RDEPEND="selinux? ( sec-policy/selinux-brctl )"
-
-CONFIG_CHECK="~BRIDGE"
-WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
-
-get_headers() {
- CTARGET=${CTARGET:-${CHOST}}
- dir=/usr/include
- tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include
- echo "${dir}"
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch
- )
- default
- eautoreconf
-}
-
-src_configure() {
- # use santitized headers and not headers from /usr/src
- local myeconfargs=(
- --prefix=/
- --libdir=/usr/$(get_libdir)
- --includedir=/usr/include
- --with-linux-headers="$(get_headers)"
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc AUTHORS ChangeLog README THANKS \
- doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
-
- [ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary"
-}
diff --git a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
index 2eec53c2645..a27f2d5a166 100644
--- a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
+++ b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
@@ -1,8 +1,17 @@
-diff --git a/whois.c b/whois.c
-index 329559a..d2f6561 100644
+https://bugs.gentoo.org/828901
+--- a/strnstr.c
++++ b/strnstr.c
+@@ -38,7 +38,6 @@
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93";
+ #endif /* LIBC_SCCS and not lint */
+-#include <sys/cdefs.h>
+
+ #include <string.h>
+
--- a/whois.c
+++ b/whois.c
-@@ -43,7 +43,6 @@ static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
+@@ -43,7 +43,6 @@
#endif /* not lint */
#endif
@@ -10,3 +19,4 @@ index 329559a..d2f6561 100644
#ifdef __FBSDID
__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/whois/whois.c,v 1.43.2.1 2006/01/31 18:11:21 jhay Exp $");
#endif
+
diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild
index 5de889537c1..d7fd9155845 100644
--- a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild
+++ b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -86,7 +86,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-RDEPEND="net-misc/cni-plugins"
+RDEPEND="app-containers/cni-plugins"
src_prepare() {
default
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 1afddd1eaba..1231114de2f 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,2 +1,2 @@
-DIST chrome-remote-desktop_96.0.4664.9_amd64.deb 62383372 BLAKE2B b7ac12e2f1c16781225b9c74e558e51d817aad5de2d953d94a06d5d3fa0d937dd317f7157c770e01a91c249f0192542da67911899014360c6fadd252bf0908ae SHA512 86d4ac9b15da2b29f7245866dbc78a131c6aad8efb8ac4f150935afdd5ad95e8f2bc4a59cda52849c96aadaa869b05f9eb7a5cdfda711358e5055e08cf9fbd79
+DIST chrome-remote-desktop_103.0.5060.46_amd64.deb 18955612 BLAKE2B 048bd46e19f61a15f9c114608677c1ba41aa256be471d8f6925c98e806fc362ae2833dcf843b271ec6409f2cd2be6182be7d82c2f3170f866c3f6aecc29323b7 SHA512 a78aa8cb50c1aaa5db2393a5cc1de09b98d5edae16a257f3f654e488f0383844c9eeeb6a2fc8d645e32f07a0dc3b05ec45143a4cc792576743b4a2db2cb6bd0f
DIST chrome-remote-desktop_99.0.4844.11_amd64.deb 16817980 BLAKE2B 4784fb597722ee8abe3d073c7c2a0c1d1e9796e5c6df9935a2b5d2c4d6ee3629738c0bbfd6528a45b85b95ee192b5760b5137b7d89bd543d5c43d56fd9a030bb SHA512 71c621d1484f80b07b04637b1472baa1072b726109f9786ceabb1393bc1ebd3fe90c546d695871924a3a243840c87e35de78ff07598fbe6f3fe9fcb22b335b65
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild
index 65b1951d7a7..489accba499 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index bb1c6ba9cc2..8561cd7b822 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,2 +1,4 @@
DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
+DIST chrony-4.3-pre1.tar.gz 592966 BLAKE2B 26811ff6ebd55720cc39ce8cb9d4ddd2e70a9919dbc9a8416728bb81ad02b53dcb895a68aa696c4a063930661f533c5a219c98d67e3b93920351e7160022dca4 SHA512 6a97b11cd7604808aa57db8cd67ae854391ef2bca84bb0256c043464e33683e15682a8ebadec3d2fcca83203d2c731953dfd4972976fe193246ca4af7fb7e0e7
+DIST chrony-4.3-pre1.tar.gz.asc 833 BLAKE2B 40b80f6fdcc749077d1548e7861ff4f55dcfa8c8a84bd197d89f3f25626d5dd3a2b36dbb8b907f3f0f61444e1e3b908631529a7a1665f95b499c70c899249ade SHA512 3a9cd53fcd0f2842241817d5bdeb3c6151eec9e1d0864ae4a89a2d7b93924ac28be7d4f090a32b99ab4b229437d027c2663bb552433182a97eca347175138164
diff --git a/net-misc/chrony/chrony-4.3_pre1.ebuild b/net-misc/chrony/chrony-4.3_pre1.ebuild
new file mode 100644
index 00000000000..c52e4bdbf30
--- /dev/null
+++ b/net-misc/chrony/chrony-4.3_pre1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+ inherit git-r3
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
+ inherit verify-sig
+
+ SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+ SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
+
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+fi
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+# nettle > nss > libtomcrypt in configure
+REQUIRED_USE="
+ sechash? ( || ( nettle nss libtomcrypt ) )
+ nettle? ( !nss )
+ nss? ( !nettle )
+ libtomcrypt? ( !nettle !nss )
+ !sechash? ( !nss )
+ !sechash? ( !nts? ( !nettle ) )
+"
+
+DEPEND="
+ caps? (
+ acct-group/ntp
+ acct-user/ntp
+ sys-libs/libcap
+ )
+ libedit? ( dev-libs/libedit )
+ !libedit? ( sys-libs/readline:= )
+ nettle? ( dev-libs/nettle:= )
+ nss? ( dev-libs/nss:= )
+ nts? ( net-libs/gnutls:= )
+ pps? ( net-misc/pps-tools )
+ seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-chronyd )
+"
+BDEPEND="
+ html? ( dev-ruby/asciidoctor )
+ nts? ( virtual/pkgconfig )
+ sechash? (
+ nettle? ( virtual/pkgconfig )
+ nss? ( virtual/pkgconfig )
+ )
+"
+
+if [[ ${PV} == 9999 ]] ; then
+ # Needed for doc generation in 9999
+ REQUIRED_USE+=" html"
+ BDEPEND+=" virtual/w3m"
+else
+ BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+ "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+ doc/* examples/* || die
+
+ cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
+ if ! use caps ; then
+ sed -i \
+ -e 's/ -u ntp//' \
+ "${T}"/chronyd.conf examples/chronyd.service || die
+ fi
+
+ if ! use seccomp ; then
+ sed -i \
+ -e 's/ -F 2//' \
+ "${T}"/chronyd.conf examples/chronyd.service || die
+ fi
+
+ tc-export CC PKG_CONFIG
+
+ # Update from time to time with output from "date +%s"
+ # on a system that is time-synced.
+ export SOURCE_DATE_EPOCH=1607976314
+
+ # Not an autotools generated script
+ local myconf=(
+ $(use_enable seccomp scfilter)
+
+ $(usex caps '' '--disable-linuxcaps')
+ $(usex cmdmon '' '--disable-cmdmon')
+ $(usex debug '--enable-debug' '')
+ $(usex ipv6 '' '--disable-ipv6')
+ $(usex libedit '' '--without-editline')
+ $(usex libtomcrypt '' '--without-tomcrypt')
+ $(usex nettle '' '--without-nettle')
+ $(usex nss '' '--without-nss')
+ $(usex ntp '' '--disable-ntp')
+ $(usex nts '' '--disable-nts')
+ $(usex nts '' '--without-gnutls')
+ $(usex phc '' '--disable-phc')
+ $(usex pps '' '--disable-pps')
+ $(usex refclock '' '--disable-refclock')
+ $(usex rtc '' '--disable-rtc')
+ $(usex samba '--enable-ntp-signd' '')
+ $(usex sechash '' '--disable-sechash')
+
+ --chronysockdir="${EPREFIX}/run/chrony"
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc/chrony"
+ --with-hwclockfile="${EPREFIX}/etc/adjtime"
+ --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
+
+ ${EXTRA_ECONF}
+ )
+
+ # Print the ./configure call
+ edo ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+ if [[ ${PV} == 9999 ]] ; then
+ # Uses w3m
+ emake -C doc man txt
+ fi
+
+ emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
+ newconfd "${T}"/chronyd.conf chronyd
+
+ insinto /etc/${PN}
+ newins examples/chrony.conf.example1 chrony.conf
+
+ docinto examples
+ dodoc examples/*.example*
+
+ newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
+
+ if use html ; then
+ docinto html
+ dodoc doc/*.html
+ fi
+
+ keepdir /var/{lib,log}/chrony
+
+ if use caps ; then
+ # Prepare a directory for the chrony.drift file (a la ntpsec)
+ # Ensures the environment is sane on new installs
+ # bug #711058
+ fowners ntp:ntp /var/{lib,log}/chrony
+ fperms 770 /var/lib/chrony
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+ systemd_dounit examples/chronyd.service
+ systemd_dounit examples/chrony-wait.service
+ systemd_enable_ntpunit 50-chrony chronyd.service
+}
+
+pkg_preinst() {
+ HAD_CAPS=0
+ HAD_SECCOMP=0
+ HAD_PRE_NEW_SECCOMP_LEVEL=0
+
+ # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
+ # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
+ if has_version 'net-misc/chrony[caps]' ; then
+ HAD_CAPS=1
+ fi
+
+ if has_version 'net-misc/chrony[seccomp]' ; then
+ HAD_SECCOMP=1
+ fi
+
+ if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+ # This version introduced a new filter level: -F 2
+ # It's a limited set of seccomp filters designed to be 'bare minimum'
+ HAD_PRE_NEW_SECCOMP_LEVEL=1
+ fi
+}
+
+pkg_postinst() {
+ tmpfiles_process chronyd.conf
+
+ if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+ if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
+ # bug #719876
+ ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+ ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+ ewarn "This is necessary for chrony to drop privileges"
+ elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
+ ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
+ fi
+ fi
+
+ # See bug #783915 for general discussion on enabling seccomp filtering
+ # by default.
+ local show_seccomp_enable_msg=0
+
+ # Was seccomp disabled before and now enabled?
+ if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ # Are we coming from an old version without the new 'minimal' filter?
+ # (-F 2)
+ if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+ elog "To enable seccomp in a stricter mode, please modify:"
+ elog "- /etc/conf.d/chronyd for OpenRC"
+ elog "- systemctl edit chronyd for systemd"
+ elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
+ elog "By default, we now use -F 2 which is a baseline/minimal filter."
+ fi
+}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 57c2893c353..c52e4bdbf30 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit systemd tmpfiles toolchain-funcs
+inherit edo systemd tmpfiles toolchain-funcs
DESCRIPTION="NTP client and server programs"
HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
inherit git-r3
else
@@ -19,7 +19,7 @@ else
SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
fi
@@ -65,7 +65,7 @@ BDEPEND="
)
"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
# Needed for doc generation in 9999
REQUIRED_USE+=" html"
BDEPEND+=" virtual/w3m"
@@ -141,12 +141,11 @@ src_configure() {
)
# Print the ./configure call
- echo sh ./configure "${myconf[@]}" >&2
- sh ./configure "${myconf[@]}" || die
+ edo ./configure "${myconf[@]}" || die
}
src_compile() {
- if [[ ${PV} == "9999" ]] ; then
+ if [[ ${PV} == 9999 ]] ; then
# Uses w3m
emake -C doc man txt
fi
diff --git a/net-misc/clusterssh/clusterssh-4.16.ebuild b/net-misc/clusterssh/clusterssh-4.16.ebuild
index c98759fb454..5cde5cedf0c 100644
--- a/net-misc/clusterssh/clusterssh-4.16.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.16.ebuild
@@ -5,20 +5,22 @@ EAPI=8
DESCRIPTION="Concurrent Multi-Server Terminal Access"
HOMEPAGE="https://github.com/duncs/clusterssh"
+
if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/duncs/clusterssh"
inherit git-r3
else
- DIST_AUTHOR="DUNCS"
- DIST_NAME="App-ClusterSSH"
# Use dev-perl/Gentoo-PerlMod-Version to update this on bumps!
# DIST_VERSION=$(gentoo-perlmod-version.pl ${UPSTREAM_VERSION})
#DIST_VERSION="$(ver_cut 1-2)"
#die "|$(ver_cut 1-2)_$(ver_cut 3)|"
+ DIST_AUTHOR="DUNCS"
+ DIST_NAME="App-ClusterSSH"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
fi
+DIST_TEST="do parallel"
inherit perl-module
LICENSE="GPL-2"
@@ -51,5 +53,3 @@ BDEPEND="
dev-perl/Module-Build
dev-perl/Test-Differences
dev-perl/Test-Pod"
-
-SRC_TEST="do parallel"
diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild
index 7d85bec6196..7627c4d1631 100644
--- a/net-misc/clusterssh/clusterssh-9999.ebuild
+++ b/net-misc/clusterssh/clusterssh-9999.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Concurrent Multi-Server Terminal Access"
HOMEPAGE="https://github.com/duncs/clusterssh"
+
if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/duncs/clusterssh"
inherit git-r3
else
- DIST_AUTHOR="DUNCS"
- DIST_NAME="App-ClusterSSH"
# Use dev-perl/Gentoo-PerlMod-Version to update this on bumps!
# DIST_VERSION=$(gentoo-perlmod-version.pl ${UPSTREAM_VERSION})
#DIST_VERSION="$(ver_cut 1-2)"
#die "|$(ver_cut 1-2)_$(ver_cut 3)|"
+ DIST_AUTHOR="DUNCS"
+ DIST_NAME="App-ClusterSSH"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
+DIST_TEST="do parallel"
inherit perl-module
LICENSE="GPL-2"
@@ -51,5 +53,3 @@ BDEPEND="
dev-perl/Module-Build
dev-perl/Test-Differences
dev-perl/Test-Pod"
-
-SRC_TEST="do parallel"
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index cb2265ddce6..70370744575 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,2 +1 @@
-DIST cmst-2022.03.13.tar.gz 3178885 BLAKE2B 0f67d4b63c1d9c5925811ae11cd6e0a16c7edefaf802dfcb7847b5e1ce5dac8435343523b5b6ba863c08d49340a06a16df65f057b7297ff874768b929e30d676 SHA512 ed8ccec8c132bfdb42bcd8429d6b25242ff2575eadf5c60afe04477a3962eb474b841c57cc4dca9345cb61b1a2502873ac91bb97b6766e637ca4254d82856a1e
DIST cmst-2022.05.01.tar.gz 3427199 BLAKE2B 3e48c45d5ce45259934af95eeb0a6462a62a7caf2c4eb030487c66d1c25ccb6204dd312e778a97310026dd3f7622b43c6b02c6dc750fe81400a756366be6d3bf SHA512 54a3cc6feee7e388d0b84967796b5d3306fdf0c5a1dde17ccaa582f4803841ea624894e6cd9afc4566d6972c1981e848dc12fbd0004669341821c068064770c8
diff --git a/net-misc/cmst/cmst-2022.03.13.ebuild b/net-misc/cmst/cmst-2022.03.13.ebuild
deleted file mode 100644
index 45b56952a1a..00000000000
--- a/net-misc/cmst/cmst-2022.03.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt GUI for Connman with system tray icon"
-HOMEPAGE="https://github.com/andrew-bibb/cmst"
-SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
- net-misc/connman
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
- export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
- eqmake5 DISTRO=gentoo
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- rm -r "${D}"/usr/share/licenses || die
- gunzip "${D}"/usr/share/man/man1/cmst.1.gz
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/net-misc/cmst/cmst-2022.05.01.ebuild b/net-misc/cmst/cmst-2022.05.01.ebuild
index 72cbdbb60aa..45b56952a1a 100644
--- a/net-misc/cmst/cmst-2022.05.01.ebuild
+++ b/net-misc/cmst/cmst-2022.05.01.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="dev-qt/qtcore:5
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
deleted file mode 100644
index dfa22e29a0a..00000000000
--- a/net-misc/cni-plugins/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cni-plugins-0.8.6.tar.gz 1993056 BLAKE2B 89276e0f7fdbc782b30ff675abcb0f92f210771bb772269210416e17d6da443fe732774d9af8ae66f69847c8b48ee4dc6485f51e2156814cfd7e3ca8b455428f SHA512 8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8
-DIST cni-plugins-0.8.7.tar.gz 1965945 BLAKE2B 592b1f126547363877c657e03d69fcb25874e6d472d731861a1a03e3933901bd618a5097f3d91f6ca7fbedce29a0ff0076a65be1a528a2584a7dcb5940a4b010 SHA512 1b11b080b1f54a8a792b1048573d7d882603b76929f0c9343eeb2e010f97700c0deea4489faeb493a1aeac12557b6847b26784c378d0430c47de6bdaca6aa70f
-DIST cni-plugins-0.9.0.tar.gz 2705022 BLAKE2B 82f723501901da40e4ea2f111bd1ed3023a1d11e1715902830f3cd0cf0d46d9f9c57389b3a763448fcd52c40aba97a731986ca1862e2ecd912e8a274abf626c9 SHA512 8d545d17e6bf4180755708e47607c855b99f6ea4183a33930b7d05974d2151c90873f1e2064b806059a26caba6942502d9954fce697bf000995d539c2208811c
-DIST cni-plugins-0.9.1.tar.gz 2703099 BLAKE2B 878f476e62f12020b39d33a79723fe246b34d80705d3a336573401743392adca9a57b196d6d191b4a6f281110f47ecbb1525aacd91cd488bea61c7aaed12a6ef SHA512 24e8fcedbff2ae7a83aa96085b546b164de6a0884d593e3b5386e9d2de3c4d9a215db9e9405332020cc45c371709a32b600e263e4f8dee62c51adafdc0180f24
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
deleted file mode 100644
index 5bf8dc6fadd..00000000000
--- a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
- exeinto /opt/cni/bin
- doexe bin/*
- dodoc README.md
- local i
- for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
- newdoc README.md ${i##*/}.README.md
- done
-}
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild
deleted file mode 100644
index 838f8dc46a5..00000000000
--- a/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
- exeinto /opt/cni/bin
- doexe bin/*
- dodoc README.md
- local i
- for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
- newdoc README.md ${i##*/}.README.md
- done
-}
diff --git a/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild
deleted file mode 100644
index 3ef070097fe..00000000000
--- a/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
- exeinto /opt/cni/bin
- doexe bin/*
- dodoc README.md
- local i
- for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
- newdoc README.md ${i##*/}.README.md
- done
- newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
-}
diff --git a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
deleted file mode 100644
index 5d452991886..00000000000
--- a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-IUSE="hardened"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
- exeinto /opt/cni/bin
- doexe bin/*
- dodoc README.md
- local i
- for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
- newdoc README.md ${i##*/}.README.md
- done
- newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
-}
diff --git a/net-misc/cni-plugins/files/cni-dhcp.initd b/net-misc/cni-plugins/files/cni-dhcp.initd
deleted file mode 100644
index 26b838c516b..00000000000
--- a/net-misc/cni-plugins/files/cni-dhcp.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-name="CNI-DHCP"
-description="virtual dhcp server for containers"
-command="/opt/cni/bin/dhcp"
-command_args="daemon"
-command_background=true
-pidfile="/run/${RC_SVCNAME}.pid"
-
-depend() {
- need net
-}
-
-stop_post() {
- if [ -e /run/cni/dhcp.sock ]; then
- ebegin "Cleaning socket for ${name}"
- rm -f /run/cni/dhcp.sock
- eend $? "Failed to cleanup socket"
- fi
-}
diff --git a/net-misc/cni-plugins/metadata.xml b/net-misc/cni-plugins/metadata.xml
deleted file mode 100644
index 8359d931614..00000000000
--- a/net-misc/cni-plugins/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>williamh@gentoo.org</email>
- <name>William Hubbs</name>
- </maintainer>
- <upstream>
- <remote-id type="github">containernetworking/plugins</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
deleted file mode 100644
index 7358a56ef94..00000000000
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit desktop python-single-r1 vcs-snapshot
-
-MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52"
-
-DESCRIPTION="Desktop notification integration for connman"
-HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
-SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
-
-EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- net-misc/connman
- virtual/notification-daemon"
-
-src_install() {
- python_fix_shebang ${PN}
- dobin ${PN}
- dodoc README.rst
-
- make_desktop_entry ${PN} ${PN} ${PN} Network
-}
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
index 217e156b72e..da4fd73408b 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit desktop python-single-r1
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index eb7e472a6cf..18375e3ead6 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1 +1,2 @@
DIST connman-1.41.tar.xz 758556 BLAKE2B 45e522d4a3a8d1a2f8eb21612d85435020f51387d4285da65da56d022df2d521f81a782af82387bdede8b71bdc591b9ffb8b79e1b1dd9d1d83ffa96eede9c1bd SHA512 b7880d908635ab9350c12e207213d20b11c1a50afcb93ae92e1fc57d4345bf792afe1a5534650e18b8cd05a3766ce9993083b2d659e49f87b867e6f2c1a83b2d
+DIST connman-363e0ed955f605fb0dc919b7ee149b6071af73ee.tar.gz 738158 BLAKE2B 05315470fe055b6b42330d3aa6e4286c551f1ce43a63e6952f0f0969d3639275eab62da0d90ff6fd756fcfca37e11d16d4ed834f0cf02e1b8cf75be742cc6a75 SHA512 e5a66134f4ee99d03aa4c77082817a4886750434e676eecb394ba1aac0475034cadec66aba27704b173151dce74e92f9e77065bcdef9576c9ed3d3cfc13a1d68
diff --git a/net-misc/connman/connman-1.42_pre20220801.ebuild b/net-misc/connman/connman-1.42_pre20220801.ebuild
new file mode 100644
index 00000000000..74a2ba49cb5
--- /dev/null
+++ b/net-misc/connman/connman-1.42_pre20220801.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools systemd tmpfiles
+
+COMMIT=363e0ed955f605fb0dc919b7ee149b6071af73ee
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+ SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.16
+ >=sys-apps/dbus-1.2.24
+ sys-libs/readline:0=
+ bluetooth? ( net-wireless/bluez )
+ iptables? ( >=net-firewall/iptables-1.4.8 )
+ iwd? ( net-wireless/iwd )
+ l2tp? ( net-dialup/xl2tpd )
+ nftables? (
+ >=net-libs/libnftnl-1.0.4:0=
+ >=net-libs/libmnl-1.0.0:0= )
+ ofono? ( net-misc/ofono )
+ openconnect? ( net-vpn/openconnect )
+ openvpn? ( net-vpn/openvpn )
+ policykit? ( sys-auth/polkit )
+ pptp? ( net-dialup/pptpclient )
+ vpnc? ( net-vpn/vpnc )
+ wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+ wireguard? ( >=net-libs/libmnl-1.0.0:0= )
+ wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-2.6.39"
+
+PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
+S=${WORKDIR}/${PN}-${COMMIT}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir=/var \
+ --runstatedir=/run \
+ --with-systemdunitdir=$(systemd_get_systemunitdir) \
+ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+ --enable-client \
+ --enable-datafiles \
+ --enable-loopback=builtin \
+ $(use_enable bluetooth bluetooth builtin) \
+ $(use_enable debug) \
+ $(use_enable ethernet ethernet builtin) \
+ $(use_enable examples test) \
+ $(use_enable iwd) \
+ $(use_enable l2tp l2tp builtin) \
+ $(use_enable networkmanager nmcompat) \
+ $(use_enable ofono ofono builtin) \
+ $(use_enable openconnect openconnect builtin) \
+ $(use_enable openvpn openvpn builtin) \
+ $(use_enable policykit polkit builtin) \
+ $(use_enable pptp pptp builtin) \
+ $(use_enable tools) \
+ $(use_enable vpnc vpnc builtin) \
+ $(use_enable wifi wifi builtin) \
+ $(use_enable wireguard) \
+ $(use_enable wispr wispr builtin) \
+ --with-firewall=$(usex iptables "iptables" "nftables" ) \
+ --disable-iospm \
+ --disable-hh2serial-gps
+}
+
+src_install() {
+ default
+ dobin client/connmanctl
+
+ if use doc; then
+ dodoc doc/*.txt
+ fi
+ keepdir /usr/lib/${PN}/scripts
+ keepdir /var/lib/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+ tmpfiles_process connman_resolvconf.conf
+}
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index 756eb472d77..bc13ffce87d 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,2 +1,2 @@
-DIST croc-9.5.3.tar.gz 2847753 BLAKE2B 7ba9f321f3e6edb3e9332ca1e71ef3bcd9ec96ec2040ea00b861e5caa4427035ac4ffd1fbb01ebd944cd77f37e52789f2d6f0fe589646725b25ef2c59a4668e1 SHA512 b4f237af9d36cdf72b993ebbfcb9502f13f383d45888057394a9fe78ac778eefbf9a61268df6e584e8880879195ab1f30cf59ff2b74bfdd16b1d451c8670af5d
DIST croc-9.5.5.tar.gz 2868323 BLAKE2B 52fda421cca32ec2f1f45f0df8e38e44c7dbb161856f9624665816b60957f5906ec01b4bdb0efd769974d2eed6f423adf987397a2e6e064e48382286d5c602a2 SHA512 7bb4f23dc6b0f809da87d67b10cfb1530cb138a3a70c9578b35de602ddf90cd0f61c2ba643a83d990890a07de29588b1387b83ac63b8eac2a75620a221330eb8
+DIST croc-9.5.6.tar.gz 2868248 BLAKE2B db9d2662ce4683767a57b88c7e06240243a93b1e0fadaa2d4ca42427df241afb5c9b290c879f18d59aa2600c8b8efc7b1716acdf1b11f57677d8d4672bd960bd SHA512 3342e0bc6e45c38653d2cca99d6e1b7b79450bdd05c77f3c073f0a4573a99a74b38da36d17950b5da49f99093dbc04c67f03816e3e831770491f0660e78b9266
diff --git a/net-misc/croc/croc-9.5.3.ebuild b/net-misc/croc/croc-9.5.6.ebuild
index 03dce788293..03dce788293 100644
--- a/net-misc/croc/croc-9.5.3.ebuild
+++ b/net-misc/croc/croc-9.5.6.ebuild
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 47dec81c652..b649227f055 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,12 +1,6 @@
DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d
DIST curl-7.79.1.tar.xz.asc 488 BLAKE2B cf1864b15ee4b47a61a03968c4fd9526d4c8d0c5a8a0a1357de61758640e6dfda57334df1e63afd94c0064b7e61527623dd20446b27fa0130e0bf92c647d9820 SHA512 4f7930fde0a21358cf0bd8d5cbde5a05efc34202265b4744e59f49d9dc269987f47b4ead77c33e2ae03acabd7b6d6a731c69b91999eea70542f49d9ea0c2ba94
-DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab
-DIST curl-7.80.0.tar.xz.asc 488 BLAKE2B 5cde8a91059bb19b9ee9b1aa4c3225522398a0d5837edf3d99b7f9ea758e5df2a729ce1d0a9763967c2319c30d94ba80ff50888dec07665a818216d42b91feee SHA512 e11adb85fb061bba8838f435f6afb200924f24cb7351d9a8208ec3d317d8ef8c1e16f06dedfc623acc749931015c42dcd86236a53602c6632b3a750841345b05
-DIST curl-7.81.0.tar.xz 2486388 BLAKE2B bf8a3a03564648a9d7a5b4e7a523d840230f03237cf9eb5b07dcb4f531b036eb8111c1944bedd0c1df188e09a09468b3487d24ea50781124bc33d194546691f4 SHA512 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df
-DIST curl-7.81.0.tar.xz.asc 488 BLAKE2B 9280f10b14ddd95a1405fda79f8c51528c91c5e86b8f90d16d20d7f11d212e6e4391377eed971d0b0b27f5f4692c702e9d7a11705f0558ad39df38608d6a0648 SHA512 ca32a639900a9f8211005227dfb594f809c5ca5ec1eb87e944ef33cca60e4844f5b6ebe49de79fba53068e5dee9652b1d43a7d3a74e05419a2ffb5b40dab8176
-DIST curl-7.82.0.tar.xz 2446764 BLAKE2B 838accae4a45c090909cff91477a023789a79535691c80e507fd9e9712861b0c08e25ecd26079cb8ac8946cdf429a50991a7521e7b550b43c19e455625bc0750 SHA512 a977d69360d1793f8872096a21f5c0271e7ad145cd69ad45f4056a0657772f0f298b04bdb41aefd4ea5c4478352c60d80b5a118642280a07a7198aa80ffb1d57
-DIST curl-7.82.0.tar.xz.asc 488 BLAKE2B 9da4ea63671621df956aa5dc191cfc6c8d2a8b1958416ca58ffc04d43ed65b89244968588879e6bd3299ca8f60b1eccb34dede012f8a2a37acf3ca34021da958 SHA512 1f14d8ab55360ba735dff916369ee318e98767718394654ce9443b6013509b6d3ed5597685b142e9823cec7496373b709a8656515d66039c06783879655151fe
-DIST curl-7.83.0.tar.xz 2472560 BLAKE2B 0669f40265a56e7549e8038ed8421680d7264bff44dcc0692cf9f5248621311be5e228314710149bf9d2ccbe739f929039e04402c1d04a1362d0bbf08cb8cdc7 SHA512 be02bb2a8a3140eff3a9046f27cd4f872ed9ddaa644af49e56e5ef7dfec84a15b01db133469269437cddc937eda73953fa8c51bb758f7e98873822cd2290d3a9
-DIST curl-7.83.0.tar.xz.asc 488 BLAKE2B a8f6dcf00f1b01b457a7eecc8364538393f414df60757f3664709c62b6007023a34ddf4ecb4688734e396031d30905b490dd0c115f09a9428db6a6be97cdf72c SHA512 8fb90f9692f4fdb82ea49f0e5151219b2334da5d3910f28e787bb688fb055b8b028ccf75cdcc15cd9f86d780d479f88f902fef7d7b9e007a4b849cb25c6c13cc
DIST curl-7.83.1.tar.xz 2474940 BLAKE2B 491427b12f082c2246ef6cb2a129340079db28bd93b4381889e7328bef1d61a79bb57cba4b8372759baa4f6e77644966ed95cfa8f839ee9db634786757fb1ce0 SHA512 2f63327d6d3687ba36fb7b8d5d3d15599eca33ebfb08681613612ea9c4b629d3b6ce4d2742fa1ebd7a997ed332001d3a4c798985f9277c83b9e7a9aecdb1b1ee
DIST curl-7.83.1.tar.xz.asc 488 BLAKE2B 78f7a6d9a32cab97e9ce26430eb2be2bc4e20552cf8c59238f30f127e9d7af5b4f9808c3fe0846c18c8f7a67b49f2f75d865d17b7760bb664872934799949441 SHA512 f0d29de315488c844eb81ed5a89ed6334910970224c8cac43e7e6f2d58c35ad0064c0b6122e69b3a34ce91f4b56873c63e2e8aea1c602ef40711bfd62a01b191
+DIST curl-7.84.0.tar.xz 2477944 BLAKE2B 811a63285f39a598bc4fd73ae4b8e23e5146b93dcf3eea805345792b7dddd85bbd54240d9871a0dc9f058d58fd7ea7f4efbcb82727218e8afaaae3600bad55e1 SHA512 86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce
+DIST curl-7.84.0.tar.xz.asc 488 BLAKE2B d74dea89fa89b6ed0a928e01987669f7dde0bcbb30423ea0f3af9f31eea1e059d458629d80455d772264d744fab236d4f506545afa1bfbd6ded7e2b27192a7c8 SHA512 80ff5274277ad97448fa53511bab6e8a1c302bcb25fc0916d78b8dc6c6af43d944c37c4ed46668b651cc639ec4964780725117ca0e85168ea66ad7cc98d29702
diff --git a/net-misc/curl/curl-7.80.0-r1.ebuild b/net-misc/curl/curl-7.80.0-r1.ebuild
deleted file mode 100644
index f1c2d683860..00000000000
--- a/net-misc/curl/curl-7.80.0-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools prefix multilib-minimal verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
- verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
-IUSE+=" nghttp3 quiche"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
- threads? ( !adns )
- ssl? (
- ^^ (
- curl_ssl_gnutls
- curl_ssl_mbedtls
- curl_ssl_nss
- curl_ssl_openssl
- )
- )"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- mbedtls? (
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- openssl? (
- dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
- )
- nss? (
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
- nghttp3? (
- net-libs/nghttp3[${MULTILIB_USEDEP}]
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
- )
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
- adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
- sys-libs/zlib[${MULTILIB_USEDEP}]
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-# rtmp? (
-# media-video/rtmpdump
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-# )
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
- virtual/pkgconfig
- test? (
- sys-apps/diffutils
- )
- 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
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch
- "${FILESDIR}"/${PN}-respect-cflags-3.patch
-)
-
-src_prepare() {
- default
-
- eprefixify curl-config.in
- eautoreconf
-}
-
-multilib_src_configure() {
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
- local myconf=()
-
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- #myconf+=( --without-default-ssl-backend )
- if use ssl ; then
- if use gnutls || use curl_ssl_gnutls; then
- einfo "SSL provided by gnutls"
- myconf+=( --with-gnutls --with-nettle )
- fi
- if use mbedtls || use curl_ssl_mbedtls; then
- einfo "SSL provided by mbedtls"
- myconf+=( --with-mbedtls )
- fi
- if use nss || use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss )
- fi
- if use openssl || use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
-
- if use curl_ssl_gnutls; then
- einfo "Default SSL provided by gnutls"
- myconf+=( --with-default-ssl-backend=gnutls )
- elif use curl_ssl_mbedtls; then
- einfo "Default SSL provided by mbedtls"
- myconf+=( --with-default-ssl-backend=mbedtls )
- elif use curl_ssl_nss; then
- einfo "Default SSL provided by nss"
- myconf+=( --with-default-ssl-backend=nss )
- elif use curl_ssl_openssl; then
- einfo "Default SSL provided by openssl"
- myconf+=( --with-default-ssl-backend=openssl )
- else
- eerror "We can't be here because of REQUIRED_USE."
- fi
-
- else
- einfo "SSL disabled"
- fi
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
- myconf+=(
- $(use_enable alt-svc)
- --enable-crypto-auth
- --enable-dict
- --disable-ech
- --enable-file
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable hsts)
- --enable-http
- $(use_enable imap)
- $(use_enable ldap)
- $(use_enable ldap ldaps)
- --enable-ntlm
- --disable-ntlm-wb
- $(use_enable pop3)
- --enable-rt
- --enable-rtsp
- $(use_enable samba smb)
- $(use_with ssh libssh2)
- $(use_enable smtp)
- $(use_enable telnet)
- $(use_enable tftp)
- --enable-tls-srp
- $(use_enable adns ares)
- --enable-cookies
- --enable-dateparse
- --enable-dnsshuffle
- --enable-doh
- --enable-symbol-hiding
- --enable-http-auth
- $(use_enable ipv6)
- --enable-largefile
- --enable-manual
- --enable-mime
- --enable-netrc
- $(use_enable progress-meter)
- --enable-proxy
- --disable-sspi
- $(use_enable static-libs static)
- $(use_enable threads threaded-resolver)
- $(use_enable threads pthreads)
- --disable-versioned-symbols
- --without-amissl
- --without-bearssl
- $(use_with brotli)
- --without-fish-functions-dir
- $(use_with http2 nghttp2)
- --without-hyper
- $(use_with idn libidn2)
- $(use_with kerberos gssapi "${EPREFIX}"/usr)
- --without-libgsasl
- --without-libpsl
- $(use_with nghttp3)
- $(use_with nghttp3 ngtcp2)
- $(use_with quiche)
- $(use_with rtmp librtmp)
- --without-rustls
- --without-schannel
- --without-secure-transport
- --without-winidn
- --without-wolfssl
- --with-zlib
- $(use_with zstd)
- )
-
- ECONF_SOURCE="${S}" \
- econf "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # avoid building the client
- 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 quiche; then
- libs+=( "-lquiche" )
- priv+=( "quiche" )
- fi
- if use nghttp3; then
- libs+=( "-lnghttp3" "-lngtcp2" )
- priv+=( "libnghttp3" "-libtcp2" )
- 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
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default_src_test
-}
-
-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-7.81.0-r1.ebuild b/net-misc/curl/curl-7.81.0-r1.ebuild
deleted file mode 100644
index e47b2c09b3d..00000000000
--- a/net-misc/curl/curl-7.81.0-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools prefix multilib-minimal verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
- verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
-IUSE+=" nghttp3 quiche"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
- threads? ( !adns )
- ssl? (
- ^^ (
- curl_ssl_gnutls
- curl_ssl_mbedtls
- curl_ssl_nss
- curl_ssl_openssl
- )
- )"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- mbedtls? (
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- openssl? (
- dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
- )
- nss? (
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
- nghttp3? (
- net-libs/nghttp3[${MULTILIB_USEDEP}]
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
- )
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
- adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
- sys-libs/zlib[${MULTILIB_USEDEP}]
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-# rtmp? (
-# media-video/rtmpdump
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-# )
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
- virtual/pkgconfig
- test? (
- sys-apps/diffutils
- )
- 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
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch
- "${FILESDIR}"/${PN}-respect-cflags-3.patch
-)
-
-src_prepare() {
- default
-
- eprefixify curl-config.in
- eautoreconf
-}
-
-multilib_src_configure() {
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
- local myconf=()
-
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- #myconf+=( --without-default-ssl-backend )
- if use ssl ; then
- if use gnutls || use curl_ssl_gnutls; then
- einfo "SSL provided by gnutls"
- myconf+=( --with-gnutls --with-nettle )
- fi
- if use mbedtls || use curl_ssl_mbedtls; then
- einfo "SSL provided by mbedtls"
- myconf+=( --with-mbedtls )
- fi
- if use nss || use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss )
- fi
- if use openssl || use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
-
- if use curl_ssl_gnutls; then
- einfo "Default SSL provided by gnutls"
- myconf+=( --with-default-ssl-backend=gnutls )
- elif use curl_ssl_mbedtls; then
- einfo "Default SSL provided by mbedtls"
- myconf+=( --with-default-ssl-backend=mbedtls )
- elif use curl_ssl_nss; then
- einfo "Default SSL provided by nss"
- myconf+=( --with-default-ssl-backend=nss )
- elif use curl_ssl_openssl; then
- einfo "Default SSL provided by openssl"
- myconf+=( --with-default-ssl-backend=openssl )
- else
- eerror "We can't be here because of REQUIRED_USE."
- fi
-
- else
- einfo "SSL disabled"
- fi
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
- myconf+=(
- $(use_enable alt-svc)
- --enable-crypto-auth
- --enable-dict
- --disable-ech
- --enable-file
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable hsts)
- --enable-http
- $(use_enable imap)
- $(use_enable ldap)
- $(use_enable ldap ldaps)
- --enable-ntlm
- --disable-ntlm-wb
- $(use_enable pop3)
- --enable-rt
- --enable-rtsp
- $(use_enable samba smb)
- $(use_with ssh libssh2)
- $(use_enable smtp)
- $(use_enable telnet)
- $(use_enable tftp)
- --enable-tls-srp
- $(use_enable adns ares)
- --enable-cookies
- --enable-dateparse
- --enable-dnsshuffle
- --enable-doh
- --enable-symbol-hiding
- --enable-http-auth
- $(use_enable ipv6)
- --enable-largefile
- --enable-manual
- --enable-mime
- --enable-netrc
- $(use_enable progress-meter)
- --enable-proxy
- --disable-sspi
- $(use_enable static-libs static)
- $(use_enable threads threaded-resolver)
- $(use_enable threads pthreads)
- --disable-versioned-symbols
- --without-amissl
- --without-bearssl
- $(use_with brotli)
- --without-fish-functions-dir
- $(use_with http2 nghttp2)
- --without-hyper
- $(use_with idn libidn2)
- $(use_with kerberos gssapi "${EPREFIX}"/usr)
- --without-libgsasl
- --without-libpsl
- $(use_with nghttp3)
- $(use_with nghttp3 ngtcp2)
- $(use_with quiche)
- $(use_with rtmp librtmp)
- --without-rustls
- --without-schannel
- --without-secure-transport
- --without-winidn
- --without-wolfssl
- --with-zlib
- $(use_with zstd)
- )
-
- ECONF_SOURCE="${S}" \
- econf "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # avoid building the client
- 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 quiche; then
- libs+=( "-lquiche" )
- priv+=( "quiche" )
- fi
- if use nghttp3; then
- libs+=( "-lnghttp3" "-lngtcp2" )
- priv+=( "libnghttp3" "-libtcp2" )
- 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
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default_src_test
-}
-
-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-7.82.0-r2.ebuild b/net-misc/curl/curl-7.82.0-r2.ebuild
deleted file mode 100644
index e4a7ea60d92..00000000000
--- a/net-misc/curl/curl-7.82.0-r2.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools prefix multilib-minimal verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
- verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
-IUSE+=" nghttp3 quiche"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
- threads? ( !adns )
- ssl? (
- ^^ (
- curl_ssl_gnutls
- curl_ssl_mbedtls
- curl_ssl_nss
- curl_ssl_openssl
- )
- )"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- mbedtls? (
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- openssl? (
- dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
- )
- nss? (
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
- nghttp3? (
- net-libs/nghttp3[${MULTILIB_USEDEP}]
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
- )
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
- adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
- sys-libs/zlib[${MULTILIB_USEDEP}]
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-# rtmp? (
-# media-video/rtmpdump
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-# )
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
- virtual/pkgconfig
- test? (
- sys-apps/diffutils
- )
- 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
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch
- "${FILESDIR}"/${PN}-respect-cflags-3.patch
- "${FILESDIR}"/${P}-certs-processing.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-gnutls --without-mbedtls --without-nss --without-ssl )
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- #myconf+=( --without-default-ssl-backend )
- if use ssl ; then
- if use gnutls || use curl_ssl_gnutls; then
- einfo "SSL provided by gnutls"
- myconf+=( --with-gnutls --with-nettle )
- fi
- if use mbedtls || use curl_ssl_mbedtls; then
- einfo "SSL provided by mbedtls"
- myconf+=( --with-mbedtls )
- fi
- if use nss || use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss --with-nss-deprecated )
- fi
- if use openssl || use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
-
- if use curl_ssl_gnutls; then
- einfo "Default SSL provided by gnutls"
- myconf+=( --with-default-ssl-backend=gnutls )
- elif use curl_ssl_mbedtls; then
- einfo "Default SSL provided by mbedtls"
- myconf+=( --with-default-ssl-backend=mbedtls )
- elif use curl_ssl_nss; then
- einfo "Default SSL provided by nss"
- myconf+=( --with-default-ssl-backend=nss )
- elif use curl_ssl_openssl; then
- einfo "Default SSL provided by openssl"
- myconf+=( --with-default-ssl-backend=openssl )
- else
- eerror "We can't be here because of REQUIRED_USE."
- fi
-
- else
- einfo "SSL disabled"
- fi
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
- myconf+=(
- $(use_enable alt-svc)
- --enable-crypto-auth
- --enable-dict
- --disable-ech
- --enable-file
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable hsts)
- --enable-http
- $(use_enable imap)
- $(use_enable ldap)
- $(use_enable ldap ldaps)
- --enable-ntlm
- --disable-ntlm-wb
- $(use_enable pop3)
- --enable-rt
- --enable-rtsp
- $(use_enable samba smb)
- $(use_with ssh libssh2)
- $(use_enable smtp)
- $(use_enable telnet)
- $(use_enable tftp)
- --enable-tls-srp
- $(use_enable adns ares)
- --enable-cookies
- --enable-dateparse
- --enable-dnsshuffle
- --enable-doh
- --enable-symbol-hiding
- --enable-http-auth
- $(use_enable ipv6)
- --enable-largefile
- --enable-manual
- --enable-mime
- --enable-netrc
- $(use_enable progress-meter)
- --enable-proxy
- --disable-sspi
- $(use_enable static-libs static)
- $(use_enable threads threaded-resolver)
- $(use_enable threads pthreads)
- --disable-versioned-symbols
- --without-amissl
- --without-bearssl
- $(use_with brotli)
- --without-fish-functions-dir
- $(use_with http2 nghttp2)
- --without-hyper
- $(use_with idn libidn2)
- $(use_with kerberos gssapi "${EPREFIX}"/usr)
- --without-libgsasl
- --without-libpsl
- $(use_with nghttp3)
- $(use_with nghttp3 ngtcp2)
- $(use_with quiche)
- $(use_with rtmp librtmp)
- --without-rustls
- --without-schannel
- --without-secure-transport
- --without-winidn
- --without-wolfssl
- --with-zlib
- $(use_with zstd)
- )
-
- ECONF_SOURCE="${S}" \
- econf "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # avoid building the client
- 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 quiche; then
- libs+=( "-lquiche" )
- priv+=( "quiche" )
- fi
- if use nghttp3; then
- libs+=( "-lnghttp3" "-lngtcp2" )
- priv+=( "libnghttp3" "-libtcp2" )
- 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
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default_src_test
-}
-
-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-7.83.0.ebuild b/net-misc/curl/curl-7.84.0.ebuild
index 041b6cd5a2e..645a223aed8 100644
--- a/net-misc/curl/curl-7.83.0.ebuild
+++ b/net-misc/curl/curl-7.84.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
LICENSE="curl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
IUSE+=" nghttp3 quiche"
@@ -95,9 +95,9 @@ MULTILIB_CHOST_TOOLS=(
PATCHES=(
"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+ "${FILESDIR}"/${PN}-7.84.0-easylock.patch
"${FILESDIR}"/${PN}-respect-cflags-3.patch
- # Bug 842780, fixed upstream, drop on next version bump
- "${FILESDIR}"/${P}-http2.patch
+ "${FILESDIR}"/${PN}-7.84.0-include-sched.patch
)
src_prepare() {
diff --git a/net-misc/curl/files/curl-7.82.0-certs-processing.patch b/net-misc/curl/files/curl-7.82.0-certs-processing.patch
deleted file mode 100644
index a62c1df20b3..00000000000
--- a/net-misc/curl/files/curl-7.82.0-certs-processing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/curl/curl/issues/8559
-https://bugs.gentoo.org/836629
-
-From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Tue, 8 Mar 2022 13:38:13 +0100
-Subject: [PATCH] openssl: fix CN check error code
-
-Due to a missing 'else' this returns error too easily.
-
-Regressed in: d15692ebb
-
-Reported-by: Kristoffer Gleditsch
-Fixes #8559
-Closes #8560
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn,
- memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen);
- peer_CN[peerlen] = '\0';
- }
-- result = CURLE_OUT_OF_MEMORY;
-+ else
-+ result = CURLE_OUT_OF_MEMORY;
- }
- }
- else /* not a UTF8 name */
diff --git a/net-misc/curl/files/curl-7.83.0-http2.patch b/net-misc/curl/files/curl-7.83.0-http2.patch
deleted file mode 100644
index ede69a177b9..00000000000
--- a/net-misc/curl/files/curl-7.83.0-http2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Bug: https://bugs.gentoo.org/842780, https://github.com/curl/curl/pull/8768
-https://github.com/curl/curl/commit/6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3
-
-From 6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 28 Apr 2022 17:11:50 +0200
-Subject: [PATCH] mbedtls: fix compile when h2-enabled
-
-Fixes #8766
-Reported-by: LigH-de on github
-Closes #8768
----
- lib/vtls/mbedtls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
-index 64f57c5d8321..5f9b87e6b75b 100644
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -815,8 +815,8 @@ mbed_connect_step2(struct Curl_easy *data, struct connectdata *conn,
- if(next_protocol) {
- infof(data, VTLS_INFOF_ALPN_ACCEPTED_1STR, next_protocol);
- #ifdef USE_HTTP2
-- if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LEN) &&
-- !next_protocol[ALPN_H2_LEN]) {
-+ if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LENGTH) &&
-+ !next_protocol[ALPN_H2_LENGTH]) {
- conn->negnpn = CURL_HTTP_VERSION_2;
- }
- else
diff --git a/net-misc/curl/files/curl-7.84.0-easylock.patch b/net-misc/curl/files/curl-7.84.0-easylock.patch
new file mode 100644
index 00000000000..77ee610fc11
--- /dev/null
+++ b/net-misc/curl/files/curl-7.84.0-easylock.patch
@@ -0,0 +1,30 @@
+From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Tue, 28 Jun 2022 09:00:25 +0200
+Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool
+
+To work with more compilers without requiring separate libs to
+link. Like with gcc-12 for RISC-V on Linux.
+
+Reported-by: Adam Sampson
+Fixes #9055
+Closes #9061
+---
+ lib/easy_lock.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/easy_lock.h b/lib/easy_lock.h
+index 07c85c5ffdd19..9c11bc50c5f20 100644
+--- a/lib/easy_lock.h
++++ b/lib/easy_lock.h
+@@ -40,8 +40,8 @@
+ #include <sched.h>
+ #endif
+
+-#define curl_simple_lock atomic_bool
+-#define CURL_SIMPLE_LOCK_INIT false
++#define curl_simple_lock atomic_int
++#define CURL_SIMPLE_LOCK_INIT 0
+
+ static inline void curl_simple_lock_lock(curl_simple_lock *lock)
+ {
diff --git a/net-misc/curl/files/curl-7.84.0-include-sched.patch b/net-misc/curl/files/curl-7.84.0-include-sched.patch
new file mode 100644
index 00000000000..842310d2eaa
--- /dev/null
+++ b/net-misc/curl/files/curl-7.84.0-include-sched.patch
@@ -0,0 +1,24 @@
+https://github.com/curl/curl/commit/e2e7f54b7bea521fa8373095d0f43261a720cda0
+https://bugs.gentoo.org/855710
+
+From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 27 Jun 2022 08:46:21 +0200
+Subject: [PATCH] easy_lock.h: include sched.h if available to fix build
+
+Patched-by: Harry Sintonen
+
+Closes #9054
+--- a/lib/easy_lock.h
++++ b/lib/easy_lock.h
+@@ -36,6 +36,9 @@
+
+ #elif defined (HAVE_ATOMIC)
+ #include <stdatomic.h>
++#if defined(HAVE_SCHED_YIELD)
++#include <sched.h>
++#endif
+
+ #define curl_simple_lock atomic_bool
+ #define CURL_SIMPLE_LOCK_INIT false
+
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 48461136292..a6e835644b8 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -36,5 +36,6 @@
<remote-id type="cpe">cpe:/a:curl:libcurl</remote-id>
<remote-id type="cpe">cpe:/a:haxx:curl</remote-id>
<remote-id type="cpe">cpe:/a:haxx:libcurl</remote-id>
+ <remote-id type="github">curl/curl</remote-id>
</upstream>
</pkgmetadata>
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
new file mode 100644
index 00000000000..4ccf762c64d
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild
@@ -0,0 +1,74 @@
+# 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/files/dahdi-autoconf.init-3.1.0-r4 b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4
new file mode 100644
index 00000000000..73ab07b8904
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4
@@ -0,0 +1,271 @@
+#!/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/Manifest b/net-misc/dahdi/Manifest
index fd12a6dd7e2..716cde8c9cc 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -16,6 +16,7 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43
DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3
DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
-DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
+DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157
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 jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
diff --git a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
index 1bde322e9f4..05ae21da55a 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,8 @@ inherit flag-o-matic linux-mod toolchain-funcs
MY_P="${P/dahdi/dahdi-linux}"
JNET=1.0.14
-GENTOO=3.1.0-r1-v2
+GENTOO_PATCHVERSION=3.1.0-r4
+GENTOO_SOURCEVERSION=3.1.0-r4
S="${WORKDIR}/${MY_P}"
JNET_DRIVERS="cwain qozap ztgsm"
@@ -16,7 +17,8 @@ DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Za
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.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
@@ -38,19 +40,21 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="flash oslec"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
+PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" )
CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
-pkg_pretend() {
+pkg_setup() {
use oslec && CONFIG_CHECK+=" ECHO"
- check_extra_config
+ 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
@@ -68,6 +72,15 @@ src_unpack() {
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() {
@@ -94,7 +107,7 @@ src_compile() {
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_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).
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 8f429acc35b..b60aceb199a 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,2 +1 @@
-DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
deleted file mode 100644
index a4794b63f7e..00000000000
--- a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/
-https://roy.marples.name/projects/dhcpcd/"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug +embedded ipv6 privsep +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
- ${COMMON_DEPEND}
- privsep? (
- acct-group/dhcpcd
- acct-user/dhcpcd
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-memleak_fix.patch"
- "${FILESDIR}/${P}-unlink_socket.patch"
- "${FILESDIR}/${P}-sparc_privsep.patch" #776178
-)
-
-src_configure() {
- local myeconfargs=(
- --dbdir="${EPREFIX}/var/lib/dhcpcd"
- --libexecdir="${EPREFIX}/lib/dhcpcd"
- --localstatedir="${EPREFIX}/var"
- --prefix="${EPREFIX}"
- --with-hook=ntp.conf
- $(use_enable debug)
- $(use_enable embedded)
- $(use_enable ipv6)
- $(use_enable privsep)
- $(usex elibc_glibc '--with-hook=yp.conf' '')
- --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
- $(usex privsep '--privsepuser=dhcpcd' '')
- $(usex udev '' '--without-dev --without-udev')
- CC="$(tc-getCC)"
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- keepdir /var/lib/dhcpcd
- newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
- systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
-}
-
-pkg_postinst() {
- local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
- local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
- local old_duid="${EROOT}"/etc/dhcpcd.duid
- local new_duid="${dbdir}"/duid
- if [[ -e "${old_old_duid}" ]] ; then
- # Upgrade the duid file to the new format if needed
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [[ ! -e "${old_duid}" ]] ; then
- cp -p "${old_old_duid}" "${new_duid}"
- fi
- old_files+=( "${old_old_duid}" )
- fi
-
- # dhcpcd-7 moves the files out of /etc
- if [[ -e "${old_duid}" ]] ; then
- if [[ ! -e "${new_duid}" ]] ; then
- cp -p "${old_duid}" "${new_duid}"
- fi
- old_files+=( "${old_duid}" )
- fi
- local old_secret="${EROOT}"/etc/dhcpcd.secret
- local new_secret="${dbdir}"/secret
- if [[ -e "${old_secret}" ]] ; then
- if [[ ! -e "${new_secret}" ]] ; then
- cp -p "${old_secret}" "${new_secret}"
- fi
- old_files+=( "${old_secret}" )
- fi
-
- # dhcpcd-7 renames some files in /var/lib/dhcpcd
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
- local new_rdm="${dbdir}"/rdm_monotonic
- if [[ -e "${old_rdm}" ]] ; then
- if [[ ! -e "${new_rdm}" ]] ; then
- cp -p "${old_rdm}" "${new_rdm}"
- fi
- old_files+=( "${old_rdm}" )
- fi
- local lease=
- for lease in "${dbdir}"/dhcpcd-*.lease*; do
- [[ -f "${lease}" ]] || continue
- old_files+=( "${lease}" )
- local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
- [[ -e "${dbdir}/${new_lease}" ]] && continue
- cp "${lease}" "${dbdir}/${new_lease}"
- done
-
- # Warn about removing stale files
- if [[ -n "${old_files[@]}" ]] ; then
- elog
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
- elog "${EROOT}/etc to ${dbdir}"
- elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
- elog "prefix dropped."
- elog
- elog "You should remove these files if you don't plan on reverting"
- elog "to an older version:"
- local old_file=
- for old_file in ${old_files[@]}; do
- elog " ${old_file}"
- done
- fi
-
- if [ -z "${REPLACING_VERSIONS}" ]; then
- elog
- elog "dhcpcd has zeroconf support active by default."
- elog "This means it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any existing"
- elog "failover support you may have configured in your net configuration."
- elog "This behaviour can be controlled with the noipv4ll configuration"
- elog "file option or the -L command line switch."
- elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
- elog
- elog "Dhcpcd has duid enabled by default, and this may cause issues"
- elog "with some dhcp servers. For more information, see"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
- fi
-
- if ! has_version net-dns/bind-tools; then
- elog
- elog "If you activate the lookup-hostname hook to look up your hostname"
- elog "using the dns, you need to install net-dns/bind-tools."
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
index 1aa27d0a3b4..b7d172155d9 100644
--- a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_P/_beta/-beta}"
MY_P="${MY_P/_rc/-rc}"
SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
deleted file mode 100644
index 61aed69656d..00000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ba9f3823ae825c341ea30f45b46d942b4ce5b8d9 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sun, 24 Jan 2021 22:53:20 +0000
-Subject: [PATCH] Linux: fix a memory leak when dhcpcd exits or the log is
- reopened
-
----
- src/logerr.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/logerr.c b/src/logerr.c
-index 21e933b8..35268870 100644
---- a/src/logerr.c
-+++ b/src/logerr.c
-@@ -484,13 +484,14 @@ logclose(void)
- #endif
-
- closelog();
-+#if defined(__linux__)
-+ free(_logprog);
-+ _logprog = NULL;
-+#endif
- #ifndef SMALL
- if (ctx->log_file == NULL)
- return;
- fclose(ctx->log_file);
- ctx->log_file = NULL;
- #endif
--#if defined(__linux__)
-- free(_logprog);
--#endif
- }
---
-2.30.0
-
-
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
deleted file mode 100644
index a91db28d08c..00000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From dcfd7a23f002793a855156255e81662ef84064d3 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 5 Feb 2021 09:25:12 +0100
-Subject: [PATCH] src/privsep-linux: fix build on sparc (#26)
-
-Fix the following build failure:
-
-privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined
- 203 | # define AUDIT_ARCH_SPARC64
- |
-In file included from privsep-linux.c:35:
-/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition
- 392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT)
- |
-In file included from privsep-linux.c:36:
-privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
- 215 | BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
- | ^~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/privsep-linux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index d00894ab..5c80c1b3 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
- # endif
- #elif defined(__sparc__)
- # if defined(__arch64__)
--# define AUDIT_ARCH_SPARC64
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64
- # else
--# define AUDIT_ARCH_SPARC
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC
- # endif
- #elif defined(__xtensa__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
deleted file mode 100644
index 493e9c342f5..00000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d55f8e440389fbf333e14fe9f1a7d7f4da2b5197 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Tue, 26 Jan 2021 17:37:29 +0000
-Subject: [PATCH] control: unlink privileged socket when shutting down
- without privsep
-
-Otherwise we have a connection refused when dhcpcd starts again
-as it sees the stale socket file.
----
- src/control.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/control.c b/src/control.c
-index 71405ed1..a601ad0a 100644
---- a/src/control.c
-+++ b/src/control.c
-@@ -50,7 +50,7 @@
-
- #ifndef SUN_LEN
- #define SUN_LEN(su) \
-- (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-+ (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
- #endif
-
- static void
-@@ -350,12 +350,12 @@ control_start1(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family,
- }
- #endif
-
-- if ((fmode & S_PRIV) == S_PRIV)
-- strlcpy(ctx->control_sock, sa.sun_path,
-- sizeof(ctx->control_sock));
-- else
-+ if ((fmode & S_UNPRIV) == S_UNPRIV)
- strlcpy(ctx->control_sock_unpriv, sa.sun_path,
- sizeof(ctx->control_sock_unpriv));
-+ else
-+ strlcpy(ctx->control_sock, sa.sun_path,
-+ sizeof(ctx->control_sock));
- return fd;
- }
-
-@@ -368,7 +368,8 @@ control_start(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family)
- if (IN_PRIVSEP_SE(ctx)) {
- make_path(ctx->control_sock, sizeof(ctx->control_sock),
- ifname, family, false);
-- make_path(ctx->control_sock_unpriv, sizeof(ctx->control_sock),
-+ make_path(ctx->control_sock_unpriv,
-+ sizeof(ctx->control_sock_unpriv),
- ifname, family, true);
- return 0;
- }
---
-2.30.0
-
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index 63a57f9688f..c0b228a9886 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1,2 +1 @@
-DIST dropbox-cli-2020.03.04.py.xz 14304 BLAKE2B 600378cbacd6e96c16e1c8464261b260f2d8919ef5f361c4f337386d3849294cf8557d44f1c5d4f5682eadb2f15885a16b0a8fa162929665e518801d23ec35cc SHA512 c6c8f2f3fb08818388f5ac812821a1530214ad18d58191b08092852aa953e2947871145b46a4df4debeb629a870e1182a47fd5a8bdf8b22144e686e19ede689a
DIST dropbox-cli-2022.py.xz 14288 BLAKE2B a90d347efcce5917179853afef346a6679dddbb33e146a936786c226ad519601f503d73eeb1d1e205be8bd11792aeedb90ff7046c770f079a47e75dea80efd99 SHA512 59bfbf3544a8407bbc232d87e57d8b27d4bbc108483af52e58c0badddde6ce2dfde2203403a8c5e8c95421fe8c4b73e75cec64def2699ae9bac31be965e98974
diff --git a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
deleted file mode 100644
index 44de1f5f0fb..00000000000
--- a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-r1 bash-completion-r1
-
-DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="net-misc/dropbox
- ${PYTHON_DEPS}
- dev-python/pygpgme[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}
-
-src_install() {
- newbin ${P}.py ${PN}
- python_replicate_script "${D}"/usr/bin/${PN}
- newbashcomp "${FILESDIR}"/${PN}-19-completion ${PN}
-}
diff --git a/net-misc/dropbox-cli/dropbox-cli-2022.ebuild b/net-misc/dropbox-cli/dropbox-cli-2022.ebuild
index 1b9b1364e01..926b2f7cba5 100644
--- a/net-misc/dropbox-cli/dropbox-cli-2022.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-2022.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+gpg"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index b6763a2fa6e..ed4c7e718bf 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,5 +1,7 @@
DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-147.4.4800.tar.gz 102214911 BLAKE2B a35086b6787cf442a326d1f6a3e6bd1d453a6d76817ece33f9a43d6d35182b20c343eafded7a6023b37267fc2c3b99896e28f7913ed18f5541fe107b0235cbe9 SHA512 16b40b080ce0b97d0d3da86543a31f07331d27ec42dcf0c06a3632c4e5448ea11f4e2471f3796729de20d13af4bfbc0bf65ae1993eb592f0b170ab44fa441b62
-DIST dropbox-lnx.x86-148.4.4519.tar.gz 103388037 BLAKE2B 5bc5a7a211dd5d4bfa12070bfcac061fa5ecfce39a7390e945a00ac3e440d5aa82633581538cffe6525dd7d55dbaa68a00648b8e62c6545a395cc6810e0e7d01 SHA512 a063e2d3f6d2edc01df9ff40dfefbfef9e42decd8b1088605cab6a1482f73b75908a4350c3053fa05e0c9cf62dd44dbb319cdce8b882bcde6f738255e366c0e5
-DIST dropbox-lnx.x86_64-147.4.4800.tar.gz 104476319 BLAKE2B 0bb282285df72bed5da4134b22500f0d3ee649d0b7902c3016288914bf331c40e6704fcbde7de21215ca93500f559f32fb503025f2d18832962650ad85ce6e74 SHA512 f54d083d901f0cb2ab53e5fc735f4fd69eb9bce87b5177c2ef9ba54913bab1d286ccd57f7ae13bc09b8dc7482a4209fc9ad792c9f74d550487daee311319c247
-DIST dropbox-lnx.x86_64-148.4.4519.tar.gz 105252627 BLAKE2B 923412d600c34daa248be2179a8c8d09b097bec9a9efb68bd9df5a8d68e0702336ef35f4c2f9cebb4a45f6bec4f2731d24e9b75a9696f6696216f1388a31d0dc SHA512 b51b06cc9a23a65c5cc75632f5c9b2cfa7e2bff9ced7527f1392c85631622c74bac2e0d3b106883f4e73012563b5eb8fd498e44d617a25bc15a41fe3c7d903cc
+DIST dropbox-lnx.x86-152.4.4880.tar.gz 104241545 BLAKE2B 9564ce288aaec193142b203edd703498f72c7c21cff33a0b3a3b6450fe45d03cec375017e3805d84b604431ae427b63ddec605aba6fd64e3d1a6cc8516f35a5a SHA512 db305c224d29eb5c053bc535ab7f20ca43cfc85bd73972feae38ab4a7b0f1261c1e6a0b18840a4ebff7ce75119a02f78114a1b12a7115ccea6958702e331ab76
+DIST dropbox-lnx.x86-153.4.3932.tar.gz 104494686 BLAKE2B 5b6b0619c38d4c1ee802b531bdbc07471f0dc0dedb14f17e76743c691ad547bd5305f414acce4611cc58157f3c6754d5f1528b6b464973f14dbd7da04d171eb1 SHA512 560cd1ea7c2b62aff35962dac0f536fa524b28cbf215c09c011e274a2de72e603a956e663bfdfabb2471625b60cb9cc5651fcfd94ffe8ef3d809db49c81c50a6
+DIST dropbox-lnx.x86-154.4.5363.tar.gz 109668134 BLAKE2B 633f03d4bef7aa5ba739f347b8b22a60290b84442378b0aa590e4b8e8a89589b3d5bfc8bacb252dfe3a5c6b5d8165fd5590f77ac84633195f785d43f6f12f5a6 SHA512 dbc3fac256a2dcc33d1400c56df3825a05b122684afa393d050771361ba60460db3cd4cea4f2dbaf80aaebfb802beae761c3c3527eaa5305c4906b7adf46f089
+DIST dropbox-lnx.x86_64-152.4.4880.tar.gz 106098480 BLAKE2B ac28503b6e5e41521466658704ba7d69f8e9786dc366fbe93b0f69de869c5272ce6202c6bc5a8b757796c3d11537363dc47cf8d5b18edaf4ad94ab2d8f68ca1c SHA512 5f4f8c377f046bf35fac4c386528f487d5996a55d84b1e0ed018bacf1e5c20844cb8626e87a41925da7f423c9118dc9f606085103270162ae5bd237f868fde80
+DIST dropbox-lnx.x86_64-153.4.3932.tar.gz 106353970 BLAKE2B eea6685eeefc7a532ac5697e32ca9ce9017872e4fbf928f6a24137160767e1315eb999deba6fdf0c7b3ae4df31aa827ad890a072bef79ce45c4bb50af9e624af SHA512 64d97316d3094341f2b661123c5bb4e42ea12a1270c9672fb29f8e365f27d40982878ac8b3a851fb65b604d5ddfeca3ec1a7f3c56299e6a46e7dd70f6bf656d5
+DIST dropbox-lnx.x86_64-154.4.5363.tar.gz 111278830 BLAKE2B a7866826cd09aca55d5d30c769124e9e588ad49f8134f873504bd360d5a9fe73993ffb3b7507ce147a1ee45e8990c52de918fca22c89353c6b095513ecd8e216 SHA512 654b4b553f0fb6d040e492bef9763dbbbc4ecd0d903b0a136709072c72d361f98f0f734c5922a3ed274f592ae7e1c4420c28118fe419544b9193e3864a015fc9
diff --git a/net-misc/dropbox/dropbox-147.4.4800.ebuild b/net-misc/dropbox/dropbox-152.4.4880.ebuild
index f43dae64fff..f43dae64fff 100644
--- a/net-misc/dropbox/dropbox-147.4.4800.ebuild
+++ b/net-misc/dropbox/dropbox-152.4.4880.ebuild
diff --git a/net-misc/dropbox/dropbox-148.4.4519.ebuild b/net-misc/dropbox/dropbox-153.4.3932.ebuild
index 0c3e0f73930..0c3e0f73930 100644
--- a/net-misc/dropbox/dropbox-148.4.4519.ebuild
+++ b/net-misc/dropbox/dropbox-153.4.3932.ebuild
diff --git a/net-misc/dropbox/dropbox-154.4.5363.ebuild b/net-misc/dropbox/dropbox-154.4.5363.ebuild
new file mode 100644
index 00000000000..0c3e0f73930
--- /dev/null
+++ b/net-misc/dropbox/dropbox-154.4.5363.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+ amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+ x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+ https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+ X? (
+ x11-themes/hicolor-icon-theme
+ )
+ selinux? ( sec-policy/selinux-dropbox )
+ app-arch/bzip2
+ dev-libs/glib:2
+ dev-libs/libffi-compat:6
+ media-libs/fontconfig
+ media-libs/freetype
+ net-misc/wget
+ sys-libs/zlib
+ sys-libs/ncurses-compat:5
+ virtual/opengl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libxcb
+"
+
+src_unpack() {
+ unpack ${A}
+ mkdir -p "${S}" || die
+ mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+ mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+ rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+ rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+ default
+ # we supply all of these in RDEPEND
+ rm -vf libGL.so.1 libX11* libffi.so.6 || die
+ # some of these do not appear to be used
+ rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+ PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \
+ wmctrl libdrm.so.2 libpopt.so.0 || die
+ if use X ; then
+ mv images/hicolor/16x16/status "${T}" || die
+ else
+ rm -vrf images || die
+ fi
+ patchelf --set-rpath '$ORIGIN' \
+ apex._apex.*.so \
+ nucleus_python.*.so \
+ tprt.*.so \
+ || die
+ pax-mark cm dropbox
+ mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+ local targetdir="/opt/dropbox"
+
+ insinto "${targetdir}"
+ doins -r *
+ fperms a+x "${targetdir}"/{dropbox,dropboxd}
+ dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+ if use X; then
+ doicon -s 16 -c status "${T}"/status
+ newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+ fi
+
+ make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+ newinitd "${FILESDIR}"/dropbox.initd dropbox
+ newconfd "${FILESDIR}"/dropbox.conf dropbox
+ systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+ dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+ einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+ einfo " your user's home directory. To prevent this, run the following as"
+ einfo " each user who will run dropbox:"
+ einfo ""
+ einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index b4e99b7f917..7d6de4e7a6f 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1 +1,2 @@
+DIST electron-cash-4.2.10.tar.gz 8023055 BLAKE2B e79c000f4278c323a8f14aa8d960c25c2971a8c5736e31a6f18f4b5faae11a8ff5339de3193e191c21373075bd6472570770d14262c9b5d41e3eca2b91e633d3 SHA512 f90a11f6a5d79024f982f8ab148c9c079049114bcb0c405da9f54b62620afbda462e074abde01bed7fa12d0090a842e393e24e66ff74031a87f0c79f6323895a
DIST electron-cash-4.2.9.tar.gz 8023098 BLAKE2B 37a55e2161a8f7c2d9b11c1bc564d77ace84ad745be677bb41f07af2b8c18c223e6cf37c7df42dea170341f276babd8eda4bd9564e9069fc9623a059cc92f09b SHA512 e27dda4a4c8b81ad7b303652fdb2d893c3d53e76eb0f7e295753a7f92676c895ea8087e424a43bbb2d32db9a4f0e8c03b779cf9daf2ff8e51d4813a097ac9c6c
diff --git a/net-misc/electron-cash/electron-cash-4.2.10.ebuild b/net-misc/electron-cash/electron-cash-4.2.10.ebuild
new file mode 100644
index 00000000000..fc56ca7c306
--- /dev/null
+++ b/net-misc/electron-cash/electron-cash-4.2.10.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+MY_P="Electron-Cash-${PV}"
+DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
+HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash"
+SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+ l10n_es l10n_ja l10n_pt l10n_zh-CN"
+RESTRICT+=" test"
+
+REQUIRED_USE="
+ || ( cli ncurses qt5 )
+ amodem? ( qt5 )
+ cosign? ( qt5 )
+ digitalbitbox? ( qt5 )
+ email? ( qt5 )
+ qrcode? ( qt5 )
+ sync? ( qt5 )
+ vkb? ( qt5 )
+"
+
+RDEPEND="
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ dev-python/ecdsa[${PYTHON_USEDEP}]
+ dev-python/jsonrpclib[${PYTHON_USEDEP}]
+ dev-python/pathvalidate[${PYTHON_USEDEP}]
+ dev-python/pbkdf2[${PYTHON_USEDEP}]
+ dev-python/pyaes[${PYTHON_USEDEP}]
+ dev-python/PySocks[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ net-libs/stem[${PYTHON_USEDEP}]
+ amodem? ( dev-python/amodem[${PYTHON_USEDEP}] )
+ qrcode? ( media-gfx/zbar[v4l] )
+ qt5? (
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )
+ ncurses? ( dev-lang/python )
+ dev-libs/libsecp256k1
+"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+ eapply "${FILESDIR}/3.3.6-no-user-root.patch"
+
+ # Prevent icon from being installed in the wrong location
+ sed -i '/icons/d' setup.py || die
+
+ if use qt5; then
+ pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die
+ else
+ sed "s|'electroncash_gui.qt',||" -i setup.py || die
+ fi
+
+ local wordlist=
+ for wordlist in \
+ $(usex l10n_ja '' japanese) \
+ $(usex l10n_pt '' portuguese) \
+ $(usex l10n_es '' spanish) \
+ $(usex l10n_zh-CN '' chinese_simplified) \
+ ; do
+ rm -f "electroncash/wordlist/${wordlist}.txt" || die
+ sed -i "/${wordlist}\\.txt/d" electroncash/mnemonic.py || die
+ done
+
+ # Remove unrequested GUI implementations:
+ local gui setup_py_gui
+ for gui in \
+ $(usex cli '' stdio) \
+ $(usex qt5 '' qt ) \
+ $(usex ncurses '' text ) \
+ ; do
+ rm electroncash_gui/"${gui}"* -r || die
+ done
+
+ # And install requested ones...
+ for gui in \
+ $(usex qt5 qt '') \
+ ; do
+ setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+ done
+
+ sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+ local bestgui
+ if use qt5; then
+ bestgui=qt
+ elif use ncurses; then
+ bestgui=text
+ else
+ bestgui=stdio
+ fi
+ sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die
+
+ local plugin
+ # trezor requires python trezorlib module
+ # keepkey requires trezor
+ for plugin in \
+ $(usex amodem '' audio_modem ) \
+ $(usex cosign '' cosigner_pool ) \
+ $(usex digitalbitbox '' digitalbitbox ) \
+ $(usex email '' email_requests ) \
+ hw_wallet \
+ ledger \
+ keepkey \
+ $(usex sync '' labels ) \
+ trezor \
+ $(usex vkb '' virtualkeyboard ) \
+ ; do
+ rm -r electroncash_plugins/"${plugin}"* || die
+ sed -i "/${plugin}/d" setup.py || die
+ done
+
+ eapply_user
+
+ distutils-r1_src_prepare
+}
+
+src_install() {
+ doicon -s 128 icons/${PN}.png
+ distutils-r1_src_install
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/net-misc/electron-cash/electron-cash-4.2.9.ebuild b/net-misc/electron-cash/electron-cash-4.2.9.ebuild
index 5a6a8226cb0..ab269027a1f 100644
--- a/net-misc/electron-cash/electron-cash-4.2.9.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.2.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="ncurses?"
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
MY_P="Electron-Cash-${PV}"
DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
@@ -17,11 +17,10 @@ SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="amodem audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
l10n_es l10n_ja l10n_pt l10n_zh-CN"
REQUIRED_USE="
- !audio_modem
|| ( cli ncurses qt5 )
amodem? ( qt5 )
cosign? ( qt5 )
diff --git a/net-misc/electron-cash/metadata.xml b/net-misc/electron-cash/metadata.xml
index 30b925e7f44..213f5fe41bb 100644
--- a/net-misc/electron-cash/metadata.xml
+++ b/net-misc/electron-cash/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="cli">Enables the CLI interface</flag>
<flag name="amodem">Enable plugin to support Audio Modem</flag>
- <flag name="audio_modem">Deprecated name for amodem</flag>
<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
<flag name="email">Enable plugin to support emailing invoices</flag>
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 305abd47b91..b6885a6a7c2 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1 +1,2 @@
-DIST electrum-4.2.1.gh.tar.gz 5066728 BLAKE2B 66b1ef4ec21f74f2f5c25de97a31c2ec23f907526df2ac661fdcb563e1e857ca88f4f534f2373e809ba978c66b78af72260af27944ac7aa8a92e86531827fef6 SHA512 b32ee5f8779bdb9bcda6a163f3f0a4cd95e91efb37418734c9f08930221ad15e54868fca0d5d0fb1dd3b1fac91b8cdea6c6ec822d98ad6b3d6ee01c841972e88
+DIST electrum-4.2.2.gh.tar.gz 5071636 BLAKE2B a13ae03e513736e5f24ded46a9b6ce13312a7d9243082f1d5b1948e7519f40f1fab238ec73550f72607ff2463a54a31f47c6ab8e511efddfcec362d5e427c6c1 SHA512 ae39ca0b548f3e4c7454096a7a05f9400a738e3b1c217ae9d41bf6156f7d642d3f1911f97829bfadbf6fdb6873538f38525363d256b363dac41d378c6b41002d
+DIST electrum-4.3.0.gh.tar.gz 5436120 BLAKE2B 180fcbd7749888707e9e57a9117b1df98f248584d68a9edcea996a73a0fdbc78f0955f778af50afae1a7a02b0d12b4aefe58b8a63f59a2b220ecddb20126966f SHA512 305ff483de498c93b118422fdff0f67ba9522275d45a5f8b14040697647b58b8113e312fd6b14bf15d3cbba3907d978657dd99d8c02e199d8c936afa2b9a6407
diff --git a/net-misc/electrum/electrum-4.2.1-r2.ebuild b/net-misc/electrum/electrum-4.2.2.ebuild
index 3741fcfc777..3741fcfc777 100644
--- a/net-misc/electrum/electrum-4.2.1-r2.ebuild
+++ b/net-misc/electrum/electrum-4.2.2.ebuild
diff --git a/net-misc/electrum/electrum-4.3.0.ebuild b/net-misc/electrum/electrum-4.3.0.ebuild
new file mode 100644
index 00000000000..125465b0838
--- /dev/null
+++ b/net-misc/electrum/electrum-4.3.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="
+ https://electrum.org/
+ https://github.com/spesmilo/electrum/
+"
+SRC_URI="
+ https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/libsecp256k1
+ >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+ =dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
+ >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+ dev-python/bitstring[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ >=dev-python/dnspython-2[${PYTHON_USEDEP}]
+ dev-python/pbkdf2[${PYTHON_USEDEP}]
+ dev-python/PySocks[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
+ qrcode? ( media-gfx/zbar[v4l] )
+ qt5? (
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )
+ ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+ test? (
+ dev-python/pyaes[${PYTHON_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # use backwards-compatible cryptodome API
+ sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+ # make qdarkstyle dep optional
+ sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
+
+ local bestgui
+ if use qt5; then
+ bestgui=qt
+ elif use ncurses; then
+ bestgui=text
+ else
+ bestgui=stdio
+ fi
+ sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+ eapply_user
+
+ xdg_environment_reset
+ distutils-r1_src_prepare
+}
+
+src_install() {
+ dodoc RELEASE-NOTES
+ distutils-r1_src_install
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index a8ea2220170..e4972b9defb 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -1,3 +1,2 @@
-DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
-DIST exabgp-4.2.16.tar.gz 2933071 BLAKE2B bc66ece537cb175811233d26f3445e1bb3f7d4f8950bf0839ced014430db17a4df614661448f275fb3a890bb2af6b2459f938f830c82f03a586829e7fe31caca SHA512 06731612df6f0f6623e8ad58c3b52fc4b5dee6b4bb3bb29cee272a4061ef087e2f98739a75cd07ae51e66fb633069926899882e6bab801010ad1db3333666471
-DIST exabgp-4.2.17.tar.gz 2933104 BLAKE2B 5751888232479c24aa4f66ef357821178c7a5564c0522adb8abf26057eb222ecfbb33caa6d9b71219b79fa309a0c4051b6098015c2362ad9c02e59326ee2bfac SHA512 2000856f540dcaed12dfaf54b689f6b04670f0ec8f19ec7a811ea8e54663afec68a7ae97ed79a001cc09ed42e6a1c5bd2d94ae0c3e3c8bde2da446cf00d66374
+DIST exabgp-4.2.19.tar.gz 2932903 BLAKE2B de988dca0d6c32dbe5a5a04a2f3b5065a71ec83aabccecf675ddf09f9bd38ee417b670c5a2940d12bf3618a9a39e8ec6d0184bfa77cfda8c5e853da0fd52bda4 SHA512 35031fbf1b73339926dd08c7edc80497c3a5c4d1a5d626bf2a704ad2e70baeca51a88fe56fe3e43b97187010cf7e89c2b69f0b28276bbf9a945e761c6578818f
+DIST exabgp-4.2.21.tar.gz 2933721 BLAKE2B 1d4b7cb6d053d2a9b8a338b6cf5f84d8d4ea2e1d1685cac8fb9b4b02cbdb8b9d5de41d4072d9379892e4bf89444f301f88243e5d5145d213956be7319861b723 SHA512 0efc7143191e8b557297e9329354c01e2418e0c4c45753941eba3a1f063e77d17a0efa7a14a3062764e45e709f0598f491c10e2c02e751590bb7c0943b61932b
diff --git a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild b/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
deleted file mode 100644
index 1ec8278c564..00000000000
--- a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit tmpfiles systemd distutils-r1
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/Exa-Networks/exabgp"
-SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/exabgp
- acct-user/exabgp
-"
-BDEPEND="
- test? (
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/exabgp-4.2.7-paths.patch"
- "${FILESDIR}/exabgp-4.2.10-ip-path.patch"
-)
-
-python_test() {
- ./qa/bin/parsing || die "tests fail with ${EPYTHON}"
- nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
- systemd_dounit etc/systemd/*
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- keepdir /etc/exabgp
-
- doman doc/man/*.?
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
deleted file mode 100644
index 0c9b22c4481..00000000000
--- a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit tmpfiles systemd distutils-r1
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/Exa-Networks/exabgp"
-SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/exabgp
- acct-user/exabgp
-"
-BDEPEND="
- test? (
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/exabgp-4.2.7-paths.patch"
- "${FILESDIR}/exabgp-4.2.10-ip-path.patch"
- "${FILESDIR}/exabgp-4.2.11-healthcheck-allow-disable-metric.patch"
- "${FILESDIR}/exabgp-4.2.11-healthcheck-fix-log-crash.patch"
- "${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch"
-)
-
-python_test() {
- ./qa/bin/parsing || die "tests fail with ${EPYTHON}"
- nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
- systemd_dounit etc/systemd/*
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- keepdir /etc/exabgp
-
- doman doc/man/*.?
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/exabgp/exabgp-4.2.17.ebuild b/net-misc/exabgp/exabgp-4.2.19-r1.ebuild
index 0bac38485f1..618539f9bee 100644
--- a/net-misc/exabgp/exabgp-4.2.17.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.19-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/net-misc/exabgp/exabgp-4.2.16.ebuild b/net-misc/exabgp/exabgp-4.2.21.ebuild
index b0427831685..2bd1bad24a9 100644
--- a/net-misc/exabgp/exabgp-4.2.16.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit tmpfiles systemd distutils-r1
@@ -24,7 +24,6 @@ RDEPEND="
BDEPEND="
test? (
dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
)
"
@@ -37,9 +36,11 @@ PATCHES=(
"${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch"
)
+distutils_enable_tests pytest
+
python_test() {
./qa/bin/parsing || die "tests fail with ${EPYTHON}"
- nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
+ epytest
}
python_install_all() {
diff --git a/net-misc/exabgp/files/exabgp.initd-r1 b/net-misc/exabgp/files/exabgp.initd-r1
deleted file mode 100644
index 1d942d85025..00000000000
--- a/net-misc/exabgp/files/exabgp.initd-r1
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# default arguments
-: "${EXABGP_ARGS:=--env=/etc/${RC_SVCNAME}/exabgp.env /etc/${RC_SVCNAME}/exabgp.conf}"
-
-command="capsh"
-command_args="
- --groups=${EXABGP_GROUP:=exabgp}
- --user=${EXABGP_USER:=exabgp}
- --caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
- -- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
-
-supervisor=supervise-daemon
-
-: "${pidfile:=/run/exabgp/${RC_SVCNAME}-supervisor.pid}"
-: "${output_log:=/var/log/${RC_SVCNAME}/exabgp.log}"
-: "${error_log:=/var/log/${RC_SVCNAME}/exabgp.log}"
-
-extra_started_commands="routes sessions"
-extra_commands="checkconfig"
-
-depend() {
- need net
-}
-
-start_pre() {
- checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
- /run/exabgp || return
-
- checkpath -q -p -m 0600 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
- /run/exabgp/${RC_SVCNAME}.{in,out} || return
-
- checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
- "/var/log/${RC_SVCNAME}" || return
-
- checkconfig || return
-}
-
-stop_pre() {
- # don't restart if the configuration is bad
- if [ "${RC_CMD}" = restart ]; then
- checkconfig || return
- fi
-}
-
-checkconfig() {
- ebegin "Checking configuration for ${RC_SVCNAME}"
- exabgp -t ${EXABGP_ARGS}
- eend ${?} "Invalid configuration"
-}
-
-sessions() {
- ebegin "Querying sessions"
- exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show neighbor summary
- eend ${?} "exabgpcli failed"
-}
-
-routes() {
- ebegin "Querying routes"
- exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show adj-rib out
- eend ${?} "exabgpcli failed"
-}
diff --git a/net-misc/felix/felix-3.1.3.ebuild b/net-misc/felix/felix-3.1.3.ebuild
index 97d86ba45d4..33172bc354b 100644
--- a/net-misc/felix/felix-3.1.3.ebuild
+++ b/net-misc/felix/felix-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -86,7 +86,7 @@ EGO_VENDOR=(
"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi"
)
-inherit golang-vcs-snapshot systemd user
+inherit golang-vcs-snapshot
FELIX_COMMIT="dba3279377fd6ec7baf0ee560bcaec685f25fa86"
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 23308ca1a18..ae8833d5e70 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1 +1,2 @@
DIST freerdp-2.7.0.tar.gz 7274512 BLAKE2B 82dc1403c8c2cada81585e869315ee2601d1fe87c3cb293f3cfe90278110644a5dab42ec0b516a204a651dc3127e458cd47994269644c41183501b848e399348 SHA512 9e9df14a39412f3ee3cd8a97123377d3da39492f66a0caee37d122f487639483d172cb89824523d57516aa83d22b9da569f2169a0598b475fbe70eab65fa2dc4
+DIST freerdp-2.8.0.tar.gz 7311891 BLAKE2B 56a91a5390c4c7833ac73502cafdd31723a8b70c9959d1f01c9284169d7da5e2956d2544d207c8fb9fb9f36286cfb43fa34b87ae2efc0de4bb5d3f841cd3d56e SHA512 6b1d11f560347796df9cd89e61d3879ca1cc302bc818c028c9df339aafc4ae64e9be5e7140d11d68ed63606b16bbd99e50ecbcac149f3bde5d18185d0afc51e3
diff --git a/net-misc/freerdp/freerdp-2.8.0.ebuild b/net-misc/freerdp/freerdp-2.8.0.ebuild
new file mode 100644
index 00000000000..d46c57ffe2d
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.8.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+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= )
+ openh264? ( media-libs/openh264:0= )
+ pulseaudio? ( media-sound/pulseaudio )
+ 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}"
+BDEPEND="
+ virtual/pkgconfig
+ X? ( doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+ ) )
+"
+
+src_configure() {
+ 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_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_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/frr/Manifest b/net-misc/frr/Manifest
index 59368f087ab..d651c9560cd 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1 @@
-DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
deleted file mode 100644
index 930f7303dc8..00000000000
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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=
- >=net-libs/libyang-2.0.0
- 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.6.3[ssh] )
- snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
- ~dev-util/clippy-${PV}
- sys-devel/flex
- virtual/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
-)
-
-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-v1 frr
-
- # Conflict files, installed by net-libs/libsmi, bug #758383
- rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-}
diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild
index 44fb6e2685f..930f7303dc8 100644
--- a/net-misc/frr/frr-8.2.2.ebuild
+++ b/net-misc/frr/frr-8.2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 2afdbb8e3c6..c46df16b4ad 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,3 +1,5 @@
-DIST gallery-dl-1.21.0.tar.gz 425507 BLAKE2B ca31b169558385fa6ed6ce9fe8082fddcc7124f945fcfaef2aab13a4357fd9d488bdfde48c27d0a86fb0f626ea831e7dc3600c7e50abce2bbcfd37a350ee2767 SHA512 dc85d522e372e8ec2565029b9dc3d736b546b4cf66bd9242fdfa11aab30975263e221ba50234ace409a4cf3dc6f36d5b1031cfbf74dc4ba3053eded5aea7f38c
DIST gallery-dl-1.21.1.tar.gz 432380 BLAKE2B 58267dad8af16cb8b03bc7532e934e15c510f8ac36a92cfbf4cf48791634973fa68dc0c1fae8968a5df1a340833980ef032c8c47fc2b2ae4c7b9018bf2d6b197 SHA512 6725937e81ef0ff6b3ad2718f51eb7be09ce364584b16be6031e5608f6b58b366aa96cf0616974147d4ec101825cdedbed8c8790970040f4f80e955847772901
DIST gallery-dl-1.21.2.tar.gz 434114 BLAKE2B 2f1335d0745c3fd3de95f9f3005fc67f079fec16925b7ac8fb3f2e9c8521139e56bf18675e15e7e0edbad2889cd7fa895552e8b40d9f1cf6bc555894c8d1da48 SHA512 11615ebb3cab5a6d9e042a94cf802f3781af6166eb199ac22f70a0d3351299bdc82dda212a3a363c323e0edb6707355fe9b6f3d89a851037a8f6ebc12894558f
+DIST gallery-dl-1.22.2.gh.tar.gz 463977 BLAKE2B f84837eaa0bdeccf7a63267c08657dc2fcbb17c218a10ed4b16d8b086f4aabca6097cb4161058b76796e96fa5fc57c8cde2a2f0387a28413cc6b6eab7a3f429b SHA512 b3a9790beed25a362a573b33dfaa18739072503d264044953b97e661e22c4850bfff04803e65f39b6ea9a077d3ffaa96a3c859f580f25890938e4f187c13a527
+DIST gallery-dl-1.22.3.gh.tar.gz 464060 BLAKE2B 6e9543675bb8118a73f81d1dffdfb20e91b385799a1bd9bbf2b5df331a384e55c4a503d5ac9e2f96e6d9d0f34913a4dcbb078c2b0044f9a418e8504e3b835cf9 SHA512 d544218f05a5ffb7eae83aa42bbc916d1b44233a50d11eed7d463c23718edaa144326dd8a88ca317f7fe0e8e1c737d5afc52e4db6d264be1cd3b63dbbfd76755
+DIST gallery-dl-1.22.4.tar.gz 467129 BLAKE2B f2f656b3255d091361bd2c80bb2647de47af14c11823fcc0e7e5790ea0b04047195e435a7a4c2b24a645c6e2a27cf53c3ce456a405b97ee014272af1a77ea4a1 SHA512 d20535115b464cb51a0fcb6bcd9e64e12fca5a199841cf4e501eae558c842d7d51dda4823b29d7ee2f1e267e59245f8e1cb1a702a96e5c45935918dbf3e6a448
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
index d424151deeb..2290b4caea0 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
else
SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
index d424151deeb..0e2805dbf2a 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
else
SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.22.2.ebuild
index d424151deeb..60c3846252c 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.22.2.ebuild
@@ -15,7 +15,7 @@ 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}.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
diff --git a/net-misc/gallery-dl/gallery-dl-1.22.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.22.3.ebuild
new file mode 100644
index 00000000000..60c3846252c
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.22.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite,ssl,xml"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+ SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# tests require network access
+RESTRICT="test"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+ emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+ optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+ optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/gallery-dl/gallery-dl-1.22.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.22.4.ebuild
new file mode 100644
index 00000000000..2290b4caea0
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.22.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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}.tar.gz"
+ KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# tests require network access
+RESTRICT="test"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+ emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+ optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+ optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index d424151deeb..60c3846252c 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -15,7 +15,7 @@ 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}.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
diff --git a/net-misc/gerbera/gerbera-1.11.0.ebuild b/net-misc/gerbera/gerbera-1.11.0.ebuild
index f069b91f13c..41b42b9fc92 100644
--- a/net-misc/gerbera/gerbera-1.11.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.11.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
acct-user/gerbera
dev-db/sqlite
dev-libs/libebml:=
- dev-libs/libfmt:=
+ <dev-libs/libfmt-9.0.0:=
dev-libs/pugixml
dev-libs/spdlog:=
>=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp]
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index f069b91f13c..41b42b9fc92 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
acct-user/gerbera
dev-db/sqlite
dev-libs/libebml:=
- dev-libs/libfmt:=
+ <dev-libs/libfmt-9.0.0:=
dev-libs/pugixml
dev-libs/spdlog:=
>=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp]
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
deleted file mode 100644
index 34df5197128..00000000000
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Crawls through your online content"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="flickr"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-# libgdata[gnome] needed for goa support
-RDEPEND="
- >=app-misc/tracker-2:0=
- >=dev-libs/glib-2.35.1:2
- >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
- media-libs/grilo:0.3
- >=net-libs/gnome-online-accounts-3.13.3:=
- >=net-libs/libgfbgraph-0.2.2:0.2
- >=net-libs/libzapojit-0.0.2
- flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable flickr) \
- --disable-static \
- --enable-facebook \
- --enable-google \
- --enable-media-server \
- --enable-owncloud \
- --enable-windows-live
-}
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild
index 3628d84feeb..491fb418c85 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI}
LICENSE="GPL-2+"
SLOT="0"
IUSE="flickr"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
# libgdata[gnome] needed for goa support
RDEPEND="
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 70e7e787a4c..591902abeda 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,4 +1,2 @@
-DIST gnome-remote-desktop-41.2.tar.xz 111000 BLAKE2B 1d6dfcc9860a5253cfb2a8111c5c039e7d236f45fa79a74ddc479f449b01ddb231368c4b604d28a8f796ab33f1648a332e110fd2adb9b739032dba67c029b9f8 SHA512 7636c0446c86748ce51c869734a2d33d8285c30616a28a0358f45d8399fd9f5dba7a1bdb830d3ca4753982ac3b9715604eb5934906645a1c11c58b4342c524eb
-DIST gnome-remote-desktop-42.0.tar.xz 158448 BLAKE2B 35c5458ec314d7e3abc60583d136e18296609af2caac658cf936685085b6f8b6725bc453336131293dadd1b548d110a4cf5cf8871fcb80d838212e60e204feb1 SHA512 3bf03fc96205df4c5efcef0e340ad85e7011ad8e4fecf2e29d9902fbb1633801da7d1094645e850267249dda9383ae0aa782f3e0207a7351d764482f2d0dc349
-DIST gnome-remote-desktop-42.1.1.tar.xz 160632 BLAKE2B 9686a9fc626c7bb5cb57196ff24ba4c694edda2a9419697283746afaf166f57511e2949699cb92885e44687bf528dde0060b559c87a7fa623a0df4bbc83f7ce0 SHA512 4fbf9305aa7339d9e7fcbf8df8eea97ba675630f6d01ef9a9f049ca3a3bf930f26b0e993ffe386682906d719b15058ce752e4592a3e710ceceb977000ebb1ce1
-DIST gnome-remote-desktop-42.1.tar.xz 160320 BLAKE2B 6f797a49cd0e17f3a553b6bd63d32d22cfedc633230ab13cd464a8755c77a14cd26a5eeb7872573b527d3fa84ff05347ea50dc798aef2f631749c29076b8bf53 SHA512 3e17d6482941fccfe6860d2ca2db50235ee70a26fd8942ee1850addb11006cfb152dd949102a4c573f2b6a29f9f2bb78c9ad5be1cba8622ad5b54f82c509376f
+DIST gnome-remote-desktop-42.3.tar.xz 165424 BLAKE2B 43ff645dfcc75d0c97ab43840631f3c47337ed89c848fa65fb6c23b74f4ab2b9ada383c1cf17592e6a9382aac28f008d34c06d90f341731d1221ac86182ac666 SHA512 3545ec6b3f7f80315546d03ecb0c30ed554e879c743e1d7031ac65cf10e6d9d510553049393221be0be203a79b8be8bc96c0d3fe600be1ac3c0a1e24431ba945
+DIST gnome-remote-desktop-42.4.tar.xz 165500 BLAKE2B c1221d5aa91fcbc5c6defd902674f210e9132495202659dbacffcb7da17042a2ad73d938a147c63a77e822b34dfee9300226fd0180e321b3087057c7e2365268 SHA512 dc040e216c7cff4a2f95d706d7916489ba0a871dff502fbc5ef81d374f7ea1edc32286d32ad07f961a3bc55b353663e72296042b61837c3479fc929bd1253d98
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild
deleted file mode 100644
index f620ffba953..00000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 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="+rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
- x11-libs/cairo
- >=dev-libs/glib-2.68:2
- >=media-video/pipewire-0.3.0:=
- app-crypt/libsecret
- x11-libs/libnotify
- rdp? (
- >=net-misc/freerdp-2.3:=[server]
- >=sys-fs/fuse-3.9.1
- >=x11-libs/libxkbcommon-1.0.0
- )
- vnc? (
- net-libs/libvncserver
- )
-"
-RDEPEND="${DEPEND}
- x11-wm/mutter[screencast]
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/gdbus-codegen
- dev-util/glib-utils
- virtual/pkgconfig
-"
-
-src_configure() {
- local emesonargs=(
- $(meson_use rdp)
- $(meson_use vnc)
- -Dnvenc=false
- $(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-42.1.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild
deleted file mode 100644
index e0ed71da320..00000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 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="+rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
- x11-libs/cairo
- >=dev-libs/glib-2.68:2
- >=media-video/pipewire-0.3.0:=
- app-crypt/libsecret
- x11-libs/libnotify
- media-libs/libepoxy
- x11-libs/libdrm
- rdp? (
- >=media-libs/nv-codec-headers-11.1.5.0
- >=net-misc/freerdp-2.5.0:=[server]
- >=sys-fs/fuse-3.9.1
- >=x11-libs/libxkbcommon-1.0.0
- )
- vnc? (
- net-libs/libvncserver
- )
-"
-RDEPEND="${DEPEND}
- x11-wm/mutter[screencast]
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/gdbus-codegen
- dev-util/glib-utils
- virtual/pkgconfig
-"
-
-src_configure() {
- local emesonargs=(
- $(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-42.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.3.ebuild
index e0ed71da320..b7ff4b49749 100644
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.4.ebuild
index e0ed71da320..b7ff4b49749 100644
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 2206963ba93..d734fbed1ce 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,2 +1,2 @@
-DIST gns3-gui-2.2.29.tar.gz 5043197 BLAKE2B 9a08f16a96448400a2826e94cf244a126527578fb6f09c6f207b106aa30c194c522f78d4803125a694bdda8bf464d8fa923bbf5e9cf4f79834028aa605ac218b SHA512 7a6ad191d772ae91739196baa64644b5fcebdd3baf8781e07ce0cbbc70b98b09930005b349b15940237798624912e466abce7eedda588fb32c43601247570ec8
DIST gns3-gui-2.2.31.tar.gz 5043086 BLAKE2B 3b028b57406d86137fc4d0488cb588bf5821de1d79c4be80c7da6b8895fb594f90bc7018341d82d4e77db2e25510b8fdb191ce819904423ebbcc5caef612bf21 SHA512 ea894cf65b80dad985fbc2112d018750c42b3c0bd358f6f5a6a491748d12e90e2de01108658611c7ba890a55fa688853c3e98d9220c8cb28c772595fa586100e
+DIST gns3-gui-2.2.33.1.tar.gz 5044746 BLAKE2B ddd1cf1cfe8cf8ad0c9e2313161ecc9c13f0f0eac7edbafc5c0ccef55935f58f889d7ca358b8bddc658b425744a19f5f7a71e80481b31c369bf8450e11e2356a SHA512 2a9018f1d04835f288b2f633e6ef71a168418aebcc6f85e666cc4ef6694754e8840ad9aaaa7a61dffff54e4432cea33d84040d1dd18bda784c18315e145f9c69
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.29.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.33.1.ebuild
index 1c1a934e12c..2253d1467a1 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.29.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.33.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{9..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 virtualx xdg
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86"
#net-misc/gns3-server version should always match gns3-gui version
RDEPEND="
- >=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.9.1[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.5.12[${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 efe10c43530..fbfc82c7e18 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,2 +1,2 @@
-DIST gns3-server-2.2.29.tar.gz 10241179 BLAKE2B ae9df1414d679c49f3b0da84f6b07789a0343ee74cf1c744c7b8dc55ab5395a92cc223cddc0d04516f315d5483d4cc3260c0f815c81992a12127fc6694fbaa2a SHA512 1e5eaeb127efddd6f21e167de4b56a2713c8a4dbc470e2595f807d8283f4b9208564f910dc3ac4602049ee4b1267eaffb9c5787b2d556c4d27176d153c67fc05
DIST gns3-server-2.2.31.tar.gz 10245461 BLAKE2B 488a91305408704accd4c7df936dde13e9a64404ac6a7e4ed7bdb94f996bb1bbd418d38523318603a8e93a7095c9fb8e30795c6b0dece70a45ed4758569b6711 SHA512 e8bf9357bc5a69e38dc27bc649af88c6ed39e6b5c63e2a1d374ec2a0784c7a6eadae3de0f4300a268fbf91ab55ad342e476573ca9a4bac609158d7d371a7a834
+DIST gns3-server-2.2.33.1.tar.gz 10245850 BLAKE2B 069af8a0b77e7c7ce50903577fe0f037ddf574d9081f547686589ee7a48b71295c8c9f3fd9e47c9428e3d3b260828ddbb83188f29dd0cdb87f14fc7757032ad5 SHA512 af1207d92f64862a3f225bde70fa1bf10853c4ab7c661524d3ceed0fcf56388556cc257a31a0b2a741b90fcd793501ba54000d3b18c35d3ff0c47ca080488fc7
diff --git a/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild b/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild
index f27244c7365..cdb46f4d488 100644
--- a/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/gns3-server/gns3-server-2.2.31.ebuild b/net-misc/gns3-server/gns3-server-2.2.31.ebuild
index 8b5af592212..ac4d69e7b4d 100644
--- a/net-misc/gns3-server/gns3-server-2.2.31.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.31.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/gns3-server/gns3-server-2.2.33.1-r1.ebuild b/net-misc/gns3-server/gns3-server-2.2.33.1-r1.ebuild
new file mode 100644
index 00000000000..10e152413aa
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.2.33.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature systemd
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
+SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ acct-group/gns3
+ acct-user/gns3
+ app-emulation/dynamips
+ >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.9.1[${PYTHON_USEDEP}]
+ >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.5.12[${PYTHON_USEDEP}]
+ net-misc/ubridge
+ sys-apps/busybox
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ default
+
+ # newer python packages are fine
+ sed -i -e 's/[<>=].*//' requirements.txt || die
+
+ # Remove Pre-built busybox binary
+ rm gns3server/compute/docker/resources/bin/busybox || die
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ systemd_dounit init/gns3.service.systemd
+ newinitd init/gns3.service.openrc gns3server
+
+ mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
+ ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
+}
+
+pkg_postinst() {
+ elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+ elog ""
+ optfeature "QEMU Support" "app-emulation/qemu"
+ optfeature "Virtualbox Support" "app-emulation/virtualbox"
+ optfeature "Docker Support" "app-containers/docker"
+ optfeature "Wireshark Support" "net-analyzer/wireshark"
+ elog ""
+ elog "The following packages are currently unsupported:"
+ elog "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/gns3-server-2.2.29.ebuild b/net-misc/gns3-server/gns3-server-2.2.33.1.ebuild
index af4f9ccadcd..9866607bfa2 100644
--- a/net-misc/gns3-server/gns3-server-2.2.29.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.33.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{9..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 optfeature systemd
@@ -19,15 +19,15 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
app-emulation/dynamips
>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.9.1[${PYTHON_USEDEP}]
>=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.5.12[${PYTHON_USEDEP}]
net-misc/ubridge
sys-apps/busybox
"
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 3acb881dc9b..79506d79d62 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1 +1,3 @@
DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
+DIST gsasl-2.0.0.tar.gz 3274625 BLAKE2B fb9ce9b3be0cbd0902128a3e8b57ad1f78c9259da646d3da56777b05922152c5e7f019a4c037a9e42a161153e87b140146eab2f2a55e33de9b52d6814a250fd3 SHA512 b7c4e3dfdaa50eaba38f3c0914dedb4bc689d1226fcf162e5bfb3942fa6ce1e96405715a747adca78150709f34830f699e9f995f04ce586cd3d0c14b275910e6
+DIST gsasl-2.0.1.tar.gz 3279632 BLAKE2B a25d121a5043455ed827a6bdc776c10d467a49b4dc6b73d2f4b08fecbf1ca5f423ffdcfd39e0d2bf71f724ed8302ffd8acda4fda3ef10ceadece60509ac73500 SHA512 01c6f6bd9f986c942a25b89fee0052aef8c10bf914ead29983abdf0cc8fcaa7223fd9d9eeafb4be07e4bc318f087f6f6258facaaeb7f83bca8de512406812be5
diff --git a/net-misc/gsasl/gsasl-2.0.0.ebuild b/net-misc/gsasl/gsasl-2.0.0.ebuild
new file mode 100644
index 00000000000..1c47d7944f8
--- /dev/null
+++ b/net-misc/gsasl/gsasl-2.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL client, server, and library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
+# if it's a stable release or not!
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND="
+ !net-libs/libgsasl
+ gcrypt? ( dev-libs/libgcrypt:0= )
+ gnutls? ( net-libs/gnutls:= )
+ idn? ( net-dns/libidn:= )
+ kerberos? ( virtual/krb5 )
+ nls? ( >=sys-devel/gettext-0.18.1 )
+ ntlm? ( >=net-libs/libntlm-0.3.5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/gl_WARN_ADD(\[-Werror/d' \
+ -e 's/ -Werror//' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local krb5_impl
+
+ if use kerberos; then
+ krb5_impl="--with-gssapi-impl="
+
+ # These are the two providers of virtual/krb5
+ if has_version app-crypt/mit-krb5; then
+ krb5_impl+="mit"
+ else
+ krb5_impl+="heimdal"
+ fi
+ fi
+
+ local myeconfargs=(
+ --disable-valgrind-tests
+ --disable-rpath
+
+ --with-packager-bug-reports="https://bugs.gentoo.org"
+ --with-packager-version="r${PR}"
+ --with-packager="Gentoo Linux"
+
+ $(use_enable client)
+ $(use_enable server)
+
+ $(use_enable kerberos gssapi)
+ ${krb5_impl}
+ $(use_enable kerberos gs2)
+
+ $(use_with gcrypt libgcrypt)
+ $(use_with gnutls)
+ $(use_enable nls)
+ $(use_with idn stringprep)
+ $(use_enable ntlm)
+ $(use_enable static-libs static)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/lib*/lib*.la || die
+ fi
+
+ doman doc/gsasl.1 doc/man/*.3
+}
diff --git a/net-misc/gsasl/gsasl-2.0.1-r2.ebuild b/net-misc/gsasl/gsasl-2.0.1-r2.ebuild
new file mode 100644
index 00000000000..79cabd639fd
--- /dev/null
+++ b/net-misc/gsasl/gsasl-2.0.1-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL client, server, and library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
+# if it's a stable release or not!
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND="
+ !net-libs/libgsasl
+ 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}"
+
+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-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/gsasl/gsasl-2.0.1.ebuild b/net-misc/gsasl/gsasl-2.0.1.ebuild
new file mode 100644
index 00000000000..2627134d719
--- /dev/null
+++ b/net-misc/gsasl/gsasl-2.0.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL client, server, and library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
+# if it's a stable release or not!
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND="
+ !net-libs/libgsasl
+ gcrypt? ( dev-libs/libgcrypt:0= )
+ gnutls? ( net-libs/gnutls:= )
+ idn? ( net-dns/libidn:= )
+ kerberos? ( virtual/krb5 )
+ nls? ( >=sys-devel/gettext-0.18.1 )
+ ntlm? ( >=net-libs/libntlm-0.3.5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/gl_WARN_ADD(\[-Werror/d' \
+ -e 's/ -Werror//' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local krb5_impl="--with-gssapi-impl=no"
+
+ # Could do net-libs/libgssglue in future?
+ if use kerberos; then
+ krb5_impl="--with-gssapi-impl="
+
+ # These are the two providers of virtual/krb5
+ if has_version app-crypt/mit-krb5; then
+ krb5_impl+="mit"
+ else
+ krb5_impl+="heimdal"
+ fi
+ fi
+
+ local myeconfargs=(
+ --disable-valgrind-tests
+ --disable-rpath
+
+ --with-packager-bug-reports="https://bugs.gentoo.org"
+ --with-packager-version="r${PR}"
+ --with-packager="Gentoo Linux"
+
+ $(use_enable client)
+ $(use_enable server)
+
+ $(use_enable kerberos gssapi)
+ ${krb5_impl}
+ $(use_enable kerberos gs2)
+
+ $(use_with gcrypt libgcrypt)
+ $(use_with gnutls)
+ $(use_enable nls)
+ $(use_with idn stringprep)
+ $(use_enable ntlm)
+ $(use_enable static-libs static)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/lib*/lib*.la || die
+ fi
+
+ doman doc/gsasl.1 doc/man/*.3
+}
diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
index 3f80b3d7f44..165c218f015 100644
--- a/net-misc/gsasl/metadata.xml
+++ b/net-misc/gsasl/metadata.xml
@@ -2,12 +2,21 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
-<use>
-<flag name="gcrypt">
- Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
-</flag>
-<flag name="ntlm">
- Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg>
-</flag>
-</use>
+ <use>
+ <flag name="client">
+ Build client component
+ </flag>
+ <flag name="gcrypt">
+ Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
+ </flag>
+ <flag name="ntlm">
+ Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg>
+ </flag>
+ <flag name="server">
+ Build server component
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="gitlab">gsasl/gsasl</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index b939cc4aba9..e119947acb0 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,2 +1,3 @@
DIST gsutil_4.60.tar.gz 4012900 BLAKE2B d3d1b57d5b0d42b1b454944efe8d62855b665d3772817c636568ef49c79ae2c566ef08c4c6e1bd3c9829471561865b64b3beec8d3911d6766748337aa1b1fc3e SHA512 18ab701cbb60513d66e8b96ced28cfe65dc0f210435fb5ffbcbfab3541ec7ed051db726e52239796d9579d0928953f610064279a3ee1e5b5c06cec963493804c
DIST gsutil_4.68.tar.gz 4459899 BLAKE2B 9855d379ba0483f1a33e4e05546444ff492c72d241ff0e5ca4f6c798c91b0c8d729247bf5fbaa39c411eb7a7e3f1fa701363898b903ba11c1bdf41c7e969c44d SHA512 b4af124808f34b5c0aa1d31b6d1bdbdeb451d39a246d4f2876ef664b6b485cdc5dc63bc3992ca4b7b33c72a00fc5119b931625e2c3230970bf0baa6389715e39
+DIST gsutil_5.9.tar.gz 11620858 BLAKE2B 09f2a79d14458a6545c45df23bd86a2769a00441ff03ae47a984cf18ae20c38e7b725f148c4e1d465f850f89871ad70b29463b8c829674d9d70d330b008595c7 SHA512 4916f3ac9c00c310a3dbc342ea0ab245cdf6952a4cee4e5b810f73254fb93439bcd7be35acbedac43501c3f19d8851848eeeff5b6ada6f31d93d478809518e35
diff --git a/net-misc/gsutil/gsutil-5.9.ebuild b/net-misc/gsutil/gsutil-5.9.ebuild
new file mode 100644
index 00000000000..2dd866b29dd
--- /dev/null
+++ b/net-misc/gsutil/gsutil-5.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+ >=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
+ >=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+ >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+ >=dev-python/gcs-oauth2-boto-plugin-3.0[${PYTHON_USEDEP}]
+ >=dev-python/google-apitools-0.5.32[${PYTHON_USEDEP}]
+ dev-python/google-auth[${PYTHON_USEDEP}]
+ >=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.20.4[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+ >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/gsutil-4.41-tests.patch"
+ "${FILESDIR}/gsutil-4.50-boto-tests.patch"
+ "${FILESDIR}/gsutil-4.50-tests.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.md CHANGES.md )
+
+# Needs to talk to Google to run tests.
+RESTRICT+=" test"
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ # NB: We don't delete all of boto/ because the tests are imported by the
+ # production code. The same reason we can't delete gslib/tests/. We can
+ # delete the main boto library and use the system version though.
+ rm -r gslib/vendored/boto/boto || die
+
+ # Fails to compile with py3.
+ rm gslib/vendored/boto/tests/mturk/cleanup_tests.py gslib/tests/test_wrapped_credentials.py || die
+
+ # monotonic is only used by bundled fasteners that we do not install.
+ sed -i \
+ -e 's/mock==/mock>=/' \
+ -e '/monotonic/d' \
+ setup.py || die
+ # Sanity check we didn't miss any updates.
+ grep '==' setup.py && die "Need to update version requirements"
+
+ # For debugging purposes, temporarily uncomment this in order to
+ # show hidden tracebacks.
+ #sed -e 's/^ except OSError as e:$/&\n raise/' \
+ # -e 's/def _HandleUnknownFailure(e):/&\n raise/' \
+ # -i gslib/__main__.py || die
+
+ # create_bucket raised ResponseNotReady.
+ sed -i \
+ -e 's/test_cp_unwritable_tracker_file/_&/' \
+ -e 's/test_cp_unwritable_tracker_file_download/_&/' \
+ gslib/tests/test_cp.py || die
+
+ sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
+ gslib/commands/test.py || die
+
+ # IOError: close() called during concurrent operation on the same file object.
+ sed -i -e 's/sys.stderr.close()/#&/' \
+ gslib/tests/testcase/unit_testcase.py || die
+}
+
+python_test() {
+ BOTO_CONFIG="${FILESDIR}/dummy.boto" \
+ "${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
+}
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index 505141681c5..0cdc469b066 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,2 +1 @@
-DIST gupnp-tools-0.10.2.tar.xz 181020 BLAKE2B ae6666d0876cfa57df56720b178d4b9bb492d9dbc82582ecaa09d178e20f55b3d045085b20965af2a9efd30fb9de0155f29b824ef004dd67309ed2be0a1fe487 SHA512 acb48b6081851345a01bd4604f4c83beca0fcff627e9d282efd807f5c98739ca4967a428456487e27196d1be6d65dd9482a12267da146e4efe0f61fa5a43c7a2
DIST gupnp-tools-0.10.3.tar.xz 180596 BLAKE2B 26140962cc24cda867465a4f94d251a26849db544fe1cb017ca86e6208f037b09e772109bfac150a9f6db845d1212af5a5c624d81958816349b3c60e45b80933 SHA512 a95a169c65e50d9953b79b96b92abbad709adc0bf74db47abaa529bd7989ebe2d41ae30ab340d09e5a727b61200d55a6d34b04d6981327b920d23a7c916babbe
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild
deleted file mode 100644
index 7aa84c55de6..00000000000
--- a/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Collection of developer-oriented UPnP tools"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
- >=net-libs/gssdp-1.2.0:=
- >=net-libs/gupnp-1.2.0:=
- >=net-libs/libsoup-2.42:2.4
- >=net-libs/gupnp-av-0.5.5:0=
- >=x11-libs/gtk+-3.10:3
- >=dev-libs/glib-2.24:2
- >=dev-libs/libxml2-2.4:2
- x11-libs/gtksourceview:4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_configure() {
- local emesonargs=(
- -Dav-tools=true
- )
- meson_src_configure
-}
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild
index 6655aaccb45..c47cd2e1623 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
RDEPEND="
>=net-libs/gssdp-1.2.0:=
diff --git a/net-misc/hashcash/metadata.xml b/net-misc/hashcash/metadata.xml
index 3ea1da8fe80..bef24d2c233 100644
--- a/net-misc/hashcash/metadata.xml
+++ b/net-misc/hashcash/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>ngg@ngg.hu</email>
- <name>Gergely Nagy</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index 019b6469ab4..fb787ddeba5 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -1,3 +1,4 @@
DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0
DIST htpdate-1.3.3.tar.gz 16302 BLAKE2B eb19462e1e5d02fe3cda7f4d2c954e2fe4b8dfcc299dc9094466a8652250ce27d37b2cf85716435639580e48295a92ad65521e0420cecac875c9b6e8074d425a SHA512 5d4892ea3626b80e5d529de873f675616dfef156e91d1e574225f91f9496503f55da43aa4f3522cb2b55da7c41dba7d97b3cc557a2704945577ec0243d8bd7f8
DIST htpdate-1.3.4.tar.gz 16312 BLAKE2B 9ebff6df6de69fa310a6459099cff2bf5ec28ac2bb486a29121b87b93505f6bb31b4debc510dc82b7d7b7cce217d9002ec7606fcf4fa863d7b2cfc78dfc6e8d5 SHA512 634317966f1e5c5d78a889a398e77f89505a5918efa076e2cd1184341f25d963b7f1c135afee7d5489bd8a20b2421d9dfea312e09b5e6bdd389626bfd4d2d960
+DIST htpdate-1.3.5.tar.gz 16661 BLAKE2B 063e5c46b86b6f99a500ff2054110b37157c11bd09b20db06d845b632a0e4d954f2f5cf8fd935f8fd8a69f0e64e0f3db1cb734fa24a77bf2b07855dd3fad9a3c SHA512 db1d237588e44e6eb113d046be2f68b5fac96cc7dc54b4522e1b61ca20a0ea3674265db03796fd6442fab58b82273e6a81ae3914c6d531e03f4fc5f65a3507e3
diff --git a/net-misc/htpdate/htpdate-1.3.5.ebuild b/net-misc/htpdate/htpdate-1.3.5.ebuild
new file mode 100644
index 00000000000..51cf1b0a172
--- /dev/null
+++ b/net-misc/htpdate/htpdate-1.3.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
+HOMEPAGE="https://www.vervest.org/htp/"
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/twekkel/htpdate"
+else
+ SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+# Test suite tries to connect to the Internet
+RESTRICT="test"
+
+DOC_CONTENTS="If you would like to run htpdate as a daemon, set
+appropriate http servers in /etc/conf.d/htpdate!"
+
+src_prepare() {
+ default
+
+ # Use more standard adjtimex() to fix uClibc builds.
+ sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
+ # Don't compress man pages by default
+ sed '/gzip/d' -i Makefile || die
+}
+
+src_compile() {
+ emake \
+ CFLAGS="-Wall ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" \
+ CC="$(tc-getCC)" \
+ $(usev ssl 'https')
+}
+
+src_install() {
+ emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install
+ dodoc README.md Changelog
+
+ newconfd "${FILESDIR}"/htpdate.conf htpdate
+ newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
+
+ readme.gentoo_create_doc
+}
diff --git a/net-misc/htpdate/htpdate-9999.ebuild b/net-misc/htpdate/htpdate-9999.ebuild
index 31e1a7d493b..51cf1b0a172 100644
--- a/net-misc/htpdate/htpdate-9999.ebuild
+++ b/net-misc/htpdate/htpdate-9999.ebuild
@@ -7,16 +7,17 @@ inherit readme.gentoo-r1 toolchain-funcs
DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
HOMEPAGE="https://www.vervest.org/htp/"
-if [[ "${PV}" == *9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/twekkel/htpdate"
else
SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
fi
-IUSE="+ssl"
+
LICENSE="GPL-2"
SLOT="0"
+IUSE="+ssl"
DEPEND="ssl? ( dev-libs/openssl:0= )"
RDEPEND="${DEPEND}"
@@ -27,8 +28,6 @@ RESTRICT="test"
DOC_CONTENTS="If you would like to run htpdate as a daemon, set
appropriate http servers in /etc/conf.d/htpdate!"
-PATCHES=( )
-
src_prepare() {
default
@@ -39,8 +38,10 @@ src_prepare() {
}
src_compile() {
- emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
- $(usex ssl "https" '')
+ emake \
+ CFLAGS="-Wall ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" \
+ CC="$(tc-getCC)" \
+ $(usev ssl 'https')
}
src_install() {
diff --git a/net-misc/htpdate/metadata.xml b/net-misc/htpdate/metadata.xml
index 838fdf83592..107df4bdc62 100644
--- a/net-misc/htpdate/metadata.xml
+++ b/net-misc/htpdate/metadata.xml
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
- <remote-id type="github">angeloc/htpdate</remote-id>
+ <remote-id type="github">twekkel/htpdate</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/httpstat/metadata.xml b/net-misc/httpstat/metadata.xml
index 556bbae45e5..be402a6b8eb 100644
--- a/net-misc/httpstat/metadata.xml
+++ b/net-misc/httpstat/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
<stabilize-allarches/>
<upstream>
<bugs-to>https://github.com/reorx/httpstat/issues</bugs-to>
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 32cc32943b9..3afaf2dbb66 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,2 +1,4 @@
DIST linuxx64-22.5.0.16.tar.gz 162733197 BLAKE2B 32b4fd64d6bccf8a3be92e8f8ee59059839f31f4f771a6344fea320d2b635174c31c9e8d572a700568bab6032352fe72657dce1ee752327ed856370fa86acf9a SHA512 796ecbccc60995baae2082b5b275d7bf1482b19aed198de6d9f4083b2a3a68ff2fe73dfd1d3d33f0f885a157a77f20de008635eade36d5f9adff6b662aaefc1b
+DIST linuxx64-22.7.0.20.tar.gz 161763935 BLAKE2B db384c4bd1d94ca64126c4a2e418b087063d3d80630855fe0887ce093979b5b81710521b9ee99048fc060838efa1253de3ffd575cda5bd1100375fa1dbc3dffe SHA512 5407deff6fc2fa94912899f7c6afd017775cc43feb76814b35238533280bb42cf1ff89f43c69f2792d54ebedff797afe7661317965ce80428dc2b1d791586a77
DIST linuxx86-22.5.0.16.tar.gz 144032901 BLAKE2B 0f58adf7645eaba6ad75e126381ecfecf7434130b0e69bed75a0499386c5301475a48e414ce57aebdfeaea0cb6615ae93b48ecfdd0149851a56459d687d75bb7 SHA512 b94a3de41118d08f3ff549de33e80a85198a3db1349177cc5c921cdd45f1d5bb7e1ee338067602725a9bed16619216f552f98314d539915a251f020094ae3121
+DIST linuxx86-22.7.0.20.tar.gz 143467730 BLAKE2B 6c913e44847a1114e8517a259fbfb6e04734d864e10ac14a074df5a6c55d908cfe1f3e6f074abf9b1dda43f9be8a1a718422ae7f792184f7e04fd91262daa347 SHA512 d5a138aa921d1106fb2808ca8bba3dc0d963dfecff439178fcb7fb3881dcce4cb9d6c5bed61d7b4d5e97a31616225bf88bf557e5711be2ab0e684324ea9c9194
diff --git a/net-misc/icaclient/icaclient-22.5.0.16.ebuild b/net-misc/icaclient/icaclient-22.5.0.16.ebuild
index ed272b4e541..ba90295aa9a 100644
--- a/net-misc/icaclient/icaclient-22.5.0.16.ebuild
+++ b/net-misc/icaclient/icaclient-22.5.0.16.ebuild
@@ -83,8 +83,11 @@ pkg_setup() {
eerror "Given architecture is not supported by Citrix."
;;
esac
+}
- S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+src_unpack() {
+ default
+ mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
}
src_prepare() {
@@ -250,7 +253,7 @@ src_install() {
pkg_postinst() {
xdg_desktop_database_update
- local inidest="${BROOT}${ICAROOT}/config"
+ local inidest="${ROOT}${ICAROOT}/config"
if [[ ! -e "${inidest}"/module.ini ]] ; then
mv "${T}"/module.ini "${inidest}/" \
|| ewarn 'Failed to install plugin.ini file'
diff --git a/net-misc/icaclient/icaclient-22.7.0.20-r1.ebuild b/net-misc/icaclient/icaclient-22.7.0.20-r1.ebuild
new file mode 100644
index 00000000000..fe8e4432788
--- /dev/null
+++ b/net-misc/icaclient/icaclient-22.7.0.20-r1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg-utils
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+ x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+ app-crypt/libsecret
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/libxml2
+ media-fonts/font-adobe-100dpi
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc
+ media-fonts/font-xfree86-type1
+ media-fonts/font-misc-ethiopic
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/gst-plugins-base:1.0
+ media-libs/gstreamer:1.0
+ media-libs/libogg
+ media-libs/libjpeg-turbo
+ media-libs/libvorbis
+ media-libs/speex
+ net-libs/libsoup:2.4
+ net-libs/webkit-gtk:4
+ sys-apps/util-linux
+ sys-libs/libcxx
+ sys-libs/libcxxabi
+ sys-libs/zlib
+ virtual/krb5
+ virtual/libudev
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXinerama
+ x11-libs/libXmu
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/pango
+"
+DEPEND=""
+
+pkg_nofetch() {
+ elog "Download the client file ${A} from
+ https://www.citrix.com/downloads/workspace-app/"
+ elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+ case ${ARCH} in
+ amd64)
+ ICAARCH=linuxx64
+ ;;
+ x86)
+ ICAARCH=linuxx86
+ ;;
+ *)
+ eerror "Given architecture is not supported by Citrix."
+ ;;
+ esac
+}
+
+src_unpack() {
+ default
+ mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
+}
+
+src_prepare() {
+ default
+ rm lib/UIDialogLibWebKit.so || die
+
+ # We need to avoid module.ini file getting added to the package's
+ # content because media-plugins/hdx-realtime-media-engine modifies
+ # this file on installation. See pkg_postinst()
+ mv nls/en/module.ini "${T}" || die
+}
+
+src_install() {
+ local bin tmpl dest
+
+ dodir "${ICAROOT}"
+
+ exeinto "${ICAROOT}"
+ doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+ exeinto "${ICAROOT}"/lib
+ if use amd64 ; then
+ rm lib/ctxjpeg_fb_8.so || die
+ fi
+ doexe lib/*.so
+
+ for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+ insinto "${dest}"
+ doins nls/en.UTF-8/eula.txt
+ done
+
+ insinto "${ICAROOT}"
+ doins -r usb
+
+ insinto "${ICAROOT}"/config
+ # nls/en/*.ini is being handled by pkg_postinst()
+ doins config/* config/.*
+ for tmpl in {appsrv,wfclient}.template ; do
+ newins nls/en/${tmpl} ${tmpl/template/ini}
+ done
+ touch "${ED}/${ICAROOT}"/config/.server || die
+
+ insinto "${ICAROOT}"/gtk
+ doins gtk/*
+
+ insinto "${ICAROOT}"/gtk/glade
+ doins gtk/glade/*
+
+ insinto "${ICAROOT}"/site
+ doins -r site/*
+
+ dodir "${ICAROOT}"/help
+
+ insinto "${ICAROOT}"/config/usertemplate
+ doins config/usertemplate/*
+
+ local lang LANGCODES=( en )
+ use l10n_de && LANGCODES+=( de )
+ use l10n_es && LANGCODES+=( es )
+ use l10n_fr && LANGCODES+=( fr )
+ use l10n_ja && LANGCODES+=( ja )
+ use l10n_zh-CN && LANGCODES+=( zh_CN )
+
+ for lang in ${LANGCODES[@]} ; do
+ insinto "${ICAROOT}"/nls/${lang}
+ doins nls/${lang}/*
+
+ insinto "${ICAROOT}"/nls/$lang/UTF-8
+ doins nls/${lang}.UTF-8/*
+
+ insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+ doins nls/${lang}/LC_MESSAGES/*
+
+ insinto "${ICAROOT}"/nls/${lang}
+ dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+ for tmpl in {appsrv,wfclient}.template ; do
+ cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+ "${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+ || die
+ done
+ done
+
+ insinto "${ICAROOT}"/nls
+ dosym en /opt/Citrix/ICAClient/nls/C
+
+ insinto "${ICAROOT}"/icons
+ doins icons/*
+
+ insinto "${ICAROOT}"/keyboard
+ doins keyboard/*
+
+ cp -a util "${ED}/${ICAROOT}" || die
+ test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine
+
+ rm -r "${S}"/keystore/cacerts || die
+ dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+ local other_files=(
+ icasessionmgr
+ NativeMessagingHost
+ UtilDaemon
+ )
+
+ exeinto "${ICAROOT}"
+ for bin in ${other_files[@]} ; do
+ doexe ${bin}
+ done
+
+ # https://bugs.gentoo.org/655922
+ dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+ dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+ dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
+ doenvd "${FILESDIR}"/10ICAClient
+
+ for bin in configmgr conncenter new_store ; do
+ make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+ done
+
+ for bin in selfservice wfica ; do
+ make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+ done
+
+ dodir /etc/revdep-rebuild/
+ echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+ > "${ED}"/etc/revdep-rebuild/70icaclient
+
+ insinto "${ICAROOT}"/pkginf
+ newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
+
+ # 651926
+ domenu "${FILESDIR}"/*.desktop
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ local inidest="${ROOT}${ICAROOT}/config"
+ if [[ ! -e "${inidest}"/module.ini ]] ; then
+ mv "${T}"/module.ini "${inidest}/" \
+ || ewarn 'Failed to install plugin.ini file'
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml
index 99e2666c588..d86008401e2 100644
--- a/net-misc/icaclient/metadata.xml
+++ b/net-misc/icaclient/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
+ <maintainer type="person" proxied="yes">
+ <email>henning@hennsch.de</email>
+ <name>Henning Schild</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml
index 658dba18610..b70d2da8b60 100644
--- a/net-misc/icecast/metadata.xml
+++ b/net-misc/icecast/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
<flag name="yp">Build support for yp public directory listings</flag>
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 543a2bb1597..289a9105a6d 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,4 +1,2 @@
-DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328
DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
-DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
diff --git a/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch b/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch
deleted file mode 100644
index 61f9f5c03fd..00000000000
--- a/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://github.com/iputils/iputils/commit/79d713eab6181e219bf932b404706f6f59ff2539.patch
-https://bugs.gentoo.org/818022
-
-From: Byron Stanoszek <gandalf@winds.org>
-Date: Thu, 16 Sep 2021 23:38:54 +0200
-Subject: [PATCH] ping: Remove 'unsupported IPv6' warning on disabled IPv6
-
-Regression was introduced in d141cb6 as introduced condition
-
-if ((errno == EAFNOSUPPORT && socktype == AF_INET6) || options & F_VERBOSE || requisite)
-
-was wrong, it should have been:
-
-if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) || options & F_VERBOSE)
-
-but bug was hidden as `family == AF_INET6' was always false until
-otherwise correct fix 904cdb6 ("ping: AF_INET6 is address family not
-socket type [lgtm scan]") propagated the error.
-
-Tested on kernel booted with ipv6.disable=1 (disabling via sysctl, i.e.
-sysctl -w net.ipv6.conf.all.disable_ipv6=1; sysctl -w net.ipv6.conf.default.disable_ipv6=1
-does not trigger the issue as it exit with "socket: Address family not
-supported by protocol" - errno EADDRNOTAVAIL).
-
-Fixes: d141cb6 ("ping: work with older kernels that don't support ping sockets")
-Closes: https://github.com/iputils/iputils/issues/293
-Closes: https://github.com/iputils/iputils/pull/370
-
-Reported-by: lekto <lekto@o2.pl>
-Reviewed-by: Andrew Clayton <andrew@digital-domain.net>
-Reviewed-by: Petr Vorel <pvorel@suse.cz>
-Signed-off-by: Byron Stanoszek <gandalf@winds.org>
-[ pvorel: create commit from Byron's patch on the issue, do analysis and wrote commit message ]
-Signed-off-by: Petr Vorel <pvorel@suse.cz>
---- a/ping/ping.c
-+++ b/ping/ping.c
-@@ -150,8 +150,8 @@ static void create_socket(struct ping_rts *rts, socket_st *sock, int family,
- /* Report error related to disabled IPv6 only when IPv6 also failed or in
- * verbose mode. Report other errors always.
- */
-- if ((errno == EAFNOSUPPORT && family == AF_INET6) ||
-- rts->opt_verbose || requisite)
-+ if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) ||
-+ rts->opt_verbose)
- error(0, errno, "socket");
- if (requisite)
- exit(2);
diff --git a/net-misc/iputils/files/iputils-20210722-optional-tests.patch b/net-misc/iputils/files/iputils-20210722-optional-tests.patch
deleted file mode 100644
index d6c4e98c080..00000000000
--- a/net-misc/iputils/files/iputils-20210722-optional-tests.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-https://github.com/iputils/iputils/commit/3163c49f9f4ad473a00d8a345ee334a028376011.patch
-https://bugs.gentoo.org/807973
-
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 23 Jul 2021 16:32:46 +0200
-Subject: [PATCH] meson: Make tests optional
-
-Now can be disabled with -DSKIP_TESTS=true.
-
-It allows to avoid meson error during build when ip isn't installed.
-
-Closes: #359
-
-Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
-Signed-off-by: Heiko Becker <heirecka@exherbo.org>
-[ pvorel: Rename variable TEST => SKIP_TESTS, default false, adjust
-the description ]
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -72,3 +72,6 @@ option('INSTALL_SYSTEMD_UNITS', type: 'boolean', value: false,
-
- option('USE_GETTEXT', type: 'boolean', value: true,
- description: 'Enable I18N')
-+
-+option('SKIP_TESTS', type: 'boolean', value: false,
-+ description: 'Skip tests during build')
---- a/ping/meson.build
-+++ b/ping/meson.build
-@@ -27,86 +27,6 @@ if (setcap_ping)
- )
- endif
-
--##### TESTS #####
--
--# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_"
--
--# GitHub CI does not have working IPv6
--# https://github.com/actions/virtual-environments/issues/668
--ipv6_dst = []
--ipv6_switch = []
--r = run_command('ip', '-6', 'a')
--if r.stdout().strip().contains('::1')
-- message('IPv6 enabled')
-- ipv6_dst = [ '::1' ]
-- ipv6_switch = [ '-6' ]
--else
-- message('WARNING: IPv6 disabled')
-+if not get_option('SKIP_TESTS')
-+ subdir('test')
- endif
--
--run_as_root = false
--r = run_command('id', '-u')
--if r.stdout().strip().to_int() == 0
-- message('running as root')
-- run_as_root = true
--else
-- message('running as normal user')
--endif
--
--foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst
-- foreach switch : [ '', '-4' ] + ipv6_switch
-- args = [ '-c1', dst ]
-- should_fail = false
--
-- if switch != ''
-- args = [switch] + args
-- if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1')
-- should_fail = true
-- endif
-- endif
--
-- name = 'ping ' + ' '.join(args)
-- test(name, ping, args : args, should_fail : should_fail)
-- endforeach
--endforeach
--
--ping_tests_opt = [
-- [ '-c1' ],
-- [ '-c5', '-i0.1' ],
-- [ '-c1', '-I', 'lo' ],
-- [ '-c1', '-w1' ],
-- [ '-c1', '-W1' ],
-- [ '-c1', '-W1.1' ],
--]
--foreach dst : [ '127.0.0.1' ] + ipv6_dst
-- foreach args : ping_tests_opt
-- args += [ dst ]
-- name = 'ping ' + ' '.join(args)
-- test(name, ping, args : args)
-- endforeach
--endforeach
--
--ping_tests_opt_fail = [
-- [ '-c1.1' ],
-- [ '-I', 'nonexisting' ],
-- [ '-w0.1' ],
-- [ '-w0,1' ],
--]
--foreach dst : [ '127.0.0.1' ] + ipv6_dst
-- foreach args : ping_tests_opt_fail
-- args += [ dst ]
-- name = 'ping ' + ' '.join(args)
-- test(name, ping, args : args, should_fail : true)
-- endforeach
--endforeach
--
--ping_tests_user_fail = [
-- [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root
--]
--foreach dst : [ '127.0.0.1' ] + ipv6_dst
-- foreach args : ping_tests_user_fail
-- args += [ dst ]
-- name = 'ping ' + ' '.join(args)
-- test(name, ping, args : args, should_fail : not run_as_root)
-- endforeach
--endforeach
---- /dev/null
-+++ b/ping/test/meson.build
-@@ -0,0 +1,81 @@
-+# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_"
-+
-+# GitHub CI does not have working IPv6
-+# https://github.com/actions/virtual-environments/issues/668
-+ipv6_dst = []
-+ipv6_switch = []
-+r = run_command('ip', '-6', 'a')
-+if r.stdout().strip().contains('::1')
-+ message('IPv6 enabled')
-+ ipv6_dst = [ '::1' ]
-+ ipv6_switch = [ '-6' ]
-+else
-+ message('WARNING: IPv6 disabled')
-+endif
-+
-+run_as_root = false
-+r = run_command('id', '-u')
-+if r.stdout().strip().to_int() == 0
-+ message('running as root')
-+ run_as_root = true
-+else
-+ message('running as normal user')
-+endif
-+
-+foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst
-+ foreach switch : [ '', '-4' ] + ipv6_switch
-+ args = [ '-c1', dst ]
-+ should_fail = false
-+
-+ if switch != ''
-+ args = [switch] + args
-+ if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1')
-+ should_fail = true
-+ endif
-+ endif
-+
-+ name = 'ping ' + ' '.join(args)
-+ test(name, ping, args : args, should_fail : should_fail)
-+ endforeach
-+endforeach
-+
-+ping_tests_opt = [
-+ [ '-c1' ],
-+ [ '-c5', '-i0.1' ],
-+ [ '-c1', '-I', 'lo' ],
-+ [ '-c1', '-w1' ],
-+ [ '-c1', '-W1' ],
-+ [ '-c1', '-W1.1' ],
-+]
-+foreach dst : [ '127.0.0.1' ] + ipv6_dst
-+ foreach args : ping_tests_opt
-+ args += [ dst ]
-+ name = 'ping ' + ' '.join(args)
-+ test(name, ping, args : args)
-+ endforeach
-+endforeach
-+
-+ping_tests_opt_fail = [
-+ [ '-c1.1' ],
-+ [ '-I', 'nonexisting' ],
-+ [ '-w0.1' ],
-+ [ '-w0,1' ],
-+]
-+foreach dst : [ '127.0.0.1' ] + ipv6_dst
-+ foreach args : ping_tests_opt_fail
-+ args += [ dst ]
-+ name = 'ping ' + ' '.join(args)
-+ test(name, ping, args : args, should_fail : true)
-+ endforeach
-+endforeach
-+
-+ping_tests_user_fail = [
-+ [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root
-+]
-+foreach dst : [ '127.0.0.1' ] + ipv6_dst
-+ foreach args : ping_tests_user_fail
-+ args += [ dst ]
-+ name = 'ping ' + ' '.join(args)
-+ test(name, ping, args : args, should_fail : not run_as_root)
-+ endforeach
-+endforeach
diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild
deleted file mode 100644
index a97324cae33..00000000000
--- a/net-misc/iputils/iputils-20210722-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors. This avoids ugly issues while
-# building stages, and reduces dependencies.
-# To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag, all USE flags enabled and
-# tar ${S}/doc folder.
-
-EAPI="7"
-
-PLOCALES="de fr ja pt_BR tr uk zh_CN"
-
-inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
-
-if [[ ${PV} == "99999999" ]] ; 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
- https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc idn nls rarpd rdisc static test tftpd tracepath traceroute6"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- virtual/pkgconfig
- test? ( sys-apps/iproute2 )
- nls? ( sys-devel/gettext )
-"
-
-LIB_DEPEND="
- caps? ( sys-libs/libcap[static-libs(+)] )
- idn? ( net-dns/libidn2:=[static-libs(+)] )
- nls? ( virtual/libintl[static-libs(+)] )
-"
-
-RDEPEND="
- traceroute6? ( !net-analyzer/traceroute )
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/os-headers
- static? ( ${LIB_DEPEND} )
-"
-
-if [[ ${PV} == "99999999" ]] ; then
- 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:0
- "
-fi
-
-PATCHES=(
- # Upstream; drop on bump
- "${FILESDIR}"/${P}-optional-tests.patch
- # Upstream; drop on bump
- "${FILESDIR}"/${P}-fix-no-ipv6-ping.patch
-)
-
-src_prepare() {
- default
-
- plocale_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- 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_RARPD="$(usex rarpd true false)"
- -DBUILD_RDISC="$(usex rdisc true false)"
- -DENABLE_RDISC_SERVER="$(usex rdisc true false)"
- -DBUILD_TFTPD="$(usex tftpd true false)"
- -DBUILD_TRACEPATH="$(usex tracepath true false)"
- -DBUILD_TRACEROUTE6="$(usex traceroute6 true false)"
- -DBUILD_NINFOD="false"
- -DNINFOD_MESSAGES="false"
- -DNO_SETCAP_OR_SUID="true"
- -Dsystemdunitdir="$(systemd_get_systemunitdir)"
- -DUSE_GETTEXT="$(usex nls true false)"
- $(meson_use !test SKIP_TESTS)
- )
-
- if [[ "${PV}" == 99999999 ]] ; then
- emesonargs+=(
- -DBUILD_HTML_MANS="$(usex doc true false)"
- -DBUILD_MANS="true"
- )
- else
- emesonargs+=(
- -DBUILD_HTML_MANS="false"
- -DBUILD_MANS="false"
- )
- fi
-
- 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
-
- dodir /bin
- local my_bin
- for my_bin in $(usex arping arping '') ping ; do
- mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
- done
- dosym ping /bin/ping4
- dosym ping /bin/ping6
-
- if use tracepath ; then
- dosym tracepath /usr/bin/tracepath4
- dosym tracepath /usr/bin/tracepath6
- dosym tracepath.8 /usr/share/man/man8/tracepath6.8
- fi
-
- if [[ "${PV}" != 99999999 ]] ; then
- local -a man_pages
- local -a html_man_pages
-
- while IFS= read -r -u 3 -d $'\0' my_bin
- do
- my_bin=$(basename "${my_bin}")
- [[ -z "${my_bin}" ]] && continue
-
- if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
- man_pages+=( ${my_bin}.8 )
- fi
-
- if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
- html_man_pages+=( ${my_bin}.html )
- fi
- done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
-
- pushd doc &>/dev/null || die
- doman "${man_pages[@]}"
- if use doc ; then
- docinto html
- dodoc "${html_man_pages[@]}"
- fi
- popd &>/dev/null || die
- else
- if use doc ; then
- mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
- fi
- fi
-}
-
-pkg_postinst() {
- fcaps cap_net_raw \
- bin/ping \
- $(usex arping 'bin/arping' '') \
- $(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20211215.ebuild b/net-misc/iputils/iputils-20211215.ebuild
index 74d10298e9c..9adbec78252 100644
--- a/net-misc/iputils/iputils-20211215.ebuild
+++ b/net-misc/iputils/iputils-20211215.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz
https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
- 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="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 9022c8970b5..6e435f7605d 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -12,7 +12,7 @@ EAPI="7"
PLOCALES="de fr ja pt_BR tr uk zh_CN"
-inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
+inherit fcaps meson plocale systemd toolchain-funcs
if [[ ${PV} == 99999999 ]] ; then
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index cd78568cc22..ae5bf52a876 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/metadata.xml
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <use>
- <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
- <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
- <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag>
- <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
- <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag>
- <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
- <flag name="traceroute6">Build and install deprecated traceroute6 tool. It's recommended to use <pkg>net-analyzer/traceroute</pkg> instead.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
- <remote-id type="github">iputils/iputils</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <use>
+ <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
+ <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
+ <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag>
+ <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
+ <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
+ <remote-id type="github">iputils/iputils</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
index 3aa11efa4dd..08459885394 100644
--- a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
@@ -31,6 +31,7 @@ src_configure() {
# --disable-db-as-registry
# --disable-db-cc-registry
local myeconfargs=(
+ --disable-compiler-warning-to-error
--disable-bundled-getopt
--disable-bundled-md5
--enable-shared
diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml
index 086afe372b4..4ca6f0a579c 100644
--- a/net-misc/kea/metadata.xml
+++ b/net-misc/kea/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
- <maintainer type="person">
<email>expeditioneer@gentoo.org</email>
<name>Dennis Lamm</name>
</maintainer>
diff --git a/net-misc/keychain/keychain-2.8.5-r1.ebuild b/net-misc/keychain/keychain-2.8.5-r1.ebuild
new file mode 100644
index 00000000000..3432617c3de
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
+HOMEPAGE="https://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="dev-lang/perl"
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+ dodoc ChangeLog README.md
+}
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
new file mode 100644
index 00000000000..6aa95d19b7e
--- /dev/null
+++ b/net-misc/kio-zeroconf/Manifest
@@ -0,0 +1 @@
+DIST zeroconf-ioslave-22.04.3.tar.xz 38960 BLAKE2B fa4d5ab9447a2d6f608046efc276f38f05fe89322232f0ccee8229f99261c1829c993cc9cb69c62d977ed182bd972971e6318ac4574539549e9710fb9f22d8f1 SHA512 c637ac397ce95a824afb527cb0aa9bd6e9934ec0154255287b2d6d9ee269075ce2b38acddb0c617dc70b3608e5c3d5e31717593669b78a11eaaba8d97fe149fc
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-22.04.3.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-22.04.3.ebuild
new file mode 100644
index 00000000000..3cb6161d4fc
--- /dev/null
+++ b/net-misc/kio-zeroconf/kio-zeroconf-22.04.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="zeroconf-ioslave"
+KFMIN=5.92.0
+QTMIN=5.15.4
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdnssd-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/kio-zeroconf/metadata.xml b/net-misc/kio-zeroconf/metadata.xml
new file mode 100644
index 00000000000..d925f243975
--- /dev/null
+++ b/net-misc/kio-zeroconf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
index 0739195533e..e979ea289cb 100644
--- a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,8 +14,8 @@ SLOT="0"
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
+DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
+RDEPEND=""
CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 00c2b48e1ec..1f700bd4808 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -2,5 +2,6 @@ DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e8488
DIST lldpd-1.0.11.tar.gz 1962748 BLAKE2B 13b6efe44a7dd0f9ec681ec5ef96358ca01c500f0238460ce633b59a1506d9caf405baf3ac910be9baa5840f3751b9d9e0bda127c96083f012eb4af75ba7b9e9 SHA512 2433c81d892b8f8f43c4a897eedfde6fff41db8514fc212bd60b71d080b963b12346017f554657d5abe6d0f02256cf49c9f8b82c8e402763ad0a5c53d459ac32
DIST lldpd-1.0.12.tar.gz 1965028 BLAKE2B 7725d650573d463e267670135fad20717b2fe2ee5f1c5b9f68a68890f6e74e7cac52bcb0aefad68b8bcade9eacd18f6aa783eec4a71e895adc173ddd2a554322 SHA512 893add53c814d904894dd768ea2e412f288bd7767090fb9b5f686ce3fed65a436ed1365039e5d7f8ef8f5ae9206800b087c71515caa16d1d375389dd7558050f
DIST lldpd-1.0.13.tar.gz 1973988 BLAKE2B ad22d6f19e566886fda1b879e2ac39c59a0cf061e17df404f0cc68504453517a438d1bb0ac2350b7ba3cafb53ae0996deace93918a6af1043aebff5bf3720fad SHA512 b78440622882a822c9114c3617323ac3c8ce759040bb5b8a9f7357ca20e2993ab0130ee9ad85f65d5f38996665d599d70bbb9dd202e2557035e98545a4304aef
+DIST lldpd-1.0.14.tar.gz 1979314 BLAKE2B 9e4dc2126eb07b09e42da07c1ddff9fd02a306404c45632cc80eb791e05cf07c0919a57fca2b91c6302ec01447213ed7f1b5a5bb14482b1f9c3a1fc501a0fdcb SHA512 268d85144fd06c70c9394acdbd92478b0ee3426beed76e48363f71e329681c57ab6bb1d7b313011e1243eeaaeb2b1f35085641bd86d6894c7d998d030d84b548
DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0
diff --git a/net-misc/lldpd/lldpd-1.0.14.ebuild b/net-misc/lldpd/lldpd-1.0.14.ebuild
new file mode 100644
index 00000000000..7d7e1e61ff1
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.14.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://lldpd.github.io/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4.9.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+ seccomp sonmp snmp static-libs test readline xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/lldpd
+ acct-user/lldpd
+ dev-libs/libbsd
+ >=dev-libs/libevent-2.1.11:=
+ sys-libs/readline:0=
+ seccomp? ( sys-libs/libseccomp:= )
+ snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
+ xml? ( dev-libs/libxml2:= )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )
+"
+BDEPEND="virtual/pkgconfig
+ doc? (
+ graph? ( app-doc/doxygen[dot] )
+ !graph? ( app-doc/doxygen )
+ )
+"
+
+REQUIRED_USE="graph? ( doc )"
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --without-embedded-libevent \
+ --with-privsep-user=${PN} \
+ --with-privsep-group=${PN} \
+ --with-privsep-chroot=/run/${PN} \
+ --with-lldpd-ctl-socket=/run/${PN}.socket \
+ --with-lldpd-pid-file=/run/${PN}.pid \
+ $(use_enable cdp) \
+ $(use_enable doc doxygen-man) \
+ $(use_enable doc doxygen-pdf) \
+ $(use_enable doc doxygen-html) \
+ $(use_enable dot1) \
+ $(use_enable dot3) \
+ $(use_enable edp) \
+ $(use_enable fdp) \
+ $(use_enable graph doxygen-dot) \
+ $(use_enable lldpmed) \
+ $(use_enable old-kernel oldies) \
+ $(use_enable sonmp) \
+ $(use_enable static-libs static) \
+ $(use_with readline) \
+ $(use_enable sanitizers) \
+ $(use_with seccomp) \
+ $(use_with snmp) \
+ $(use_with xml)
+}
+
+src_compile() {
+ emake
+ use doc && emake doxygen-doc
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+ newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+ newbashcomp src/client/completion/lldpcli lldpcli
+
+ use doc && dodoc -r doxygen/html
+
+ insinto /etc
+ doins "${FILESDIR}/lldpd.conf"
+ keepdir /etc/${PN}.d
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
+
+pkg_postinst() {
+ tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index e19746d7c4a..e7758cdcca9 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -2,3 +2,4 @@ DIST memcached-1.6.10.tar.gz 609630 BLAKE2B 1b4d632cb57e1f49d6e667aea5a4d2a1c74b
DIST memcached-1.6.13.tar.gz 1031167 BLAKE2B f65871ad2a110fb4baa96dd57844cfc403bcfc905120bbf13a6be9392a78ae3dafcbb59f05b9d212a1239ede465a3688d5ca90e5d104f654e36c76739545c234 SHA512 3f3ef37f5838d8b1b8100cdb77b2226d8d29eef093bcb2c9a03f2420144aa35a5c8c1c957134eddce1fdd37a05b5ffc19058baf05dd3aad60fca12f8c81eaf1d
DIST memcached-1.6.14.tar.gz 1034514 BLAKE2B 960da79748019cfc6b8c1e2f63e67bede8a472985e738e3998ef41e48bd1c645671cf42661280cd4d97fde8de368f9f5d74e0aa83a7447d7f19fa6eeb303a01c SHA512 607b5c0d4c721c714b6e6e3fbca4845fc24103e1dfb988a2edf818b78f918eeb71b86b211e311dc2bcbc438a9a0ffcb69a3bd6694b591720ede8b5349c804740
DIST memcached-1.6.15.tar.gz 1051109 BLAKE2B 96e931b2a513cc6717dbc3262e3c7d30a2293c7a1380e3bd961d82e3f24bb2f3fce20950a587e0588bf11c9606af230cad6ab1e749d438e62daf171cbaaf1853 SHA512 00ee15eb7932420a25f3ce973bc7fcc5ba77a514091883f8b4e58ea861073caa91c676c0020f03c768077e20c76f34bca96616be104af3fbc8e7e78303958f3d
+DIST memcached-1.6.16.tar.gz 1054877 BLAKE2B 6052153a0442df1e7fcd8a959184c6ef1ca5ca26ef8c145144f8d26d4ded971e19bfd7a310f80e7b1cded840ebe95626a8714b583e156111ba68ae4721bda0c2 SHA512 cacd71d11aaa575361b83b5c565b6d665cac7a6dc6768af209d5108620d6883a7b3159351b7eab6da034a15162fa71fefe8024e41a1f46911acd1ca3aa23b209
diff --git a/net-misc/memcached/memcached-1.6.16.ebuild b/net-misc/memcached/memcached-1.6.16.ebuild
new file mode 100644
index 00000000000..39801d79547
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.16.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+ https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+ dev-lang/perl
+ sasl? ( dev-libs/cyrus-sasl )
+ seccomp? ( sys-libs/libseccomp )
+ selinux? ( sec-policy/selinux-memcached )
+ ssl? ( >=dev-libs/openssl-1.1.0g:= )"
+DEPEND="${RDEPEND}
+ acct-user/memcached
+ test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+ "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+ "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+ "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's,-Werror,,g' configure.ac || die
+ sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+ eautoreconf
+
+ use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+ # Tweak upstream systemd unit to use Gentoo variables/envfile.
+ # As noted by bug #587440
+ sed -i -e '/^ExecStart/{
+ s,{USER},{MEMCACHED_RUNAS},g;
+ s,{CACHESIZE},{MEMUSAGE},g;
+ s,OPTIONS,MISC_OPTS,g;
+ };
+ /Environment=/{s,OPTIONS,MISC_OPTS,g;};
+ /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+ ' \
+ "${S}"/scripts/memcached.service
+}
+
+src_configure() {
+ econf \
+ --disable-docs \
+ $(use_enable sasl) \
+ $(use_enable ssl tls)
+ # The xml2rfc tool to build the additional docs requires TCL :-(
+ # `use_enable doc docs`
+}
+
+src_compile() {
+ # There is a heavy degree of per-object compile flags
+ # Users do NOT know better than upstream. Trying to compile the testapp and
+ # the -debug version with -DNDEBUG _WILL_ fail.
+ append-flags -UNDEBUG -pthread
+ emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+ filter-flags -UNDEBUG
+ emake
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dobin scripts/memcached-tool
+ use debug && dobin memcached-debug
+
+ dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+ newconfd "${FILESDIR}/memcached.confd" memcached
+ newinitd "${FILESDIR}/memcached.init2" memcached
+ systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+ elog "With this version of Memcached Gentoo now supports multiple instances."
+ elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+ elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+ elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.0-r1.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.0-r1.ebuild
index 1ea1f1e65a1..6eaa3bb39db 100644
--- a/net-misc/miniupnpd/miniupnpd-2.3.0-r1.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
RDEPEND="
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index a05c936c23d..c4b78cfcd26 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,3 +1,2 @@
-DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0ed2a36c374210e57cdd6a1346772c7f1c06a273e753606f70fe5d911eb6b11c6779382e2fc8a7bfa99ce216522807c6be60ed1719d05b7b452b SHA512 d3166484792aa0d97d7a094ecac309062fa1bf07c50c5b9bcc827e45c0a4d005a1131a589af1ec9920f373346d9ccb27bea6c019bad39c633998c00df92a5356
-DIST mobile-broadband-provider-info-20220315.tar.xz 84068 BLAKE2B 69b1805cdac393d733c7c4bd033f623d01260abe9be97108b1f7525a1e96935dd6b6582cd647e415a4f6329988cc105a220fbd3672b0d8c719e298ac53e0bcac SHA512 92da9e03f48d1a3e5807cab616627d0d31539dfee5c9650f78c5eb4371748366700ffe26f922ac061f877cd1bd5c3fb766e71fea0677eee007e68873c39c597c
DIST mobile-broadband-provider-info-20220511.tar.xz 85064 BLAKE2B 7abb1d493cc39b9988a188edf260b5440bc8cb9e0879897df550ee63cb46c52721ee75dee304bbc93add3173a7ff56bd17bccf8dd062590ae583cee67e9093ab SHA512 7b3a9c0a2e618ef3ef0e29b947ab9f0a55f30bd738f0e976529e8f3ddbb60a738f623e718ea67fa6e6008275dbbe78ce3ed9852c005748a266f04e3dd65179a6
+DIST mobile-broadband-provider-info-20220725.tar.xz 85184 BLAKE2B 1b36b2cf8f0a66755a7cd10090531efd2c5094e5d611247af748f0923fd76b5e1ce20c31ce16be2b0bad5bd64e44e72eeeec7123435366186e31c7da9e66343a SHA512 335b3a5598144f4b11eab2d924b4671055c414664c783507fb8aa0ee20769dca640d03e559e7f55741b38652590812e777b663264d6dcafd24407cfaeb5bc24d
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
deleted file mode 100644
index 0da3e23ad4b..00000000000
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org
-
-DESCRIPTION="Database of mobile broadband service providers"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
-
-LICENSE="CC-PD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-libs/libxslt
- test? ( dev-libs/libxml2 )
-"
-
-DOCS=( README )
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
index c7d2788a09a..c852b0dcbc9 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
LICENSE="CC-PD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild
index d0704be34ed..ba7cf7cab4d 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome.org
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
LICENSE="CC-PD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index a3993df8a86..8281970d3e2 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,2 +1,2 @@
-DIST ModemManager-1.18.6.tar.xz 2519572 BLAKE2B 022e461d43a10bfce8d97f39b855cd28e1d165d07ec65db15c4ec3e89d932829b8c88a1834d182bc966c22f0d848cb6bb06bae2cc2930f685c9fa43b277668d9 SHA512 3b154d459e1196494d7f99303f88088215992aadb57a8cc66f838b068e762fa3d25f19a597922c26a138f670e1da46d627de11cf41d83ce96b3197a086f8e91b
+DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec2752880fb4ffe779c0dae7e2b0852d5f77bb403b5cc1f529e254818fd3e6df2698cd77493d801f5c55d5fe60c817df1e713 SHA512 4615ddb852b750ba0ca62224b669145a408a22b841937d42271638a73bf59dff5fb8b73553388afee8e7d2b2126c61f51af3f8fcb4475a2e2ea313d438443f9b
DIST ModemManager-1.18.8.tar.xz 2533392 BLAKE2B 7e95aa2303b55524174475ace96e0b938d2ac9abee0867bb56c6405f3460e73fad0ab68e50361c148551401ff2450abe70733616534507251cbaaee41ee02028 SHA512 fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 44a1c20ee04..97718f935bb 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -9,5 +9,6 @@
<flag name="mbim">Enable MBIM modem protocol</flag>
<flag name="qmi">Enable support for the QMI modem protocol used by
devices with Qualcomm chipsets</flag>
+ <flag name="qrtr">Enable support for the QMI over IPC Router bus (QRTR) protocol</flag>
</use>
</pkgmetadata>
diff --git a/net-misc/modemmanager/modemmanager-1.18.6.ebuild b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
index 0b3fef8057f..89e61a44926 100644
--- a/net-misc/modemmanager/modemmanager-1.18.6.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala
DESCRIPTION="Modem and mobile broadband management libraries"
@@ -11,11 +11,12 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
LICENSE="GPL-2+"
SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="elogind +introspection mbim policykit +qmi systemd test +udev vala"
+IUSE="elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala"
REQUIRED_USE="
?? ( elogind systemd )
+ qrtr? ( qmi )
vala? ( introspection )
"
RESTRICT="!test? ( test )"
@@ -26,7 +27,8 @@ DEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
mbim? ( >=net-libs/libmbim-1.26.0 )
policykit? ( >=sys-auth/polkit-0.106[introspection?] )
- qmi? ( >=net-libs/libqmi-1.30.2:= )
+ qmi? ( >=net-libs/libqmi-1.30.8:=[qrtr?] )
+ qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
elogind? ( sys-auth/elogind )
systemd? ( >=sys-apps/systemd-209 )
"
@@ -71,7 +73,7 @@ src_prepare() {
add your user account to the 'plugdev' group."
fi
- use vala && vala_src_prepare
+ use vala && vala_setup
gnome2_src_prepare
}
@@ -87,7 +89,7 @@ src_configure() {
$(use_with policykit polkit)
$(use_with systemd systemd-journal)
$(use_with qmi)
- --without-qrtr # libqrtr-glib not packaged
+ $(use_with qrtr)
$(use_enable vala)
)
if use systemd || use elogind; then
@@ -139,7 +141,13 @@ pkg_postinst() {
ewarn "about your modem port manually."
fi
+ use udev && udev_reload
+
systemd_reenable ModemManager.service
readme.gentoo_print_elog
}
+
+pkg_postrm() {
+ use udev && udev_reload
+}
diff --git a/net-misc/modemmanager/modemmanager-1.18.8.ebuild b/net-misc/modemmanager/modemmanager-1.18.8.ebuild
index e0ec59b247a..6ed05d4bf7f 100644
--- a/net-misc/modemmanager/modemmanager-1.18.8.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.18.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
LICENSE="GPL-2+"
SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
IUSE="elogind +introspection mbim policykit +qmi systemd test +udev vala"
REQUIRED_USE="
@@ -139,6 +139,8 @@ pkg_postinst() {
ewarn "about your modem port manually."
fi
+ use udev && udev_reload
+
systemd_reenable ModemManager.service
readme.gentoo_print_elog
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 528cca3c432..47ed30477c2 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1 +1,2 @@
+DIST mosh-1.3.2.95rc1.tar.gz 386399 BLAKE2B fb69d3f80d4f38c12894a4fee5ff57c83f766a324b961c59fa73b219680b41e047d12028ea4831efc04254b1fdc9737bce3e167f4175a672a79caab8887f3a14 SHA512 2589dc91544c3d080cdd51ac40557892e6de8bf5c3df695a695a4bab750c29fd41963feb6e57f472483cdb663c896ba9279b6838b697136b82f0db266bae2cf4
DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index a4282e88998..c715ea93366 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -9,6 +9,7 @@
<flag name="client">Build network client</flag>
<flag name="examples">Include example scripts</flag>
<flag name="mosh-hardening">Enable compiler and linker options to frustrate memory corruption exploits</flag>
+ <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for some cryptographic functions instead of <pkg>dev-libs/openssl</pkg>. With Nettle, some of mosh's own code is used for OCB.</flag>
<flag name="server">Build network server</flag>
<flag name="ufw">Install net-firewall/ufw rule set</flag>
<flag name="utempter">Include libutempter support</flag>
@@ -20,6 +21,7 @@
- intelligent local echo and line editing to reduce the effects of "network lag" on high-latency connections.
</longdescription>
<upstream>
- <bugs-to>https://github.com/keithw/mosh/issues</bugs-to>
+ <bugs-to>https://github.com/mobile-shell/mosh/issues</bugs-to>
+ <remote-id type="github">mobile-shell/mosh</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/mosh/mosh-1.3.2.95_rc1.ebuild b/net-misc/mosh/mosh-1.3.2.95_rc1.ebuild
new file mode 100644
index 00000000000..289455b3b6e
--- /dev/null
+++ b/net-misc/mosh/mosh-1.3.2.95_rc1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+MY_P=${PN}-${PV/_rc/rc}
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="https://mosh.org"
+#SRC_URI="https://mosh.org/${P}.tar.gz"
+SRC_URI="https://github.com/mobile-shell/mosh/releases/download/${MY_P}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+IUSE="+client examples +hardened nettle +server syslog ufw +utempter"
+
+REQUIRED_USE="
+ || ( client server )
+ examples? ( client )"
+
+RDEPEND="
+ dev-libs/protobuf:=
+ sys-libs/ncurses:=
+ sys-libs/zlib
+ virtual/ssh
+ client? (
+ dev-lang/perl
+ dev-perl/IO-Tty
+ )
+ !nettle? ( dev-libs/openssl:= )
+ nettle? ( dev-libs/nettle:= )
+ utempter? (
+ sys-libs/libutempter
+ )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+# [0] - avoid sandbox-violation calling git describe in Makefile.
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.5-git-version.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ MAKEOPTS+=" V=1"
+
+ local myeconfargs=(
+ # We install it ourselves in src_install
+ --disable-completion
+
+ $(use_enable client)
+ $(use_enable server)
+ $(use_enable examples)
+ $(use_enable hardened hardening)
+ $(use_enable ufw)
+ $(use_enable syslog)
+ $(use_with utempter)
+
+ # We default to OpenSSL as upstream do
+ --with-crypto-library=$(usex nettle nettle openssl-with-openssl-ocb)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ for myprog in $(find src/examples -type f -perm /0111) ; do
+ newbin ${myprog} ${PN}-$(basename ${myprog})
+ elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+ done
+
+ # bug #477384
+ dobashcomp conf/bash-completion/completions/mosh
+}
diff --git a/net-misc/mptcpd/Manifest b/net-misc/mptcpd/Manifest
index bc4e0961471..3e5be0c6a1a 100644
--- a/net-misc/mptcpd/Manifest
+++ b/net-misc/mptcpd/Manifest
@@ -1 +1 @@
-DIST mptcpd-0.9.tar.gz 654063 BLAKE2B fd9e8bf5cec517c934b9d38a736a128d087b54b5e4db90816a8cf8c242195fec8e3c4cd28d2f6e5a93326cac311a6b29048313c722004cea39e19448dc467976 SHA512 4fd292304d6270351b865e86cc401c1f5cc9043606b171e852bd37b2472c5f80061d760be68e5cd965caccb2f25c03d9ceea6232a5a587016c81f85e68ca8882
+DIST mptcpd-0.10.tar.gz 671508 BLAKE2B de29050b5394b4011bf2bc25ce7ca33c42da8332e10d89c849047508886080e43e0e4f734e77437f8b0122336b47aa4f6442c07461e4552183cf10b08dfb6d81 SHA512 758dd9c84446abab7a26e6e7fa19fedb6ab4a8dbb8d6e2535f3eae5b9b423becaec9a18aea214498b424d110227af7eafb630b91b963eb5be2da0da936fd3a93
diff --git a/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch b/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch
deleted file mode 100644
index 38061a754a4..00000000000
--- a/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From a200ef26e4daf0347dd8f1bd35d49dd66fba7a7e Mon Sep 17 00:00:00 2001
-From: Ossama Othman <ossama.othman@intel.com>
-Date: Thu, 17 Feb 2022 16:39:59 -0800
-Subject: [PATCH] Allow loopback network interface monitoring. (#220)
-
-* network_monitor: Allow loopback monitoring.
-
-Add a new mptcpd_nm_monitor_loopback() function that allows the user
-to enable monitoring of loopback network interfaces. Monitoring of
-loopback network interfaces is meant primarily for testing purposes.
-Mptcpd will retain the previous behavior of only monitoring
-non-loopback network interfaces by default.
-
-* tests: Enable loopback interface monitoring.
-
-Enable loopback network interface monitoring to allow the
-test-network-monitor unit test to succeed in cases where non-loopback
-interfaces are unavailable, such as in a sandboxed environment.
-
-Fixes #208.
-
-Co-authored-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
----
- include/mptcpd/network_monitor.h | 21 ++++++++++++++++++
- lib/network_monitor.c | 38 +++++++++++++++++++++-----------
- tests/test-network-monitor.c | 15 +++++++++----
- 3 files changed, 57 insertions(+), 17 deletions(-)
-
-diff --git a/include/mptcpd/network_monitor.h b/include/mptcpd/network_monitor.h
-index dc35e3d..ea1a95b 100644
---- a/include/mptcpd/network_monitor.h
-+++ b/include/mptcpd/network_monitor.h
-@@ -213,6 +213,27 @@ MPTCPD_API bool mptcpd_nm_register_ops(struct mptcpd_nm *nm,
- struct mptcpd_nm_ops const *ops,
- void *user_data);
-
-+/**
-+ * @brief Enable monitoring of the loopback network interface.
-+ *
-+ * Mptcpd normally only monitors non-loopback network interfaces.
-+ * Call this function to enable monitoring of loopback network
-+ * interfaces.
-+ *
-+ * @note Mptcpd monitoring of loopback network interfaces is meant
-+ * primarily for testing purposes.
-+ *
-+ * @param[in,out] nm Pointer to the mptcpd network monitor
-+ * object.
-+ * @param[in] enable Enable or disable monitoring of loopback
-+ * network interfaces.
-+ *
-+ * @retval true Successfully enable or disabled.
-+ * @retval false Invalid @a nm argument.
-+ */
-+MPTCPD_API bool mptcpd_nm_monitor_loopback(struct mptcpd_nm *nm,
-+ bool enable);
-+
- #ifdef __cplusplus
- }
- #endif
-diff --git a/lib/network_monitor.c b/lib/network_monitor.c
-index 2ae275b..7a3927e 100644
---- a/lib/network_monitor.c
-+++ b/lib/network_monitor.c
-@@ -4,7 +4,7 @@
- *
- * @brief mptcpd network device monitoring.
- *
-- * Copyright (c) 2017-2021, Intel Corporation
-+ * Copyright (c) 2017-2022, Intel Corporation
- */
-
- #ifdef HAVE_CONFIG_H
-@@ -78,6 +78,9 @@ struct mptcpd_nm
-
- /// Flags controlling address notification.
- uint32_t notify_flags;
-+
-+ /// Enable/disable loopback network interface monitoring.
-+ bool monitor_loopback;
- };
-
- // -------------------------------------------------------------------
-@@ -525,16 +528,15 @@ static void mptcpd_interface_callback(void *data, void *user_data)
- *
- * @return @c true if network interface is ready, and @c false other.
- */
--static bool is_interface_ready(struct ifinfomsg const *ifi)
-+static bool is_interface_ready(struct mptcpd_nm const *nm,
-+ struct ifinfomsg const *ifi)
- {
-- /*
-- Only accept non-loopback network interfaces that are
-- up and running.
-- */
-- static unsigned int const iff_ready = IFF_UP | IFF_RUNNING;
-+ // Only accept network interfaces that are up and running.
-+ static unsigned int iff_ready = IFF_UP | IFF_RUNNING;
-
- return (ifi->ifi_flags & iff_ready) == iff_ready
-- && (ifi->ifi_flags & IFF_LOOPBACK) == 0;
-+ && ((ifi->ifi_flags & IFF_LOOPBACK) == 0
-+ || nm->monitor_loopback);
- }
-
- /**
-@@ -708,7 +710,7 @@ static void handle_link(uint16_t type,
-
- switch (type) {
- case RTM_NEWLINK:
-- if (is_interface_ready(ifi))
-+ if (is_interface_ready(nm, ifi))
- update_link(ifi, len, nm);
- else
- remove_link(ifi, nm); // Interface disabled.
-@@ -1301,7 +1303,7 @@ static void handle_rtm_getlink(int error,
- struct ifinfomsg const *const ifi = data;
- struct mptcpd_nm *const nm = user_data;
-
-- if (is_interface_ready(ifi)) {
-+ if (is_interface_ready(nm, ifi)) {
- (void) insert_link(ifi, len, nm);
- }
- }
-@@ -1442,9 +1444,10 @@ struct mptcpd_nm *mptcpd_nm_create(uint32_t flags)
- return NULL;
- }
-
-- nm->notify_flags = flags;
-- nm->interfaces = l_queue_new();
-- nm->ops = l_queue_new();
-+ nm->notify_flags = flags;
-+ nm->interfaces = l_queue_new();
-+ nm->ops = l_queue_new();
-+ nm->monitor_loopback = false;
-
- /**
- * Get network interface information.
-@@ -1555,6 +1558,15 @@ bool mptcpd_nm_register_ops(struct mptcpd_nm *nm,
- return registered;
- }
-
-+bool mptcpd_nm_monitor_loopback(struct mptcpd_nm *nm, bool enable)
-+{
-+ if (nm == NULL)
-+ return false;
-+
-+ nm->monitor_loopback = enable;
-+
-+ return true;
-+}
-
- /*
- Local Variables:
-diff --git a/tests/test-network-monitor.c b/tests/test-network-monitor.c
-index d7c6b87..d22f6be 100644
---- a/tests/test-network-monitor.c
-+++ b/tests/test-network-monitor.c
-@@ -4,7 +4,7 @@
- *
- * @brief mptcpd network monitor test.
- *
-- * Copyright (c) 2018-2020, Intel Corporation
-+ * Copyright (c) 2018-2020, 2022, Intel Corporation
- */
-
- #define _DEFAULT_SOURCE // Enable IFF_... interface flags in <net/if.h>.
-@@ -115,12 +115,11 @@ static void check_interface(struct mptcpd_interface const *i, void *data)
- l_queue_foreach(i->addrs, dump_addr, NULL);
-
- /*
-- Only non-loopback interfaces that are up and running should
-- be monitored.
-+ Only network interfaces that are up and running should be
-+ monitored.
- */
- static unsigned int const ready = IFF_UP | IFF_RUNNING;
- assert(ready == (i->flags & ready));
-- assert(!(i->flags & IFF_LOOPBACK));
-
- if (data) {
- struct foreach_data *const fdata = data;
-@@ -249,6 +248,14 @@ int main(void)
- struct mptcpd_nm *const nm = mptcpd_nm_create(0);
- assert(nm);
-
-+ assert(!mptcpd_nm_monitor_loopback(NULL, true)); // Bad arg
-+
-+ /*
-+ Enable loopback network interface monitoring for this unit
-+ test in case non-loopback network interfaces are unavailable.
-+ */
-+ assert(mptcpd_nm_monitor_loopback(nm, true));
-+
- struct mptcpd_nm_ops const nm_events[] = {
- {
- .new_interface = handle_new_interface,
diff --git a/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch b/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch
new file mode 100644
index 00000000000..7e3357c8e36
--- /dev/null
+++ b/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/832563
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ dnl Support "--enable-debug=..." configure script command line option.
+ AX_IS_RELEASE([git-directory])
+ AX_CHECK_ENABLE_DEBUG([yes])
+
+-AM_INIT_AUTOMAKE([1.15 -Wall -Werror -Wno-portability silent-rules std-options check-news])
++AM_INIT_AUTOMAKE([1.15 -Wall -Wno-portability silent-rules std-options check-news])
+ AM_SILENT_RULES([yes])
+ LT_INIT([disable-static])
+
+@@ -301,7 +301,7 @@ LIBS=$mptcpd_save_libs
+ # warning free.
+ # ---------------------------------------------------------------
+ AX_CFLAGS_WARN_ALL([CFLAGS])
+-AX_APPEND_COMPILE_FLAGS([-Wextra -Werror -pedantic])
++AX_APPEND_COMPILE_FLAGS([-Wextra -pedantic])
+
+ # ---------------------------------------------------------------
+ # Enable compile-time defense
diff --git a/net-misc/mptcpd/mptcpd-0.9.ebuild b/net-misc/mptcpd/mptcpd-0.10-r1.ebuild
index a35610eb41a..2ee9b4505be 100644
--- a/net-misc/mptcpd/mptcpd-0.9.ebuild
+++ b/net-misc/mptcpd/mptcpd-0.10-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0/${PV}"
IUSE="debug doc"
RDEPEND="
- >=dev-libs/ell-0.30.0
+ >=dev-libs/ell-0.45.0
elibc_musl? ( sys-libs/argp-standalone )
"
DEPEND="
@@ -27,9 +27,6 @@ BDEPEND="
)
virtual/pkgconfig
"
-PATCHES=(
- "${FILESDIR}/${P}-loopback-monitoring.patch"
-)
if [[ ${PV} == 9999* ]]; then
inherit git-r3
@@ -41,9 +38,15 @@ fi
CONFIG_CHECK="MPTCP"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9-no-werror.patch
+)
+
src_prepare() {
default
- [[ ${PV} == 9999* ]] && eautoreconf
+
+ # For Werror patch
+ eautoreconf
}
src_configure() {
@@ -64,3 +67,8 @@ src_compile() {
src_test() {
emake check
}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/mptcpd/mptcpd-9999.ebuild b/net-misc/mptcpd/mptcpd-9999.ebuild
index 8f307676ab4..2ee9b4505be 100644
--- a/net-misc/mptcpd/mptcpd-9999.ebuild
+++ b/net-misc/mptcpd/mptcpd-9999.ebuild
@@ -13,7 +13,7 @@ SLOT="0/${PV}"
IUSE="debug doc"
RDEPEND="
- >=dev-libs/ell-0.30.0
+ >=dev-libs/ell-0.45.0
elibc_musl? ( sys-libs/argp-standalone )
"
DEPEND="
@@ -38,9 +38,15 @@ fi
CONFIG_CHECK="MPTCP"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9-no-werror.patch
+)
+
src_prepare() {
default
- [[ ${PV} == 9999* ]] && eautoreconf
+
+ # For Werror patch
+ eautoreconf
}
src_configure() {
@@ -61,3 +67,8 @@ src_compile() {
src_test() {
emake check
}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/ndisc6/ndisc6-1.0.5.ebuild b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
index 19faf911e8e..3e0dcf8b597 100644
--- a/net-misc/ndisc6/ndisc6-1.0.5.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~x64-macos"
IUSE="debug"
BDEPEND="dev-lang/perl
diff --git a/net-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest
index 90178ef5c73..123942b2897 100644
--- a/net-misc/netkit-fingerd/Manifest
+++ b/net-misc/netkit-fingerd/Manifest
@@ -1 +1 @@
-DIST bsd-finger_0.17.orig.tar.gz 25521 BLAKE2B 4b8eb07d057d2ef2bfea5987820ad6aed7c73e2365fc78c7dcf76be0f74a3056ccf5115c3b58f3235384caaacda76dc38e4ce51713fa1c28c10160232213f348 SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0
+DIST bsd-finger_0.17.orig.tar.bz2 24096 BLAKE2B 96342764b07e3946c2ddba8ecd094e3760b32601e6eea630c1586e821ee856a2e09420ba69ff55e3023d832757f8daaf58e4bf5d4bab35e475bcd83c851ab730 SHA512 06bc071fb5115be13ab88b946626f97b14ec60e9223c831bdc0575c6ad9556227179736078191ce4f4b982ebcba9a82b4aba2ad970803b35015999a167841bdc
diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
index 4b7aca59d55..6bbfe0669c1 100644
--- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ MY_PN="${PN/netkit/bsd}"
MY_PN="${MY_PN/rd/r}"
DESCRIPTION="Netkit - fingerd and finger client"
HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.bz2"
LICENSE="BSD"
SLOT="0"
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
index 7423dd55a7d..d7586da721f 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-misc/netopeer2/netopeer2-2.1.23.ebuild b/net-misc/netopeer2/netopeer2-2.1.23.ebuild
index f2d625e240a..7d8235fd616 100644
--- a/net-misc/netopeer2/netopeer2-2.1.23.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.1.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
dev-libs/openssl:=
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 9384b121d4d..78d75fca5e3 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d5464604b329c8b740a2a143266c0bc05ec6a16079cfdf67770fc75afe523664e2e4234189031a8ffa2f51c0f02d4760f3ab20e04a SHA512 b8dfa409302781fdab19790afeb7f4396875e282d6983e2c5775294c8c13d3c1036dee69a37bf6e4fb2a2e80504c8e792780b6a9c1262616e57860da5ebc0e61
-DIST NetworkManager-1.36.2.tar.xz 5432676 BLAKE2B 8ce2922573ae5b1d244e87d1b979a9fe7443e4fa2cb6caf52b59139ad92169dd46f53460871b44e687860aaee06dd6a4999d0ebce9cde466e61c203ae18dbaa3 SHA512 3d9085bb836000a2354415e5ff35e5e67eacd97680660613128b9befe981d67b6ac8d519581f8635bf219c2db03a92f182066efef3abb2094da2870e12caa353
-DIST NetworkManager-1.36.4.tar.xz 5433152 BLAKE2B 2bb625381bc5a816a9fdc51498721f9bc1e85fe2e83d114c8897f99f90af6924a0a07fddf0099f8e52c0df2f3353834129b99b4bb487b413cee503da7c680035 SHA512 17b2d39ed2584fb8b805e7b9950f9c4e6d657380881e9e78a1aa85dc58615e0a3896413a6902086f516dee2f373155f69042b4a229f3b9e15fb3c0f958cd8149
-DIST NetworkManager-1.38.0.tar.xz 5431664 BLAKE2B adc298681e339d6cfac9c7310a94a1b11bc7f5044a0b2a129d5ab764bd5f29ccc604bbc27c49d52ceab9e2e6dbd923a686fbaf96cf20c73438d680fa5659e5ff SHA512 0f1532b4ea1aeb9d5dd922ee005eef325d39ba3526884793aaaed2eae61737f6a6e95644077f2b45ace569df79246d3d6404272cce02ca7e02b3632aee882940
+DIST NetworkManager-1.38.2.tar.xz 5526780 BLAKE2B 54e9746d3bf41146bb2bbc1ec273c4e2ca0a458e1a488eba7e5f17572e6e8db02ccfcd5b884e00162e505512b24a38de77447944d979fbe40d20d4af4c688a71 SHA512 0da3294bec659e6742c2b941eb6cb2464df1018e801148ac37cce0a0612c4468701add13659c18b1c08b51556c7e3e2782ad2353804fdf2a094e97d531da964b
+DIST NetworkManager-1.38.4.tar.xz 5446860 BLAKE2B c7b1e456a33ff136137cf0bd615fffdbc2d24b853bbe31dcab143c2748baf0a8f25fcc55af1811f4a179c5d85d86a09dcb2cdd3b374996b013be1acfea580316 SHA512 b36b35f1292df9888a5930cb28aca693ee566eec9216520adf3f5aeb9631d4d399bb0ea06641ab488f025584df438b69b2be01a3a7782e20267b60165f9159b6
diff --git a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
deleted file mode 100644
index fd6fc99404a..00000000000
--- a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- bluetooth? ( modemmanager )
- connection-sharing? ( || ( iptables nftables ) )
- gtk-doc? ( introspection )
- iwd? ( wifi )
- vala? ( introspection )
- wext? ( wifi )
- ^^ ( gnutls nss )
- ?? ( elogind systemd )
- ?? ( dhclient dhcpcd )
- ?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-COMMON_DEPEND="
- sys-apps/util-linux[${MULTILIB_USEDEP}]
- elogind? ( >=sys-auth/elogind-219 )
- >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
- sys-apps/dbus
- net-libs/libndp
- systemd? ( >=sys-apps/systemd-209:0= )
- >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- selinux? ( sys-libs/libselinux )
- audit? ( sys-process/audit )
- teamd? (
- >=dev-libs/jansson-2.7:=
- >=net-misc/libteam-1.9
- )
- policykit? ( >=sys-auth/polkit-0.106 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- gnutls? (
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
- )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- modemmanager? (
- net-misc/mobile-broadband-provider-info
- >=net-misc/modemmanager-0.7.991:0=
- )
- bluetooth? ( >=net-wireless/bluez-5 )
- ofono? ( net-misc/ofono )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
- ovs? ( >=dev-libs/jansson-2.7:= )
- resolvconf? ( net-dns/openresolv )
- connection-sharing? (
- net-dns/dnsmasq[dbus,dhcp]
- iptables? ( net-firewall/iptables )
- nftables? ( net-firewall/nftables )
- )
- psl? ( net-libs/libpsl )
- concheck? ( net-misc/curl )
- tools? (
- sys-libs/readline:0=
- >=dev-libs/newt-0.52.15
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/plugdev
- || (
- net-misc/iputils[arping(+)]
- net-analyzer/arping
- )
- wifi? (
- !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
- iwd? ( net-wireless/iwd )
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.18
- net-libs/libndp[${MULTILIB_USEDEP}]
-"
-BDEPEND="
- dev-util/gdbus-codegen
- dev-util/glib-utils
- gtk-doc? (
- dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.1.2
- )
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- introspection? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- dev-lang/perl
- dev-libs/libxslt
- )
- vala? ( $(vala_depend) )
- test? (
- >=dev-libs/jansson-2.7
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-python_check_deps() {
- if use introspection; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
- fi
-}
-
-pkg_setup() {
- if use connection-sharing; then
- if kernel_is lt 5 1; then
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
- else
- CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
- fi
- linux-info_pkg_setup
- fi
-
- if use introspection || use test; then
- python-any-r1_pkg_setup
- fi
-
- # bug 809695
- if tc-is-clang && use lto; then
- eerror "Clang does not support -flto-partition"
- die "Please use gcc or turn off USE=lto flag when building with clang"
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- default
- use vala && vala_src_prepare
-
- sed -i \
- -e 's#/usr/bin/sed#/bin/sed#' \
- data/84-nm-drivers.rules \
- || die
-}
-
-meson_nm_program() {
- usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
- multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
- local emesonargs=(
- --localstatedir="${EPREFIX}/var"
-
- -Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
- -Dsystem_ca_path=/etc/ssl/certs
- -Dudev_dir=$(get_udevdir)
- -Ddbus_conf_dir=/usr/share/dbus-1/system.d
- -Dkernel_firmware_dir=/lib/firmware
- -Diptables=/sbin/iptables
- -Dnft=/sbin/nft
- -Ddnsmasq=/usr/sbin/dnsmasq
- #-Ddnssec_trigger=
-
- -Ddist_version=${PVR}
- $(meson_native_use_bool policykit polkit)
- $(meson_native_use_bool policykit config_auth_polkit_default)
- -Dmodify_system=true
- -Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool systemd systemd_journal)
- -Dhostname_persist=gentoo
- -Dlibaudit=$(multilib_native_usex audit)
-
- $(meson_native_use_bool wext)
- $(meson_native_use_bool wifi)
- $(meson_native_use_bool iwd)
- $(meson_native_use_bool ppp)
- -Dpppd=/usr/sbin/pppd
- $(meson_native_use_bool modemmanager modem_manager)
- $(meson_native_use_bool ofono)
- $(meson_native_use_bool concheck)
- $(meson_native_use_bool teamd teamdctl)
- $(meson_native_use_bool ovs)
- $(meson_native_use_bool tools nmcli)
- $(meson_native_use_bool tools nmtui)
- $(meson_native_use_bool tools nm_cloud_setup)
- $(meson_native_use_bool bluetooth bluez5_dun)
- -Debpf=true
-
- -Dconfig_plugins_default=keyfile
- -Difcfg_rh=false
- -Difupdown=false
-
- $(meson_nm_native_program resolvconf "" /sbin/resolvconf)
- -Dnetconfig=no
- -Dconfig_dns_rc_manager_default=auto
-
- $(meson_nm_program dhclient "" /sbin/dhclient)
- -Ddhcpcanon=no
- $(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
- $(meson_native_use_bool introspection)
- $(meson_native_use_bool vala vapi)
- $(meson_native_use_bool gtk-doc docs)
- -Dtests=$(multilib_native_usex test)
- $(meson_native_true firewalld_zone)
- -Dmore_asserts=0
- $(meson_use debug more_logging)
- -Dvalgrind=no
- -Dvalgrind_suppressions=
- -Dld_gc=false
- $(meson_native_use_bool psl libpsl)
- -Dqt=false
-
- $(meson_use lto b_lto)
- )
-
- if multilib_is_native_abi && use systemd; then
- emesonargs+=( -Dsession_tracking_consolekit=false )
- emesonargs+=( -Dsession_tracking=systemd )
- emesonargs+=( -Dsuspend_resume=systemd )
- elif multilib_is_native_abi && use elogind; then
- emesonargs+=( -Dsession_tracking_consolekit=false )
- emesonargs+=( -Dsession_tracking=elogind )
- emesonargs+=( -Dsuspend_resume=elogind )
- else
- emesonargs+=( -Dsession_tracking_consolekit=false )
- emesonargs+=( -Dsession_tracking=no )
- emesonargs+=( -Dsuspend_resume=auto )
- fi
-
- if multilib_is_native_abi && use syslog; then
- emesonargs+=( -Dconfig_logging_backend_default=syslog )
- elif multilib_is_native_abi && use systemd; then
- emesonargs+=( -Dconfig_logging_backend_default=journal )
- else
- emesonargs+=( -Dconfig_logging_backend_default=default )
- fi
-
- if multilib_is_native_abi && use dhclient; then
- emesonargs+=( -Dconfig_dhcp_default=dhclient )
- elif multilib_is_native_abi && use dhcpcd; then
- emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
- else
- emesonargs+=( -Dconfig_dhcp_default=internal )
- fi
-
- if use nss; then
- emesonargs+=( -Dcrypto=nss )
- else
- emesonargs+=( -Dcrypto=gnutls )
- fi
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- meson_src_configure
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx meson_src_test
- fi
-}
-
-multilib_src_install() {
- meson_src_install
- if ! multilib_is_native_abi; then
- rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
- fi
-}
-
-multilib_src_install_all() {
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
- insinto /usr/lib/NetworkManager/conf.d #702476
- doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
- if use iwd; then
- # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
- cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
- [device]
- wifi.backend=iwd
- EOF
- fi
-
- mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
- rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
- # Empty
- rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
- systemd_reenable NetworkManager.service
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-
- if use dhclient || use dhcpcd; then
- ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
- ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
- ewarn "works for you, and you're happy with, the alternative USE flags can be"
- ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
- ewarn "the main.dhcp configuration option to use one of them instead of internal."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.36.2.ebuild b/net-misc/networkmanager/networkmanager-1.36.2.ebuild
deleted file mode 100644
index 40c06d6ef04..00000000000
--- a/net-misc/networkmanager/networkmanager-1.36.2.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- bluetooth? ( modemmanager )
- connection-sharing? ( || ( iptables nftables ) )
- gtk-doc? ( introspection )
- iwd? ( wifi )
- vala? ( introspection )
- wext? ( wifi )
- ^^ ( gnutls nss )
- ?? ( elogind systemd )
- ?? ( dhclient dhcpcd )
- ?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-COMMON_DEPEND="
- sys-apps/util-linux[${MULTILIB_USEDEP}]
- elogind? ( >=sys-auth/elogind-219 )
- >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
- sys-apps/dbus
- net-libs/libndp
- systemd? ( >=sys-apps/systemd-209:0= )
- >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- selinux? ( sys-libs/libselinux )
- audit? ( sys-process/audit )
- teamd? (
- >=dev-libs/jansson-2.7:=
- >=net-misc/libteam-1.9
- )
- policykit? ( >=sys-auth/polkit-0.106 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- gnutls? (
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
- )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- modemmanager? (
- net-misc/mobile-broadband-provider-info
- >=net-misc/modemmanager-0.7.991:0=
- )
- bluetooth? ( >=net-wireless/bluez-5 )
- ofono? ( net-misc/ofono )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
- ovs? ( >=dev-libs/jansson-2.7:= )
- resolvconf? ( net-dns/openresolv )
- connection-sharing? (
- net-dns/dnsmasq[dbus,dhcp]
- iptables? ( net-firewall/iptables )
- nftables? ( net-firewall/nftables )
- )
- psl? ( net-libs/libpsl )
- concheck? ( net-misc/curl )
- tools? (
- >=dev-libs/newt-0.52.15
- libedit? ( dev-libs/libedit )
- !libedit? ( sys-libs/readline:= )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/plugdev
- || (
- net-misc/iputils[arping(+)]
- net-analyzer/arping
- )
- wifi? (
- !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
- iwd? ( net-wireless/iwd )
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.18
- net-libs/libndp[${MULTILIB_USEDEP}]
-"
-BDEPEND="
- dev-util/gdbus-codegen
- dev-util/glib-utils
- gtk-doc? (
- dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.1.2
- )
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- introspection? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- dev-lang/perl
- dev-libs/libxslt
- )
- vala? ( $(vala_depend) )
- test? (
- >=dev-libs/jansson-2.7
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-python_check_deps() {
- if use introspection; then
- has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- if use test; then
- has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
- fi
-}
-
-pkg_setup() {
- if use connection-sharing; then
- if kernel_is lt 5 1; then
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
- else
- CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
- fi
- linux-info_pkg_setup
- fi
-
- if use introspection || use test; then
- python-any-r1_pkg_setup
- fi
-
- # bug 809695
- if tc-is-clang && use lto; then
- eerror "Clang does not support -flto-partition"
- die "Please use gcc or turn off USE=lto flag when building with clang"
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- default
- use vala && vala_setup
-
- sed -i \
- -e 's#/usr/bin/sed#/bin/sed#' \
- data/84-nm-drivers.rules \
- || die
-}
-
-meson_nm_program() {
- usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
- multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
- local emesonargs=(
- --localstatedir="${EPREFIX}/var"
-
- -Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
- -Dsystem_ca_path=/etc/ssl/certs
- -Dudev_dir=$(get_udevdir)
- -Ddbus_conf_dir=/usr/share/dbus-1/system.d
- -Dkernel_firmware_dir=/lib/firmware
- -Diptables=/sbin/iptables
- -Dnft=/sbin/nft
- -Ddnsmasq=/usr/sbin/dnsmasq
- #-Ddnssec_trigger=
-
- -Ddist_version=${PVR}
- $(meson_native_use_bool policykit polkit)
- $(meson_native_use_bool policykit config_auth_polkit_default)
- -Dmodify_system=true
- -Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool systemd systemd_journal)
- -Dhostname_persist=gentoo
- -Dlibaudit=$(multilib_native_usex audit)
-
- $(meson_native_use_bool wext)
- $(meson_native_use_bool wifi)
- $(meson_native_use_bool iwd)
- $(meson_native_use_bool ppp)
- -Dpppd=/usr/sbin/pppd
- $(meson_native_use_bool modemmanager modem_manager)
- $(meson_native_use_bool ofono)
- $(meson_native_use_bool concheck)
- $(meson_native_use_bool teamd teamdctl)
- $(meson_native_use_bool ovs)
- $(meson_native_use_bool tools nmcli)
- $(meson_native_use_bool tools nmtui)
- $(meson_native_use_bool tools nm_cloud_setup)
- $(meson_native_use_bool bluetooth bluez5_dun)
- -Debpf=true
-
- -Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
- -Dconfig_plugins_default=keyfile
- -Difcfg_rh=false
- -Difupdown=false
-
- $(meson_nm_native_program resolvconf "" /sbin/resolvconf)
- -Dnetconfig=no
- -Dconfig_dns_rc_manager_default=auto
-
- $(meson_nm_program dhclient "" /sbin/dhclient)
- -Ddhcpcanon=no
- $(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
- $(meson_native_use_bool introspection)
- $(meson_native_use_bool vala vapi)
- $(meson_native_use_bool gtk-doc docs)
- -Dtests=$(multilib_native_usex test)
- $(meson_native_true firewalld_zone)
- -Dmore_asserts=0
- $(meson_use debug more_logging)
- -Dvalgrind=no
- -Dvalgrind_suppressions=
- -Dld_gc=false
- $(meson_native_use_bool psl libpsl)
- -Dqt=false
-
- $(meson_use lto b_lto)
- )
-
- if multilib_is_native_abi && use systemd; then
- emesonargs+=( -Dsession_tracking_consolekit=false )
- emesonargs+=( -Dsession_tracking=systemd )
- emesonargs+=( -Dsuspend_resume=systemd )
- elif multilib_is_native_abi && use elogind; then
- emesonargs+=( -Dsession_tracking_consolekit=false )
- emesonargs+=( -Dsession_tracking=elogind )
- emesonargs+=( -Dsuspend_resume=elogind )
- else
- emesonargs+=( -Dsession_tracking_consolekit=false )
- emesonargs+=( -Dsession_tracking=no )
- emesonargs+=( -Dsuspend_resume=auto )
- fi
-
- if multilib_is_native_abi && use syslog; then
- emesonargs+=( -Dconfig_logging_backend_default=syslog )
- elif multilib_is_native_abi && use systemd; then
- emesonargs+=( -Dconfig_logging_backend_default=journal )
- else
- emesonargs+=( -Dconfig_logging_backend_default=default )
- fi
-
- if multilib_is_native_abi && use dhclient; then
- emesonargs+=( -Dconfig_dhcp_default=dhclient )
- elif multilib_is_native_abi && use dhcpcd; then
- emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
- else
- emesonargs+=( -Dconfig_dhcp_default=internal )
- fi
-
- if use nss; then
- emesonargs+=( -Dcrypto=nss )
- else
- emesonargs+=( -Dcrypto=gnutls )
- fi
-
- if use tools ; then
- emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
- else
- emesonargs+=( -Dreadline=none )
- fi
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- meson_src_configure
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx meson_src_test
- fi
-}
-
-multilib_src_install() {
- meson_src_install
- if ! multilib_is_native_abi; then
- rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
- fi
-}
-
-multilib_src_install_all() {
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
- insinto /usr/lib/NetworkManager/conf.d #702476
- doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
- if use iwd; then
- # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
- cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
- [device]
- wifi.backend=iwd
- EOF
- fi
-
- mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
- rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
- # Empty
- rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
- systemd_reenable NetworkManager.service
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-
- if use dhclient || use dhcpcd; then
- ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
- ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
- ewarn "works for you, and you're happy with, the alternative USE flags can be"
- ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
- ewarn "the main.dhcp configuration option to use one of them instead of internal."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.38.0.ebuild b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
index be21864cdeb..697765c019e 100644
--- a/net-misc/networkmanager/networkmanager-1.38.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
@@ -3,8 +3,7 @@
EAPI=8
GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
@@ -30,7 +29,7 @@ REQUIRED_USE="
?? ( syslog systemd )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
COMMON_DEPEND="
sys-apps/util-linux[${MULTILIB_USEDEP}]
@@ -41,7 +40,10 @@ COMMON_DEPEND="
systemd? ( >=sys-apps/systemd-209:0= )
>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- selinux? ( sys-libs/libselinux )
+ selinux? (
+ sec-policy/selinux-networkmanager
+ sys-libs/libselinux
+ )
audit? ( sys-process/audit )
teamd? (
>=dev-libs/jansson-2.7:=
@@ -90,6 +92,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-3.18
net-libs/libndp[${MULTILIB_USEDEP}]
+ ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
"
BDEPEND="
dev-util/gdbus-codegen
@@ -117,11 +120,11 @@ BDEPEND="
python_check_deps() {
if use introspection; then
- has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+ python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
fi
if use test; then
- has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+ python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
fi
}
@@ -408,3 +411,7 @@ pkg_postinst() {
ewarn "the main.dhcp configuration option to use one of them instead of internal."
fi
}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/net-misc/networkmanager/networkmanager-1.36.4.ebuild b/net-misc/networkmanager/networkmanager-1.38.4.ebuild
index 400242fc95b..d7793ea79d9 100644
--- a/net-misc/networkmanager/networkmanager-1.36.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.4.ebuild
@@ -3,8 +3,7 @@
EAPI=8
GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
@@ -14,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables +iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -30,7 +29,7 @@ REQUIRED_USE="
?? ( syslog systemd )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
COMMON_DEPEND="
sys-apps/util-linux[${MULTILIB_USEDEP}]
@@ -41,7 +40,10 @@ COMMON_DEPEND="
systemd? ( >=sys-apps/systemd-209:0= )
>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- selinux? ( sys-libs/libselinux )
+ selinux? (
+ sec-policy/selinux-networkmanager
+ sys-libs/libselinux
+ )
audit? ( sys-process/audit )
teamd? (
>=dev-libs/jansson-2.7:=
@@ -90,6 +92,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-3.18
net-libs/libndp[${MULTILIB_USEDEP}]
+ ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
"
BDEPEND="
dev-util/gdbus-codegen
@@ -117,11 +120,11 @@ BDEPEND="
python_check_deps() {
if use introspection; then
- has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+ python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
fi
if use test; then
- has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+ python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
fi
}
@@ -369,6 +372,8 @@ multilib_src_install_all() {
}
pkg_postinst() {
+ udev_reload
+
systemd_reenable NetworkManager.service
! use systemd && readme.gentoo_print_elog
@@ -406,3 +411,7 @@ pkg_postinst() {
ewarn "the main.dhcp configuration option to use one of them instead of internal."
fi
}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 21ddc8f945d..0113696053a 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,3 +1,2 @@
-DIST nextcloud-client-3.4.3.tar.gz 14338935 BLAKE2B c9d03e0d950764537aa883da88603746ccd8818c9d0659f8df009a2550ea33f2f51f12448327b7a73a9106e310860b8399a2d12cf18c2c6b7a8f5fa2b7652148 SHA512 b3a9aa019ea2f01ffe74fe1a39c37f3d61cfa4c4b9a520d4f17061960c388541abf0c6541d60d2beed4de26f7fa18fdbef42121d9150c6b916d566bd7285ba71
-DIST nextcloud-client-3.4.4.tar.gz 14352142 BLAKE2B 104af477a15adc30885bd4d6c5fa022efc89d63c9294c8a632349999ed60b95ad1a34bdc8fed8602fd60f4fbff7c9dca2c33461bf9b167401b8d933ef9b02821 SHA512 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4
-DIST nextcloud-client-3.5.0.tar.gz 15359946 BLAKE2B 144f50fb1ce3f1cad205fd2bf5c161c54602d75642518e4db2bad1e384b28bf3baf3ba7a22eafe7530aae9aa1bced4c2025c33dc1566ba48db64224ae00537e9 SHA512 9c20cc2878832fb9fbe690fb0a2b9f960ea58480bb14c89d8e713d9847a27fad920ce4b507fb8b7b5ac211f4a0e1c775e3b985d57acd9191e87f45e01a86f85c
+DIST nextcloud-client-3.5.2.tar.gz 15433543 BLAKE2B 082031ac34a644f0db09679ef34237ee8fc9def88ff4659ad4a71e3ac611b3be3f9a0750deda25cd0ef34aca7e9d3c60fe7d3fc5a4d747eef46978e2fe84b742 SHA512 2892c277466869e3872a68049541c3d5afe94ca4dde1e97ea13ac615adedba198946763b5ff5dcb4694a9cec1946e35d1d6b6fd950d26b23cd6ddd94181f4b83
+DIST nextcloud-client-3.5.4.tar.gz 15436558 BLAKE2B e95aac753e4fcc70093ba497022572d4ee2988ed943e09247a0ddec3b039d658e3f1f498c24f5b5a92c15bd50b14c7e5c71f420c35e8de4894c2f65d06563766 SHA512 7b8afe19acad7f7ca96184b0f925e0eb324605a11bc468ef5662e5a879cada16483b9185e12336471ca2a9debf2e00671d8245bdbae2f7be01af756b57225bae
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
deleted file mode 100644
index a3ac5480811..00000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
- >=dev-libs/openssl-1.1.0:0=
- dev-libs/qtkeychain:=[qt5(+)]
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtquickcontrols2:5
- dev-qt/qtsvg:5
- dev-qt/qtwebsockets:5
- dev-qt/qtwidgets:5
- sys-libs/zlib
- dolphin? (
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kio:5
- )
- nautilus? ( dev-python/nautilus-python )
- webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qtconcurrent:5
- dev-qt/qtxml:5
- gnome-base/librsvg
- doc? (
- dev-python/sphinx
- dev-tex/latexmk
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- dolphin? ( kde-frameworks/extra-cmake-modules )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
- # We do not package libcloudproviders
- sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
-
- # Keep tests in ${T}
- sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DBUILD_UPDATER=OFF
- $(cmake_use_find_package doc Sphinx)
- $(cmake_use_find_package doc PdfLatex)
- $(cmake_use_find_package webengine Qt5WebEngine)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
- -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use doc ; then
- elog "Documentation and man pages not installed"
- elog "Enable doc USE-flag to generate them"
- fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
index f73bb52faae..d44483e6593 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
@@ -8,6 +8,7 @@ inherit cmake virtualx xdg
DESCRIPTION="Desktop Syncing Client for Nextcloud"
HOMEPAGE="https://github.com/nextcloud/desktop"
SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/desktop-${PV/_/-}"
LICENSE="CC-BY-3.0 GPL-2"
SLOT="0"
@@ -15,7 +16,8 @@ KEYWORDS="amd64 ~arm64 x86"
IUSE="doc dolphin nautilus test webengine"
RESTRICT="!test? ( test )"
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+RDEPEND="
+ >=dev-db/sqlite-3.34:3
>=dev-libs/openssl-1.1.0:0=
dev-libs/qtkeychain:=[qt5(+)]
dev-qt/qtcore:5
@@ -33,28 +35,27 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3
kde-frameworks/kio:5
)
nautilus? ( dev-python/nautilus-python )
- webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
+ webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
dev-qt/qtxml:5
- gnome-base/librsvg
+ || ( gnome-base/librsvg media-gfx/inkscape )
doc? (
dev-python/sphinx
dev-tex/latexmk
dev-texlive/texlive-latexextra
virtual/latex-base
)
- dolphin? ( kde-frameworks/extra-cmake-modules )
test? (
- dev-util/cmocka
dev-qt/qttest:5
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
+ dev-util/cmocka
+ )
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ dolphin? ( kde-frameworks/extra-cmake-modules )
+"
src_prepare() {
# We do not package libcloudproviders
@@ -86,6 +87,14 @@ src_test() {
virtx cmake_src_test
}
+src_compile() {
+ local compile_targets=(all)
+ if use doc; then
+ compile_targets+=(doc doc-man)
+ fi
+ cmake_src_compile ${compile_targets[@]}
+}
+
pkg_postinst() {
xdg_pkg_postinst
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild
index df8b692a88c..5599ebda4bf 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild
@@ -8,6 +8,7 @@ inherit cmake virtualx xdg
DESCRIPTION="Desktop Syncing Client for Nextcloud"
HOMEPAGE="https://github.com/nextcloud/desktop"
SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/desktop-${PV/_/-}"
LICENSE="CC-BY-3.0 GPL-2"
SLOT="0"
@@ -15,7 +16,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc dolphin nautilus test webengine"
RESTRICT="!test? ( test )"
-COMMON_DEPEND="
+RDEPEND="
>=dev-db/sqlite-3.34:3
>=dev-libs/openssl-1.1.0:0=
dev-libs/qtkeychain:=[qt5(+)]
@@ -36,27 +37,25 @@ COMMON_DEPEND="
nautilus? ( dev-python/nautilus-python )
webengine? ( dev-qt/qtwebengine:5[widgets] )
"
-DEPEND="
- ${COMMON_DEPEND}
- dev-qt/linguist-tools:5
+DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
dev-qt/qtxml:5
- gnome-base/librsvg
+ || ( gnome-base/librsvg media-gfx/inkscape )
doc? (
dev-python/sphinx
dev-tex/latexmk
dev-texlive/texlive-latexextra
virtual/latex-base
)
- dolphin? ( kde-frameworks/extra-cmake-modules )
test? (
- dev-util/cmocka
dev-qt/qttest:5
+ dev-util/cmocka
)
"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ dolphin? ( kde-frameworks/extra-cmake-modules )
+"
src_prepare() {
# We do not package libcloudproviders
diff --git a/net-misc/ntp/files/ntpd.rc-r2 b/net-misc/ntp/files/ntpd.rc-r2
new file mode 100644
index 00000000000..f4608f78461
--- /dev/null
+++ b/net-misc/ntp/files/ntpd.rc-r2
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="${NTPD_OPTS}"
+command_args_background="-p ${pidfile}"
+command_args_foreground="-n"
+
+depend() {
+ use net dns logger
+ after ntp-client
+}
+
+start_pre() {
+ if [ ! -f /etc/ntp.conf ] ; then
+ eerror "Please create /etc/ntp.conf"
+ return 1
+ fi
+ return 0
+}
diff --git a/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild
new file mode 100644
index 00000000000..7e0c42fe368
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+ https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+ >=dev-libs/libevent-2.0.9:=[threads?]
+ kernel_linux? ( caps? ( sys-libs/libcap ) )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+ snmp? ( net-analyzer/net-snmp )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ parse-clocks? ( net-misc/pps-tools )"
+BDEPEND="virtual/pkgconfig
+ acct-group/ntp
+ acct-user/ntp"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/ntp
+ acct-user/ntp
+ selinux? ( sec-policy/selinux-ntp )
+ vim-syntax? ( app-vim/ntp-syntax )
+ !net-misc/ntpsec
+ !openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+ "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+ "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
+ "${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409
+ "${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch
+)
+
+src_prepare() {
+ default
+ append-cppflags -D_GNU_SOURCE #264109
+ # Make sure every build uses the same install layout. #539092
+ find sntp/loc/ -type f '!' -name legacy -delete || die
+ eautoreconf #622754
+ # Disable pointless checks.
+ touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+ # avoid libmd5/libelf
+ export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+ export ac_cv_lib_elf_nlist=no
+ # blah, no real configure options #176333
+ export ac_cv_header_dns_sd_h=$(usex zeroconf)
+ export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+ local myeconfargs=(
+ --with-lineeditlibs=readline,edit,editline
+ --with-yielding-select
+ --disable-local-libevent
+ # Increase the default memlimit from 32MiB to 128MiB. #533232
+ --with-memlock=256
+ $(use_enable caps linuxcaps)
+ $(use_enable parse-clocks)
+ $(use_enable ipv6)
+ $(use_enable debug debugging)
+ $(use_with readline lineeditlibs readline)
+ $(use_enable samba ntp-signd)
+ $(use_with snmp ntpsnmpd)
+ $(use_with ssl crypto)
+ $(use_enable threads thread-support)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ # move ntpd/ntpdate to sbin #66671
+ dodir /usr/sbin
+ mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+ dodoc INSTALL WHERE-TO-START
+ doman "${WORKDIR}"/man/*.[58]
+
+ insinto /etc
+ doins "${FILESDIR}"/ntp.conf
+ use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+ newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd
+ newconfd "${FILESDIR}"/ntpd.confd ntpd
+ newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+ newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+ newinitd "${FILESDIR}"/sntp.rc sntp
+ newconfd "${FILESDIR}"/sntp.confd sntp
+ if ! use caps ; then
+ sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+ fi
+ sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+ keepdir /var/lib/ntp
+ use prefix || fowners ntp:ntp /var/lib/ntp
+
+ if use openntpd ; then
+ cd "${ED}" || die
+ rm usr/sbin/ntpd || die
+ rm -r var/lib || die
+ rm etc/{conf,init}.d/ntpd || die
+ rm usr/share/man/*/ntpd.8 || die
+ else
+ systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+ if use caps ; then
+ sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+ "${D}$(systemd_get_systemunitdir)"/ntpd.service \
+ || die
+ fi
+ systemd_enable_ntpunit 60-ntpd ntpd.service
+ fi
+
+ systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+ systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+ systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+ systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+ if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+ eerror "The notrust option was found in your /etc/ntp.conf!"
+ ewarn "If your ntpd starts sending out weird responses,"
+ ewarn "then make sure you have keys properly setup and see"
+ ewarn "https://bugs.gentoo.org/41827"
+ fi
+}
diff --git a/net-misc/ntpsec/files/ntpd.rc-r3 b/net-misc/ntpsec/files/ntpd.rc-r3
new file mode 100644
index 00000000000..68d07237455
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpd.rc-r3
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="ntpd - the network time protocol daemon"
+pidfile="/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="${NTPD_OPTS}"
+command_args_background="-p ${pidfile}"
+command_args_foreground="-n"
+
+depend() {
+ use net dns logger
+ after ntp-client
+}
+
+start_pre() {
+ if [ ! -f /etc/ntp.conf ] ; then
+ eerror "Please create /etc/ntp.conf"
+ return 1
+ fi
+ return 0
+}
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch
new file mode 100644
index 00000000000..5b7a4e51374
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch
@@ -0,0 +1,34 @@
+https://gitlab.com/NTPsec/ntpsec/-/commit/a49d53b7fe1d
+https://bugs.gentoo.org/851531
+
+From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
+Date: Sat, 11 Jun 2022 15:16:15 +0200
+Subject: [PATCH] ntpd/ntp_sandbox.c: allow readv() for glibc nscd
+ getaddrinfo() provider
+
+Otherwise, ntpd crashes from time to time with the following stack trace:
+#0 0x00007f5763bfac4d in readv () from /lib64/libc.so.6
+#1 0x00007f5763c48b4c in __readvall () from /lib64/libc.so.6
+#2 0x00007f5763c467ed in nscd_gethst_r () from /lib64/libc.so.6
+#3 0x00007f5763c46c0d in __nscd_gethostbyname2_r () from /lib64/libc.so.6
+#4 0x00007f5763c15a2a in gethostbyname2_r () from /lib64/libc.so.6
+#5 0x00007f5763bed3ca in gaih_inet.constprop () from /lib64/libc.so.6
+#6 0x00007f5763bee225 in getaddrinfo () from /lib64/libc.so.6
+#7 0x000055fcf0ad6544 in open_TCP_socket ()
+#8 0x000055fcf0ad79b4 in nts_probe ()
+#9 0x000055fcf0ac37c4 in dns_lookup ()
+#10 0x00007f5763b8205a in start_thread () from /lib64/libc.so.6
+#11 0x00007f5763c05d1c in clone3 () from /lib64/libc.so.6
+
+Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
+--- a/ntpd/ntp_sandbox.c
++++ b/ntpd/ntp_sandbox.c
+@@ -357,6 +357,7 @@ int scmp_sc[] = {
+ SCMP_SYS(poll),
+ SCMP_SYS(pselect6),
+ SCMP_SYS(read),
++ SCMP_SYS(readv), /* nscd getaddrinfo() provider */
+ SCMP_SYS(recvfrom), /* Comment this out for testing.
+ * It will die on the first reply.
+ * (Or maybe sooner if a request arrives.)
+GitLab
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
index 69d38d6263b..93bcb0332fa 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
else
SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 ~riscv ~x86"
fi
DESCRIPTION="The NTP reference implementation, refactored"
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild
new file mode 100644
index 00000000000..c6da1c0300f
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+ SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+ oncore trimble truetime gpsd jjy generic spectracom
+ shm pps hpgps zyfer arbiter nmea modem local
+)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+DEPEND="${PYTHON_DEPS}
+ dev-libs/openssl:=
+ dev-python/psutil[${PYTHON_USEDEP}]
+ sys-libs/libcap
+ libbsd? ( dev-libs/libbsd:0= )
+ seccomp? ( sys-libs/libseccomp )
+ rclock_oncore? ( net-misc/pps-tools )
+ rclock_pps? ( net-misc/pps-tools )"
+RDEPEND="${DEPEND}
+ !net-misc/ntp
+ !net-misc/openntpd
+ acct-group/ntp
+ acct-user/ntp
+ ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
+BDEPEND=">=app-text/asciidoc-8.6.8
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ sys-devel/bison"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+ "${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
+ "${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
+ "${FILESDIR}/${PN}-1.2.1-build-notests.patch"
+ "${FILESDIR}/${PN}-py3-test-clarify.patch"
+)
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+ default
+
+ # Remove autostripping of binaries
+ sed -i -e '/Strip binaries/d' wscript || die
+ if ! use libbsd ; then
+ eapply "${FILESDIR}/${PN}-no-bsd.patch"
+ fi
+ # remove extra default pool servers
+ sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
+ python_copy_sources
+}
+
+src_configure() {
+ is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+ local string_127=""
+ local rclocks="";
+ local CLOCKSTRING=""
+
+ for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+ if use rclock_${refclock} ; then
+ string_127+="$refclock,"
+ fi
+ done
+ CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+ local myconf=(
+ --notests
+ --nopyc
+ --nopyo
+ --enable-pylib ext
+ --refclock="${CLOCKSTRING}"
+ #--build-epoch="$(date +%s)"
+ $(use doc || echo "--disable-doc")
+ $(use early && echo "--enable-early-droproot")
+ $(use gdb && echo "--enable-debug-gdb")
+ $(use samba && echo "--enable-mssntp")
+ $(use seccomp && echo "--enable-seccomp")
+ $(use smear && echo "--enable-leap-smear")
+ $(use debug && echo "--enable-debug")
+ )
+
+ python_configure() {
+ waf-utils_src_configure "${myconf[@]}"
+ }
+ python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+ unset MAKEOPTS
+ python_compile() {
+ waf-utils_src_compile --notests
+ }
+ python_foreach_impl run_in_build_dir python_compile
+}
+
+src_test() {
+ python_compile() {
+ waf-utils_src_compile check
+ }
+ python_foreach_impl run_in_build_dir python_compile
+}
+
+python_test() {
+ # Silence QA warning as we're running tests via src_test anyway.
+ :;
+}
+
+src_install() {
+ python_install() {
+ waf-utils_src_install --notests
+ python_fix_shebang "${ED}"
+ }
+ python_foreach_impl run_in_build_dir python_install
+ python_foreach_impl python_optimize
+
+ # Install heat generating scripts
+ use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+ # Install the openrc files
+ newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
+ newconfd "${FILESDIR}"/ntpd.confd ntp
+
+ # Install the systemd unit file
+ systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+ # Prepare a directory for the ntp.drift file
+ mkdir -pv "${ED}"/var/lib/ntp
+ chown ntp:ntp "${ED}"/var/lib/ntp
+ chmod 770 "${ED}"/var/lib/ntp
+ keepdir /var/lib/ntp
+
+ # Install a log rotate script
+ mkdir -pv "${ED}"/etc/logrotate.d
+ cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+ # Install the configuration file and sample configuration
+ cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+ cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+ # move doc files to /usr/share/doc/"${P}"
+ use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+ einfo "If you want to serve time on your local network, then"
+ einfo "you should disable all the ref_clocks unless you have"
+ einfo "one and can get stable time from it. Feel free to try"
+ einfo "it but PPS probably won't work unless you have a UART"
+ einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild
new file mode 100644
index 00000000000..faba59c221e
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+ SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+ oncore trimble truetime gpsd jjy generic spectracom
+ shm pps hpgps zyfer arbiter nmea modem local
+)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+DEPEND="${PYTHON_DEPS}
+ dev-libs/openssl:=
+ dev-python/psutil[${PYTHON_USEDEP}]
+ sys-libs/libcap
+ libbsd? ( dev-libs/libbsd:0= )
+ seccomp? ( sys-libs/libseccomp )
+ rclock_oncore? ( net-misc/pps-tools )
+ rclock_pps? ( net-misc/pps-tools )"
+RDEPEND="${DEPEND}
+ !net-misc/ntp
+ !net-misc/openntpd
+ acct-group/ntp
+ acct-user/ntp
+ ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
+BDEPEND=">=app-text/asciidoc-8.6.8
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ sys-devel/bison"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+ "${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
+ "${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
+ "${FILESDIR}/${PN}-1.2.1-build-notests.patch"
+ "${FILESDIR}/${PN}-py3-test-clarify.patch"
+ "${FILESDIR}/${PN}-1.2.1-seccomp-nsd.patch"
+)
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+ default
+
+ # Remove autostripping of binaries
+ sed -i -e '/Strip binaries/d' wscript || die
+ if ! use libbsd ; then
+ eapply "${FILESDIR}/${PN}-no-bsd.patch"
+ fi
+ # remove extra default pool servers
+ sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
+ python_copy_sources
+}
+
+src_configure() {
+ is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+ local string_127=""
+ local rclocks="";
+ local CLOCKSTRING=""
+
+ for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+ if use rclock_${refclock} ; then
+ string_127+="$refclock,"
+ fi
+ done
+ CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+ local myconf=(
+ --notests
+ --nopyc
+ --nopyo
+ --enable-pylib ext
+ --refclock="${CLOCKSTRING}"
+ #--build-epoch="$(date +%s)"
+ $(use doc || echo "--disable-doc")
+ $(use early && echo "--enable-early-droproot")
+ $(use gdb && echo "--enable-debug-gdb")
+ $(use samba && echo "--enable-mssntp")
+ $(use seccomp && echo "--enable-seccomp")
+ $(use smear && echo "--enable-leap-smear")
+ $(use debug && echo "--enable-debug")
+ )
+
+ python_configure() {
+ waf-utils_src_configure "${myconf[@]}"
+ }
+ python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+ unset MAKEOPTS
+ python_compile() {
+ waf-utils_src_compile --notests
+ }
+ python_foreach_impl run_in_build_dir python_compile
+}
+
+src_test() {
+ python_compile() {
+ waf-utils_src_compile check
+ }
+ python_foreach_impl run_in_build_dir python_compile
+}
+
+python_test() {
+ # Silence QA warning as we're running tests via src_test anyway.
+ :;
+}
+
+src_install() {
+ python_install() {
+ waf-utils_src_install --notests
+ python_fix_shebang "${ED}"
+ }
+ python_foreach_impl run_in_build_dir python_install
+ python_foreach_impl python_optimize
+
+ # Install heat generating scripts
+ use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+ # Install the openrc files
+ newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
+ newconfd "${FILESDIR}"/ntpd.confd ntp
+
+ # Install the systemd unit file
+ systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+ # Prepare a directory for the ntp.drift file
+ mkdir -pv "${ED}"/var/lib/ntp
+ chown ntp:ntp "${ED}"/var/lib/ntp
+ chmod 770 "${ED}"/var/lib/ntp
+ keepdir /var/lib/ntp
+
+ # Install a log rotate script
+ mkdir -pv "${ED}"/etc/logrotate.d
+ cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+ # Install the configuration file and sample configuration
+ cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+ cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+ # move doc files to /usr/share/doc/"${P}"
+ use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+ einfo "If you want to serve time on your local network, then"
+ einfo "you should disable all the ref_clocks unless you have"
+ einfo "one and can get stable time from it. Feel free to try"
+ einfo "it but PPS probably won't work unless you have a UART"
+ einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
new file mode 100644
index 00000000000..b163db94a45
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+ SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
+ KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+ oncore trimble truetime gpsd jjy generic spectracom
+ shm pps hpgps zyfer arbiter nmea modem local
+)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+DEPEND="${PYTHON_DEPS}
+ dev-libs/openssl:=
+ dev-python/psutil[${PYTHON_USEDEP}]
+ sys-libs/libcap
+ libbsd? ( dev-libs/libbsd:0= )
+ seccomp? ( sys-libs/libseccomp )
+ rclock_oncore? ( net-misc/pps-tools )
+ rclock_pps? ( net-misc/pps-tools )"
+RDEPEND="${DEPEND}
+ !net-misc/ntp
+ !net-misc/openntpd
+ acct-group/ntp
+ acct-user/ntp
+ ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
+BDEPEND=">=app-text/asciidoc-8.6.8
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ sys-devel/bison"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+ "${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
+ "${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
+ "${FILESDIR}/${PN}-1.2.1-build-notests.patch"
+ "${FILESDIR}/${PN}-py3-test-clarify.patch"
+ "${FILESDIR}/${PN}-1.2.1-seccomp-nsd.patch"
+)
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+ default
+
+ # Remove autostripping of binaries
+ sed -i -e '/Strip binaries/d' wscript || die
+ if ! use libbsd ; then
+ eapply "${FILESDIR}/${PN}-no-bsd.patch"
+ fi
+ # remove extra default pool servers
+ sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
+ python_copy_sources
+}
+
+src_configure() {
+ is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+ local string_127=""
+ local rclocks="";
+ local CLOCKSTRING=""
+
+ for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+ if use rclock_${refclock} ; then
+ string_127+="$refclock,"
+ fi
+ done
+ CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+ myconf=(
+ --notests
+ --nopyc
+ --nopyo
+ --enable-pylib ext
+ --refclock="${CLOCKSTRING}"
+ #--build-epoch="$(date +%s)"
+ $(use doc || echo "--disable-doc")
+ $(use early && echo "--enable-early-droproot")
+ $(use gdb && echo "--enable-debug-gdb")
+ $(use samba && echo "--enable-mssntp")
+ $(use seccomp && echo "--enable-seccomp")
+ $(use smear && echo "--enable-leap-smear")
+ $(use debug && echo "--enable-debug")
+ )
+
+ distutils-r1_src_configure
+}
+
+python_configure() {
+ waf-utils_src_configure "${myconf[@]}"
+}
+
+python_compile() {
+ unset MAKEOPTS
+ waf-utils_src_compile --notests
+}
+
+python_test() {
+ waf-utils_src_compile check
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ # Install heat generating scripts
+ use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+ # Install the openrc files
+ newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
+ newconfd "${FILESDIR}"/ntpd.confd ntp
+
+ # Install the systemd unit file
+ systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+ # Prepare a directory for the ntp.drift file
+ mkdir -pv "${ED}"/var/lib/ntp
+ chown ntp:ntp "${ED}"/var/lib/ntp
+ chmod 770 "${ED}"/var/lib/ntp
+ keepdir /var/lib/ntp
+
+ # Install a log rotate script
+ mkdir -pv "${ED}"/etc/logrotate.d
+ cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+ # Install the configuration file and sample configuration
+ cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+ cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+ # move doc files to /usr/share/doc/"${P}"
+ use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+python_install() {
+ waf-utils_src_install --notests
+ python_fix_shebang "${ED}"
+ python_optimize
+}
+
+pkg_postinst() {
+ einfo "If you want to serve time on your local network, then"
+ einfo "you should disable all the ref_clocks unless you have"
+ einfo "one and can get stable time from it. Feel free to try"
+ einfo "it but PPS probably won't work unless you have a UART"
+ einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 4d49e9065f2..c5b75b26451 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -54,7 +54,6 @@ BDEPEND=">=app-text/asciidoc-8.6.8
PATCHES=(
"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
- "${FILESDIR}/${PN}-py3-test-clarify.patch"
)
WAF_BINARY="${S}/waf"
@@ -87,7 +86,7 @@ src_configure() {
done
CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
- local myconf=(
+ myconf=(
--notests
--nopyc
--nopyo
@@ -103,45 +102,30 @@ src_configure() {
$(use debug && echo "--enable-debug")
)
- python_configure() {
- waf-utils_src_configure "${myconf[@]}"
- }
- python_foreach_impl run_in_build_dir python_configure
+ distutils-r1_src_configure
}
-src_compile() {
- unset MAKEOPTS
- python_compile() {
- waf-utils_src_compile --notests
- }
- python_foreach_impl run_in_build_dir python_compile
+python_configure() {
+ waf-utils_src_configure "${myconf[@]}"
}
-src_test() {
- python_compile() {
- waf-utils_src_compile check
- }
- python_foreach_impl run_in_build_dir python_compile
+python_compile() {
+ unset MAKEOPTS
+ waf-utils_src_compile --notests
}
python_test() {
- # Silence QA warning as we're running tests via src_test anyway.
- :;
+ waf-utils_src_compile check
}
src_install() {
- python_install() {
- waf-utils_src_install --notests
- python_fix_shebang "${ED}"
- }
- python_foreach_impl run_in_build_dir python_install
- python_foreach_impl python_optimize
+ distutils-r1_src_install
# Install heat generating scripts
use heat && dosbin "${S}"/contrib/ntpheat{,usb}
# Install the openrc files
- newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+ newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
newconfd "${FILESDIR}"/ntpd.confd ntp
# Install the systemd unit file
@@ -165,6 +149,12 @@ src_install() {
use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
}
+python_install() {
+ waf-utils_src_install --notests
+ python_fix_shebang "${ED}"
+ python_optimize
+}
+
pkg_postinst() {
einfo "If you want to serve time on your local network, then"
einfo "you should disable all the ref_clocks unless you have"
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 19d96f9eb2f..3b61e20a7a2 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1 +1,2 @@
DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55 SHA512 6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb
+DIST oidc-agent-4.3.1.tar.gz 2124200 BLAKE2B 4108f50688fd0d2043105972a7a7fbab58a74b6a36e0d0a739be5b42a29c3b6bedb29b2273038d49b77fc3245a51f8cf998a12fee5e39096dd5e35ec72660b05 SHA512 3b598f760b1932a07bb243ce7c978a99c209ffbe5594cbb9e084c430c11c089ff0f7be113f73b165bd5f6b382d0ab30dd230c4c9fab6e210a327af20715e6d60
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch
new file mode 100644
index 00000000000..94019132234
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch
@@ -0,0 +1,59 @@
+--- a/Makefile
++++ b/Makefile
+@@ -644,19 +644,19 @@
+
+ ## Man pages
+ $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+
+ endif
+
+@@ -673,16 +673,16 @@
+ @ln -sf $(SHARED_LIB_NAME_SO) $@
+
+ $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+- @install $< $@
++ @install -m 644 $< $@
+
+ endif
+
+@@ -690,7 +690,7 @@
+
+ ## scheme handler
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
+- @install -D $< $@
++ @install -m 644 -D $< $@
+ @echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@
+
+ ## Xsession
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch
new file mode 100644
index 00000000000..ac9ec72c84c
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -80,7 +80,7 @@
+
+ # USE_CJSON_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i libcjson >/dev/null && echo 1 || echo 0)
+ USE_CJSON_SO ?= 0
+-USE_LIST_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i liblist >/dev/null && echo 1 || echo 0)
++USE_LIST_SO ?= 0
+ USE_ARGP_SO ?= 0
+
+ ifeq ($(USE_CJSON_SO),1)
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch
new file mode 100644
index 00000000000..cd1b99ee72b
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -154,7 +154,7 @@
+ LINKER := $(CC)
+ LINKER_XX := $(CXX)
+ ifndef ANY_MSYS
+-PROMPT_LFLAGS = $(CPPFLAGS) $(LSODIUM)
++PROMPT_LFLAGS := $(CPPFLAGS) $(LDFLAGS) $(LSODIUM)
+ endif
+ ifdef MAC_OS
+ LFLAGS = $(LSODIUM) $(LARGP)
diff --git a/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
new file mode 100644
index 00000000000..017cd56ec18
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+ dev-libs/libsodium:=
+ media-gfx/qrencode
+ net-libs/libmicrohttpd:=
+ net-libs/webkit-gtk:4=
+ sys-libs/libseccomp
+ elibc_musl? ( sys-libs/argp-standalone )"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.1_install-perms.patch
+ "${FILESDIR}"/${PN}-4.3.1_liblist-automagic.patch
+ "${FILESDIR}"/${PN}-4.3.1_prompt-user-ldflags.patch
+)
+
+src_prepare() {
+ xdg_environment_reset
+ default
+ sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+src_compile() {
+ use elibc_musl && local -x USE_ARGP_SO=1
+ emake
+}
+
+src_install() {
+ emake \
+ PREFIX="${ED}" \
+ BIN_AFTER_INST_PATH="/usr" \
+ INCLUDE_PATH="${ED}"/usr/include \
+ LIB_PATH="${ED}"/usr/$(get_libdir) \
+ install
+
+ # This file is not compatible with Gentoo and in any case, we generally
+ # let the users load such agents themselves.
+ rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog
+ elog "You should use oidc-gen to initially generate your account configuration"
+ elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
+ elog "consult the man page of oidc-gen, or full documentation at"
+ elog " https://indigo-dc.gitbooks.io/oidc-agent/"
+ elog
+ else
+ local new_major_ver old_ver
+ new_major_ver=$(ver_cut 1)
+ for old_ver in ${REPLACING_VERSIONS}; do
+ if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+ ewarn
+ ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+ ewarn "to make sure they are compatible with the updated clients."
+ ewarn
+ break
+ fi
+ done
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 875a1e7dc30..55791e76cfe 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1 +1,2 @@
DIST omniORB-4.2.4.tar.bz2 2713397 BLAKE2B 5759b2563dca421b9a994bb13c30ce6dd98324a2357c4908130a42ce5baec357b881c22b4dff27809607ebde27e7cd65305a91aa5cbdb6d68a19df1f36524e72 SHA512 0b142b127175f16f844823e5adf5593b290528646e13a4c30f6cbd92d159d3998a81b952717039c3f0e386f79404ddd18a3de35fc45fa88383d1d9e51064d988
+DIST omniORB-4.3.0.tar.bz2 2762061 BLAKE2B f9103080011a7e683b7e63f6553e8a60947820a331d7c4e3559c961a7f36b17e235c5808e7b282d0227343e6e794106b9f2b93bf138b1a919716d1338e1c9cc2 SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
index fb1b00f7428..2178b72656c 100644
--- a/net-misc/omniORB/metadata.xml
+++ b/net-misc/omniORB/metadata.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!--maintainer-needed-->
- <upstream>
- <remote-id type="sourceforge">omniorb</remote-id>
- </upstream>
+ <maintainer type="person" proxied="yes">
+ <email>aliens.satin0y@icloud.com</email>
+ <name>Thomas Juerges</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">omniorb</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/omniORB/omniORB-4.3.0.ebuild b/net-misc/omniORB/omniORB-4.3.0.ebuild
new file mode 100644
index 00000000000..318a73b9dc0
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.3.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-single-r1
+
+MY_P="${P/_p/-}"
+DESCRIPTION="A robust, high-performance CORBA 2 ORB"
+HOMEPAGE="http://omniorb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE="doc ipv6 ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ # The OPTC(XX)FLAGS variables aren't present in these files, but we
+ # will set them when we call emake.
+ sed \
+ -e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
+ -e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
+ -i mk/beforeauto.mk.in mk/unix.mk || \
+ die "failed to switch CFLAGS variables in the makefile includes"
+
+ # The out-of-source build is suggested by upstream.
+ mkdir build || die "failed to create build directory"
+}
+
+src_configure() {
+ cd build || die "failed to change into the build directory"
+
+ ECONF_SOURCE=".." econf \
+ --disable-static \
+ --with-omniORB-config=/etc/omniorb/omniORB.cfg \
+ --with-omniNames-logdir=/var/log/omniORB \
+ --libdir="/usr/$(get_libdir)" \
+ $(use_enable ipv6) \
+ $(use_with ssl openssl "/usr")
+}
+
+src_compile() {
+ cd build || die "failed to change into the build directory"
+ emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+ cd build || die "failed to change into the build directory"
+ default
+
+ rm "${ED}/usr/bin/omniidlrun.py" || \
+ die "failed to remove redundant omniidlrun.py"
+
+ cd "${S}" || die "failed to change into the ${S} directory"
+
+ dodoc CREDITS doc/*.html ReleaseNotes.txt update.log
+ dodoc -r doc/omniORB
+
+ if use doc; then
+ dodoc doc/*.pdf
+ fi
+
+ cat <<- EOF > "${T}/90omniORB"
+ PATH="/usr/share/omniORB/bin/scripts"
+ OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
+ EOF
+ doenvd "${T}/90omniORB"
+ doinitd "${FILESDIR}"/omniNames
+
+ cp "sample.cfg" "${T}/omniORB.cfg" || die
+ cat <<- EOF >> "${T}/omniORB.cfg"
+ # resolve the omniNames running on localhost
+ InitRef = NameService=corbaname::localhost
+ EOF
+ insinto /etc/omniorb
+ doins "${T}"/omniORB.cfg
+
+ keepdir /var/log/omniORB
+
+ python_optimize
+ python_fix_shebang "${ED}"/usr/bin/omniidl
+}
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 75ed1f5d2f6..4ce09235179 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -18,4 +18,7 @@
<use>
<flag name="constraints">Enable HTTPS TLS time constraint support</flag>
</use>
+ <upstream>
+ <remote-id type="github">openntpd-portable/openntpd-portable</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 029c76bb16d..2992675630d 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -6,6 +6,7 @@ DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a
DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
DIST openssh-9.0p1+x509-13.3.2.diff.gz 1128591 BLAKE2B fb560e2f1803ceb946a1ba8bd53a1f9fd262896b820c23d4b0015218433d2200f1fd9df5b1889a670261f13936d8153da1ab4beb2a5d52ede78168189c522bf3 SHA512 e643168d7098c44f85a9bac9894a936a3480ec843162197ce56e016dd4f634ef182dcfae1f7e18408f6a18832e0a95d2d249a23fdbc3dc46df76989ca0a0c7fc
+DIST openssh-9.0p1+x509-13.4.1.diff.gz 1146757 BLAKE2B 070d6bc23179a581e4fe79412274f11399009ba69ad643cc354ec9cd6392ffb0a651fd2d7f310c52c60a9c626140b9c823e2f19c600f15ac9cdf992707274bcb SHA512 4aaa86c1a785741b28c5e2738cf6de6fa7965ac8692165a8b18fe7677aeb0996979f23b45306781e6be75d34fb39294659be5ae016ab4a82ef2a73bedcc6e8e7
DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd1570c6cc48d1e28ef7261344918905e94a548d3a3acb6feb1c6ef13f0c6cacf2b845163cad2b96ab20cb9fc58a49aeb699c1 SHA512 d6aa5f32464d5f3e2e63e9ba82108f33bdaa890e2adf2ccc47ce0d672979fc67510d9dd7561b17eaba0c2f11a8eb565029b0ebff3b2d050e9e04e6143aedb8a3
DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9
DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f
diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch
new file mode 100644
index 00000000000..dc93182e1d4
--- /dev/null
+++ b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch
@@ -0,0 +1,54 @@
+diff -ur '--exclude=.*.un~' a/openssh-9.0p1+x509-13.4.1.diff b/openssh-9.0p1+x509-13.4.1.diff
+--- a/openssh-9.0p1+x509-13.4.1.diff 2022-06-23 10:43:33.957093896 -0700
++++ b/openssh-9.0p1+x509-13.4.1.diff 2022-06-23 10:44:17.232396805 -0700
+@@ -48941,8 +48941,8 @@
+ gss_create_empty_oid_set(&status, &oidset);
+ gss_add_oid_set_member(&status, ctx->oid, &oidset);
+
+-- if (gethostname(lname, MAXHOSTNAMELEN)) {
+-+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) {
++- if (gethostname(lname, HOST_NAME_MAX)) {
+++ if (gethostname(lname, HOST_NAME_MAX) == -1) {
+ gss_release_oid_set(&status, &oidset);
+ return (-1);
+ }
+@@ -57102,12 +57102,11 @@
+
+ install-files:
+ $(MKDIR_P) $(DESTDIR)$(bindir)
+-@@ -395,6 +372,8 @@
++@@ -395,6 +372,7 @@
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+ $(MKDIR_P) $(DESTDIR)$(libexecdir)
+ + $(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+ $(MKDIR_P) $(DESTDIR)$(piddir)
+ $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+ $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+ $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
+@@ -78638,7 +78637,7 @@
+ +if test "$sshd_type" = "pkix" ; then
+ + unset_arg=''
+ +else
+-+ unset_arg=none
+++ unset_arg=''
+ +fi
+ +
+ cat > $OBJ/sshd_config.i << _EOF
+@@ -143777,16 +143776,6 @@
+ +int asnmprintf(char **, size_t, int *, const char *, ...)
+ __attribute__((format(printf, 4, 5)));
+ void msetlocale(void);
+-diff -ruN openssh-9.0p1/version.h openssh-9.0p1+x509-13.4.1/version.h
+---- openssh-9.0p1/version.h 2022-04-06 03:47:48.000000000 +0300
+-+++ openssh-9.0p1+x509-13.4.1/version.h 2022-06-23 09:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+-
+- #define SSH_VERSION "OpenSSH_9.0"
+-
+--#define SSH_PORTABLE "p1"
+--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-9.0p1/version.m4 openssh-9.0p1+x509-13.4.1/version.m4
+ --- openssh-9.0p1/version.m4 1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-9.0p1+x509-13.4.1/version.m4 2022-06-23 09:07:00.000000000 +0300
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index f23eae1e122..699281fbc1f 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <longdescription>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <longdescription>
OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that
increasing numbers of people on the Internet are coming to rely on. Many users of telnet,
rlogin, ftp, and other such programs might not realize that their password is transmitted
@@ -18,19 +18,20 @@ The OpenSSH suite includes the ssh program which replaces rlogin and telnet, scp
replaces rcp, and sftp which replaces ftp. Also included is sshd which is the server side of
the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan,
ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0.
-</longdescription>
- <use>
- <flag name="scp">Enable scp command with known security problems. See bug 733802</flag>
- <flag name="hpn">Enable high performance ssh</flag>
- <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
- <flag name="livecd">Enable root password logins for live-cd environment.</flag>
- <flag name="security-key">Include builtin U2F/FIDO support</flag>
- <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
- <flag name="X509">Adds support for X.509 certificate authentication</flag>
- <flag name="xmss">Enable XMSS post-quantum authentication algorithm</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:openbsd:openssh</remote-id>
- <remote-id type="sourceforge">hpnssh</remote-id>
- </upstream>
+ </longdescription>
+ <use>
+ <flag name="scp">Enable scp command with known security problems. See bug 733802</flag>
+ <flag name="hpn">Enable high performance ssh</flag>
+ <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
+ <flag name="livecd">Enable root password logins for live-cd environment.</flag>
+ <flag name="security-key">Include builtin U2F/FIDO support</flag>
+ <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
+ <flag name="X509">Adds support for X.509 certificate authentication</flag>
+ <flag name="xmss">Enable XMSS post-quantum authentication algorithm</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:openbsd:openssh</remote-id>
+ <remote-id type="github">openssh/openssh-portable</remote-id>
+ <remote-id type="sourceforge">hpnssh</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/openssh/openssh-9.0_p1-r2.ebuild b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
new file mode 100644
index 00000000000..9402ad203dc
--- /dev/null
+++ b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.5_P1"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+ ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+ ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+ ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2"
+SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="13.4.1"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+ ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+ ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+ ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+ verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ hpn? ( ssl )
+ ldns? ( ssl )
+ pie? ( !static )
+ static? ( !kerberos !pam )
+ X509? ( !sctp ssl !xmss )
+ xmss? ( ssl )
+ test? ( ssl )
+"
+
+# tests currently fail with XMSS
+REQUIRED_USE+="test? ( !xmss )"
+
+LIB_DEPEND="
+ audit? ( sys-process/audit[static-libs(+)] )
+ ldns? (
+ net-libs/ldns[static-libs(+)]
+ net-libs/ldns[ecdsa(+),ssl(+)]
+ )
+ libedit? ( dev-libs/libedit:=[static-libs(+)] )
+ sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+ security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
+ selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+ ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
+ virtual/libcrypt:=[static-libs(+)]
+ >=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+ acct-group/sshd
+ acct-user/sshd
+ !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ pam? ( sys-libs/pam )
+ kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+ virtual/os-headers
+ kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+ static? ( ${LIB_DEPEND} )
+"
+RDEPEND="${RDEPEND}
+ pam? ( >=sys-auth/pambase-20081028 )
+ !prefix? ( sys-apps/shadow )
+ X? ( x11-apps/xauth )
+"
+BDEPEND="
+ virtual/pkgconfig
+ sys-devel/autoconf
+ verify-sig? ( sec-keys/openpgp-keys-openssh )
+"
+
+pkg_pretend() {
+ # this sucks, but i'd rather have people unable to `emerge -u openssh`
+ # than not be able to log in to their server any more
+ local missing=()
+ check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
+ check_feature hpn HPN_VER
+ check_feature sctp SCTP_PATCH
+ check_feature X509 X509_PATCH
+ if [[ ${#missing[@]} -ne 0 ]] ; then
+ eerror "Sorry, but this version does not yet support features"
+ eerror "that you requested: ${missing[*]}"
+ eerror "Please mask ${PF} for now and check back later:"
+ eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+ die "Missing requested third party patch."
+ fi
+
+ # Make sure people who are using tcp wrappers are notified of its removal. #531156
+ if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+ ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+ ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please."
+ fi
+}
+
+src_unpack() {
+ default
+
+ # We don't have signatures for HPN, X509, so we have to write this ourselves
+ use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
+}
+
+src_prepare() {
+ sed -i \
+ -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+ pathnames.h || die
+
+ # don't break .ssh/authorized_keys2 for fun
+ sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+ eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+ eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+ eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+ eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+ eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+ eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+ eapply "${FILESDIR}"/${PN}-8.9_p1-allow-ppoll_time64.patch #834019
+ eapply "${FILESDIR}"/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch #834044
+
+ [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+ local PATCHSET_VERSION_MACROS=()
+
+ if use X509 ; then
+ pushd "${WORKDIR}" &>/dev/null || die
+ eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
+ popd &>/dev/null || die
+
+ eapply "${WORKDIR}"/${X509_PATCH%.*}
+ eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch"
+
+ # We need to patch package version or any X.509 sshd will reject our ssh client
+ # with "userauth_pubkey: could not parse key: string is too large [preauth]"
+ # error
+ einfo "Patching package version for X.509 patch set ..."
+ sed -i \
+ -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+ "${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+ einfo "Patching version.h to expose X.509 patch set ..."
+ sed -i \
+ -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \
+ "${S}"/version.h || die "Failed to sed-in X.509 patch version"
+ PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+ fi
+
+ if use sctp ; then
+ eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+ einfo "Patching version.h to expose SCTP patch set ..."
+ sed -i \
+ -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \
+ "${S}"/version.h || die "Failed to sed-in SCTP patch version"
+ PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+ einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..."
+ sed -i \
+ -e "/\t\tcfgparse \\\/d" \
+ "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+ fi
+
+ if use hpn ; then
+ local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+ mkdir "${hpn_patchdir}" || die
+ cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+ pushd "${hpn_patchdir}" &>/dev/null || die
+ eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-glue.patch
+ use X509 && eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-X509-glue.patch
+ use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
+ popd &>/dev/null || die
+
+ eapply "${hpn_patchdir}"
+
+ use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
+
+ einfo "Patching Makefile.in for HPN patch set ..."
+ sed -i \
+ -e "/^LIBS=/ s/\$/ -lpthread/" \
+ "${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+ einfo "Patching version.h to expose HPN patch set ..."
+ sed -i \
+ -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \
+ "${S}"/version.h || die "Failed to sed-in HPN patch version"
+ PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+ if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+ einfo "Disabling known non-working MT AES cipher per default ..."
+
+ cat > "${T}"/disable_mtaes.conf <<- EOF
+
+ # HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+ # and therefore disabled per default.
+ DisableMTAES yes
+ EOF
+ sed -i \
+ -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+ "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+ sed -i \
+ -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+ "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+ fi
+ fi
+
+ if use X509 || use sctp || use hpn ; then
+ einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+ sed -i \
+ -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+ "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+ einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+ sed -i \
+ -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+ "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+ einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+ sed -i \
+ -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+ "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+ fi
+
+ sed -i \
+ -e "/#UseLogin no/d" \
+ "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+ eapply_user #473004
+
+ # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+ sed -e '/\t\tpercent \\/ d' \
+ -i regress/Makefile || die
+
+ tc-export PKG_CONFIG
+ local sed_args=(
+ -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+ # Disable PATH reset, trust what portage gives us #254615
+ -e 's:^PATH=/:#PATH=/:'
+ # Disable fortify flags ... our gcc does this for us
+ -e 's:-D_FORTIFY_SOURCE=2::'
+ )
+
+ # The -ftrapv flag ICEs on hppa #505182
+ use hppa && sed_args+=(
+ -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+ -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+ )
+ # _XOPEN_SOURCE causes header conflicts on Solaris
+ [[ ${CHOST} == *-solaris* ]] && sed_args+=(
+ -e 's/-D_XOPEN_SOURCE//'
+ )
+ sed -i "${sed_args[@]}" configure{.ac,} || die
+
+ eautoreconf
+}
+
+src_configure() {
+ addwrite /dev/ptmx
+
+ use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+ use static && append-ldflags -static
+ use xmss && append-cflags -DWITH_XMSS
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+ # doesn't check for this, so force the replacement to be put in
+ # place
+ append-cppflags -DBROKEN_GLOB
+ fi
+
+ # use replacement, RPF_ECHO_ON doesn't exist here
+ [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
+
+ local myconf=(
+ --with-ldflags="${LDFLAGS}"
+ --disable-strip
+ --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+ --sysconfdir="${EPREFIX}"/etc/ssh
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+ --datadir="${EPREFIX}"/usr/share/openssh
+ --with-privsep-path="${EPREFIX}"/var/empty
+ --with-privsep-user=sshd
+ $(use_with audit audit linux)
+ $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+ # We apply the sctp patch conditionally, so can't pass --without-sctp
+ # unconditionally else we get unknown flag warnings.
+ $(use sctp && use_with sctp)
+ $(use_with ldns)
+ $(use_with libedit)
+ $(use_with pam)
+ $(use_with pie)
+ $(use_with selinux)
+ $(usex X509 '' "$(use_with security-key security-key-builtin)")
+ $(use_with ssl openssl)
+ $(use_with ssl ssl-engine)
+ $(use_with !elibc_Cygwin hardening) #659210
+ )
+
+ if use elibc_musl; then
+ # musl defines bogus values for UTMP_FILE and WTMP_FILE
+ # https://bugs.gentoo.org/753230
+ myconf+=( --disable-utmp --disable-wtmp )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_test() {
+ local tests=( compat-tests )
+ local shell=$(egetshell "${UID}")
+ if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+ ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+ ewarn "user, so we will run a subset only."
+ tests+=( interop-tests )
+ else
+ tests+=( tests )
+ fi
+
+ local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
+ mkdir -p "${HOME}"/.ssh || die
+ emake -j1 "${tests[@]}" </dev/null
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+ local locale_vars=(
+ # These are language variables that POSIX defines.
+ # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+ LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+ # These are the GNU extensions.
+ # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+ LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+ )
+
+ # First the server config.
+ cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+ # Allow client to pass locale environment variables. #367017
+ AcceptEnv ${locale_vars[*]}
+
+ # Allow client to pass COLORTERM to match TERM. #658540
+ AcceptEnv COLORTERM
+ EOF
+
+ # Then the client config.
+ cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+ # Send locale environment variables. #367017
+ SendEnv ${locale_vars[*]}
+
+ # Send COLORTERM to match TERM. #658540
+ SendEnv COLORTERM
+ EOF
+
+ if use pam ; then
+ sed -i \
+ -e "/^#UsePAM /s:.*:UsePAM yes:" \
+ -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+ -e "/^#PrintMotd /s:.*:PrintMotd no:" \
+ -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+ "${ED}"/etc/ssh/sshd_config || die
+ fi
+
+ if use livecd ; then
+ sed -i \
+ -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+ "${ED}"/etc/ssh/sshd_config || die
+ fi
+}
+
+src_install() {
+ emake install-nokeys DESTDIR="${D}"
+ fperms 600 /etc/ssh/sshd_config
+ dobin contrib/ssh-copy-id
+ newinitd "${FILESDIR}"/sshd-r1.initd sshd
+ newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+ if use pam; then
+ newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+ fi
+
+ tweak_ssh_configs
+
+ doman contrib/ssh-copy-id.1
+ dodoc CREDITS OVERVIEW README* TODO sshd_config
+ use hpn && dodoc HPN-README
+ use X509 || dodoc ChangeLog
+
+ diropts -m 0700
+ dodir /etc/skel/.ssh
+ rmdir "${ED}"/var/empty || die
+
+ systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+ systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+ if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+ show_ssl_warning=1
+ fi
+}
+
+pkg_postinst() {
+ local old_ver
+ for old_ver in ${REPLACING_VERSIONS}; do
+ if ver_test "${old_ver}" -lt "5.8_p1"; then
+ elog "Starting with openssh-5.8p1, the server will default to a newer key"
+ elog "algorithm (ECDSA). You are encouraged to manually update your stored"
+ elog "keys list as servers update theirs. See ssh-keyscan(1) for more info."
+ fi
+ if ver_test "${old_ver}" -lt "7.0_p1"; then
+ elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+ elog "Make sure to update any configs that you might have. Note that xinetd might"
+ elog "be an alternative for you as it supports USE=tcpd."
+ fi
+ if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+ elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+ elog "weak sizes. If you rely on these key types, you can re-enable the key types by"
+ elog "adding to your sshd_config or ~/.ssh/config files:"
+ elog " PubkeyAcceptedKeyTypes=+ssh-dss"
+ elog "You should however generate new keys using rsa or ed25519."
+
+ elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+ elog "to 'prohibit-password'. That means password auth for root users no longer works"
+ elog "out of the box. If you need this, please update your sshd_config explicitly."
+ fi
+ if ver_test "${old_ver}" -lt "7.6_p1"; then
+ elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+ elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+ fi
+ if ver_test "${old_ver}" -lt "7.7_p1"; then
+ elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+ elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+ elog "if you need to authenticate against LDAP."
+ elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+ fi
+ if ver_test "${old_ver}" -lt "8.2_p1"; then
+ ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+ ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+ ewarn "connection is generally safe."
+ fi
+ done
+
+ if [[ -n ${show_ssl_warning} ]]; then
+ elog "Be aware that by disabling openssl support in openssh, the server and clients"
+ elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys"
+ elog "and update all clients/servers that utilize them."
+ fi
+
+ if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+ elog ""
+ elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+ elog "and therefore disabled at runtime per default."
+ elog "Make sure your sshd_config is up to date and contains"
+ elog ""
+ elog " DisableMTAES yes"
+ elog ""
+ elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+ elog ""
+ fi
+}
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index cc9e42bfb51..d4e3c4ddb1c 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,2 +1,2 @@
-DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b
DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832
+DIST openvswitch-2.17.2.tar.gz 7955727 BLAKE2B da7ffc29b6af5dbf8eeb410725ed4cb6b6c5f4abe22f17d0963429a3333e459e1d4cc4ef06d13518dc2486d5e9e78a090318ad66e50175606e47fcf1d61cfce7 SHA512 e01e41ef2fea21afcc891b8ab0a773fe7c9adf873853e10926b8bde2fd970e12b354010687439238e8d80a87884f497f7396a4a1f2b179104e49e87c66cfc79e
diff --git a/net-misc/openvswitch/files/ovs-delete-transient-ports.service b/net-misc/openvswitch/files/ovs-delete-transient-ports.service
deleted file mode 100644
index 4cd4d7f57f9..00000000000
--- a/net-misc/openvswitch/files/ovs-delete-transient-ports.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Open vSwitch Delete Transient Ports
-After=ovsdb-server.service
-Before=ovs-vswitchd.service
-AssertPathExists=/var/run/openvswitch/db.sock
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/share/openvswitch/scripts/ovs-ctl delete-transient-ports
diff --git a/net-misc/openvswitch/files/ovs-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service
deleted file mode 100644
index a573a503e14..00000000000
--- a/net-misc/openvswitch/files/ovs-vswitchd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Open vSwitch Daemon
-Documentation=man:ovs-vswitchd
-Wants=network.target
-Before=network.target
-Requires=ovsdb-server.service
-After=ovsdb-server.service
-
-[Service]
-# --pidfile options is needed for create file used
-# by ovs-appctl command.
-ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock --pidfile
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/openvswitch/files/ovsdb-server.service b/net-misc/openvswitch/files/ovsdb-server.service
deleted file mode 100644
index 9493c40755d..00000000000
--- a/net-misc/openvswitch/files/ovsdb-server.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Open vSwitch Database Server
-Documentation=man:ovsdb-server
-
-[Service]
-# The file can be shared for this as this values are prone to change
-# and that way we don't need to update them in two different places
-EnvironmentFile=/etc/conf.d/ovsdb-server
-ExecStart=/usr/sbin/ovsdb-server --monitor \
- --remote=punix:${DB_SOCKET} \
- --remote=${REMOTE_DB} \
- --private-key=${PRIVATE_KEY} \
- --certificate=${CERTIFICATE} \
- --bootstrap-ca-cert=${BOOTSTRAP_CA_CERT}
diff --git a/net-misc/openvswitch/files/ovsdb-server_conf b/net-misc/openvswitch/files/ovsdb-server_conf
deleted file mode 100644
index 1299b820640..00000000000
--- a/net-misc/openvswitch/files/ovsdb-server_conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Socket for bringing the server up
-DB_SOCKET="/var/run/openvswitch/db.sock"
-
-# Remote sockets are defined in the database by default
-REMOTE_DB="db:Open_vSwitch,manager_options"
-
-# All certificates and keys are stored in the database (if any)
-PRIVATE_KEY="db:SSL,private_key"
-CERTIFICATE="db:SSL,certificate"
-BOOTSTRAP_CA_CERT="db:SSL,ca_cert"
-
-# Alternative path for the database (default is /etc/openvswitch/conf.db)
-# DATABASE="/etc/openvswitch/conf.db"
-
-# Additional options
-# OPTIONS=""
diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
index 564a93cad57..fad2a4a6287 100644
--- a/net-misc/openvswitch/metadata.xml
+++ b/net-misc/openvswitch/metadata.xml
@@ -11,4 +11,7 @@
<use>
<flag name="monitor">Build the Python and GUI dependent monitor applications</flag>
</use>
+ <upstream>
+ <remote-id type="github">openvswitch/ovs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild
index c873cc5a547..6cfb0d98f8b 100644
--- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+EAPI=8
-inherit autotools linux-info linux-mod python-r1 systemd tmpfiles
+MODULES_OPTIONAL_USE="modules"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools linux-info linux-mod python-single-r1 systemd tmpfiles
DESCRIPTION="Production quality, multilayer virtual switch"
HOMEPAGE="https://www.openvswitch.org"
@@ -12,24 +14,26 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="debug modules monitor +ssl"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="
- ssl? ( dev-libs/openssl:0= )
- ${PYTHON_DEPS}
- ~dev-python/ovs-2.13.0[${PYTHON_USEDEP}]
- dev-python/twisted[conch,${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- debug? ( dev-lang/perl )"
+# Check python/ovs/version.py in tarball for dev-python/ovs dep
+RDEPEND="${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ ')
+ debug? ( dev-lang/perl )
+ ssl? ( dev-libs/openssl:= )"
DEPEND="${RDEPEND}
sys-apps/util-linux[caps]"
BDEPEND="virtual/pkgconfig"
-PATCHES="
+PATCHES=(
"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-"
+)
CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
@@ -38,9 +42,8 @@ BUILD_TARGETS="all"
pkg_setup() {
if use modules ; then
CONFIG_CHECK+=" ~!OPENVSWITCH"
- kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
- # docs state 4.17.x code states 4.15.x
- kernel_is le 5 5 999 || die "Linux >= 3.10.0 and <= 4.18 required for userspace modules"
+ kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
+ kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
linux-mod_pkg_setup
else
CONFIG_CHECK+=" ~OPENVSWITCH"
@@ -49,29 +52,38 @@ pkg_setup() {
}
src_prepare() {
+ default
+
# Never build kernelmodules, doing this manually
sed -i \
-e '/^SUBDIRS/d' \
datapath/Makefile.in || die "sed failed"
+
eautoreconf
- default
}
src_configure() {
set_arch_to_kernel
- # monitor is statically enabled for bug 596206
+ python_setup
+
+ # monitor is statically enabled for bug #596206
# use monitor || export ovs_cv_python="no"
# pyside is staticly disabled
export ovs_cv_pyuic4="no"
# flake8 is primarily a style guide tool, running it as part of the tests
- # in Gentoo does not make much sense, only breaks them: bug 607280
+ # in Gentoo does not make much sense, only breaks them: bug #607280
export ovs_cv_flake8="no"
+ # Only adds a diagram to the man page, just skip it as we don't
+ # want to add a BDEPEND on graphviz right now. bug #856286
+ export ovs_cv_dot="no"
+
local linux_config
use modules && linux_config="--with-linux=${KV_OUT_DIR}"
- econf ${linux_config} \
+ # Need PYTHON3 variable for bug #860240
+ PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \
--with-rundir=/var/run/openvswitch \
--with-logdir=/var/log/openvswitch \
--with-pkidir=/etc/ssl/openvswitch \
@@ -92,8 +104,7 @@ src_install() {
local SCRIPT
if use monitor; then
for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
- python_foreach_impl python_doscript utilities/"${SCRIPT}"
+ python_doscript utilities/"${SCRIPT}"
done
rm -r "${ED}"/usr/share/openvswitch/python || die
fi
@@ -125,7 +136,7 @@ pkg_postinst() {
tmpfiles_process openvswitch.conf
- # only needed on non-systemd, but helps anyway
+ # Only needed on non-systemd, but helps anyway
elog "Use the following command to create an initial database for ovsdb-server:"
elog " emerge --config =${CATEGORY}/${PF}"
elog "(will create a database in /var/lib/openvswitch/conf.db)"
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 5d29238c69e..f421c1da28f 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,2 +1,2 @@
DIST ownCloud-2.10.0.6519.tar.xz 5791912 BLAKE2B 3cf02ef89a6af249ab8f9d1b0a4cc899fbb11f49bf47ffb0ce042442da984d8dbf49619cf3344cf1837f1f3437e70f6e6d302f4e4c67a7df5f547368be4252ba SHA512 ab1e8aebefa049a73c436325b3b6e1d03e9a74f93ab6e090adbc71ccdd1cf56297898f004b12312ebba82158f5c2e299d9d0b13c14e291b855dcf267bac490f2
-DIST ownCloud-2.9.2.6206.tar.xz 5759996 BLAKE2B c328ea261a4fddecf93837dbcac01aab0971542d8dfb3f5b0a32a8432ca0e0904c3f4fc81c5c7811da8b3af64b58e929c055e7cec0649f00049e037372948eec SHA512 d075a11ee92aa9771c631a766feddfa1a70907d7d341b58043e1ba96ac52786a6a750b15c2f9b7a0992fe02a45586cc3445755dc9df4cd267e72f070d2222f0f
+DIST ownCloud-2.10.1.7389.tar.xz 5598044 BLAKE2B 8558a8a7b7bd4b8a0685b703f0882d6b5619c4902217d40feb4cf5587555b9a85363c7f61834e4c85a84789142fca8c73910fce66544f491ec5968818c816605 SHA512 2a0893d48786b88f8210966a2b6b48f5bdada82818d4115e68ecc6c0c926ba62bc74df03c4ab35eb271aef2f3a43b36b1a6a115585efe3739fd4a6164f9c45a1
diff --git a/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch b/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
new file mode 100644
index 00000000000..31981415f88
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
@@ -0,0 +1,93 @@
+From c1e3bb8457d77619a1c31217716789e76fd06500 Mon Sep 17 00:00:00 2001
+From: Hannah von Reth <hannah.vonreth@owncloud.com>
+Date: Fri, 20 May 2022 11:19:59 +0200
+Subject: [PATCH] Fix build with gcc12
+
+---
+ src/common/asserts.h | 2 +-
+ src/common/vfs.h | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/common/asserts.h b/src/common/asserts.h
+index 9f43c532a6d..5fa4b4da3e5 100644
+--- a/src/common/asserts.h
++++ b/src/common/asserts.h
+@@ -44,7 +44,7 @@
+ } else { \
+ }
+
+-inline OC_REQUIRED_RESULT bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info)
++OC_REQUIRED_RESULT inline bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info)
+ {
+ if (Q_UNLIKELY(!condition)) {
+ OC_ASSERT_MSG("ENSURE: \"%s\" in file %s, line %d %s", cond, file, line, info);
+diff --git a/src/common/vfs.h b/src/common/vfs.h
+index 983c999106c..da04d7ed97d 100644
+--- a/src/common/vfs.h
++++ b/src/common/vfs.h
+@@ -162,17 +162,17 @@ class OCSYNC_EXPORT Vfs : public QObject
+ virtual bool isHydrating() const = 0;
+
+ /// Create a new dehydrated placeholder. Called from PropagateDownload.
+- virtual OC_REQUIRED_RESULT Result<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
++ OC_REQUIRED_RESULT virtual Result<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
+
+ /** Discovery hook: even unchanged files may need UPDATE_METADATA.
+ *
+ * For instance cfapi vfs wants local hydrated non-placeholder files to
+ * become hydrated placeholder files.
+ */
+- virtual OC_REQUIRED_RESULT bool needsMetadataUpdate(const SyncFileItem &item) = 0;
++ OC_REQUIRED_RESULT virtual bool needsMetadataUpdate(const SyncFileItem &item) = 0;
+
+ /// Determine whether the file at the given absolute path is a dehydrated placeholder.
+- virtual OC_REQUIRED_RESULT bool isDehydratedPlaceholder(const QString &filePath) = 0;
++ OC_REQUIRED_RESULT virtual bool isDehydratedPlaceholder(const QString &filePath) = 0;
+
+ /** Similar to isDehydratedPlaceholder() but used from sync discovery.
+ *
+@@ -181,7 +181,7 @@ class OCSYNC_EXPORT Vfs : public QObject
+ *
+ * Returning true means that type was fully determined.
+ */
+- virtual OC_REQUIRED_RESULT bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0;
++ OC_REQUIRED_RESULT virtual bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0;
+
+ /** Sets the pin state for the item at a path.
+ *
+@@ -192,7 +192,7 @@ class OCSYNC_EXPORT Vfs : public QObject
+ *
+ * relFilePath is relative to the sync folder. Can be "" for root folder.
+ */
+- virtual OC_REQUIRED_RESULT bool setPinState(const QString &relFilePath, PinState state) = 0;
++ OC_REQUIRED_RESULT virtual bool setPinState(const QString &relFilePath, PinState state) = 0;
+
+ /** Returns the pin state of an item at a path.
+ *
+@@ -203,7 +203,7 @@ class OCSYNC_EXPORT Vfs : public QObject
+ *
+ * Returns none on retrieval error.
+ */
+- virtual OC_REQUIRED_RESULT Optional<PinState> pinState(const QString &relFilePath) = 0;
++ OC_REQUIRED_RESULT virtual Optional<PinState> pinState(const QString &relFilePath) = 0;
+
+ /** Returns availability status of an item at a path.
+ *
+@@ -212,7 +212,7 @@ class OCSYNC_EXPORT Vfs : public QObject
+ *
+ * folderPath is relative to the sync folder. Can be "" for root folder.
+ */
+- virtual OC_REQUIRED_RESULT AvailabilityResult availability(const QString &folderPath) = 0;
++ OC_REQUIRED_RESULT virtual AvailabilityResult availability(const QString &folderPath) = 0;
+
+ public slots:
+ /** Update in-sync state based on SyncFileStatusTracker signal.
+@@ -240,7 +240,7 @@ public slots:
+ * If the remote metadata changes, the local placeholder's metadata should possibly
+ * change as well.
+ */
+- virtual OC_REQUIRED_RESULT Result<ConvertToPlaceholderResult, QString> updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0;
++ OC_REQUIRED_RESULT virtual Result<ConvertToPlaceholderResult, QString> updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0;
+
+ /** Setup the plugin for the folder.
+ *
diff --git a/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild b/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
index e75c66fabf6..ef87f857f8d 100644
--- a/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
@@ -9,13 +9,15 @@ MY_PN="ownCloud"
DESCRIPTION="Synchronize files from ownCloud Server with your computer"
HOMEPAGE="https://owncloud.org/"
SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
+S=${WORKDIR}/${MY_PN}-${PV}
LICENSE="CC-BY-3.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="dolphin gnome-keyring nautilus test"
+RESTRICT="!test? ( test )"
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+RDEPEND=">=dev-db/sqlite-3.4:3
dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -32,18 +34,15 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
)
nautilus? ( dev-python/nautilus-python )"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules
+DEPEND="${RDEPEND}
test? (
dev-util/cmocka
dev-qt/qttest:5
)"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
+BDEPEND="
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules"
src_prepare() {
# Keep tests in ${T}
diff --git a/net-misc/owncloud-client/owncloud-client-2.9.2.6206.ebuild b/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
index 1f71bd2d512..c9f1b379477 100644
--- a/net-misc/owncloud-client/owncloud-client-2.9.2.6206.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,13 +9,15 @@ MY_PN="ownCloud"
DESCRIPTION="Synchronize files from ownCloud Server with your computer"
HOMEPAGE="https://owncloud.org/"
SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
+S=${WORKDIR}/${MY_PN}-${PV}
LICENSE="CC-BY-3.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="dolphin gnome-keyring nautilus test"
+RESTRICT="!test? ( test )"
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+RDEPEND=">=dev-db/sqlite-3.4:3
dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -32,18 +34,17 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
)
nautilus? ( dev-python/nautilus-python )"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules
+DEPEND="${RDEPEND}
test? (
dev-util/cmocka
dev-qt/qttest:5
)"
-RESTRICT="!test? ( test )"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules"
-S=${WORKDIR}/${MY_PN}-${PV}
+PATCHES=( "${FILESDIR}"/${P}-gcc12.patch )
src_prepare() {
# Keep tests in ${T}
diff --git a/net-misc/pssh/pssh-2.3.4-r1.ebuild b/net-misc/pssh/pssh-2.3.4-r1.ebuild
index 81921416658..78373cfe0d2 100644
--- a/net-misc/pssh/pssh-2.3.4-r1.ebuild
+++ b/net-misc/pssh/pssh-2.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
new file mode 100644
index 00000000000..0d4ba16c875
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -0,0 +1 @@
+DIST pulseaudio-dlna-0.6.5-1.tar.gz 712483 BLAKE2B baf1fc94f41c9ac2ca7df5c239ace36b36da4d7a40e30cf19fa630f51a0e94fa44a1ba531943ad5c4425580e4bbe68af1d5de48f5f17163783aab7b471faa72e SHA512 6fd59ac6ff0dfa98baed7a5d929c6f7d9f3539016a6383770895732f7066bc260b3d56751691573d0834a0ee29a6e542ef26e66e48c7a7af97cc84ca23ff5c2d
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
new file mode 100644
index 00000000000..cc609b92ede
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop distutils-r1
+
+DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
+HOMEPAGE="https://github.com/Cygn/pulseaudio-dlna"
+
+if [[ ${PV} == *9999 ]];then
+ EGIT_REPO_URI="https://github.com/Cygn/pulseaudio-dlna"
+ inherit git-r3
+else
+ MY_P=${PN}-${PV/_p/-}
+
+ SRC_URI="https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/${MY_P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${MY_P}
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+ >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+ >=dev-python/notify2-0.3[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
+ >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+ >=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3[${PYTHON_USEDEP}]
+ >=dev-python/pychromecast-10[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ >=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
+ gnome-base/librsvg[introspection]
+ x11-libs/gtk+:3[introspection]
+ || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
+ || (
+ || (
+ media-video/ffmpeg[encode,mp3,opus,vorbis]
+ media-video/ffmpeg[encode,fdk,mp3,opus,vorbis]
+ )
+ (
+ media-libs/flac
+ media-sound/lame
+ media-sound/opus-tools
+ media-sound/sox
+ media-sound/vorbis-tools
+ )
+ )"
+
+python_prepare_all() {
+ sed -i -e 's/.gz//' setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 6fc29c68a64..cc609b92ede 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -1,27 +1,29 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
inherit desktop distutils-r1
DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
+HOMEPAGE="https://github.com/Cygn/pulseaudio-dlna"
if [[ ${PV} == *9999 ]];then
+ EGIT_REPO_URI="https://github.com/Cygn/pulseaudio-dlna"
inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/masmu/pulseaudio-dlna"
- EGIT_BRANCH="python3"
else
- SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ MY_P=${PN}-${PV/_p/-}
+
+ SRC_URI="https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/${MY_P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${MY_P}
+
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-3"
SLOT="0"
-IUSE=""
RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
@@ -33,13 +35,13 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
>=dev-python/lxml-3[${PYTHON_USEDEP}]
- >=dev-python/pychromecast-2.3.0[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=dev-python/pychromecast-10[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
- dev-python/pygobject[cairo,${PYTHON_USEDEP}]
gnome-base/librsvg[introspection]
x11-libs/gtk+:3[introspection]
+ || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
|| (
|| (
media-video/ffmpeg[encode,mp3,opus,vorbis]
@@ -54,20 +56,14 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
)
)"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )"
-
python_prepare_all() {
- sed -i '/dbus-python/d' setup.py || die
- sed -i '/notify2/d' setup.py || die
- sed -i '/docopt/d' setup.py || die
- sed -i '/pychromecast/d' setup.py || die
+ sed -i -e 's/.gz//' setup.py || die
+
distutils-r1_python_prepare_all
}
src_install() {
distutils-r1_src_install
- domenu "${FILESDIR}/${PN}.desktop"
+ domenu "${FILESDIR}"/${PN}.desktop
}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 071ce9c471f..28730e9df28 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,2 +1,3 @@
DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
+DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da81d33f864d72074d1e5cae2fcf2710a038aef1de56077de2e296f4c5e573af077f4b55e433563f680cd9cc4b SHA512 35eb1e3f98a07611365bedc492c69a5475ce9b3d920ecebc78c76813505684c16cfcbfbb2306c1106fb5a9b72ca3dd52cbd39b9e9805c6689c9a9464910c0e7d
DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index 56d8ef2b427..ba7ec402bc1 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
+ <email>matthew@gentoo.org</email>
+ <name>Matthew Smith</name>
</maintainer>
<longdescription lang="en">
PuTTY is a free implementation of Telnet and SSH for Windows and Unix
diff --git a/net-misc/putty/putty-0.76.ebuild b/net-misc/putty/putty-0.76.ebuild
index c793525eff4..49c3ca73ee4 100644
--- a/net-misc/putty/putty-0.76.ebuild
+++ b/net-misc/putty/putty-0.76.ebuild
@@ -11,7 +11,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
SRC_URI="
- https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2
+ https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2
https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
"
IUSE="doc +gtk gtk2 ipv6 gssapi"
diff --git a/net-misc/putty/putty-0.77-r1.ebuild b/net-misc/putty/putty-0.77-r1.ebuild
new file mode 100644
index 00000000000..be3a4064acc
--- /dev/null
+++ b/net-misc/putty/putty-0.77-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake desktop xdg-utils
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
+else
+ SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="MIT"
+
+SLOT="0"
+IUSE="debug doc +gtk gtk2 ipv6 gssapi"
+
+RDEPEND="
+ !net-misc/pssh
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf
+ x11-libs/libX11
+ x11-libs/pango
+ gtk2? ( x11-libs/gtk+:2 )
+ !gtk2? ( x11-libs/gtk+:3[X] )
+ )
+ gssapi? ( virtual/krb5 )
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+ doc? ( app-doc/halibut )
+"
+
+REQUIRED_USE="
+ gtk2? ( gtk )
+"
+
+src_unpack() {
+ [[ ${PV} == *9999 ]] && git-r3_src_unpack
+ default
+}
+
+src_configure() {
+ cd "${S}"/unix || die
+ local mycmakeargs=(
+ -DPUTTY_DEBUG="$(usex debug)"
+ -DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
+ -DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
+ -DPUTTY_IPV6="$(usex ipv6)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile all doc
+}
+
+src_install() {
+ cmake_src_install
+
+ doman "${BUILD_DIR}"/doc/*.1
+
+ if use doc ; then
+ docinto html
+ dodoc "${BUILD_DIR}"/doc/html/*.html
+ fi
+
+ if use gtk ; then
+ local i
+ for i in 16 22 24 32 48 64 128 256; do
+ newicon -s ${i} \
+ "${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
+ ${PN}.png
+ done
+
+ # install desktop file provided by Gustav Schaffter in #49577
+ make_desktop_entry ${PN} PuTTY ${PN} Network
+ fi
+}
+
+pkg_postinst() {
+ use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && xdg_icon_cache_update
+}
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index 97dbfaea150..be3a4064acc 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -1,18 +1,23 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit autotools desktop git-r3 toolchain-funcs xdg-utils
+EAPI=8
+inherit cmake desktop xdg-utils
DESCRIPTION="A Free Telnet/SSH Client"
HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
+else
+ SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS=""
-IUSE="doc +gtk gtk2 ipv6 gssapi"
+IUSE="debug doc +gtk gtk2 ipv6 gssapi"
RDEPEND="
!net-misc/pssh
@@ -30,62 +35,51 @@ DEPEND="
${RDEPEND}
"
BDEPEND="
- app-doc/halibut
dev-lang/perl
virtual/pkgconfig
+ doc? ( app-doc/halibut )
"
+
REQUIRED_USE="
gtk2? ( gtk )
"
src_unpack() {
- git-r3_src_unpack
- default
-}
-
-src_prepare() {
+ [[ ${PV} == *9999 ]] && git-r3_src_unpack
default
-
- sed -i \
- -e 's|-Werror||g' \
- configure.ac || die
-
- ./mkfiles.pl || die
-
- eautoreconf
}
src_configure() {
cd "${S}"/unix || die
- econf \
- $(use_with gssapi) \
- $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
+ local mycmakeargs=(
+ -DPUTTY_DEBUG="$(usex debug)"
+ -DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
+ -DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
+ -DPUTTY_IPV6="$(usex ipv6)"
+ )
+ cmake_src_configure
}
src_compile() {
- emake -C "${S}"/doc
- emake -C "${S}"/unix AR="$(tc-getAR)" $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_test() {
- emake -C unix cgtest
- unix/cgtest || die
+ cmake_src_compile all doc
}
src_install() {
- dodoc doc/puttydoc.txt
+ cmake_src_install
+
+ doman "${BUILD_DIR}"/doc/*.1
- if use doc; then
+ if use doc ; then
docinto html
- dodoc doc/*.html
+ dodoc "${BUILD_DIR}"/doc/html/*.html
fi
- cd "${S}"/unix || die
- default
-
if use gtk ; then
+ local i
for i in 16 22 24 32 48 64 128 256; do
- newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+ newicon -s ${i} \
+ "${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
+ ${PN}.png
done
# install desktop file provided by Gustav Schaffter in #49577
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
index 153510b8ebc..1568b9c349d 100644
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
DESCRIPTION="X2Go command line client"
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
index 671e506e1ff..3705cbbe531 100644
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
DESCRIPTION="X2Go graphical client applet"
diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index 227f8d14742..4d4d53475a1 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -1 +1,3 @@
DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
+DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
+DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
new file mode 100644
index 00000000000..6da1bdae6b6
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
@@ -0,0 +1,31 @@
+Added compatibility with Linux Kernel 5.18+.
+
+Author: Karlson2k (Evgeny Grin)
+Gentoo bug: https://bugs.gentoo.org/852311
+
+diff --git a/src/r8125_n.c b/src/r8125_n.c
+
+--- a/src/r8125_n.c
++++ b/src/r8125_n.c
+@@ -11852,11 +11852,20 @@ rtl8125_init_board(struct pci_dev *pdev,
+
+ if ((sizeof(dma_addr_t) > 4) &&
+ use_dac &&
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+ !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
++#else // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
++ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++ !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
+ dev->features |= NETIF_F_HIGHDMA;
+ } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++#else // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
++ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
+ if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+ if (netif_msg_probe(tp))
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild
index 7b0093e09b8..b848421ede7 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00.ebuild
@@ -22,6 +22,7 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
PATCHES=(
"${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282
+ "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
)
CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01.ebuild
new file mode 100644
index 00000000000..2a1b7c23535
--- /dev/null
+++ b/net-misc/r8125/r8125-9.009.01.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8125(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="+multi-tx-q ptp +rss use-firmware"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
+)
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+pkg_setup() {
+ linux-mod_pkg_setup
+ BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+ BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
+ BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
+ BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
+ BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+ linux-mod_src_install
+ einstalldocs
+}
diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02.ebuild
new file mode 100644
index 00000000000..9178eeaa64d
--- /dev/null
+++ b/net-misc/r8125/r8125-9.009.02.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8125(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="+multi-tx-q ptp +rss use-firmware"
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+pkg_setup() {
+ linux-mod_pkg_setup
+ BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+ BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
+ BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
+ BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
+ BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+ linux-mod_src_install
+ einstalldocs
+}
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 497e72dd1f4..8a8110c06a6 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,2 +1,2 @@
DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
-DIST r8168-8.050.00.tar.bz2 115418 BLAKE2B b3e24d0548494f1904b5d3341994bdda35a05a71dce85a64c9e87cbde7f40807b0b1bcd78401928ff7625e67606918d5c844e8254cbbab62ed3f8e8058a3f15b SHA512 04043fd01ea877ea9f422b8f2319630b8664a49b41363039fc725ed382dc5afb732dda59ba63021a94c50b12ed2f0b3585cd668d969bc06fdc40d08420dbdb95
+DIST r8168-8.050.03.tar.bz2 115525 BLAKE2B 9681417c5ded9d089259d80226a16789beaacf31902d896410d581927468c44486a4c496e45d9973851ccca2d4c408159064452849b03347c789390b2b23e57b SHA512 b4c0af2f4e6b9dc36f2db9e33f465d8598afa0b28577ea1f016617e853af00cf41886941fd8173a5b035e219d87a0fae28771230079c88f34039efe669c1e1c6
diff --git a/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch b/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch
new file mode 100644
index 00000000000..442fa1c3ead
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch
@@ -0,0 +1,51 @@
+Functions like 'pci_dma_sync_single_for_device', 'pci_set_dma_mask', and 'pci_set_consistent_dma_mask'
+no longer exist in 5.18.0.
+Fix similar to https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2238850.html
+
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -3698,7 +3698,11 @@
+ txd->opts2 = 0;
+ while (1) {
+ memset(tmpAddr, pattern++, len - 14);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ pci_dma_sync_single_for_device(tp->pci_dev,
++#else
++ dma_sync_single_for_device(&tp->pci_dev->dev,
++#endif
+ le64_to_cpu(mapping),
+ len, DMA_TO_DEVICE);
+ txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len);
+@@ -3726,7 +3730,11 @@
+ if (rx_len == len) {
+ dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+ i = memcmp(skb->data, rx_skb->data, rx_len);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
++#else
++ dma_sync_single_for_device(&tp->pci_dev->dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
++#endif
+ if (i == 0) {
+ // dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len);
+ break;
+@@ -26408,11 +26416,20 @@
+
+ if ((sizeof(dma_addr_t) > 4) &&
+ use_dac &&
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+ !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
++#else
++ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++ !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
++#endif
+ dev->features |= NETIF_F_HIGHDMA;
+ } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++#else
++ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++#endif
+ if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+ if (netif_msg_probe(tp))
diff --git a/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch b/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch
new file mode 100644
index 00000000000..d0f5d30ada0
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch
@@ -0,0 +1,23 @@
+From: Andrea Righi <andrea.righi@canonical.com>
+Subject: support linux 5.19
+
+Index: r8168-8.050.03/src/r8168_n.c
+===================================================================
+--- r8168-8.050.03.orig/src/r8168_n.c
++++ r8168-8.050.03/src/r8168_n.c
+@@ -116,6 +116,15 @@
+ #define FIRMWARE_8168FP_3 "rtl_nic/rtl8168fp-3.fw"
+ #define FIRMWARE_8168FP_4 "rtl_nic/rtl8168fp-4.fw"
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++static inline void netif_set_gso_max_size(struct net_device *dev,
++ unsigned int size)
++{
++ /* dev->gso_max_size is read locklessly from sk_setup_caps() */
++ WRITE_ONCE(dev->gso_max_size, size);
++}
++#endif
++
+ /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
+ The RTL chips use a 64 element hash table based on the Ethernet CRC. */
+ static const int multicast_filter_limit = 32;
diff --git a/net-misc/r8168/r8168-8.050.00.ebuild b/net-misc/r8168/r8168-8.050.03.ebuild
index df0f69ffed6..b2ff7ea4f8a 100644
--- a/net-misc/r8168/r8168-8.050.00.ebuild
+++ b/net-misc/r8168/r8168-8.050.03.ebuild
@@ -24,6 +24,11 @@ IUSE="use-firmware"
CONFIG_CHECK="~!R8169"
WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+PATCHES=(
+ "${FILESDIR}/r8168-8.050.02-5.18-fix.patch"
+ "${FILESDIR}/r8168-8.050.03-5.19-fix.patch"
+)
+
pkg_setup() {
linux-mod_pkg_setup
BUILD_PARAMS="KERNELDIR=${KV_DIR}"
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 2d79ff58e5c..f6967b01d41 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1 +1,3 @@
DIST rabbitmq-server-3.8.19.tar.xz 3263712 BLAKE2B 3dc990d3720883fe2b6b61d48122b64c81564124f48f0a0e6aa2dc1d0837f6dce0bf174b4044c39dc0c8da64b2f78499922c58c90d7e7f80e50b80b4535f55c7 SHA512 05c789dc25e2f236d9643e582792c8a9ab90129247d9306e60c303fa3a707e68dcbe685460b255b6f610c8ab55d48cb7b372ea51ce1d3c86d8d770e4e4f7cfea
+DIST rabbitmq-server-3.8.34.tar.xz 3415500 BLAKE2B 90cf0ec285e53fd8ec7663857c036d9f202769840c1ae7ae0442fcbdc2cf32cdaf29a2ebbc6b50d2e73ba42f5ed407ea66443e1b39e92ae97f1dec66e9c706ab SHA512 3d30e81de8e6293d2784909109bdcc9c09c0f1e385da9c8570f844ab8dd0ac999631cff198c2f70c9345097759f87c4c7926dfb0c92c2a81a3753a2d740e9635
+DIST rabbitmq-server-3.9.20.tar.xz 3540364 BLAKE2B c430b08b5ecab1e6015a6d2ef2ac653ce111043bf41c8d80743c36273266b65d10c819e251fbc91a2d65276eea837b75d8d0ad01c61c3332b05b7e42843f34e8 SHA512 20205551e077545cdee6b64b28beebae0d9da32658ac1aea2548238bfdbeaf7b067ae28ce849e0458d611d8905219dfde17f2c46b229d27d7231ab6442936ec4
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
index 2410ca43590..85dfa8ae0db 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,18 +20,22 @@ RESTRICT="test"
RDEPEND="
acct-group/rabbitmq
acct-user/rabbitmq
- >=dev-lang/erlang-22[ssl]
+ >=dev-lang/erlang-22[ssl] <dev-lang/erlang-25.0
"
DEPEND="${RDEPEND}
app-arch/zip
app-arch/unzip
app-text/docbook-xml-dtd:4.5
app-text/xmlto
- >=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0
+ >=dev-lang/elixir-1.10.4 <dev-lang/elixir-1.13.0
dev-libs/libxslt
$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
"
+python_check_deps() {
+ has_version -d "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
python-any-r1_pkg_setup
}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild
new file mode 100644
index 00000000000..afe6892d7d5
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit python-any-r1 systemd
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+ acct-group/rabbitmq
+ acct-user/rabbitmq
+ >=dev-lang/erlang-23.2[ssl] <dev-lang/erlang-25.0
+"
+DEPEND="${RDEPEND}
+ app-arch/zip
+ app-arch/unzip
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+ >=dev-lang/elixir-1.10.4 <dev-lang/elixir-1.14.0
+ dev-libs/libxslt
+ $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+ has_version -d "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_compile() {
+ emake all docs dist
+}
+
+src_install() {
+ # erlang module
+ local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+ einfo "Setting correct RABBITMQ_HOME in scripts"
+ sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+ -i deps/rabbit/scripts/rabbitmq-env || die
+
+ einfo "Installing Erlang modules to ${targetdir}"
+ insinto "${targetdir}"
+ doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
+
+ einfo "Installing server scripts to /usr/sbin"
+ rm -v deps/rabbit/scripts/*.bat
+ exeinto /usr/libexec/rabbitmq
+ for script in deps/rabbit/scripts/*; do
+ doexe ${script}
+ newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+ done
+
+ # install the init script
+ newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+ systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+ # install documentation
+ dodoc deps/rabbit/docs/*.example
+ dodoc deps/rabbit/README.md
+ doman deps/rabbit/docs/*.5
+ doman deps/rabbit/docs/*.8
+
+ # create the directory where our log file will go.
+ diropts -m 0770 -o rabbitmq -g rabbitmq
+ keepdir /var/log/rabbitmq /etc/rabbitmq
+
+ # create the mnesia directory
+ diropts -m 0770 -o rabbitmq -g rabbitmq
+ keepdir /var/lib/rabbitmq/mnesia
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild
new file mode 100644
index 00000000000..afe6892d7d5
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit python-any-r1 systemd
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+ acct-group/rabbitmq
+ acct-user/rabbitmq
+ >=dev-lang/erlang-23.2[ssl] <dev-lang/erlang-25.0
+"
+DEPEND="${RDEPEND}
+ app-arch/zip
+ app-arch/unzip
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+ >=dev-lang/elixir-1.10.4 <dev-lang/elixir-1.14.0
+ dev-libs/libxslt
+ $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+ has_version -d "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_compile() {
+ emake all docs dist
+}
+
+src_install() {
+ # erlang module
+ local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+ einfo "Setting correct RABBITMQ_HOME in scripts"
+ sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+ -i deps/rabbit/scripts/rabbitmq-env || die
+
+ einfo "Installing Erlang modules to ${targetdir}"
+ insinto "${targetdir}"
+ doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
+
+ einfo "Installing server scripts to /usr/sbin"
+ rm -v deps/rabbit/scripts/*.bat
+ exeinto /usr/libexec/rabbitmq
+ for script in deps/rabbit/scripts/*; do
+ doexe ${script}
+ newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+ done
+
+ # install the init script
+ newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+ systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+ # install documentation
+ dodoc deps/rabbit/docs/*.example
+ dodoc deps/rabbit/README.md
+ doman deps/rabbit/docs/*.5
+ doman deps/rabbit/docs/*.8
+
+ # create the directory where our log file will go.
+ diropts -m 0770 -o rabbitmq -g rabbitmq
+ keepdir /var/log/rabbitmq /etc/rabbitmq
+
+ # create the mnesia directory
+ diropts -m 0770 -o rabbitmq -g rabbitmq
+ keepdir /var/lib/rabbitmq/mnesia
+}
diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
index 0d25bb4f291..f35e6574562 100644
--- a/net-misc/radvd/metadata.xml
+++ b/net-misc/radvd/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:litech:router_advertisement_daemon</remote-id>
+ <remote-id type="github">radvd-project/radvd</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 670419f6730..058b84dc5fb 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,1422 +1,4 @@
-DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.mod 158 BLAKE2B 2b8e2dc6a4055bfa30dcc2df66c47140ac85a3b998210ae97cac41cf2a0f13125fda57c580b08f48377ac58be6a192af8cf4387ca9d3a010b012ab5fc468a172 SHA512 570386c94cfce7255778442222ff746186dc7e8ce1471deaec672f7efa157f2069b493a30b9e700dfce68d48c29eb95e8a373a5300e14fe01e58c37cf29478c5
-DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.zip 236558 BLAKE2B 1426f4d517d149ad1b04b50345d7dd1a16592e8eb7e774ef00ba7d4829904c410f772c4480f4c2055093c390ad0db623c88a254ca6116895ed97a62a0d1b545e SHA512 8ea9fccff666a16c4e4328d715c3cb90bdbc745357bb19e5df3c495af8b6f6eef2ded330f43f4e8759fc2f027a20f483bc9fa472a1c0914c64f9d745f9c210de
-DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200524192727-fb710f7dfd05.mod 400 BLAKE2B aeec5ff609e337c59f01985361421623b6113422c1eb4ddaa84fc62a3a0dd290525f247fd587ec86d7e21e1717fabc4913362e2e06aca41cce896408fc37c6af SHA512 3bfb1ec026d32a4684d37573d7042367ba2cebacbd60e367f04776b1cd59b19320457991e75b9d77e558ab17266b4a14605e250bee1448ed78b64be52a138089
-DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200524192727-fb710f7dfd05.zip 159927 BLAKE2B 2aa994ccaccbaa5d76cf0a9c6a29b713f0872602bfaa3d85b3a1435704ecb3f0ce883f8dda7b5357899b386f19100cd1e27cc568205338bd4a90c8fea77107c3 SHA512 605cc0c8254f41f8dff6fef25c9050acf43e7b78b941d05a713457759f213be3052bc7c22b78d5f35cf0730b481255759b5ccfa85ec4d4c81ac69e23b842c3cc
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod 1008 BLAKE2B 4927d7d7fae96f989d42ac23ac107e4fdab6ba955f3ba69140e56ceab2e4c618faf5fd88006794a20c3660e368e717dcead18289cb09608af3bd4fc4bda29f0c SHA512 24150b760cdcb32da7bcd7adf54085973c41904673ceebc13cf12609a63e68e6620737414de3ffca810525e1f69aa7b725a3b5635d114c1c2d31f13b2ca8a7e6
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip 1365713 BLAKE2B d6dcaeeed2ba93cc3c8da0f92685d0c14252827497bbf54a736b6284c92b599cd4e176d6c458b643ab1d41b91499c3b0fa8e6a8265e52e432162a034273155f6 SHA512 b82cefd32e011cd1d821ed93665e0f08be55d81c33397587120d05fef31a3941d2dfdc84399414636170bbc3553f5ccc3048621ae6417d6b9ec07804546d27ab
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.59.0.mod 946 BLAKE2B 84e81b1fa7285b9db6ec0fdc6249b926b365ead14c764ee800bd83c8f4bc67aa20ff1039af00949f08e69e360d0164a830c0448aaa65234016c5a25caad6c01c SHA512 651169872f8c1b6525b0a6209a76984ed1aca2f41fbdad505c15884bbd96beb9c4fb335f6975bafbaa87be68f6bb6444c06de16226763117193dd2e769cb4e70
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.59.0.zip 1442518 BLAKE2B 12d927fb2d38324eab3ba3e7d47b1473018b0e345afbb2b1607a6c4e37c9bae5cf9eb2e0a26f649bf84e318ce304260a063c8091256597f465a542626d76b281 SHA512 bda8bc184eb1996b48ecb37b2009490bd55b0330f849cbec771c1e07fc82cc5be2c582e202739417cd2be6c6be0cefc8fba02737328c7663d5eb699805ee6360
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod 810 BLAKE2B 50cf503d994003d7974ad786a741c1429b44d6764bd9d9ba58139fc5fb88c0264a7e908699ee35667f4e827cbc59733f7fbb8b38837b495d4c23c2d10b1da114 SHA512 b6dd5fa24e928bad836e791a19a0d707c755d6c2b75c8f60f42a9e0410e91034373b01baa61104c24bf1565adade99656948c75be08cec2f945bb8bde91046d3
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod 831 BLAKE2B 9d34710c0f721d3f471c3da32555b4a3e559474afb8d30237b0935ce167e7bcb5507d2b19bd6675da724927109ed74ba79dc9dc3b3d8cb271515ef2c6bb0c7c1 SHA512 d1a718c4ba19ee0d4221858dd0710cc480fdf6c0b134f1ce5c4a805b15cac88a77e73f26e79f480b0852a6c0f499c63876dacdb3038ea40d38e9f8ae577ce219
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod 762 BLAKE2B e6349d349c8249101b89b3fd324ef16b7fcf65dc5a87f751a8738b00619942abd06511247ee0e425b3f9b380a669475061f64cdb27c7c8f8f9007bd6067da13d SHA512 57501aa2452b72ec72fe2fc0cb2e2dc7e53f28895b0a9e829f4bcbf6e87464b9f1d05283f72c066fe7e5665b300112db1b92533affb36db3894ab5dbc04a0cbf
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod 799 BLAKE2B b9cf83579a32d0109d952fac0d6bda1f8524aadc267aa062e05f7679ad4e910ac18f2b0c652ce71cfc153a30f7df128f69fc742f7f95392c74fa6b32f360cd95 SHA512 123b30fd3799e31fa3ca7237b81cd6ba20874cedbe0c9c168409adf90c09d2dce45de24c7de61fd60c117bf3306ab5299fa22bf0f9231e0ea10bc1a7c9f2dc3e
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod 836 BLAKE2B a7c8abe165d93aff4607f158f66af5c6bba37fd06f42c89da797276a9dc3358b782b5d23da4c1c4706e9429b1e1e55583511695239fb552556af4c998a94b287 SHA512 8e02d438dcf1ef35271817b3ecde8a0bb29d95f08b9299463cc9eb82ee40c2669181f850e5b7c9cfbaee640a711952828772dcb47277c91064b5d30b9276da69
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod 734 BLAKE2B 0f3ff37abbf9359ae68c780de7406253cca023e201fa7bac86901abd52312429c5e94dce0b361dc5773f738b2155ca5dbb4273742da1f6599a30d60c432c1094 SHA512 2da8ed0a65a4825e939e8a35733d9cd828f102c531e322f233fb65d441ab566421f259f1e562743f982518f27334b4e1bffb6a22f8f7b4a3097df904f1e4aa03
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod 734 BLAKE2B e3ac7f5f2081a672878f5c017da4816147aa1d076dd1f24b9dd2a5ae07390323c15890f34d66a6089625da6a831545fb3c01a0a02a05c06a95a0799848172788 SHA512 0f20f17224815d31006304ee27cd0c79e25f3d83e962e1fff3e61483126b950dc21ecb7494dc585410b2ab7fa72f5c40c14d577ad85b50702d5b07758b2225a5
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.83.0.mod 717 BLAKE2B c7769274eab79772fa41793f0a6ab7560823e0bf101dfa0e5e583d6f59c3a7acaa74b7b4fcbacb5d4c9eab1472fc77fe31e6826d9c6e96e87ef27d9303466eff SHA512 1ff1b33b078484f834924b6c10c2d840749411314f56afbffc07f0ad4f97fc1b603aaac9293ff44e08600e56adbcf68398837eb5480b7b7b247de0ef4d1a30f1
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.84.0.mod 717 BLAKE2B dc70c95cb4bb9be1d8c2c8937092f5a457a056292c598e0e943e54d4fe69abc8a6609e239fc2e683eff3f6130f687cb51fed52f1ec90dbd045c2b2c0b9e46439 SHA512 247f8edc7a3e66b3538aa26da1ef94dc78d808704e9913dfee2082106d6e3cd2eb79c980cdbf3be86f33c07ebc393a515e64397d61f75d3f41952643df97c964
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.87.0.mod 717 BLAKE2B cea2816408c856fdad48e0456a41f5935c7e6a87f2ebaa21d820f74b843732887e672add29d3e9229cd047fedbbf9fdc00ef191ca3e2a3385985d836002c673a SHA512 0737cb897a6b6019851ddd08d18ab406f7dea69a0b8d30b0067315e45f4955a092e7ba58a76fbdfa7186fd9afc79e2f0a7ccf842307d1a262eba03980ed4fbec
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.90.0.mod 717 BLAKE2B eb7841827d8d5df498be184fb9a0fa0675caf2cf319580a2091e50b78da5642c7a7f457ee2a951da549831949d821648b7c6184b44eed15d830f79cb0e635205 SHA512 850490616112a8b1280d86e55803641614285cf11083c6328f4939dd22f84713d81c52b082c7fe4742c8785583fbddcf8c9b7d7b2a5e0713ba78e46250dc4768
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.93.3.mod 475 BLAKE2B e4026fa0b4d9e58eb3e3b51ed52b7679886a0005a7706ac12e3a1a43a2294cc9797d7294425164219aa8054f9270193512c31b86faa18755d6642539e99db651 SHA512 db1ed639b6414cf8a0c7c0d365b70d47574208177cee3f3b11a91870ca56eb989958f6ad8fd607b1491862b777745accb8cbeb6425cf454e9eeb1ee643aa88ae
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.93.3.zip 1031100 BLAKE2B f3dc29a7d65dfe277ec660f48932eb4111f492b8c1920631870c7833a994dc97451d5f88c88e06d86953355dea023158e3ed0b69686975d881abe923fc571f3a SHA512 f94ab951e690d2d4ee38875c3c24c431883b9798b9394ee14744b7210dd831508cfff5615b33a7c3800801e2809c3664de7e5cce1f06139d43f7715956c603b3
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
-DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
-DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
-DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
-DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
-DIST dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod 40 BLAKE2B a701681a24f3354c06bffbbff75ce9ee56a1512189b5f3791cdfde30efedea11121f097b6d06f7dff40f9f651b0eab82e79bc33d0ac003bbeb123568d23124df SHA512 26c349638b8c031e65fde1387c9fad8fd99f09e2e165d943ee5ed2d1858db713936f07f640e9b2bb4e156c794cdf18f7076a559c4df7ecf39deb959232ca7940
-DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod 38 BLAKE2B fe16fc3a32dfa62245da350c0082791b531fee71fc796e478326ba118ef6b939b775fbed97ba504a8712eee54a46d35081e84fbc66d2ccb3a52874fa256671c5 SHA512 a1c78474d2b67323d7d06018d53646df667fb3a6ed8ece9f6b482b4492c84cc71287b28932dde1a2962a610019b1c6290370fa100076fc185147c4406125870c
-DIST dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod 43 BLAKE2B cff5f7b2d25e3da40a625b06b150c042b30e2ff9ccc59d96fbac61fa32662f07986d4d9ce89df8c0479119ba5ca1a2ddad8537d8daf8576bf93b1979afa581bb SHA512 20d56bff980c4af50c7dad8e3b30d6152ad71da004cc032c74f94fe132b2ed7757e59b420226b14e1900ce0f48df741b526814612c8eca1014db852ae409b0da
-DIST dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod 34 BLAKE2B 2d06e85972edda7081d69a24f79d8586b56d028c0c56e5512751535086f79444b03a50c53c763ba3b4596b11c9db6407824d88595c3c23edec8e711908f201c1 SHA512 8db816cd549d69ae78c02240c9d2fcf68460264ce3bede4878f11e9bc2a722186e4d32d494ff207216503127b548453cca0c1c532fa4f433de011d9ab0296f56
-DIST git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod 33 BLAKE2B 1876ea8756f905511c9bb18327d11e071b5595ca315e60fbb613b2bf441656e4bbb304198aa3937240a9641f51c147ab61701c6bc39978583147ebd4e62f2627 SHA512 20958dd7849b90732d66ff46316a8e234839491c7bb2688c59f9c755ea7458d810a345362d0145c9e4c15311f0d999b030a7ba53dac7266ab7b95b926de6302c
-DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod 114 BLAKE2B 970e1a4ad4507dea0b0edd259c1ca8439bff37a76b9f706cbde70a15c57a90ad7fea738c03762e83824052cb84d025ea65e32d76b395dd7a968daada036918c4 SHA512 d03d2cd1f8e526d2efbea4cbb3d5915b70095cd921a111d97b5acea9dd1e7594f5fa1719df17637606945269563c9e6c64deb00af61adf2ad1581dcc485aaeea
-DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip 22219 BLAKE2B d516576021eaafe8bf16205681fb2da682eb151e889320ca8cf110275959dee546bb30c8485dffb76a7e8a5cbdf2cc5040bc0169505feada70dce48d664cff10 SHA512 6044ee433265b00ce865312c00aa848f2578affe0fa86a6ce5d05697539e373783eadfabac905e2114ee1efabd16151e6004c15e4b0ae7b79545667450a8ae5d
-DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.mod 130 BLAKE2B 3e94c2178b0aeabcc5391ab0d7d7684378d2d84fcae0b098a1aad2b08f154e0299879769c307eed0e42340c4bc06eb68881dffb04d6c9241a808ac2348aa83c2 SHA512 be347e2e234c217a9e0f4221a5e2cd6878141dba894c757440e46e55cb111e696e971ecff6159eaada4125594b42c65eae5db4658f2c0bc7bc488cc9ac9e9c31
-DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.zip 22813 BLAKE2B 608887bd25846bd5dca5445a10525d798aedf84881c9abb38537f86c485a54691219e5475bed9e0d33f19910ba1d37189a78c936b6223610294df8c3b132483a SHA512 510b422b6ea699208856a29b8b17a42e231ffa95e165275d9e07c6c7011e25b06e19f2f1a4f6a7378d0f4f1de493ad47ef146879b0e2fb0470449c4757fbef28
-DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.10.0.mod 383 BLAKE2B 02151eb0738757d716e533a60ba232da493cc10563decdba722a1739ebf9db92c44f4436b064cea42f9b6a6f4324a1a35270eba2f05cbe89a597254ab21b04cf SHA512 926ec3206d9bacb0e63bfe59db4af366d44fd5d76ee987e82db32d978a36a6d55880a0328b8587f99bc1d2c35ee71fc17405c3383ce94fd079aa0be8f874e540
-DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.10.0.zip 260982 BLAKE2B c7444e807f04e766596f049ee867e23f57c3087477c71fdf44c7bf62e65f40f033fa082cbaef24647eb371085230cfd35a40cf59dbcc39e5304a08ba5758f996 SHA512 7880691f61d8decc2e5e1f6647fe13574ef89ba06459a2bb192da218527b71b76fdafa9152fc3d11bbfa751b25d5300be7f15a0c812d8fa358f637d3556908e5
-DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.14.0.mod 313 BLAKE2B cdd1e0cdb35e7661d6b016f5394bed70800da894e3198c1a4b0a4a72bb9a72835b03add818d3a47084fd82e819f6f8a704f3fe64251468c127c4dd70fda13315 SHA512 dfe42541f2dfb16de5246ecaece418db8ff3f4bef1e77dae32220a58c1c71218ff67b8b7b40f8e544f5b64f96c557fb07fe7afedba657fee3fb39a30f52d6bac
-DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.14.0.zip 302225 BLAKE2B 147e7289f97915a54bf57cc166a4a4dea5cfdc8885c7cdf838feefb4c34dfccefa5d88324a6c06783d5612d81fad8a162bc206cab512a19bcf2b9866a1e055d2 SHA512 940bbbccb2ead1e9469b27c79b4f68432493b3355ea4836e1cd64c3bd5be44a8d9d13c0b1acafd689d8ca8183d941f4cd5cfa12d0855c11271930b9bf7c069df
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip 24733 BLAKE2B 66be4a311f84fec9bf833da384747f93cded83fb7cfe07481ef9a8a5747b626c3da56437e24b687524403d463463599c193a0e4dd367f4afd4b7c41fee7dbea9 SHA512 b5615d6e8b8e3d1550218258027891063d3296af88918fd63559d2c108a5faad4ee1281c57dbbe51057f1c417ba94895a59e969550acc0ed276a7cf648ff6ac7
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.zip 96932 BLAKE2B d2dc2a89edf90b671ae441ab2c2ca6a5aa2b228cd5279f78714f43563ce98d5755386fb544fc007886315b4ebfb139205f70e5f7bc8e3c8e69fb779162e3848a SHA512 ad0798726a0c4c15525c3511b28785a626d6835e872956549d38ca1fce7351a2c8be930081c6d2f22c409665218bd854c54460e149a91dfa9f57d6fe6ef2ad1b
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.zip 40676 BLAKE2B caaf1d9fe9b5eeb4809bea57c8f66cd28fbfcc7c7c05a2a387aafe615dde1dd7dab7acbe5a52cc5d09b5af68bb3282a117a49a809349e93054ff535859b1f8fa SHA512 85c9d9d28312e52cef5a3f6900342ee9c4324405aa79a3f93be96d4b981bbef450f67aee77f86c941fa637e62c90b5cf9612ed8703c1243124d7ea1ac6315566
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod 424 BLAKE2B 19dd207fb48b9175da4fb2afa17012cc48a2da5eea52ba9e2f32250b291ddaebc5fd8ffb42d19c8fb8fd1265ac2f7ae5525863010f6502c1c86616ca22600bcc SHA512 873698094ff3f392a54d01ae2b5744cbdce84e10b7c28b930aa7366d72dde4ece9636e168b003c46f8a21eeebddab150e687626338f6d938798b99c35bb62ced
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.14.mod 424 BLAKE2B 19dd207fb48b9175da4fb2afa17012cc48a2da5eea52ba9e2f32250b291ddaebc5fd8ffb42d19c8fb8fd1265ac2f7ae5525863010f6502c1c86616ca22600bcc SHA512 873698094ff3f392a54d01ae2b5744cbdce84e10b7c28b930aa7366d72dde4ece9636e168b003c46f8a21eeebddab150e687626338f6d938798b99c35bb62ced
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.14.zip 47896 BLAKE2B d0b6ac98127c235e5103ba1f2b45940d5c973058e5bc7373534e76a4c8a1abaf51e5bf7f10f96b52bff495aa2a0f97aaaf00f1782f98c25f0231736f74296b7d SHA512 6f407cd44ea93583e926e7ef6f9d9e8a5a9c003d2cfb84b2c95281d52b3fbbcb6385e94fe1310f4d4a0dbee66349a45bb9ce3fcf58abb6db93d933a3fd49420a
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip 18897 BLAKE2B 984f84c50aa5024a3eb78369d669ad73e9b6a7ee6bc7a7ae95667d29706bbb7f6d1f06a8e8e98e037a1226ac9f9637e6072735a3d01b8467f3f21657ccbf7929 SHA512 3eb5646b62d06c1d610de05889dc4533e0bfe1ee5de2fd9feda4f4dea0606ddc7c667a41c73687460ab1f28f4fb17ea9b3f79b5c93ad6c4aaac6b0b9f15cd8ce
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip 18297 BLAKE2B 5691fe3176a689e7f79f39cac16d24e00334f2107892df1b4f38d0816a69decd6ad0a906a4932e0d79db60723f51d3a92a87b359bbb87df8b0ef2131dc097ef5 SHA512 9e4a0d741c735d4e285ce8b0fbb7f19e98424593cadc64a5b958e273bab208e8102140c4570069ee4e35ae3c1f5bcddba3cda854f7a6df6b50f736008a5a34a5
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip 9849 BLAKE2B 710903822f31a6678941a4489984af5b5cb7a82a97476a642fbe35061d4df496ce79159a82e4e7871fb9dfdbc3cead15416d29ac8d293165bfeb29b4c973c546 SHA512 1529a7855dce3307332e12e3b717b8c6ed9c274637e357007801df890332304f88f7aa159da3bc3685701f49edd78cbd10895131daea9c6c034d7619d21847a5
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip 9299 BLAKE2B ade95bdf956e40a7c5a6e44d75d4b1b999aa02ef7b3a8bb6c33dac291d2ba06d4c691dc87ddedd6c3218b67b1fbb512529eea41d2d62a18226a82de2e01c0df6 SHA512 ff018e85092e3aaf288aba57d453088eaf24d22638f57f0d494dfa36899070c07938e50362d22267f1b40a65a69e7930a3214ea29f02ba6406a1de2b3c770de5
-DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
-DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B aef4f369994d869906ca45a1051cc706579525324b8fe2a5c98dd4d80d4181366ff7e3cbb08f3274762a6f2ab2259a2770fa11a9b088b07ff3abf1a241d01814 SHA512 f81a070b61e026440ddd9b29174fd1d59241eb32d1fb4a2202c38fe80022aaff07b389ed6d75eff27da9408a7832f74c51f3c53866774cd9125e83c9f258bb61
-DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
-DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip 10631 BLAKE2B 23199c0e4bffb67d890f4ac5729c97f3546e178e53f65c725fcf3728f625696ad96a6bbdd13fba9c45da6c849eed44e5143e6efd174c8dc0dc0b2a9345f61929 SHA512 974649535e3db11c2ac0ae8f3a3b401f0d967ce3562c55f92c41af6a9aaad69cc22066d00c15d8be17ac545e1b39689e35b3377eaae8d48571a961f86476e59f
-DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
-DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155
-DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
-DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip 7440 BLAKE2B 51b84bff91f8490df83c9a013b58acc0cbc6fccb77ee765379e94797073521242aae7066de134c1064f460c15df57d9bce42e934d95336160413050c61b69276 SHA512 b602a1a658c95e12e71c814c40ca44356a615d48c1cc8f1aeb0130edf0c5eba10f2da2e335ff70989a1dbe4dfe789b86ff5f02424d6ae4ff3f5117e292951b3b
-DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
-DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip 13778 BLAKE2B cb389977b9c081b3531f0d62708b8f0202deb17ac651100343b6e59c668c7135e1eb0ea0c0dc4ebb953b6d8c8df40498e09362e8415f6daa8725e4c768813082 SHA512 0b87ddabac154fad7ea06ed88d28fc4586dd41afac9a2eedb2b0b3a695ef52354d3bb6f087c2422b88cc58778afa0e6a4da19fd2fb0fae5a125aaad79fc92d53
-DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
-DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
-DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
-DIST github.com%2F!julusian%2Fgodocdown%2F@v%2Fv0.0.0-20170816220326-6d19f8ff2df8.mod 37 BLAKE2B 5f68bd2d683e27df16421381d24e96e646906df90004acb9cc83e4c65cfc2c5b8429a2aef048659328b55023c09ed40a4f76870071892ade44cd89bf86049b0e SHA512 6d1318c27e3022371555bf689aa605b10bf4bd5a1e2f58aa4fc577272ed3f46f301bcddba0a122d9a3eb7a906aba92ae32f1a44b225a31409e10d28932f1e0bb
-DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.5.0.mod 177 BLAKE2B 1abd608ff82193394b1553334bad24f5062c68fbc1b773733d4e69d121e4c23879207bee0211488307dd055def52bf24464b2be9685f10efdb23d63f8745bcf7 SHA512 5a32f55d6a4c3269cfa12d67a4f083477dfc5743b80911055c9e415bcc7cf477077478286fee918c154309d1420d19f811b8222e022df09ba2b7a3e1c93ffb38
-DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.5.0.zip 116495 BLAKE2B cc0e829f93c7f5ac8a5a3e1f1dee0b6fe6472afad9552d73052b8b36dbc63697a24f433d07fc5f74a719549b668a52c42f93d7c981cfdc74fb4a044f5dbb7ad4 SHA512 6a53f2a836adc34f59860858ae718d46dd015dea0e6d53d19b58ce7ed662e877a36693c6b2b9c7e243bdb80ec7cde4bf122ebe45924aca8bbd90f7aef7ef0cf6
-DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
-DIST github.com%2F!roaring!bitmap%2Froaring%2F@v%2Fv0.4.7.mod 40 BLAKE2B b44c63cdfc82888697723b5342dd100042599a8b5ed94e0f743f3c3e44833432bfe9cb1a673aceba123c14fd054c93e4398cb391717b805faa39f7090ec0796a SHA512 f6ce2a55f08fca0d8d18a21570db3933e816f0117d8b8f792da159d6798a19726d850d2427cfa3c7d8c78beaba0609d80fb7486594b57ae01d4d222fb908e966
-DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.mod 86 BLAKE2B 6c2c22f1d5872c1b1dc64b77d2275d5f639866ee0e8c923090b8435d0873f358cf041356d2fed267e5a8d5952ef007cb21deaa0ecce688444b40ce3416d9b47d SHA512 5d265223a8ce7ca21d85cabf22eb44adc5021de447f085ab0734f278fe05dfa897040c40350ee13558491c9c1ce6e1e36320625e86a9b9b550319c787da60b78
-DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.zip 16105 BLAKE2B 0b066c6e8641294301749adfdd4afb2093444518b66fbc2d03ed3507551cf1a326d1e4e781701f57884d2d4112278e711ea3ee9cdaa203f7a93c2484608a8564 SHA512 27350fbcf1f6b76b704af269766b408f8ef2500b9ae4ba22f311839bae3d1148c12a59f7f940dbfbe528824918c6b06f9856cce39dba73756e2c2636659aa890
-DIST github.com%2F!unknwon%2Fgoconfig%2F@v%2Fv0.0.0-20191126170842-860a72fb44fd.mod 35 BLAKE2B 3fa6b1095c574b70b16551036cb056f2682bee7c4d72561a517b78a0639fb7087763a843cfe440a2e16d6d9e1ae8fbd7b23d494b3c2c329c1e334f385d6c26c0 SHA512 c3587cf56f66da44740ab45674394b4106398eec10361095205cfabe29f53ca11dcfe91c964c7a46de152a715e2ea56d5c4c13e3c94d729561450754f7dd15e8
-DIST github.com%2F!unknwon%2Fgoconfig%2F@v%2Fv0.0.0-20191126170842-860a72fb44fd.zip 21167 BLAKE2B 01ffca9794bf32b323526d27d1840b753cf7a42523b9f5a407c2984c3dafc6cb963023dac3254b31241507ff4514ad8ef2804cbcf27a1813b7e53298b35a3d38 SHA512 b42ad4612415fdeac1ddf90850e0ce70d3f5946a6eb4ca63260a4d88b2b1625a32eece98b2a1438d845fc32c0e4335352d803d961ed9951307c8c60d6c3df5f6
-DIST github.com%2F!unknwon%2Fgoconfig%2F@v%2Fv0.0.0-20200908083735-df7de6a44db8.mod 35 BLAKE2B 3fa6b1095c574b70b16551036cb056f2682bee7c4d72561a517b78a0639fb7087763a843cfe440a2e16d6d9e1ae8fbd7b23d494b3c2c329c1e334f385d6c26c0 SHA512 c3587cf56f66da44740ab45674394b4106398eec10361095205cfabe29f53ca11dcfe91c964c7a46de152a715e2ea56d5c4c13e3c94d729561450754f7dd15e8
-DIST github.com%2F!unknwon%2Fgoconfig%2F@v%2Fv0.0.0-20200908083735-df7de6a44db8.zip 21887 BLAKE2B ed1714f7b697af6c0a6b9b7eda2f8aeca2240f9caf1e3d7e00209e030b4428de9fcb99a4cec13e8740a997d2b6daa25d3d517e9053c2d930fc46227c094aa92f SHA512 9afe81e873d81eb4b9c633ed99a7c712fc339ed663437e88f95832677f2383ddd21dac879d01cb448d11cf0b2d3ab34f98d6c4a1fd61b9e499a28da5473a0392
-DIST github.com%2Fa8m%2Ftree%2F@v%2Fv0.0.0-20181222104329-6a0b80129de4.mod 27 BLAKE2B 95d66662dce1ab5bc9800eb098b36c6494cc2cf3e742f6537d6361401325b18bdd7b6e933a9f72a6a8aad0d19e38e38b18b2002a1dd25ab26fc96b7505d4388b SHA512 c64df5fe6e4ec181850a2c87595e0a9cf3f4c8b13303c8f90c21d55fddfbc26b5dc2f6765708bb72992eeb61662047f0b3f3bc951d223b54831a743bf164938f
-DIST github.com%2Fa8m%2Ftree%2F@v%2Fv0.0.0-20181222104329-6a0b80129de4.zip 17087 BLAKE2B 18a4c6d31fc947c95da7aee0c36a91fc08540afe817963e8b43367d69f7ae43c1bdc3c89bbf36f49b6d49a60c098ff08aa648472010d1718ec6712a7a47044e4 SHA512 53f6bd666dc8c41c2452faddde42c392a14695797dcf91aa86554aa9d9fb19289306d5060008c7dccccf6f954aeac45a2d75d2911155ae76885a797a9be17f4f
-DIST github.com%2Fa8m%2Ftree%2F@v%2Fv0.0.0-20210414114729-ce3525c5c2ef.mod 27 BLAKE2B 95d66662dce1ab5bc9800eb098b36c6494cc2cf3e742f6537d6361401325b18bdd7b6e933a9f72a6a8aad0d19e38e38b18b2002a1dd25ab26fc96b7505d4388b SHA512 c64df5fe6e4ec181850a2c87595e0a9cf3f4c8b13303c8f90c21d55fddfbc26b5dc2f6765708bb72992eeb61662047f0b3f3bc951d223b54831a743bf164938f
-DIST github.com%2Fa8m%2Ftree%2F@v%2Fv0.0.0-20210414114729-ce3525c5c2ef.zip 19179 BLAKE2B 2bac48712f77eb47c367c3ddd371b3bf8b7bcb0e88a51e4e0268c75b8cb52b8a236b65fa032e7ba40873001487c30674d16e2f4f516f477c0e83a299f9126f57 SHA512 07501ada2fa644fe0b76f8b67dfbda9309357299782106df283bf7ebd5038980ea3c33a95ae5607fde8412d102e99f1831b8c71fbfb4c399b62337cc7bc8fa7f
-DIST github.com%2Faalpar%2Fdeheap%2F@v%2Fv0.0.0-20200318053559-9a0c2883bd56.mod 32 BLAKE2B 478fad943b5ed2e3ec1262a81f7544af90bd56ab659fd2146ad54b22229c99fcfda8f6c0c0e091d97987cfa47a460b731c964cd705ea9353df31c19e73c94138 SHA512 e1a3ec96c7c5b844625f6a4534d0e93332a055afa6c2499dd72bdfd342bf79b5478075b8c5812e566f9ab98acd228f987f58dbf8980e8be119b0db8c2b4c561e
-DIST github.com%2Faalpar%2Fdeheap%2F@v%2Fv0.0.0-20200318053559-9a0c2883bd56.zip 10285 BLAKE2B 230272d5f0e626ba2e5a4891bf3da2eec3d287407f1b4375caac0a5cacf3aeae874faebc1c9facce0ce9285f2341cfb678bea6ce826f7d20b40dae7d3f33a894 SHA512 a2c8a1977d946a6da80d32a21b051bb27e1c6ec057d1f692c949d40106a8f9eb74ad32716cc7e8d9a188e0eb3974c21f9e1c323a3916c6b9e18625fc6d2b5a4c
-DIST github.com%2Fabbot%2Fgo-http-auth%2F@v%2Fv0.4.0.mod 37 BLAKE2B c2092425b8c00b2d65f9acd280a767c1688bf3836e447a49d9e16e1f36984d6f0a8efffe35ed40fda5553a4bf45202f716e0471dd95086064c67da107a535730 SHA512 37c17489e7a493c676569f210c4909a5dbe595992919a65b1e5e5111fe39c567e8e8238e31d9e034b64fb72f5c9addc4ed958b3e7ef264ba9387b24760ddff78
-DIST github.com%2Fabbot%2Fgo-http-auth%2F@v%2Fv0.4.0.zip 23279 BLAKE2B 8487b3dc039694c667e6769bb6