From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- net-misc/Manifest.gz | Bin 55602 -> 55883 bytes net-misc/aggregate/Manifest | 2 +- net-misc/aggregate/aggregate-1.6.ebuild | 2 +- net-misc/apt-cacher-ng/Manifest | 9 +- .../apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild | 132 ------ net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild | 131 ------ net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild | 137 ++++++ .../files/apt-cacher-ng-3.3-flags.patch | 60 --- net-misc/asterisk-core-sounds/Manifest | 1 + .../asterisk-core-sounds-1.6.1-r1.ebuild | 69 +++ net-misc/asterisk-extra-sounds/Manifest | 2 +- .../asterisk-extra-sounds-1.5.2.ebuild | 11 +- net-misc/asterisk-moh-opsound/Manifest | 2 +- .../asterisk-moh-opsound-2.03-r1.ebuild | 4 +- net-misc/asterisk-opus/Manifest | 4 + .../asterisk-opus/asterisk-opus-13.0.1.3.0.ebuild | 48 ++ net-misc/asterisk-opus/metadata.xml | 16 + net-misc/asterisk/Manifest | 14 +- net-misc/asterisk/asterisk-13.31.0.ebuild | 2 +- net-misc/asterisk/asterisk-13.32.0-r1.ebuild | 331 ++++++++++++++ net-misc/asterisk/asterisk-13.32.0.ebuild | 332 ++++++++++++++ .../files/asterisk-13.32.0-binutils-2.34.patch | 18 + .../asterisk-historic-dahdiras-without-root.patch | 23 + .../asterisk-historic-dundi-null-dereference.patch | 40 ++ ...terisk-historic-invert-gmine-search-order.patch | 12 + .../asterisk-historic-no-var-run-install.patch | 14 + .../asterisk/files/asterisk-historic-uclibc.patch | 23 + net-misc/asterisk/files/confd-13.32.0 | 160 +++++++ net-misc/asterisk/files/initd-13.32.0 | 380 ++++++++++++++++ net-misc/asterisk/files/initd-13.32.0-r1 | 362 ++++++++++++++++ net-misc/axel/Manifest | 13 +- net-misc/axel/axel-2.12.ebuild | 46 -- net-misc/axel/axel-2.14.1.ebuild | 53 --- net-misc/axel/axel-2.15.ebuild | 53 --- net-misc/axel/axel-2.17.7.ebuild | 2 +- net-misc/axel/axel-2.17.8.ebuild | 41 ++ net-misc/axel/axel-2.4-r3.ebuild | 48 -- net-misc/axel/axel-9999.ebuild | 54 --- net-misc/bridge-utils/Manifest | 2 +- net-misc/bridge-utils/bridge-utils-1.5.ebuild | 2 +- net-misc/chrony/Manifest | 20 +- net-misc/chrony/chrony-3.1.ebuild | 119 ----- net-misc/chrony/chrony-3.3.ebuild | 121 ------ net-misc/chrony/chrony-3.4.ebuild | 123 ------ net-misc/chrony/chrony-3.5-r3.ebuild | 152 +++++++ net-misc/chrony/chrony-4.0_pre1-r1.ebuild | 155 +++++++ net-misc/chrony/chrony-4.0_pre1.ebuild | 130 ++++++ net-misc/chrony/chrony-9999.ebuild | 39 +- .../chrony/files/chrony-3.4-systemd-gentoo.patch | 28 -- .../files/chrony-3.5-r3-systemd-gentoo.patch | 12 + net-misc/chrony/files/chronyd.conf | 2 +- net-misc/chrony/files/chronyd.init-r1 | 69 --- net-misc/chrony/files/chronyd.service-r2 | 12 - net-misc/chrony/metadata.xml | 2 + net-misc/cmst/Manifest | 2 + net-misc/cmst/cmst-2020.03.07.ebuild | 42 ++ net-misc/connman/Manifest | 5 +- net-misc/connman/connman-1.37.ebuild | 95 ---- net-misc/connman/connman-1.38.ebuild | 2 +- .../connman-1.33-polkit-configure-check-fix.patch | 15 - net-misc/curl/Manifest | 14 +- net-misc/curl/curl-7.65.0.ebuild | 238 ---------- net-misc/curl/curl-7.65.3.ebuild | 246 ----------- net-misc/curl/curl-7.66.0.ebuild | 2 +- net-misc/curl/curl-7.67.0-r1.ebuild | 4 +- net-misc/curl/curl-7.68.0.ebuild | 2 +- net-misc/curl/curl-7.69.0.ebuild | 265 +++++++++++ net-misc/curl/curl-7.69.1.ebuild | 265 +++++++++++ net-misc/dahdi-tools/Manifest | 5 +- net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild | 3 + .../files/dahdi-tools-3.1.0-cplusplusexternc.patch | 26 ++ .../files/dahdi-tools-3.1.0-execinfo.patch | 40 ++ .../files/dahdi-tools-3.1.0-fno-common.patch | 39 ++ net-misc/dahdi/Manifest | 2 + net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 101 +++++ net-misc/dhcp/Manifest | 6 +- net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +- net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +- net-misc/dhcp/dhcp-4.4.2.ebuild | 2 +- net-misc/dhcpcd/Manifest | 19 +- net-misc/dhcpcd/dhcpcd-7.2.3.ebuild | 2 +- net-misc/dhcpcd/dhcpcd-7.2.5.ebuild | 4 +- net-misc/dhcpcd/dhcpcd-8.0.6.ebuild | 4 +- net-misc/dhcpcd/dhcpcd-8.1.5.ebuild | 144 ------ net-misc/dhcpcd/dhcpcd-8.1.6.ebuild | 2 +- net-misc/dhcpcd/dhcpcd-8.1.7.ebuild | 144 ++++++ net-misc/dhcpcd/dhcpcd-9.0.0.ebuild | 175 ++++++++ net-misc/dhcpcd/dhcpcd-9999.ebuild | 36 +- .../files/dhcpcd-9.0.0-no_ipv6_build_fix.patch | 92 ++++ net-misc/dhcpcd/metadata.xml | 3 + net-misc/dropbear/Manifest | 6 +- net-misc/dropbear/dropbear-2017.75.ebuild | 98 ----- net-misc/dropbear/dropbear-2018.76.ebuild | 101 ----- net-misc/dropbear/dropbear-2019.78.ebuild | 4 +- net-misc/dropbox/Manifest | 24 +- net-misc/dropbox/dropbox-89.3.268-r1.ebuild | 109 ----- net-misc/dropbox/dropbox-89.4.278.ebuild | 109 ----- net-misc/dropbox/dropbox-90.4.307.ebuild | 109 ----- net-misc/dropbox/dropbox-91.4.548.ebuild | 109 ----- net-misc/dropbox/dropbox-92.3.365.ebuild | 102 ----- net-misc/dropbox/dropbox-93.4.273.ebuild | 102 +++++ net-misc/dropbox/dropbox-94.3.371.ebuild | 102 +++++ net-misc/dropbox/dropbox-94.4.384.ebuild | 102 +++++ net-misc/ena-driver/Manifest | 4 +- net-misc/ena-driver/ena-driver-2.0.2.ebuild | 35 -- net-misc/ena-driver/ena-driver-2.2.3.ebuild | 40 ++ net-misc/ethertypes/Manifest | 2 +- net-misc/ethertypes/ethertypes-0.ebuild | 4 +- net-misc/fakeidentd/Manifest | 2 +- net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild | 2 +- net-misc/freerdp/Manifest | 6 +- net-misc/freerdp/files/2.0.0-backports.patch | 94 ++++ net-misc/freerdp/freerdp-2.0.0-r1.ebuild | 126 ++++++ net-misc/freerdp/freerdp-2.9999.ebuild | 125 ++++++ net-misc/freerdp/freerdp-9999.ebuild | 13 +- net-misc/geoipupdate/Manifest | 2 +- net-misc/geoipupdate/geoipupdate-2.3.1.ebuild | 2 +- net-misc/getdate/Manifest | 2 + net-misc/getdate/files/getdate-glibc-2.31.patch | 13 + net-misc/getdate/getdate-1.2-r2.ebuild | 42 ++ net-misc/gnome-online-miners/Manifest | 2 + .../gnome-online-miners-3.34.0.ebuild | 39 ++ net-misc/htpdate/Manifest | 6 +- net-misc/htpdate/htpdate-1.0.7.ebuild | 4 +- net-misc/htpdate/htpdate-1.2.0.ebuild | 4 +- net-misc/htpdate/htpdate-1.2.2.ebuild | 4 +- net-misc/ipcalc/Manifest | 2 +- net-misc/ipcalc/ipcalc-0.41.ebuild | 2 +- net-misc/iputils/Manifest | 12 +- ...rt-partially-fix-sent-vs-received-package.patch | 34 ++ ...-main-loop-over-multiple-addrinfo-results.patch | 86 ++++ ...ping-try-next-addrinfo-on-connect-failure.patch | 190 ++++++++ net-misc/iputils/iputils-20180629.ebuild | 2 +- net-misc/iputils/iputils-20190515.ebuild | 4 +- net-misc/iputils/iputils-20190709-r1.ebuild | 203 +++++++++ net-misc/iputils/iputils-20190709.ebuild | 2 +- net-misc/iputils/iputils-99999999.ebuild | 2 +- net-misc/jwhois/Manifest | 2 +- net-misc/jwhois/jwhois-4.0-r1.ebuild | 2 +- net-misc/kea/Manifest | 4 +- net-misc/kea/kea-1.7.4.ebuild | 76 ---- net-misc/kea/kea-1.7.6.ebuild | 73 ++++ net-misc/keychain/Manifest | 4 +- net-misc/keychain/keychain-2.8.1.ebuild | 2 +- net-misc/keychain/keychain-2.8.5.ebuild | 2 +- net-misc/lksctp-tools/Manifest | 4 +- net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild | 2 +- .../lksctp-tools/lksctp-tools-1.0.18-r1.ebuild | 2 +- net-misc/lldpd/Manifest | 2 + net-misc/lldpd/lldpd-1.0.5.ebuild | 105 +++++ net-misc/memcached/Manifest | 13 +- .../memcached/files/memcached-1.6.0-gcc10.patch | 34 ++ net-misc/memcached/files/memcached.init2 | 2 +- net-misc/memcached/memcached-1.5.14.ebuild | 97 ----- net-misc/memcached/memcached-1.5.21-r1.ebuild | 100 ----- net-misc/memcached/memcached-1.5.22.ebuild | 2 +- net-misc/memcached/memcached-1.6.2.ebuild | 99 +++++ net-misc/memcached/memcached-1.6.3.ebuild | 99 +++++ net-misc/miniupnpd/Manifest | 4 +- net-misc/miniupnpd/metadata.xml | 3 - net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild | 88 ++++ net-misc/mobile-broadband-provider-info/Manifest | 2 +- .../mobile-broadband-provider-info-20190618.ebuild | 2 +- net-misc/mosh/Manifest | 2 +- net-misc/mosh/mosh-1.3.2.ebuild | 2 +- net-misc/ncman/Manifest | 3 +- net-misc/ncman/ncman-0.0.1_p20190327-r1.ebuild | 34 ++ net-misc/ncman/ncman-9999.ebuild | 25 +- net-misc/netdate/Manifest | 2 +- net-misc/netdate/netdate-1.2-r1.ebuild | 4 +- net-misc/netifrc/Manifest | 26 +- net-misc/netifrc/netifrc-0.2.2.ebuild | 2 +- net-misc/netifrc/netifrc-0.2.3.ebuild | 2 +- net-misc/netifrc/netifrc-0.2.4.ebuild | 2 +- net-misc/netifrc/netifrc-0.3.0.ebuild | 2 +- net-misc/netifrc/netifrc-0.3.1.ebuild | 2 +- net-misc/netifrc/netifrc-0.4.0-r1.ebuild | 2 +- net-misc/netifrc/netifrc-0.4.0.ebuild | 2 +- net-misc/netifrc/netifrc-0.5.0.ebuild | 2 +- net-misc/netifrc/netifrc-0.5.1.ebuild | 2 +- net-misc/netifrc/netifrc-0.6.0.ebuild | 2 +- net-misc/netifrc/netifrc-0.6.1.ebuild | 2 +- net-misc/netifrc/netifrc-0.7.1.ebuild | 2 +- net-misc/netifrc/netifrc-9999.ebuild | 2 +- net-misc/netkit-fingerd/Manifest | 2 +- .../netkit-fingerd/netkit-fingerd-0.17-r3.ebuild | 2 +- net-misc/netkit-rsh/Manifest | 2 +- net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild | 2 +- net-misc/netkit-talk/Manifest | 2 +- net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild | 2 +- net-misc/netkit-telnetd/Manifest | 6 +- net-misc/netkit-telnetd/metadata.xml | 1 - .../netkit-telnetd/netkit-telnetd-0.17-r10.ebuild | 2 +- .../netkit-telnetd/netkit-telnetd-0.17-r12.ebuild | 12 +- net-misc/netpipe/Manifest | 2 +- net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild | 6 +- net-misc/networkmanager/Manifest | 7 +- ...-1.20.6-dont_call_helpers_with_full_paths.patch | 12 + net-misc/networkmanager/metadata.xml | 4 + .../networkmanager/networkmanager-1.22.10.ebuild | 333 ++++++++++++++ .../networkmanager/networkmanager-1.22.8-r1.ebuild | 333 ++++++++++++++ net-misc/nextcloud-client/Manifest | 2 + .../nextcloud-client/nextcloud-client-2.6.4.ebuild | 89 ++++ net-misc/ntp/Manifest | 9 +- .../ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch | 13 + net-misc/ntp/ntp-4.2.8_p13-r1.ebuild | 144 ------ net-misc/ntp/ntp-4.2.8_p13-r2.ebuild | 2 +- net-misc/ntp/ntp-4.2.8_p13.ebuild | 2 +- net-misc/ntp/ntp-4.2.8_p14-r2.ebuild | 144 ++++++ net-misc/ntpsec/Manifest | 9 +- net-misc/ntpsec/files/ntpd-r1.service | 5 +- ...ternalize-sys_maxclock-fix-for-bug-708522.patch | 23 + .../ntpsec-1.1.8-fix-asciidoc-version-detect.patch | 372 ++++++++++++++++ ...sec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch | 16 + net-misc/ntpsec/ntpsec-1.1.8.ebuild | 13 +- net-misc/ntpsec/ntpsec-9999.ebuild | 2 +- net-misc/oidentd/Manifest | 2 +- net-misc/oidentd/oidentd-2.4.0.ebuild | 2 +- net-misc/openntpd/Manifest | 6 +- net-misc/openntpd/openntpd-6.0_p1.ebuild | 2 +- net-misc/openntpd/openntpd-6.2_p3-r1.ebuild | 4 +- net-misc/openntpd/openntpd-6.2_p3.ebuild | 4 +- net-misc/openssh/Manifest | 18 +- .../files/openssh-8.2_p1-X509-12.4.3-tests.patch | 11 + .../files/openssh-8.2_p1-X509-glue-12.4.3.patch | 128 ++++++ net-misc/openssh/metadata.xml | 2 +- net-misc/openssh/openssh-7.5_p1-r4.ebuild | 335 -------------- net-misc/openssh/openssh-7.5_p1-r5.ebuild | 335 ++++++++++++++ net-misc/openssh/openssh-7.7_p1-r10.ebuild | 445 +++++++++++++++++++ net-misc/openssh/openssh-7.7_p1-r9.ebuild | 445 ------------------- net-misc/openssh/openssh-7.9_p1-r4.ebuild | 468 -------------------- net-misc/openssh/openssh-7.9_p1-r5.ebuild | 468 ++++++++++++++++++++ net-misc/openssh/openssh-8.0_p1-r4.ebuild | 465 -------------------- net-misc/openssh/openssh-8.0_p1-r5.ebuild | 465 ++++++++++++++++++++ net-misc/openssh/openssh-8.1_p1-r2.ebuild | 468 -------------------- net-misc/openssh/openssh-8.1_p1-r3.ebuild | 468 ++++++++++++++++++++ net-misc/openssh/openssh-8.2_p1-r3.ebuild | 482 --------------------- net-misc/openssh/openssh-8.2_p1-r5.ebuild | 482 +++++++++++++++++++++ net-misc/openssh/openssh-8.2_p1-r6.ebuild | 482 +++++++++++++++++++++ net-misc/openvswitch/Manifest | 4 +- net-misc/openvswitch/openvswitch-2.10.2.ebuild | 5 +- net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild | 5 +- net-misc/portfwd/Manifest | 2 +- net-misc/portfwd/portfwd-0.29-r1.ebuild | 2 +- net-misc/pps-tools/Manifest | 2 +- net-misc/pps-tools/pps-tools-1.0.2.ebuild | 4 +- net-misc/proxytunnel/Manifest | 6 +- net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild | 4 +- net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild | 2 +- net-misc/proxytunnel/proxytunnel-9999.ebuild | 4 +- net-misc/quagga/Manifest | 2 +- net-misc/quagga/quagga-1.2.4.ebuild | 16 +- net-misc/r8168/Manifest | 11 +- net-misc/r8168/files/kernel56.patch | 50 +++ net-misc/r8168/files/linux-4.15-2.patch | 85 ---- net-misc/r8168/files/linux-5.4.patch | 12 - net-misc/r8168/r8168-8.045.08.ebuild | 33 -- net-misc/r8168/r8168-8.047.05.ebuild | 38 -- net-misc/r8168/r8168-8.048.00.ebuild | 2 +- net-misc/r8168/r8168-8.048.02.ebuild | 36 ++ net-misc/rabbitmq-server/Manifest | 2 + .../rabbitmq-server/rabbitmq-server-3.8.3.ebuild | 80 ++++ net-misc/rdate/Manifest | 2 +- net-misc/rdate/rdate-1.4-r4.ebuild | 2 +- net-misc/rdesktop/Manifest | 4 +- net-misc/rdesktop/rdesktop-1.8.6.ebuild | 2 +- net-misc/rdesktop/rdesktop-1.9.0.ebuild | 2 +- net-misc/remmina/Manifest | 12 +- net-misc/remmina/remmina-1.3.10.ebuild | 2 +- net-misc/remmina/remmina-1.3.4.ebuild | 2 +- net-misc/remmina/remmina-1.3.6-r1.ebuild | 2 +- net-misc/remmina/remmina-1.3.9-r1.ebuild | 2 +- net-misc/remmina/remmina-1.4.1.ebuild | 2 +- net-misc/remmina/remmina-1.4.2-r1.ebuild | 98 +++++ net-misc/rsync/Manifest | 2 +- net-misc/rsync/rsync-3.1.3.ebuild | 2 +- net-misc/s3cmd/Manifest | 4 +- net-misc/s3cmd/s3cmd-2.0.0.ebuild | 2 +- net-misc/s3cmd/s3cmd-2.0.2.ebuild | 2 +- net-misc/smb4k/Manifest | 2 + net-misc/smb4k/smb4k-3.0.3.ebuild | 72 +++ net-misc/socat/Manifest | 6 +- net-misc/socat/socat-1.7.3.2.ebuild | 2 +- net-misc/socat/socat-1.7.3.3.ebuild | 4 +- net-misc/socat/socat-1.7.3.4.ebuild | 2 +- net-misc/spice-gtk/Manifest | 2 +- net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild | 4 +- net-misc/ssh-askpass-fullscreen/Manifest | 2 +- .../ssh-askpass-fullscreen-1.0-r1.ebuild | 2 +- net-misc/sslh/Manifest | 4 +- net-misc/sslh/sslh-1.20.ebuild | 4 +- net-misc/sslh/sslh-9999.ebuild | 4 +- net-misc/streamlink/Manifest | 6 +- net-misc/streamlink/streamlink-1.3.0-r1.ebuild | 2 - net-misc/streamlink/streamlink-1.3.1.ebuild | 2 - net-misc/streamlink/streamlink-9999.ebuild | 2 - net-misc/taylor-uucp/Manifest | 2 +- net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild | 2 +- net-misc/teamviewer/Manifest | 6 + net-misc/teamviewer/teamviewer-15.3.2682.ebuild | 136 ++++++ net-misc/teamviewer/teamviewer-15.4.4445.ebuild | 136 ++++++ net-misc/telnet-bsd/Manifest | 2 +- net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild | 4 +- net-misc/tigervnc/Manifest | 2 +- net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild | 2 +- net-misc/unix2tcp/Manifest | 2 +- net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild | 2 +- net-misc/utelnetd/Manifest | 2 +- net-misc/utelnetd/utelnetd-0.1.11-r1.ebuild | 34 -- net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild | 34 ++ net-misc/vinagre/Manifest | 2 +- net-misc/vinagre/vinagre-3.22.0-r3.ebuild | 2 +- net-misc/vino/Manifest | 4 - .../vino-return-error-if-X11-is-no-detected.patch | 41 -- .../vino/files/vino-segfaults-on-wayland.patch | 30 -- net-misc/vino/vino-3.22.0-r1.ebuild | 72 --- net-misc/vino/vino-3.22.0.ebuild | 66 --- net-misc/wakeonlan/Manifest | 2 + .../files/wakeonlan-0.41-ethers-lookup-r1.patch | 90 ++++ net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild | 25 ++ net-misc/wget/Manifest | 4 +- net-misc/wget/wget-1.20.3-r1.ebuild | 2 +- net-misc/wget/wget-1.20.3-r3.ebuild | 2 +- net-misc/wget2/Manifest | 4 + .../files/wget2-1.99.2-remove_ldconfig_call.patch | 25 ++ net-misc/wget2/metadata.xml | 16 + net-misc/wget2/wget2-1.99.2.ebuild | 92 ++++ net-misc/whois/Manifest | 8 +- net-misc/whois/whois-5.4.3.ebuild | 2 +- net-misc/whois/whois-5.5.5.ebuild | 2 +- net-misc/whois/whois-5.5.6.ebuild | 2 +- net-misc/whois/whois-9999.ebuild | 4 +- net-misc/x11-ssh-askpass/Manifest | 2 +- .../x11-ssh-askpass-1.2.4.1-r2.ebuild | 2 +- net-misc/youtube-dl/Manifest | 8 +- net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild | 78 ---- net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild | 78 ---- net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild | 75 ++++ net-misc/youtube-dl/youtube-dl-99999999.ebuild | 5 +- net-misc/youtube-viewer/Manifest | 8 +- net-misc/youtube-viewer/metadata.xml | 4 +- .../youtube-viewer/youtube-viewer-3.5.8-r1.ebuild | 75 ---- .../youtube-viewer/youtube-viewer-3.7.4-r1.ebuild | 91 ++++ net-misc/youtube-viewer/youtube-viewer-9999.ebuild | 39 +- 344 files changed, 11694 insertions(+), 6696 deletions(-) delete mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild delete mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild create mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild delete mode 100644 net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch create mode 100644 net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild create mode 100644 net-misc/asterisk-opus/Manifest create mode 100644 net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0.ebuild create mode 100644 net-misc/asterisk-opus/metadata.xml create mode 100644 net-misc/asterisk/asterisk-13.32.0-r1.ebuild create mode 100644 net-misc/asterisk/asterisk-13.32.0.ebuild create mode 100644 net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch create mode 100644 net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch create mode 100644 net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch create mode 100644 net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch create mode 100644 net-misc/asterisk/files/asterisk-historic-no-var-run-install.patch create mode 100644 net-misc/asterisk/files/asterisk-historic-uclibc.patch create mode 100644 net-misc/asterisk/files/confd-13.32.0 create mode 100644 net-misc/asterisk/files/initd-13.32.0 create mode 100644 net-misc/asterisk/files/initd-13.32.0-r1 delete mode 100644 net-misc/axel/axel-2.12.ebuild delete mode 100644 net-misc/axel/axel-2.14.1.ebuild delete mode 100644 net-misc/axel/axel-2.15.ebuild create mode 100644 net-misc/axel/axel-2.17.8.ebuild delete mode 100644 net-misc/axel/axel-2.4-r3.ebuild delete mode 100644 net-misc/axel/axel-9999.ebuild delete mode 100644 net-misc/chrony/chrony-3.1.ebuild delete mode 100644 net-misc/chrony/chrony-3.3.ebuild delete mode 100644 net-misc/chrony/chrony-3.4.ebuild create mode 100644 net-misc/chrony/chrony-3.5-r3.ebuild create mode 100644 net-misc/chrony/chrony-4.0_pre1-r1.ebuild create mode 100644 net-misc/chrony/chrony-4.0_pre1.ebuild delete mode 100644 net-misc/chrony/files/chrony-3.4-systemd-gentoo.patch create mode 100644 net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch delete mode 100644 net-misc/chrony/files/chronyd.init-r1 delete mode 100644 net-misc/chrony/files/chronyd.service-r2 create mode 100644 net-misc/cmst/cmst-2020.03.07.ebuild delete mode 100644 net-misc/connman/connman-1.37.ebuild delete mode 100644 net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch delete mode 100644 net-misc/curl/curl-7.65.0.ebuild delete mode 100644 net-misc/curl/curl-7.65.3.ebuild create mode 100644 net-misc/curl/curl-7.69.0.ebuild create mode 100644 net-misc/curl/curl-7.69.1.ebuild create mode 100644 net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch create mode 100644 net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch create mode 100644 net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch create mode 100644 net-misc/dahdi/dahdi-3.1.0-r1.ebuild delete mode 100644 net-misc/dhcpcd/dhcpcd-8.1.5.ebuild create mode 100644 net-misc/dhcpcd/dhcpcd-8.1.7.ebuild create mode 100644 net-misc/dhcpcd/dhcpcd-9.0.0.ebuild create mode 100644 net-misc/dhcpcd/files/dhcpcd-9.0.0-no_ipv6_build_fix.patch delete mode 100644 net-misc/dropbear/dropbear-2017.75.ebuild delete mode 100644 net-misc/dropbear/dropbear-2018.76.ebuild delete mode 100644 net-misc/dropbox/dropbox-89.3.268-r1.ebuild delete mode 100644 net-misc/dropbox/dropbox-89.4.278.ebuild delete mode 100644 net-misc/dropbox/dropbox-90.4.307.ebuild delete mode 100644 net-misc/dropbox/dropbox-91.4.548.ebuild delete mode 100644 net-misc/dropbox/dropbox-92.3.365.ebuild create mode 100644 net-misc/dropbox/dropbox-93.4.273.ebuild create mode 100644 net-misc/dropbox/dropbox-94.3.371.ebuild create mode 100644 net-misc/dropbox/dropbox-94.4.384.ebuild delete mode 100644 net-misc/ena-driver/ena-driver-2.0.2.ebuild create mode 100644 net-misc/ena-driver/ena-driver-2.2.3.ebuild create mode 100644 net-misc/freerdp/files/2.0.0-backports.patch create mode 100644 net-misc/freerdp/freerdp-2.0.0-r1.ebuild create mode 100644 net-misc/freerdp/freerdp-2.9999.ebuild create mode 100644 net-misc/getdate/files/getdate-glibc-2.31.patch create mode 100644 net-misc/getdate/getdate-1.2-r2.ebuild create mode 100644 net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild create mode 100644 net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch create mode 100644 net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch create mode 100644 net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch create mode 100644 net-misc/iputils/iputils-20190709-r1.ebuild delete mode 100644 net-misc/kea/kea-1.7.4.ebuild create mode 100644 net-misc/kea/kea-1.7.6.ebuild create mode 100644 net-misc/lldpd/lldpd-1.0.5.ebuild create mode 100644 net-misc/memcached/files/memcached-1.6.0-gcc10.patch delete mode 100644 net-misc/memcached/memcached-1.5.14.ebuild delete mode 100644 net-misc/memcached/memcached-1.5.21-r1.ebuild create mode 100644 net-misc/memcached/memcached-1.6.2.ebuild create mode 100644 net-misc/memcached/memcached-1.6.3.ebuild create mode 100644 net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild create mode 100644 net-misc/ncman/ncman-0.0.1_p20190327-r1.ebuild create mode 100644 net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch create mode 100644 net-misc/networkmanager/networkmanager-1.22.10.ebuild create mode 100644 net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild create mode 100644 net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild create mode 100644 net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch delete mode 100644 net-misc/ntp/ntp-4.2.8_p13-r1.ebuild create mode 100644 net-misc/ntp/ntp-4.2.8_p14-r2.ebuild create mode 100644 net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch create mode 100644 net-misc/ntpsec/files/ntpsec-1.1.8-fix-asciidoc-version-detect.patch create mode 100644 net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch create mode 100644 net-misc/openssh/files/openssh-8.2_p1-X509-12.4.3-tests.patch create mode 100644 net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.3.patch delete mode 100644 net-misc/openssh/openssh-7.5_p1-r4.ebuild create mode 100644 net-misc/openssh/openssh-7.5_p1-r5.ebuild create mode 100644 net-misc/openssh/openssh-7.7_p1-r10.ebuild delete mode 100644 net-misc/openssh/openssh-7.7_p1-r9.ebuild delete mode 100644 net-misc/openssh/openssh-7.9_p1-r4.ebuild create mode 100644 net-misc/openssh/openssh-7.9_p1-r5.ebuild delete mode 100644 net-misc/openssh/openssh-8.0_p1-r4.ebuild create mode 100644 net-misc/openssh/openssh-8.0_p1-r5.ebuild delete mode 100644 net-misc/openssh/openssh-8.1_p1-r2.ebuild create mode 100644 net-misc/openssh/openssh-8.1_p1-r3.ebuild delete mode 100644 net-misc/openssh/openssh-8.2_p1-r3.ebuild create mode 100644 net-misc/openssh/openssh-8.2_p1-r5.ebuild create mode 100644 net-misc/openssh/openssh-8.2_p1-r6.ebuild create mode 100644 net-misc/r8168/files/kernel56.patch delete mode 100644 net-misc/r8168/files/linux-4.15-2.patch delete mode 100644 net-misc/r8168/files/linux-5.4.patch delete mode 100644 net-misc/r8168/r8168-8.045.08.ebuild delete mode 100644 net-misc/r8168/r8168-8.047.05.ebuild create mode 100644 net-misc/r8168/r8168-8.048.02.ebuild create mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild create mode 100644 net-misc/remmina/remmina-1.4.2-r1.ebuild create mode 100644 net-misc/smb4k/smb4k-3.0.3.ebuild create mode 100644 net-misc/teamviewer/teamviewer-15.3.2682.ebuild create mode 100644 net-misc/teamviewer/teamviewer-15.4.4445.ebuild delete mode 100644 net-misc/utelnetd/utelnetd-0.1.11-r1.ebuild create mode 100644 net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild delete mode 100644 net-misc/vino/files/vino-return-error-if-X11-is-no-detected.patch delete mode 100644 net-misc/vino/files/vino-segfaults-on-wayland.patch delete mode 100644 net-misc/vino/vino-3.22.0-r1.ebuild delete mode 100644 net-misc/vino/vino-3.22.0.ebuild create mode 100644 net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup-r1.patch create mode 100644 net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild create mode 100644 net-misc/wget2/Manifest create mode 100644 net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch create mode 100644 net-misc/wget2/metadata.xml create mode 100644 net-misc/wget2/wget2-1.99.2.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild delete mode 100644 net-misc/youtube-viewer/youtube-viewer-3.5.8-r1.ebuild create mode 100644 net-misc/youtube-viewer/youtube-viewer-3.7.4-r1.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index df7113bcc547..9b3b7ab8e0e6 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest index c671108926ee..caac21ddbd01 100644 --- a/net-misc/aggregate/Manifest +++ b/net-misc/aggregate/Manifest @@ -1,4 +1,4 @@ AUX aggregate-1.6-build-fixup.patch 193 BLAKE2B 99a4266726eb7ef36cb58c5f3ace8c36bc1f923f453acb003f3f59af179ab88e5ef641b387c03912f476a8bb29a46fada6ce5b4b6382d7328fd06752134ba186 SHA512 6c7508f88da5f287b5dbf7e12bf5891722300d11d0c167659c816a28dd38e2cf46de928b4cda48ee8ff6b6201b01cc6a41bc22345eb478ab255b5c1dc2713b11 DIST aggregate-1.6.tar.gz 20566 BLAKE2B 8d7c9b16063da1481a1be57e1de8e73d5ee54ab8fe539b116263582b951bc84396b174388ce6ea1ee8126a1b1ac49e4e69dcfad8ded37f32edd429d620c4971f SHA512 b6c48540a6905c5b0c2195c91c6b19fa537f1a746adb7e173642c3f0bd894cbbd8f4ab7203f1c6b904538c4b0f1ce13138c5e00e6f05567992bfc51b8b459f84 -EBUILD aggregate-1.6.ebuild 630 BLAKE2B abb6acf97599dc38c3c8212c7aa7132d1209693a9733fb8c079f5e506ec90116f5093d0a08d700be3bc03ecbb8d4fb751ab37f33629fd87a80b1ab20c60666ba SHA512 c67517678076044267989a3153c012364e17593f23ac345844a72f1c727268cfe985f7e2804d53f543aa6b6170ad8f7a03c7dc8e51cecc0747135827687c9372 +EBUILD aggregate-1.6.ebuild 631 BLAKE2B a974acda258e63cff8a765b9cfe0491f317a322481b88928507b59e378c0f7cd903a58b058e73ff7426db8e0d083cfeb64317ecddf647fcc1a3f2d63598549f8 SHA512 cba2179cd5af585ae5b87dadfb8ce2e2414c62f0c3f2bef4d7d27ed4e5f07d54b9ba310d3ea2784e8713ff818b7e23c7b74c3a08a5a17292075b8bc7fff9b23c MISC metadata.xml 975 BLAKE2B 5478f76eb90bbdb4daee5ccc930312d6b1e6fa162e20824b1c6ee7c9371183ca3436fe000ba9b7c66d4b991ace6109b5ff4d0bd0453a7c055105e2d3007fc124 SHA512 f192380066542eb7a770edc78e4804f06b41bdc65dcd70a9a69618789220c220c7d97e9ba979e3cebb2d9813bf26664bfb7536d4c51e01071964561d72dac054 diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild index 62deaea14885..4e967e9b1a31 100644 --- a/net-misc/aggregate/aggregate-1.6.ebuild +++ b/net-misc/aggregate/aggregate-1.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://ftp.isc.org/isc/aggregate/${P}.tar.gz" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc sparc x86" +KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc sparc x86" IUSE="" RDEPEND="dev-lang/perl" diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest index 356d9bea735d..4ec3f5bedd87 100644 --- a/net-misc/apt-cacher-ng/Manifest +++ b/net-misc/apt-cacher-ng/Manifest @@ -1,17 +1,14 @@ -AUX apt-cacher-ng-3.3-flags.patch 2227 BLAKE2B a07848127807e0b03340934d721be6f159fa29357488f32f4c2f63cf07a0ffa5b67959693dc18f37a2d838963f6ba71c5acbac836c80db26e8c11494a7b07b3c SHA512 62f35a3e51cf7511b63f00ac48d70630cd2287ac0792f8a41ea6d244bccd00306787f838d21195e99af94b991ab343e7e54b4339fe3b80e92fa6586eea77070f AUX apt-cacher-ng-3.3.1-flags.patch 340 BLAKE2B e9de81bc2a73a24c99fc7f3509d5e94e148e5ec1c4c672c28428aec398344a37b180084f26f7050fc39a92942ffb2a743b87e13dda7b21d9085516c7847e29f7 SHA512 f57cf0f6d74f1326feb2796a92ed22c6e19dcfed923f6c3a130ca82e0a0abd3c7e629ca29eb1512aefd2500e2da75cdffbd32d53c727a1be52ea3d4664f4cceb AUX apt-cacher-ng-9999999-flags.patch 660 BLAKE2B 64c1e8ef41841daf8e13b1cc9a0a2fe8839200eb37663069c52e1a2e2ae1f454ed98d802b7dfa6df95c9f3f113badfbf6bc07f3e9aa9b8925e88c87c8a3af9ee SHA512 fb3332380708ec37179de9493193e8c674e38fbd38af00098572fbe1b66184e5c3358640a8f56d8e336582b496e3d0d924761a3dffdc397e98903beb90efa8de AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd2563eca81ec9db8e50aa9d34c9e31b1014ecf2db7e85cb055d7a67af494bf88c2ec9b9c13465 SHA512 c58ecc104ab7fa90cbccc1d9f9725c9ddad84bb7225ea3eea56d7874b060ce453e4576ca055e014b9621b9514d95a189915fead2057557fb785d9520d7121831 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a AUX initd-r2 1003 BLAKE2B f8e87da524cb10358420de9bc7e76d5b954cdfa70ba54637ca0b4653c1f718eebe77bbc3220003691d7163374f3af0aa4ca8568b76218d7214e2e498c2998f79 SHA512 f57c58074bbe1c35b748f94bf2a8a4aa10f8264e662b61c1178582f16f5e53c38941e9b2c2c0a46718ab8615ff426a887f64fe170da42b7aaaa9bb3c23a0fc00 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 -DIST apt-cacher-ng_3.3-2.debian.tar.xz 48496 BLAKE2B 327d57cdf74798b99067cdd7153aaba4d3fb03c047203fb1d59fce730c68a28b6db2853f5f944843b96d8613f213c0399ba78aed1b3a186968f8767d03c0fd0c SHA512 aa446b8147a42fa44fcd29754dabe388eedc9829cd908314ba97e0cacbd17d6a0222789015827196ab6fe3efd51ab08a2673ae7c04f5c0781705310e28ca44e7 -DIST apt-cacher-ng_3.3.1-1.debian.tar.xz 50912 BLAKE2B a873c4e718765a7161d9f87b68fc891202c6406e91252eb4b1aee6ca87f3497e6f4a1ca9353d3a86f3a8a24059339f2c370a707427f5baecb1e8b6d3977b445a SHA512 b643d9b38891ffd6603239ddb8635dd3dcd7c31d7a32fa128e9b4d632fa08c95ca652e1bdbd2bb046895341bc4611c436e6ff4d997ae2050cdb84e56fb311078 DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8 DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3 -DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f -EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2880 BLAKE2B 132ba8bc3e684efd3d907763bff442e17a561d12e7a679ab698d54a6f4b97f7a21399c372be8918759db3fad4905d4da2571d7cc0d8c74932c6338df4df3a565 SHA512 7ed99cd2482b820ae7bc44022a088ea21a4bbd123f075251d2cdd95a3c6ef7ebbecb7163de03218e1c1ad13383fe42b6e676a4799c4a2462ccd53e38c281ed6f +DIST apt-cacher-ng_3.4-1.debian.tar.xz 49880 BLAKE2B a49dc9ca415cd00f275f8aab61836ef002b9463a8ce22b2fbf1379ce908737d0df813e9d112e64667790e0c9c29ae44ca12291ff531fa565a30b0345c3970824 SHA512 49879c8786ba5aa6398ce43d733a71529a5c2a93a0e8e3e856bb7bf6d6dd0d8dcf9f6a96b291a3e77e0a71a9a990b5d0ade9134e5ec670a33592c9a1ab61a48e +DIST apt-cacher-ng_3.4.orig.tar.xz 324040 BLAKE2B 0164ac35815fb42a2197830134172c4b93677f6ee6add71d115e975a3b8538db18e635fae2fe9556346229dc076c732b3b3f6fb9958e347fee8876f0f2363c9e SHA512 956366431f4671afd46f3bc0cdb9acaf02378606a7e210a190902e519ed25d2d102a336032c31fcc8b71c879bd219f249f411af732bfb6f9213e485ba6981c5d EBUILD apt-cacher-ng-3.3.1_p2.ebuild 2987 BLAKE2B b3a076b3b4e58020e8795279da7c28cfa9f496f285814f34e5bcfc37976de7496e1e89df002f31e89bff8311db3ac261c1609041fc115cf85216b7214e9e90a4 SHA512 847e7cd3b1eab44f0d883da8bc6642b191b96302a9082e3f4a1ea80c65b4e5fc8382274ffdfc0dd19f93c7d4fac4db6bd003bd02a0bce14ac9971dc018cb35c1 -EBUILD apt-cacher-ng-3.3_p2.ebuild 2836 BLAKE2B 6e5556ca639c5dbf75b08d56aaec16a49c019cc720f124cd852747265c5ca25954ab01f99a3255eaf9d3bbcd271c7a919c7539d6b9883a8034a8dc0e9344073f SHA512 c9fc9be4c3f8d67984e1ac865bd77d04161d4d088edc4a412495a3bae78486f4dba60c302ad8aec11fb3e3abb979a4ef89398e21136e1fd3ca77a2c48ef25f20 +EBUILD apt-cacher-ng-3.4_p1.ebuild 2987 BLAKE2B b3a076b3b4e58020e8795279da7c28cfa9f496f285814f34e5bcfc37976de7496e1e89df002f31e89bff8311db3ac261c1609041fc115cf85216b7214e9e90a4 SHA512 847e7cd3b1eab44f0d883da8bc6642b191b96302a9082e3f4a1ea80c65b4e5fc8382274ffdfc0dd19f93c7d4fac4db6bd003bd02a0bce14ac9971dc018cb35c1 EBUILD apt-cacher-ng-9999999.ebuild 2766 BLAKE2B 4f701f236badb3a89b585690aab07e0004a5ac09daa6afb8dab499e3ae083ff6cf70ebba41c72ed6eb185c0c668d499c94d1f458da2c1117c9140a1a7b998dc2 SHA512 664184bd5ebc58302e952848ab301b241173e2ddec5896a9f99c35f96622d915e47d9243d590473d65d488fd66c869accb31c0cc7bd22c97245a0784b369186e MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild deleted file mode 100644 index b8e377221817..000000000000 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake-utils toolchain-funcs user - -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 -" -LICENSE="BSD-4 ZLIB public-domain" -SLOT="0" -SRC_URI=" - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz -" - -KEYWORDS="~amd64 ~x86" -IUSE="doc fuse systemd tcpd" - -COMMON_DEPEND=" - app-arch/bzip2 - app-arch/xz-utils - dev-libs/openssl:0= - sys-libs/zlib - systemd? ( - sys-apps/systemd - ) -" -BDEPEND=" - ${COMMON_DEPEND} - dev-util/cmake - >sys-devel/gcc-4.8 - virtual/pkgconfig -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl - fuse? ( sys-fs/fuse ) - tcpd? ( sys-apps/tcp-wrappers ) -" -PATCHES=( - "${FILESDIR}"/${PN}-3.3-flags.patch - "${WORKDIR}"/debian/patches/debian-changes -) -S=${WORKDIR}/${P/_*} - -pkg_pretend() { - if [[ $(gcc-major-version) -lt 4 ]]; then - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" - elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" - fi -} - -pkg_setup() { - # add new user & group for daemon - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_configure() { - local mycmakeargs=() - if use fuse; then - mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) - else - mycmakeargs+=( "-DHAVE_FUSE_25=no" ) - fi - if use tcpd; then - mycmakeargs+=( "-DHAVE_LIBWRAP=yes" ) - else - mycmakeargs+=( "-DHAVE_LIBWRAP=no" ) - fi - - cmake-utils_src_configure - - sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die -} - -src_install() { - pushd "${BUILD_DIR}" || die - dosbin ${PN} acngtool - dolib.so libsupacng.so - if use fuse; then - dobin acngfs - fi - popd || die - - newinitd "${FILESDIR}"/initd-r2 ${PN} - newconfd "${FILESDIR}"/confd-r1 ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}"/logrotate ${PN} - - doman doc/man/${PN}* - if use fuse; then - doman doc/man/acngfs* - fi - - # Documentation - dodoc doc/README TODO VERSION INSTALL ChangeLog - if use doc; then - dodoc doc/*.pdf - - docinto html - dodoc doc/html/* - - find conf -name '*.gz' -exec gzip -d {} \; || die - docinto examples/conf - dodoc conf/* - fi - - newdoc "${WORKDIR}"/debian/changelog debian.changelog - - # perl daily cron script - dosbin scripts/expire-caller.pl - exeinto /etc/cron.daily - newexe "${FILESDIR}"/cron.daily ${PN} - - # default configuration - insinto /etc/${PN} - newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf - doins $( echo conf/* | sed 's|conf/acng.conf.in||g' ) - - keepdir /var/log/${PN} - # Some directories must exists - keepdir /var/log/${PN} - fowners -R ${PN}:${PN} \ - /etc/${PN} \ - /var/log/${PN} -} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild deleted file mode 100644 index f92adf794bf4..000000000000 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake-utils toolchain-funcs user - -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 -" -LICENSE="BSD-4 ZLIB public-domain" -SLOT="0" -SRC_URI=" - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz -" - -KEYWORDS="~amd64 ~x86" -IUSE="doc fuse systemd tcpd" - -COMMON_DEPEND=" - app-arch/bzip2 - app-arch/xz-utils - dev-libs/openssl:0= - sys-libs/zlib - systemd? ( - sys-apps/systemd - ) -" -BDEPEND=" - ${COMMON_DEPEND} - dev-util/cmake - >sys-devel/gcc-4.8 - virtual/pkgconfig -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl - fuse? ( sys-fs/fuse ) - tcpd? ( sys-apps/tcp-wrappers ) -" -PATCHES=( - "${FILESDIR}"/${PN}-3.3-flags.patch -) -S=${WORKDIR}/${P/_*} - -pkg_pretend() { - if [[ $(gcc-major-version) -lt 4 ]]; then - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" - elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" - fi -} - -pkg_setup() { - # add new user & group for daemon - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_configure() { - local mycmakeargs=() - if use fuse; then - mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) - else - mycmakeargs+=( "-DHAVE_FUSE_25=no" ) - fi - if use tcpd; then - mycmakeargs+=( "-DHAVE_LIBWRAP=yes" ) - else - mycmakeargs+=( "-DHAVE_LIBWRAP=no" ) - fi - - cmake-utils_src_configure - - sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die -} - -src_install() { - pushd "${BUILD_DIR}" || die - dosbin ${PN} acngtool - dolib.so libsupacng.so - if use fuse; then - dobin acngfs - fi - popd || die - - newinitd "${FILESDIR}"/initd-r2 ${PN} - newconfd "${FILESDIR}"/confd-r1 ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}"/logrotate ${PN} - - doman doc/man/${PN}* - if use fuse; then - doman doc/man/acngfs* - fi - - # Documentation - dodoc doc/README TODO VERSION INSTALL ChangeLog - if use doc; then - dodoc doc/*.pdf - - docinto html - dodoc doc/html/* - - find conf -name '*.gz' -exec gzip -d {} \; || die - docinto examples/conf - dodoc conf/* - fi - - newdoc "${WORKDIR}"/debian/changelog debian.changelog - - # perl daily cron script - dosbin scripts/expire-caller.pl - exeinto /etc/cron.daily - newexe "${FILESDIR}"/cron.daily ${PN} - - # default configuration - insinto /etc/${PN} - newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf - doins $( echo conf/* | sed 's|conf/acng.conf.in||g' ) - - keepdir /var/log/${PN} - # Some directories must exists - keepdir /var/log/${PN} - fowners -R ${PN}:${PN} \ - /etc/${PN} \ - /var/log/${PN} -} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild new file mode 100644 index 000000000000..0b5dc00272ba --- /dev/null +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cmake-utils toolchain-funcs user + +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 +" +LICENSE="BSD-4 ZLIB public-domain" +SLOT="0" +SRC_URI=" + mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz + mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz +" + +KEYWORDS="~amd64 ~x86" +IUSE="doc fuse systemd tcpd" + +COMMON_DEPEND=" + app-arch/bzip2 + app-arch/xz-utils + dev-libs/openssl:0= + sys-libs/zlib + systemd? ( + sys-apps/systemd + ) +" +BDEPEND=" + ${COMMON_DEPEND} + dev-util/cmake + >sys-devel/gcc-4.8 + virtual/pkgconfig +" +RDEPEND=" + ${COMMON_DEPEND} + dev-lang/perl + fuse? ( sys-fs/fuse ) + tcpd? ( sys-apps/tcp-wrappers ) +" +PATCHES=( + "${FILESDIR}"/${PN}-3.3.1-flags.patch + "${WORKDIR}"/debian/patches/debian-changes +) +S=${WORKDIR}/${P/_*} + +pkg_pretend() { + if [[ $(gcc-major-version) -lt 4 ]]; then + die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" + elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then + die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" + fi +} + +pkg_setup() { + # add new user & group for daemon + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_configure() { + local mycmakeargs=() + if use fuse; then + mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) + else + mycmakeargs+=( "-DHAVE_FUSE_25=no" ) + fi + if use tcpd; then + mycmakeargs+=( "-DHAVE_LIBWRAP=yes" ) + else + mycmakeargs+=( "-DHAVE_LIBWRAP=no" ) + fi + if tc-ld-is-gold; then + mycmakeargs+=( "-DUSE_GOLD=yes" ) + else + mycmakeargs+=( "-DUSE_GOLD=no" ) + fi + + cmake-utils_src_configure + + sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die +} + +src_install() { + pushd "${BUILD_DIR}" || die + dosbin ${PN} acngtool + dolib.so libsupacng.so + if use fuse; then + dobin acngfs + fi + popd || die + + newinitd "${FILESDIR}"/initd-r2 ${PN} + newconfd "${FILESDIR}"/confd-r1 ${PN} + + insinto /etc/logrotate.d + newins "${FILESDIR}"/logrotate ${PN} + + doman doc/man/${PN}* + if use fuse; then + doman doc/man/acngfs* + fi + + # Documentation + dodoc doc/README TODO VERSION INSTALL ChangeLog + if use doc; then + dodoc doc/*.pdf + + docinto html + dodoc doc/html/* + + find conf -name '*.gz' -exec gzip -d {} \; || die + docinto examples/conf + dodoc conf/* + fi + + newdoc "${WORKDIR}"/debian/changelog debian.changelog + + # perl daily cron script + dosbin scripts/expire-caller.pl + exeinto /etc/cron.daily + newexe "${FILESDIR}"/cron.daily ${PN} + + # default configuration + insinto /etc/${PN} + newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf + doins $( echo conf/* | sed 's|conf/acng.conf.in||g' ) + + keepdir /var/log/${PN} + # Some directories must exists + keepdir /var/log/${PN} + fowners -R ${PN}:${PN} \ + /etc/${PN} \ + /var/log/${PN} +} diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch deleted file mode 100644 index fbe34e66697f..000000000000 --- a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,7 +14,7 @@ - - set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) --#set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever -+set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever - - INCLUDE(CheckIncludeFiles) - INCLUDE(CheckCXXSourceCompiles) -@@ -27,7 +27,7 @@ - INCLUDE(GNUInstallDirs) - - IF(NOT DEFINED(CMAKE_INSTALL_PREFIX)) --set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space") -+#_cmake_modify_IGNORE set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space") - ENDIF() - IF(NOT DEFINED(LIBDIR)) - set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}" CACHE STRING "Location of ${PACKAGE} extra files") -@@ -94,23 +94,6 @@ - _append(ACNG_CXXFLAGS -fvisibility-inlines-hidden) - endif() - --foreach(linkarg -Wl,--as-needed -Wl,-O1 -Wl,--discard-all -Wl,--no-undefined -Wl,--build-id=sha1 -Wl,-fuse-ld=gold) -- STRING(REGEX REPLACE "=|-|," "" optname "${linkarg}") -- set(CMAKE_REQUIRED_FLAGS "${linkarg}") -- CHECK_CXX_COMPILER_FLAG("" "LD_${optname}") -- if(LD_${optname}) -- _append(CMAKE_EXE_LINKER_FLAGS ${linkarg}) -- endif() -- set(CMAKE_REQUIRED_FLAGS "") --endforeach(linkarg) -- --set(CMAKE_REQUIRED_FLAGS "-Wl,-fuse-ld=gold -Wl,--threads") --CHECK_CXX_COMPILER_FLAG("" LD_MULTITHREADED) --if(LD_MULTITHREADED) -- _append(CMAKE_EXE_LINKER_FLAGS "-Wl,-fuse-ld=gold -Wl,--threads") --endif() --set(CMAKE_REQUIRED_FLAGS "") -- - option(USE_SSL "Use OpenSSL library for TLS and other crypto functionality" on) - - IF(CMAKE_SYSTEM MATCHES "Darwin") -@@ -132,15 +115,6 @@ - if(CMAKE_BUILD_TYPE MATCHES Debug) - set(USE_LTO_DEFAULT off) - _append(ACNG_COMPFLAGS -DDEBUG) --else() -- set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections") -- CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS) -- if(GC_SECTIONS) -- _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections) -- _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections) -- _append(CMAKE_SHARED_LINKER_FLAGS -Wl,--gc-sections) -- endif() -- set(CMAKE_REQUIRED_FLAGS "") - endif() - - option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT}) diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest index 9ab24dba3bce..154b2bee3a0e 100644 --- a/net-misc/asterisk-core-sounds/Manifest +++ b/net-misc/asterisk-core-sounds/Manifest @@ -153,5 +153,6 @@ DIST asterisk-core-sounds-sv-ulaw-1.6.1.tar.gz 7254975 BLAKE2B fbc603d336d7ab43a DIST asterisk-core-sounds-sv-wav-1.6.1.tar.gz 15042378 BLAKE2B 5f62bfc3fdd0715a15406f281af5c17b46e918b797ac8fa7430ff4e17249513509213c3a15c2ec9d12d2258545ef0be3fb35348617ffe65806ce4bdf74146d44 SHA512 7fe05dff8082b93e5b79a4fb93c873f9c618e1baee03d000a82a98b2d305fd837e32f3bd502896df50aac6e30421d0f48ae8122c1fabbee3bffc45d8717b3b60 EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200 EBUILD asterisk-core-sounds-1.4.22.ebuild 1853 BLAKE2B bbdd6efb432a829f6c3408d5b72fe51bc2758db0800a660d98c6cda8be15af82ce6ed4026ce1d73bdc8de442e225505bf2b598d378a4c7de7822b3c12ac9208a SHA512 b798ec930025c9c5ed86a0c911da5403c57c015f1fd92dbf53e2dcd6c79e951eac4d02692b874147537a518b4d3aade0aec634c635f506bbac75876390d95194 +EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1731 BLAKE2B b9a6be51edd9026f5645335742b2fe0034e9331b194d861a0db6731537311a652b57c0995b3eeeb444e5e3cfd9ec69c9c1b0f2737f7246dbb3283e62dafdc4b4 SHA512 df00909abb5494b546c45f4aa68adaddc8131fae40ae7a666c9385a6ebb2b0a16d0811fe20160f436b336b8ce276652f5516242306787aea9e5051c283b9a763 EBUILD asterisk-core-sounds-1.6.1.ebuild 1918 BLAKE2B 3fc7d2338255e46b873a530b1faa0695f141dc973067e424a32ead733892c5cb5c52ffe3e8219e85343737c3302553f5ea8a0abc7e8b7d8bdcfebda257bfcbce SHA512 ceac6189c14a623eee56c1095f01c6f038eaa1820a741c2fb2843c92dc9991864b5d01faaa0060831af7e56a49b0acd2e1c5c345338d604c4f6d65cfd7d9d702 MISC metadata.xml 958 BLAKE2B a0bb142f5343679cc734d2154054fae0a93faf3cba74dd6a0939d37b1acfd7dc0c41b1aa22bc7a45e408b7c046d31d9c29ad9d5f2869d7e6c5388c10bafb99f6 SHA512 0665a156659c7b7199f06cca2a2d9498ae1230f65e850b92b2d8efd56550671c6f1932beae53b27ddd145133dae067e0fc0dfcfd264ab251de17f2bda7e8d3bf diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild new file mode 100644 index 000000000000..2b7e7e0a7500 --- /dev/null +++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="Core sounds for asterisk" +HOMEPAGE="https://www.asterisk.org/" +MY_L10N="^en en_AU en_GB es fr it ja ru sv" # ^ is used to indicate to the loops below to NOT set this as an optional +CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav" + +SRC_URI="" +IUSE="${CODECS}" +for l in ${MY_L10N}; do + [[ "${l}" != ^* ]] && IUSE+=" l10n_${l//_/-}" && SRC_URI+=" l10n_${l//_/-}? (" + for c in ${CODECS}; do + SRC_URI+=" ${c#+}? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )" + done + [[ "${l}" = ^* ]] || SRC_URI+=" )" +done + +REQUIRED_USE="|| ( ${CODECS//+/} )" + +LICENSE="CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +S="${WORKDIR}" + +RDEPEND="! + + + + jaco@uls.co.za + Jaco Kroon + + + proxy-maint@gentoo.org + Proxy Maintainers + + + OPUS is one of the codecs utilized for WebRTC, this one is a binary module + provided by Digium (royalty free) for use in asterisk for transcoding. + + diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index a24a44355cb4..be2030b4c48c 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -9,18 +9,30 @@ AUX 1.8.0/asterisk.initd7 9261 BLAKE2B a0b3740b9d4352bff9489b74aef60847eacb1f2b3 AUX 1.8.0/asterisk.initd8 9784 BLAKE2B 84558128572f9c3ca3331eda48728613e23ec7d5ebe5a1ef930a1ab125f1e1f2457a13231308506612e98b6c530c7a0d007bb8b673560ee77d078de5fc341d61 SHA512 eb0f316a2fbfbc228a605118b03e213653b94ab1400e50248bd2de5ce436eab9318d486d1c46d7ee8e83c71161d6106605b38bc01d5d4b461f91962749e41ee3 AUX 1.8.0/find_call_ids.sh 1078 BLAKE2B b480ec9f61453081735e0a1e5176a6de3e6ecc58ec8035b439bd95d64f9e1a5d02fe9810db4ba2e8d20632f186dd91d17c6cdd17a307ddd7802e8aea4638abbc SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9 AUX 1.8.0/find_call_sip_trace.sh 1115 BLAKE2B d9f5cc559f3dd3fbbb9c50a2b6e6ad30c94521774d3774023d0fd4f51d74b8109b4c9d3eea92c7872532012cabbe892d49aa5261aa4a64b324dff5b679820851 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a +AUX asterisk-13.32.0-binutils-2.34.patch 573 BLAKE2B a92202c4d07f11b59f68b5b32f8c2240c81d599b0ade14f4a70281bd1bf8b6885e021679bdaf3d5b3594076c15e37be67fa657cbb280a82d437b6064b8ae3243 SHA512 fe54d844aaa1ba5c62199330905bbe614322742b86f93d627c0572093ce1c119cbc88fc96165a1a856c4b4d2f2f56a128951d854777d89e04475f30efa648df7 +AUX asterisk-historic-dahdiras-without-root.patch 668 BLAKE2B 020298676b0e7e195c2c4fc73463a9517263bd4f2b695206609b032f4cd476f8c990dda5dd5157e45012674fc27034d44097259bc96029cb66a1e83ae3b9795d SHA512 11e660c28a5b293719df70488ca656f171a080afb7fde3acb20bbf7e9f250de92391ab3a6e5d2a1ddd0e9551c52cca3a5ef8371b306ce260943c273a3ab6a22e +AUX asterisk-historic-dundi-null-dereference.patch 1196 BLAKE2B fe3fa097328ca1b4205025ba9a749045490c4aba2cf8242ef755ab359d422d4edddc306b9af61d215800a65d5f4010a37d987b944729a9f5bf45b811ccb61f58 SHA512 c117e999e1ab731dda27da5238b863e3fc1ef0252ba6b20e4651a10c245cb935baa2f150fcd92fc1482ee87f2579b61c6dd5a7992df7ffe6624b60f2d26bb365 +AUX asterisk-historic-invert-gmine-search-order.patch 415 BLAKE2B ff5ed07584ac2fa05792e690900ac207edf61b74fda7515e78783daae31a662484067750c580ca3efcb410cca5b5e6f2af3c8225a62c17194a53dfe0456ffa56 SHA512 a93f25bec0c3564442a95f0ab1904c848bf7f8e08b51a626539d93e6a712ba5f01e1fce7f5e2ce676b28f13d618443afc1a05e0697d8ee1af7617ce52e5b2efb +AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd +AUX asterisk-historic-uclibc.patch 734 BLAKE2B 0d1e7bef3b641de0cdf3ba3e146fce63a507860fe8842e15b38937326e1881dd6498ddc89b6d96825132fac52f951cd2508c7b8614c93bd11017b327589015e0 SHA512 ff3872d1e77b609dcbbce702fa000d3431c4592ee41efd959887e0d38c39f93196422c1a1e0d22a7839fe92a68c2a13da81b7f70310863713772c59e5c2cc08a AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3 AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23 +AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5 +AUX initd-13.32.0 10546 BLAKE2B 857c44b74a411ab4ef5b9ffafb566f8f81949b40c685807db26d59d8b7233a06c3c55425151937c11f8e1c2d7f72f64674d77cef2bca8b28c5d608d9816905ab SHA512 f22e789bd33576ebb149fb07a623397aeccc2280b6c55ee762f2c95d3622a25d208a06078faf2fefaf0d984a24c00b60eb82da2ae084abb3e3efd90ffa5351a9 +AUX initd-13.32.0-r1 9945 BLAKE2B 26fd8ff02e63a77fbe0712b745b9270fa58ae44d1dec4428bdaa93e1354b660dfb76b5969b5811add3b092302dcba3fbbdfdcd849cacb1f05fe645af9d73d359 SHA512 556fe37a67994989642b609443d94f990b23fd0cf037268b1ef9f66a9fdd93a79cb7f2e9ee10c069936b41b7f361abbb72836b1da759e646733e2f7c14d3195b DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed DIST asterisk-13.23.1.tar.gz 33064056 BLAKE2B 7f531766df5f2db29b562e7c7d4e265d5cf610f192188691279c0294195b835bb62beef19d7e9554862e6b44764064b21d50a3e307bbf85dd12b67a2df8be459 SHA512 227bfc80b2e6382019d608296c4e1c8e992ba867636fa2c8ee578d0aa406b8828bf7962b24035d9b581c433afd18be7cbe98eb954112661b9759b6296ee686dd DIST asterisk-13.29.1.tar.gz 33061969 BLAKE2B b581a3b706438fd0f685cab9c6148f9803d09f878d2ec824cd7b3edb299d5514e7c473622f135caa8a7905ab70dff915b83ff9dcbcf80cb04955ba8dea03c968 SHA512 3c32324f67413abdf73a3146b8e280fd23d65854df23b87b01e7f20c635c304606f6216c49c6dcd44c3a09b945d15124a5d70182c4b69e5ed8e542a13589d2df DIST asterisk-13.31.0.tar.gz 33110710 BLAKE2B b4fd186697784d7755992f0ae0cd881c58878420a2a43e0d50e93b91ac1fb9e41d95d7419509a403112975a2b5968c9691ad04ebe04c28c9e80809ad06710ec5 SHA512 b95a982d132420b971cf6750b2124e8df9f7d1bdab788c972897dc1a5b9ac6dccc6414b9b4684fb2196782d12a8dddab4059c2bd3c19fd3de6ef4ff6a3656344 +DIST asterisk-13.32.0.tar.gz 33652378 BLAKE2B c6b0ca0895b25526c135332966f33761b74a88dec4a7b0ff0fe40263640ee2fb928eca29e716fba3cc8e96c6e395e7c70c36f41def6a0d055baac2a5c7b8637a SHA512 daafcd5d3544725e7a96bd467d998c4d74fd3c5d7e9d8fb4ce16e340ce09c502b1603e468e89c5a62b59282848b4ff0a43bdbcd75902cd11f6951d828511e841 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1 EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8 EBUILD asterisk-13.23.1.ebuild 9721 BLAKE2B bb24fad06bea49534ead1bb19917842eed3e04c24b0a2f60ae2035544ba250d420c995134cbe221a51aa05327c45cfe5e44710539891966fb0af7d6e379876c6 SHA512 42df62f3e23ceef24fe934b2565bcb44fadbce1c69d9c6c17c14afea457418f250ad99e9969a4197ab28b208a48d7fb86ab4a2872d27a1fa1f00c01dcd86f41e EBUILD asterisk-13.29.1.ebuild 9818 BLAKE2B 365c779b4cb8efc96eba5c03447b6e706bba2bcc7ba942bedb190fdcac646463fb7ddfbaa4924048729d30bd4daf858cee7f4400092ab2c41ec63c1d604714a8 SHA512 99c700cec1b101c3d85c452be848fd7e616906fe541f20c53fe2d8e342bdf6aa3377671340fe71ed5aa4720d10f629207718a1fbefca771a1e85eb5cac726121 -EBUILD asterisk-13.31.0.ebuild 9819 BLAKE2B 8c210d6b31d5beafbca4f5d8cb8280b6a922383230c70e83126d5f0cff7fa8f1a662960b3552cfd23dd9b3014d26801bb26bd67a574de1afcf8f1afa4a96837f SHA512 977940a0e5e39b8c38ebc97d5a0b35be603d738eb7eb15db86575de0243c1671dd600ad27d77ee7d8a12b8bbe91bc207aa2dde2d5e907afb99f80281cfc2f1a3 +EBUILD asterisk-13.31.0.ebuild 9818 BLAKE2B 7ed34d473c27e02d9f62f236b9417af20f0664eac276a93162d8462da4aa3f9cd8bfe062f7f1488ace1560f8fa482c9adefc18e4ebf54f2d1478c1353af36b4d SHA512 a3a3a0a73cc30a76d806a4942888faf3518864be35ae3187c893bdb41d9d3e5d83f6d7e7273b89e64d55a50e156ea82b7482c2d828bfcaa64775a7f74de688b3 +EBUILD asterisk-13.32.0-r1.ebuild 10080 BLAKE2B 66a7f25961526bc9f59822ddd28a4f264520446a3385f4d9f0c060cbca984827c6acd1bf7acbf3f99099d2748c2644320f24b168128116e61062a5e606908343 SHA512 e6fd8905d974be4db997f3658500e6968ed4f4d2d26347a71f3cb39c7b7f609e970a7931dc76d3bcc78c9af5e6f6b8ec8e444cab5edbeac5968626095f360e2a +EBUILD asterisk-13.32.0.ebuild 10117 BLAKE2B 05e6e6909e80d06fbed271e6be7bc8918eb255466851cf5a476deff6aa901389b2d69d53936b55e42c330afff660c243aa2612c6c98b25e262bf403bf42242df SHA512 5568432ef228cfca813190247b96fe835278d5ea31ac2732eada87a3614c02aa5357576687ee3b2fec52790c42522ae700179aa1fba89703c1e26cbdffa473e6 MISC metadata.xml 1302 BLAKE2B 813ef13f37f239e03c203a77d1b035d7177c24fc96c4da6cf333b1779ea7fc4be1bf44a288ea5f0f21cc284136ee67ef7a68178a048cb4890ac75001e4d4fbe8 SHA512 73dbe17abd814e6f1babbfb860badb42b64bec299cb1cd75db57fc05e9ea775a14b0f2c5c9ec9f4422a64036d90c2797057ec273150da17c91d6b957a71d6f73 diff --git a/net-misc/asterisk/asterisk-13.31.0.ebuild b/net-misc/asterisk/asterisk-13.31.0.ebuild index 6678f7aec857..05a603721b85 100644 --- a/net-misc/asterisk/asterisk-13.31.0.ebuild +++ b/net-misc/asterisk/asterisk-13.31.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}. https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE_VOICEMAIL_STORAGE=" +voicemail_storage_file diff --git a/net-misc/asterisk/asterisk-13.32.0-r1.ebuild b/net-misc/asterisk/asterisk-13.32.0-r1.ebuild new file mode 100644 index 000000000000..f19f5e4caf2f --- /dev/null +++ b/net-misc/asterisk/asterisk-13.32.0-r1.ebuild @@ -0,0 +1,331 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info systemd + +MY_P="${PN}-${PV/_/-}" + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz + https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE_VOICEMAIL_STORAGE=" + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-historic-uclibc.patch" + "${FILESDIR}/asterisk-historic-dahdiras-without-root.patch" + "${FILESDIR}/asterisk-historic-invert-gmine-search-order.patch" + "${FILESDIR}/asterisk-historic-dundi-null-dereference.patch" + "${FILESDIR}/asterisk-historic-no-var-run-install.patch" + "${FILESDIR}/asterisk-13.32.0-binutils-2.34.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + dev-libs/jansson + dev-libs/libxml2:2 + dev-libs/libxslt + sys-libs/ncurses:0= + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + cluster? ( sys-cluster/corosync ) + 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? ( dev-libs/ilbc-rfc3951 ) + ldap? ( net-nds/openldap ) + libedit? ( dev-libs/libedit ) + lua? ( dev-lang/lua:* ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + osplookup? ( net-libs/osptoolkit ) + pjproject? ( net-libs/pjproject ) + 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/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + vorbis? ( 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="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +pkg_setup() { + 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 +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +function menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." +} + +src_configure() { + local vmst + + econf \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --without-libedit \ + $(use_with caps cap) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) + + # 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 NOISE_BUILD=yes 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 + + # The others are based on USE-flag settings + 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 + } + + 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 curl func_curl res_config_curl res_curl + use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + use_select freetds {cdr,cel}_tds + use_select gtalk chan_motif + use_select http res_http_post + use_select iconv func_iconv + use_select ilbc codec_ilbc format_ilbc + use_select ldap res_config_ldap + use_select lua pbx_lua + use_select mysql app_mysql cdr_mysql res_config_mysql + use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + use_select osplookup app_osplookup + 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 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_THREADS BETTER_BACKTRACES; do + menuselect --enable $o menuselect.makeopts + done + fi +} + +src_compile() { + emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes +} + +src_install() { + local d + + mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die + emake DESTDIR="${ED}" NOISY_BUILD=yes install + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + diropts -m 0750 -o root -g asterisk + keepdir /etc/asterisk + if use samples; then + emake NOISY_BUILD=yes DESTDIR="${ED}" samples + for conffile in "${ED}/etc/asterisk/"* + do + fowners root:root "${conffile#${ED}}" + fperms 0644 "${conffile#${ED}}" + done + einfo "Sample files have been installed" + else + einfo "Skipping installation of sample files..." + rm "${ED}"/var/lib/asterisk/mohmp3/* || die + rm "${ED}"/var/lib/asterisk/sounds/demo-* || die + rm "${ED}"/var/lib/asterisk/agi-bin/* || die + rm "${ED}"/etc/asterisk/* || die + fi + rm -r "${ED}"/var/spool/asterisk/voicemail/default || die + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/lib/asterisk + keepdir /var/spool/asterisk + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk + newconfd "${FILESDIR}"/confd-13.32.0 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.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 + if use doc; then + dodoc doc/*.txt + dodoc doc/*.pdf + fi + + # install SIP scripts; bug #300832 + # + dodoc "${FILESDIR}/1.6.2/sip_calc_auth" + dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh" + dodoc "${FILESDIR}/1.8.0/find_call_ids.sh" + dodoc "${FILESDIR}/1.6.2/call_data.txt" + + # 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. + for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + # + # Announcements, warnings, reminders... + # + einfo "Asterisk has been installed" + echo + elog "If you want to know more about asterisk, visit these sites:" + elog "http://www.asteriskdocs.org/" + elog "http://www.voip-info.org/wiki-Asterisk" + echo + elog "http://www.automated.it/guidetoasterisk.htm" + echo + elog "Gentoo VoIP IRC Channel:" + elog "#gentoo-voip @ irc.freenode.net" + echo + echo + elog "Please read the Asterisk 13 upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13" +} diff --git a/net-misc/asterisk/asterisk-13.32.0.ebuild b/net-misc/asterisk/asterisk-13.32.0.ebuild new file mode 100644 index 000000000000..b6fe5c5964fc --- /dev/null +++ b/net-misc/asterisk/asterisk-13.32.0.ebuild @@ -0,0 +1,332 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info systemd + +MY_P="${PN}-${PV/_/-}" + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz + https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE_VOICEMAIL_STORAGE=" + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-historic-uclibc.patch" + "${FILESDIR}/asterisk-historic-dahdiras-without-root.patch" + "${FILESDIR}/asterisk-historic-invert-gmine-search-order.patch" + "${FILESDIR}/asterisk-historic-dundi-null-dereference.patch" + "${FILESDIR}/asterisk-historic-no-var-run-install.patch" + "${FILESDIR}/asterisk-13.32.0-binutils-2.34.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + dev-libs/jansson + dev-libs/libxml2:2 + dev-libs/libxslt + sys-libs/ncurses:0= + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + cluster? ( sys-cluster/corosync ) + 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? ( dev-libs/ilbc-rfc3951 ) + ldap? ( net-nds/openldap ) + libedit? ( dev-libs/libedit ) + lua? ( dev-lang/lua:* ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + osplookup? ( net-libs/osptoolkit ) + pjproject? ( net-libs/pjproject ) + 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/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + vorbis? ( 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="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +pkg_setup() { + 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 +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +function menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." +} + +src_configure() { + local vmst + + econf \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --without-libedit \ + $(use_with caps cap) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) + + # 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 NOISE_BUILD=yes 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 + + # The others are based on USE-flag settings + 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 + } + + 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 curl func_curl res_config_curl res_curl + use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + use_select freetds {cdr,cel}_tds + use_select gtalk chan_motif + use_select http res_http_post + use_select iconv func_iconv + use_select ilbc codec_ilbc format_ilbc + use_select ldap res_config_ldap + use_select lua pbx_lua + use_select mysql app_mysql cdr_mysql res_config_mysql + use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + use_select osplookup app_osplookup + 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 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_THREADS BETTER_BACKTRACES; do + menuselect --enable $o menuselect.makeopts + done + fi +} + +src_compile() { + emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes +} + +src_install() { + local d + + mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die + emake DESTDIR="${D}" NOISY_BUILD=yes installdirs + emake DESTDIR="${D}" NOISY_BUILD=yes install + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + diropts -m 0750 -o root -g asterisk + keepdir /etc/asterisk + if use samples; then + emake NOISY_BUILD=yes DESTDIR="${ED}" samples + for conffile in "${ED}/etc/asterisk/"* + do + fowners root:root "${conffile#${ED}}" + fperms 0644 "${conffile#${ED}}" + done + einfo "Sample files have been installed" + else + einfo "Skipping installation of sample files..." + rm "${ED}"/var/lib/asterisk/mohmp3/* || die + rm "${ED}"/var/lib/asterisk/sounds/demo-* || die + rm "${ED}"/var/lib/asterisk/agi-bin/* || die + rm "${ED}"/etc/asterisk/* || die + fi + rm -r "${ED}"/var/spool/asterisk/voicemail/default || die + + # keep directories + diropts -m 0770 -o asterisk asterisk + keepdir /var/lib/asterisk + keepdir /var/spool/asterisk + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/initd-13.32.0 asterisk + newconfd "${FILESDIR}"/confd-13.32.0 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.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 + if use doc; then + dodoc doc/*.txt + dodoc doc/*.pdf + fi + + # install SIP scripts; bug #300832 + # + dodoc "${FILESDIR}/1.6.2/sip_calc_auth" + dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh" + dodoc "${FILESDIR}/1.8.0/find_call_ids.sh" + dodoc "${FILESDIR}/1.6.2/call_data.txt" + + # 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. + for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + # + # Announcements, warnings, reminders... + # + einfo "Asterisk has been installed" + echo + elog "If you want to know more about asterisk, visit these sites:" + elog "http://www.asteriskdocs.org/" + elog "http://www.voip-info.org/wiki-Asterisk" + echo + elog "http://www.automated.it/guidetoasterisk.htm" + echo + elog "Gentoo VoIP IRC Channel:" + elog "#gentoo-voip @ irc.freenode.net" + echo + echo + elog "Please read the Asterisk 13 upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13" +} diff --git a/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch b/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch new file mode 100644 index 000000000000..6ce797ca4f2d --- /dev/null +++ b/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch @@ -0,0 +1,18 @@ +--- a/main/backtrace.c 2020-03-12 07:37:03.000000000 -0700 ++++ b/main/backtrace.c 2020-03-31 23:22:18.272691980 -0700 +@@ -64,6 +64,15 @@ + #if defined(HAVE_DLADDR) && defined(HAVE_BFD) && defined(BETTER_BACKTRACES) + #include + #include ++#ifndef bfd_get_section_size ++#define bfd_get_section_size(x) bfd_section_size(x) ++#endif ++#ifndef bfd_get_section_vma ++#define bfd_get_section_vma(x, y) bfd_section_vma(y) ++#endif ++#ifndef bfd_get_section_flags ++#define bfd_get_section_flags(bfd, ptr) ((void) bfd, (ptr)->flags) ++#endif + #endif + + #include diff --git a/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch b/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch new file mode 100644 index 000000000000..1fdf033b7224 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch @@ -0,0 +1,23 @@ +Gentoo bug 337297 +Link: http://bugs.gentoo.org/show_bug.cgi?id=337297 +Patch-By: Jaco Kroon +Committed-Date: 2010-09-16 +Ebuild-Version: 1.6.2.13-r1 + +Upstream bug 17991 +Link: https://issues.asterisk.org/view.php?id=17991 +Patch-By: Jaco Kroon +Committed-Date: none + +diff -uNr asterisk-1.8.0.ORIG/apps/app_dahdiras.c asterisk-1.8.0/apps/app_dahdiras.c +--- asterisk-1.8.0.ORIG/apps/app_dahdiras.c 2010-10-27 00:41:40.000000000 +0100 ++++ asterisk-1.8.0/apps/app_dahdiras.c 2010-10-27 00:50:00.000000000 +0100 +@@ -119,8 +119,6 @@ + c = strsep(&stringp, ","); + } + +- argv[argc++] = "plugin"; +- argv[argc++] = "dahdi.so"; + argv[argc++] = "stdin"; + + /* Finally launch PPP */ diff --git a/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch b/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch new file mode 100644 index 000000000000..8fb531937989 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch @@ -0,0 +1,40 @@ +Upstream issue 21205 +Link: https://issues.asterisk.org/jira/browse/ASTERISK-21205 + +Submitted upstream: 2013-03-05 07:06 +For Asterisk version: 11.2.1 +Patch by: Jaco Kroon + +If a negative (error) return is received from dundi_lookup_internal, this is not handled +correctly when assigning the result to the buffer. As such, use a signed integer in the +assignment and do a proper comparison. + +--- a/pbx/pbx_dundi.c 2013-03-05 15:07:00.523387892 +0200 ++++ b/pbx/pbx_dundi.c 2013-03-05 15:18:49.512625981 +0200 +@@ -4123,7 +4123,7 @@ + + struct dundi_result_datastore { + struct dundi_result results[MAX_RESULTS]; +- unsigned int num_results; ++ int num_results; + unsigned int id; + }; + +@@ -4255,7 +4255,7 @@ + drds = datastore->data; + + if (!strcasecmp(args.resultnum, "getnum")) { +- snprintf(buf, len, "%u", drds->num_results); ++ snprintf(buf, len, "%u", drds->num_results < 0 ? 0 : drds->num_results); + res = 0; + goto finish; + } +@@ -4266,7 +4266,7 @@ + goto finish; + } + +- if (num && num <= drds->num_results) { ++ if (num && drds->num_results > 0 && num <= drds->num_results) { + snprintf(buf, len, "%s/%s", drds->results[num - 1].tech, drds->results[num - 1].dest); + res = 0; + } else diff --git a/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch b/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch new file mode 100644 index 000000000000..99e76d947fb2 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch @@ -0,0 +1,12 @@ +diff -uNr asterisk-13.18.2.ORIG/configure.ac asterisk-13.18.2/configure.ac +--- asterisk-13.18.2.ORIG/configure.ac 2017-11-14 11:26:06.179850146 +0000 ++++ asterisk-13.18.2/configure.ac 2017-11-14 11:27:46.256844611 +0000 +@@ -2503,7 +2503,7 @@ + fi + fi + +-for ver in 2.0 2.2 2.4 2.6 3.0; do ++for ver in 3.0 2.6 2.4 2.2 2.0; do + AST_PKG_CONFIG_CHECK([GMIME], gmime-$ver) + if test "$PBX_GMIME" = 1; then + break; diff --git a/net-misc/asterisk/files/asterisk-historic-no-var-run-install.patch b/net-misc/asterisk/files/asterisk-historic-no-var-run-install.patch new file mode 100644 index 000000000000..aa9fb306831f --- /dev/null +++ b/net-misc/asterisk/files/asterisk-historic-no-var-run-install.patch @@ -0,0 +1,14 @@ +Patch by: Jaco Kroon +Link: https://bugs.gentoo.org/show_bug.cgi?id=451808 + +--- a/Makefile 2013-01-17 17:16:59.767081716 +0200 ++++ b/Makefile 2013-01-17 17:17:45.897600655 +0200 +@@ -541,7 +541,7 @@ + + NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h)) + OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) +-INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \ ++INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" \ + "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \ + "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \ + "$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \ diff --git a/net-misc/asterisk/files/asterisk-historic-uclibc.patch b/net-misc/asterisk/files/asterisk-historic-uclibc.patch new file mode 100644 index 000000000000..167ae080b193 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-historic-uclibc.patch @@ -0,0 +1,23 @@ +Gentoo bug 66557 +Link: http://bugs.gentoo.org/show_bug.cgi?id=66557 +Patch-By: REdOG + +Submitted upstream: No + +The uclibc environment, as opposed to the glibc environment, needs explicit +linking with the pthread & dl libraries. Without these, name resolution is +not functional. + +--- asterisk-1.8.7.0-rc2.orig/Makefile 2011-08-25 21:00:55.000000000 +0200 ++++ asterisk-1.8.7.0-rc2.orig/Makefile 2011-09-21 14:13:12.823076046 +0200 +@@ -247,6 +247,10 @@ + _ASTCFLAGS+=-pthread -ftrampolines + endif + ++ifeq ($(OSARCH),linux-uclibc) ++ AST_LIBS+=-lpthread -ldl ++endif ++ + ifeq ($(OSARCH),SunOS) + _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__ + endif diff --git a/net-misc/asterisk/files/confd-13.32.0 b/net-misc/asterisk/files/confd-13.32.0 new file mode 100644 index 000000000000..20e8df4de21c --- /dev/null +++ b/net-misc/asterisk/files/confd-13.32.0 @@ -0,0 +1,160 @@ +# 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 + +# +# Kill these tasks after asterisk crashed +# +# Warning! This will kill _ALL_ tasks with the specified names! +# +# Value: Space separated list of names in double quotes (e.g. "mpg123 mad") +# +# Default is to not do stupid things like killing random processes. +# +#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad" + +# +# 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" + +# +# 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 diff --git a/net-misc/asterisk/files/initd-13.32.0 b/net-misc/asterisk/files/initd-13.32.0 new file mode 100644 index 000000000000..6d1f77e51b9b --- /dev/null +++ b/net-misc/asterisk/files/initd-13.32.0 @@ -0,0 +1,380 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="forcestop reload" +extra_commands="checkperms" + +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). +# ast_spooldir: +setup_svc_variables() +{ + local t + + ast_instancename=asterisk + ast_rundir=/var/run/${RC_SVCNAME} + ast_logdir=/var/log/${RC_SVCNAME} + ast_spooldir=/var/spool/${RC_SVCNAME} + ast_confdir=/etc/${RC_SVCNAME/.//} + 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+="(${t})" + fi + + [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}" + [ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}" + [ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}" + [ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}" + [ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}" + case "${ASTERISK_STOP_METHOD}" in + grasefully|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 +} + +checkperms() { + setup_svc_variables + + local path + checkpath -d -m 0755 -o ${ast_user}:${ast_group:-${ast_pgroup}} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}" + for path in "${ast_rundir}" "${ast_spooldir}" "${ast_logdir}"; do + ebegin "Checking ${path}" + find "${path}" ! -user "${ast_user}" | while read element; do + [[ "${element}" = *.gz ]] && continue # Skip logrotated files. + ewarn "${ast_user} is not the owner of ${element}, or permissions are insufficient, fixing." + chown ${ast_user} "${element}" + chmod u+rwX "${element}" + done; + eend 0 + done +} + +asterisk_run_loop() { + local result=0 signal=0 + + echo "Initializing ${ast_instancename} wrapper" + OPTS="$*" + + trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT + touch "${ast_rundir}/wrapper_loop.running" + + while [ -r "${ast_rundir}/wrapper_loop.running" ]; do + if [ -n "${TTY}" ]; then + /usr/bin/stty -F "${TTY}" sane + ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}" + result=$? + else + ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1 + result=$? + fi + + if [ "$result" -eq 0 ]; then + echo "Asterisk terminated normally" + break + else + if [ "$result" -gt 128 ]; then + signal="$(expr "$result" - 128)" + MSG="Asterisk terminated with Signal: $signal" + + CORE_TARGET="core-" + yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-" + CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")" + + local CORE_DUMPED=0 + if [ -f "${ASTERISK_CORE_DIR}/core" ]; then + mv "${ASTERISK_CORE_DIR}/core" \ + "${ASTERISK_CORE_DIR}/${CORE_TARGET}" + CORE_DUMPED=1 + + elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then + mv "${ASTERISK_CORE_DIR}/core.${PID}" \ + "${ASTERISK_CORE_DIR}/${CORE_TARGET}" + CORE_DUMPED=1 + + fi + + [ $CORE_DUMPED -eq 1 ] && \ + MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}" + else + MSG="Asterisk terminated with return code: $result" + fi + + # kill left-over tasks + for X in ${ASTERISK_CLEANUP_ON_CRASH}; do + kill -9 "$(pidof "${X}")"; + done + fi + + [ -n "${TTY}" ] \ + && echo "${MSG}" >"${TTY}" \ + || echo "${MSG}" + + + if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \ + [ -x /usr/sbin/sendmail ]; then + echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ + /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}" + fi + sleep "${ASTERISK_RESTART_DELAY}" + echo "Restarting Asterisk..." + done + + echo "Terminating wrapper loop." + return 0 +} + +start() { + local OPTS PID + local tmp x + + local OPTS ARGS + + 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} -f" # don't fork / detach breaks wrapper script... + + # 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 + + if [ -n "${ASTERISK_CORE_SIZE}" ] && + [ "${ASTERISK_CORE_SIZE}" != "0" ]; then + ulimit -c ${ASTERISK_CORE_SIZE} + + 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}" + + OPTS="${OPTS} -g" + fi + + if [ -n "${ASTERISK_MAX_FD}" ]; then + ulimit -n ${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}" + NICE="nice -n ${ASTERISK_NICE} --" + else + eerror "Nice value must be between -20 and 19" + return 1 + fi + else + NICE="" + fi + + if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then + if [ -x /usr/sbin/sendmail ]; then + einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}" + else + ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!" + unset ASTERISK_NOTIFY_EMAIL + 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 + [ -n "${TTY}" ] && \ + einfo "Messages are sent to : ${TTY}" + fi + + if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then + einfo "Starting Asterisk console : Yes" + OPTS="${OPTS} -c" + fi + + if ! getent passwd "${ast_user}" &>/dev/null; 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; 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}" + einfo "Starting asterisk as : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}" + asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null & + 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 + eend $? + fi + fi + + return $result +} + +wrapperstop() { + # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running). + if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then + ebegin "Killing ${ast_instancename} wrapper script" + kill "$(cat /var/run/asterisk/wrapper_loop.pid)" + eend $? + fi + + # The new one (due to "hardened" requirements) uses a simpler + # flag to indicate running or shutting down. + if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + ebegin "Signalling ${ast_instancename} wrapper script to terminate" + rm "${ast_rundir}/wrapper_loop.running" + 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 /var/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 + # 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 + echo -n "." + done + echo + fi + eend 0 +} + +reload() { + setup_svc_variables || return $? + + if is_running; then + ebegin "Forcing ${ast_instancename} to reload configuration" + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null + eend $? + else + eerror "${ast_instancename} is not running!" + fi +} diff --git a/net-misc/asterisk/files/initd-13.32.0-r1 b/net-misc/asterisk/files/initd-13.32.0-r1 new file mode 100644 index 000000000000..45c5f31398d5 --- /dev/null +++ b/net-misc/asterisk/files/initd-13.32.0-r1 @@ -0,0 +1,362 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 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). +# ast_spooldir: +setup_svc_variables() +{ + local t + + ast_instancename=asterisk + ast_rundir=/var/run/${RC_SVCNAME} + ast_logdir=/var/log/${RC_SVCNAME} + ast_spooldir=/var/spool/${RC_SVCNAME} + ast_confdir=/etc/${RC_SVCNAME/.//} + 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+="(${t})" + fi + + [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}" + [ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}" + [ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}" + [ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}" + [ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}" + case "${ASTERISK_STOP_METHOD}" in + grasefully|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 +} + +asterisk_run_loop() { + local result=0 signal=0 + + echo "Initializing ${ast_instancename} wrapper" + OPTS="$*" + + trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT + touch "${ast_rundir}/wrapper_loop.running" + + while [ -r "${ast_rundir}/wrapper_loop.running" ]; do + if [ -n "${TTY}" ]; then + /usr/bin/stty -F "${TTY}" sane + ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}" + result=$? + else + ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1 + result=$? + fi + + if [ "$result" -eq 0 ]; then + echo "Asterisk terminated normally" + break + else + if [ "$result" -gt 128 ]; then + signal="$(expr "$result" - 128)" + MSG="Asterisk terminated with Signal: $signal" + + CORE_TARGET="core-" + yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-" + CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")" + + local CORE_DUMPED=0 + if [ -f "${ASTERISK_CORE_DIR}/core" ]; then + mv "${ASTERISK_CORE_DIR}/core" \ + "${ASTERISK_CORE_DIR}/${CORE_TARGET}" + CORE_DUMPED=1 + + elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then + mv "${ASTERISK_CORE_DIR}/core.${PID}" \ + "${ASTERISK_CORE_DIR}/${CORE_TARGET}" + CORE_DUMPED=1 + + fi + + [ $CORE_DUMPED -eq 1 ] && \ + MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}" + else + MSG="Asterisk terminated with return code: $result" + fi + + # kill left-over tasks + for X in ${ASTERISK_CLEANUP_ON_CRASH}; do + kill -9 "$(pidof "${X}")"; + done + fi + + [ -n "${TTY}" ] \ + && echo "${MSG}" >"${TTY}" \ + || echo "${MSG}" + + + if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \ + [ -x /usr/sbin/sendmail ]; then + echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ + /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}" + fi + sleep "${ASTERISK_RESTART_DELAY}" + echo "Restarting Asterisk..." + done + + echo "Terminating wrapper loop." + return 0 +} + +start() { + local OPTS PID + local tmp x + + local OPTS ARGS + + 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} -f" # don't fork / detach breaks wrapper script... + + # 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 + + if [ -n "${ASTERISK_CORE_SIZE}" ] && + [ "${ASTERISK_CORE_SIZE}" != "0" ]; then + ulimit -c ${ASTERISK_CORE_SIZE} + + 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}" + + OPTS="${OPTS} -g" + fi + + if [ -n "${ASTERISK_MAX_FD}" ]; then + ulimit -n ${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}" + NICE="nice -n ${ASTERISK_NICE} --" + else + eerror "Nice value must be between -20 and 19" + return 1 + fi + else + NICE="" + fi + + if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then + if [ -x /usr/sbin/sendmail ]; then + einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}" + else + ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!" + unset ASTERISK_NOTIFY_EMAIL + 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 + [ -n "${TTY}" ] && \ + einfo "Messages are sent to : ${TTY}" + fi + + if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then + einfo "Starting Asterisk console : Yes" + OPTS="${OPTS} -c" + fi + + if ! getent passwd "${ast_user}" &>/dev/null; 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; 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}" + einfo "Starting asterisk as : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}" + asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null & + 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 + eend $? + fi + fi + + return $result +} + +wrapperstop() { + # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running). + if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then + ebegin "Killing ${ast_instancename} wrapper script" + kill "$(cat /var/run/asterisk/wrapper_loop.pid)" + eend $? + fi + + # The new one (due to "hardened" requirements) uses a simpler + # flag to indicate running or shutting down. + if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + ebegin "Signalling ${ast_instancename} wrapper script to terminate" + rm "${ast_rundir}/wrapper_loop.running" + 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 /var/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 + # 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 + echo -n "." + done + echo + fi + eend 0 +} + +reload() { + setup_svc_variables || return $? + + if is_running; then + ebegin "Forcing ${ast_instancename} to reload configuration" + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null + eend $? + else + eerror "${ast_instancename} is not running!" + fi +} diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest index b5193546f8e9..81cef2862ad2 100644 --- a/net-misc/axel/Manifest +++ b/net-misc/axel/Manifest @@ -1,15 +1,8 @@ AUX axel-2.4-bffr-overflow.patch 333 BLAKE2B 67dcc951faf0090673d2e5ff48291b28981ea401052602b2e3c054d1d0485e02d4acc22699c08ac0fabcc2402450d9ce7bceadc0e428234a7e1446c441d9df3a SHA512 8072f7a7d15028f2272e45f6b42704fb3cadb30aec1ade093c80ee3b5d983d6362ed426c529bf46864f3f1adf8d2cd582be632796c8abcb43b125db87b1f0f75 AUX axel-2.4-buildsystem.patch 566 BLAKE2B 47dd700ec0506824ff2bc3509a6c43cbd0b0b6c1676cb0600ec0ed96d4fd3f0daf7ccd3619f277c6bc7961fc3aeca18f12174bceb3cecd58b259d63f5520db7e SHA512 5a6d087a959adb88aed6ae7df602e3731c9a6773877eb731e670ab854c20fd0e41e24a91b759192882ccb9c5dff2a07d51f73b5e5cbb868f25b0aa991b6af428 AUX axel-2.4-max-redir.patch 412 BLAKE2B 62146c6f0da6fdff0fe89aeeb487094020b04eee4d7ffbe223217910e32b81a5fadfb5a9e90a1602ee0ad80e6da47b2948b8eea534ef2cda53602fc8b753f9a5 SHA512 81aa9e566798959af38ff9f59f493462acfdff7e817c2285717456463505149a00970a39cf7f14cc4f5c79c159e5a57b83b76eff690d454921ecb80efabd7491 -DIST axel-2.12.tar.gz 82995 BLAKE2B da6e00cb577ffd9ab55c3b5b4362f0bdbc08ae89572a7cc224c092710da7911d2c974f52240fd4d2e16ce1d7657a68b5917d866120fb092b85736f181887adac SHA512 5e163c319366f7efd16f8b35dbcf901300c884ab303696dabe87ad47511f56cc3f1e399af738dc79ca717ca70fd529b6dd1adf30f5162cfb530105ce34e2eaf2 -DIST axel-2.14.1.tar.gz 89356 BLAKE2B 43e278f09304ed9f872c9348fb2113758a046819c6c8667bd6bff65824a8a55c3d0ac647027947f76b9c4f334495284f30066fa3bd60bc0eaab4f4b5b5059620 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b -DIST axel-2.15.tar.gz 96474 BLAKE2B 73b35b0c234bf2c21b5c6038979061c908de7520d923ecf6d84d7d6cee348c3e17b8f8d3771909ed74cf20899e3d8ece2cba44764ce625755e0ff44563c0fc43 SHA512 b0a516850b56b74fe763df3320b98e47f9977dda208cff9a98a87bdc63e37f5e0fd31d30c240a375f9d992320674983ced8201ee631187149e62b42804c48eb6 DIST axel-2.17.7.tar.xz 202632 BLAKE2B 2d799ad39c0742e2edfa09dd19f9d941c54c6136f4d5ec5a95f85d338bdebcc79545205cd1dde6ef25d28c89f494ae3cc278c73e375c9f4a96dabff73b139257 SHA512 ed1815199a7cc78897a820e1938a80dba72b83e1b40e6c1e81c6d3457aaa17faf20148a82383768524d61bbabda5b00cdcb2c15ff8ae5ed74e415da0b53be3aa -DIST axel-2.4.tar.bz2 44995 BLAKE2B 03218c6243029695deae1a2d96b4e0cce719cf23602faf2d2fb4422f06ae313f5a1ed6759e7bc59a1ce756a732873ca5faed636742b608b6a66240b694b7189a SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9 -EBUILD axel-2.12.ebuild 1108 BLAKE2B a8b96a4e82b041e098990502c07a4cf1c60addbd80032527f0df3ed7aa6071eb32c922d91afb865ec9be21bed374d8a70a02f9c5bb91d9bfca134c0bc5a9609b SHA512 b7df6f7160734344d763fbca4c095dbbbfe5e4afe98a91bccce2da958ce8f21a67dc433164586ddaa02e61e2041898d64dc74ca1d699a35fd5c8affc9219488f -EBUILD axel-2.14.1.ebuild 1306 BLAKE2B 85d9063a51d8c0e51e9bf74be671605c1e79b6e427ac48f09565b857f9da70f3955ad6d5ad3b3ce8cfa0f207f03a6a4be348a28be6a6e789e2620395844ccae0 SHA512 4327edc03fcea40ad2132700c284b4361abe8c4508bf250b5ad4bfa65acfea3f6c1ff893f65716b8b1687289229933a1761850378dc99aa314cb477d41d3c5eb -EBUILD axel-2.15.ebuild 1306 BLAKE2B 85d9063a51d8c0e51e9bf74be671605c1e79b6e427ac48f09565b857f9da70f3955ad6d5ad3b3ce8cfa0f207f03a6a4be348a28be6a6e789e2620395844ccae0 SHA512 4327edc03fcea40ad2132700c284b4361abe8c4508bf250b5ad4bfa65acfea3f6c1ff893f65716b8b1687289229933a1761850378dc99aa314cb477d41d3c5eb -EBUILD axel-2.17.7.ebuild 1265 BLAKE2B 564377b6c9d3cb51c9d875a24f1d8d297a0486b277482948ad5bf28ec923344d0ee9a20cef14e34e083a3be00e7b685990f8c3d7002fcc1dcf2b535281d76d42 SHA512 fc37cbc285b8f993cfdeb0cf25a32fc1206d045020148c5fd102be977cc74de6736da8153a894c8b23906148e3c109fbef94c1aaeb6a2e740c09dd7cf9f8b58e -EBUILD axel-2.4-r3.ebuild 1237 BLAKE2B d0d8ce79c27539a484d5fb95946dc899b795fb032983da603fe589915aaf0da3b23be582381ebbe721bc2d6dfab400765c57f7a6c2bac6857067d2894a8f547a SHA512 5df8d2b9540294029d86073950ae495a2ccea4f8a1f1b960963c3946fb0b5cf2c281b8264151e2104ebf0cec5dd1b27f55c9c636b132a9b44659024b8898fa02 -EBUILD axel-9999.ebuild 1187 BLAKE2B 4c472cbd4c0ba71f7bda52eaaae06193b175978072d7d7d60094f158e76a6fb0b51060b9aebc66260bb28751f2b8d5f57598511a8b00ba5d346278fb8421143d SHA512 c11ab2d39ef19797a4b2e0ddae4d7bcb80fc6979527bdccfd4fd600bb366c14d7c0cbae7f2bf55062b34f286246c45e6d4498296466d5fe179cb19c5cb6cc3ee +DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea +EBUILD axel-2.17.7.ebuild 1260 BLAKE2B 1f976957b0425607de9728fc358454134191a4d0d136700d144d19f4348bead0e3167221091f9bd458d631f2bc09d5c9b4034175517659249174923bbd87ea69 SHA512 c5e24d64e0b781e7caa596eee0c82ee78a7d3fce9d8557e13a88c89a4eefe414e054ff4d80b5d9672d2cf9155575ae2fadfab15fb12e625daafda57231bf3cd8 +EBUILD axel-2.17.8.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936 MISC metadata.xml 410 BLAKE2B 89c374385d4e3a03953352d1d995029ca481386a0c522b1c4c2c18bc58c62f65e5eb287a656392093d72735174adc8e48dacd1771989d0bdd6ca2a0c77e3cd80 SHA512 f64c314f27882031b215373ded6b4a1e0a93b398ec96aff1a429ef6b01cc1d426c1692b8f2ecdea4f5503d853d753f292a7edac960a559bcb60ea491d5a1e7ce diff --git a/net-misc/axel/axel-2.12.ebuild b/net-misc/axel/axel-2.12.ebuild deleted file mode 100644 index deb3bcff1c1b..000000000000 --- a/net-misc/axel/axel-2.12.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Light Unix download accelerator" -HOMEPAGE="https://github.com/eribertomota/axel" -SRC_URI="https://github.com/eribertomota/axel/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" -IUSE="debug libressl nls ssl" - -CDEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${CDEPEND} - nls? ( virtual/libintl virtual/libiconv )" - -DOCS=( doc/. ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with ssl openssl) -} - -pkg_postinst() { - einfo 'To use axel with portage, try these settings in your make.conf' - einfo - einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\' - einfo ' RESUMECOMMAND="${FETCHCOMMAND}"' -} diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild deleted file mode 100644 index aeda7636fbd5..000000000000 --- a/net-misc/axel/axel-2.14.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Light Unix download accelerator" -HOMEPAGE="https://github.com/axel-download-accelerator/axel" -SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" -IUSE="debug libressl nls ssl" - -CDEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${CDEPEND} - nls? ( virtual/libintl virtual/libiconv )" - -DOCS=( doc/. ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with ssl) -} - -pkg_postinst() { - einfo 'To use axel with portage, create a script in' - einfo '/usr/local/bin/fetchwrapper.sh with the following content:' - einfo - einfo ' #!/bin/bash' - einfo ' set -e' - einfo ' /usr/bin/axel -o "$1.axel" "$2"' - einfo ' mv "$1.axel" "$1"' - einfo - einfo 'and then add the following to your make.conf:' - einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\' - einfo ' RESUMECOMMAND="${FETCHCOMMAND}"' -} diff --git a/net-misc/axel/axel-2.15.ebuild b/net-misc/axel/axel-2.15.ebuild deleted file mode 100644 index aeda7636fbd5..000000000000 --- a/net-misc/axel/axel-2.15.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Light Unix download accelerator" -HOMEPAGE="https://github.com/axel-download-accelerator/axel" -SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" -IUSE="debug libressl nls ssl" - -CDEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${CDEPEND} - nls? ( virtual/libintl virtual/libiconv )" - -DOCS=( doc/. ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with ssl) -} - -pkg_postinst() { - einfo 'To use axel with portage, create a script in' - einfo '/usr/local/bin/fetchwrapper.sh with the following content:' - einfo - einfo ' #!/bin/bash' - einfo ' set -e' - einfo ' /usr/bin/axel -o "$1.axel" "$2"' - einfo ' mv "$1.axel" "$1"' - einfo - einfo 'and then add the following to your make.conf:' - einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\' - einfo ' RESUMECOMMAND="${FETCHCOMMAND}"' -} diff --git a/net-misc/axel/axel-2.17.7.ebuild b/net-misc/axel/axel-2.17.7.ebuild index 5a684ef22ffd..72e5d4d16651 100644 --- a/net-misc/axel/axel-2.17.7.ebuild +++ b/net-misc/axel/axel-2.17.7.ebuild @@ -11,7 +11,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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" +KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" IUSE="debug libressl nls ssl" CDEPEND=" diff --git a/net-misc/axel/axel-2.17.8.ebuild b/net-misc/axel/axel-2.17.8.ebuild new file mode 100644 index 000000000000..dad9472d9679 --- /dev/null +++ b/net-misc/axel/axel-2.17.8.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +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 libressl nls ssl" + +CDEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl: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/axel/axel-2.4-r3.ebuild b/net-misc/axel/axel-2.4-r3.ebuild deleted file mode 100644 index 8f06b29de4f1..000000000000 --- a/net-misc/axel/axel-2.4-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -DOWNLOAD_ID=3016 - -DESCRIPTION="Light Unix download accelerator" -HOMEPAGE="http://axel.alioth.debian.org/" -SRC_URI="http://alioth.debian.org/frs/download.php/${DOWNLOAD_ID}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" -IUSE="debug nls" - -DEPEND="nls? ( sys-devel/gettext )" -RDEPEND="nls? ( virtual/libintl )" - -DOCS=( API CHANGES CREDITS README axelrc.example ) - -src_prepare() { - append-lfs-flags - epatch \ - "${FILESDIR}"/${P}-buildsystem.patch \ - "${FILESDIR}"/${P}-bffr-overflow.patch \ - "${FILESDIR}"/${P}-max-redir.patch - tc-export CC -} - -src_configure() { - local myconf=() - - use debug && myconf+=( --debug=1 ) - myconf+=( --i18n=$(usex nls 1 0) ) - econf \ - --strip=0 \ - ${myconf[@]} -} - -pkg_postinst() { - einfo 'To use axel with portage, try these settings in your make.conf' - einfo - einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\' - einfo ' RESUMECOMMAND="${FETCHCOMMAND}"' -} diff --git a/net-misc/axel/axel-9999.ebuild b/net-misc/axel/axel-9999.ebuild deleted file mode 100644 index aeeaf251d69f..000000000000 --- a/net-misc/axel/axel-9999.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools git-r3 - -DESCRIPTION="Light Unix download accelerator" -HOMEPAGE="https://github.com/axel-download-accelerator/axel" -SRC_URI="" -EGIT_REPO_URI="https://github.com/axel-download-accelerator/axel.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="debug libressl nls ssl" - -CDEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${CDEPEND} - nls? ( virtual/libintl virtual/libiconv )" - -DOCS=( doc/. ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with ssl) -} - -pkg_postinst() { - einfo 'To use axel with portage, create a script in' - einfo '/usr/local/bin/fetchwrapper.sh with the following content:' - einfo - einfo ' #!/bin/bash' - einfo ' set -e' - einfo ' /usr/bin/axel -o "$1.axel" "$2"' - einfo ' mv "$1.axel" "$1"' - einfo - einfo 'and then add the following to your make.conf:' - einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\' - einfo ' RESUMECOMMAND="${FETCHCOMMAND}"' -} diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest index 0c1d522b754c..0af123eb3951 100644 --- a/net-misc/bridge-utils/Manifest +++ b/net-misc/bridge-utils/Manifest @@ -1,6 +1,6 @@ AUX bridge-utils-1.5-linux-3.8.patch 435 BLAKE2B 0e9adb67c1cf21f58d85933ee2d00a21c6192500ab2dfc71f61a3da4a6367afec2d217efcca52dc515ee75b099432ff5ec2b04ae91f4cef3d0c36fba193bc0c9 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635 DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 -EBUILD bridge-utils-1.5.ebuild 1277 BLAKE2B 53d99bff5e104da916a9badc58b4f454125aa5b72d0c075eeb6303f8c3205cccd6f60340c5ab71f16d7bcaedb971f6b301e6adeacc2c076b380824ae91eda215 SHA512 ea72b9e527becce6eecf88a96f61ec974c7b62928be7684a5653ef211feb566cd2d0a8b3d0a990f6588c43037901b252cacea1393d853721af9adf1b96d16a4c +EBUILD bridge-utils-1.5.ebuild 1278 BLAKE2B 91a901f5cd9357ab8537df51af01148f9ea020f84a5101b5573f778abcb76360bf3ef16fc56e71d83a358f1466090cc463b6762b7f154fcbef52c75b96513b65 SHA512 7aa509626c6e4681dad465b1fe3173c0cd9c87ba160ea418dff281f6bd8038b4c76ba2b6fa52e5a19b2e0bc282a2862c549542d02af0a2b1fc112a037df5998e EBUILD bridge-utils-1.6.ebuild 1353 BLAKE2B 1de8bfd74d84f0191b4b508cc004e3ac8a6db354c59db9b8886f27d69fe361636349ae2930e13dff71338ce8121246de1b5d4431c5f5ff7fb5b1fb001147144f SHA512 94fab337794fc88b33d9cf4a13aaa43f4aaf082235432b2ae2bec8f2d73351b6f81dce4c47feaeb81149e4760006f53804708c29ca47098bfe804021499d9d7f MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.5.ebuild index 239e3a9622eb..db1eb2d66e3c 100644 --- a/net-misc/bridge-utils/bridge-utils-1.5.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="selinux" DEPEND="virtual/os-headers" diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 58d9111b39ed..ecc4a7a50280 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,19 +1,15 @@ AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b -AUX chrony-3.4-systemd-gentoo.patch 765 BLAKE2B 541cf597dcecb800f569847e813edfbfaa13130fee2d1b991de710ff2936cc593aad65497505e99da3f563288e0d52d52432f392817a45c5fcf123a5af370d7b SHA512 0662ab22428d221f62e76e97217c8f5589b54d12deac7d4fc2f9359987b57f39d7c42e6a10c3b97ae0c17b57d63cd11e8e586110194249f7ed2d5dd0fb9a8041 AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4 +AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 933a8fb5dc5225d86aa1a97083755607df76e767c38c58ead1e1ed5e4c180502b31edfbc8c045f976d0b511d60d35562b53d1f0a5ab0ba8b306843cd95b8a9f7 SHA512 e2be0c5cf68cd899a3fd15bf129e664e795883f9912b300e2a1fa0a01f7ca9faea32edd3f1232c9be91e629d5fbbc3a58ec793bf6a73108fa0e58e40c861a0c9 AUX chrony-3.5-systemd-gentoo.patch 297 BLAKE2B b7a8502ede5886b7e51fbaf43d62b59bdb43d8c5059d1ee0c8a14de843d58d576efd6b5c53cb3cbdd1c4583b787a8c180bea93a97a997349d97f652b7b4f1fbb SHA512 ecf0eda8de2c36f14a6d3dac8b7b688b06f46516ae064513314cc46323962147b29f13a57beb34cc7d2664b967b5f0eee26a00ddeac63d88dda59fc196f1aec1 -AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686ea0012fb38ae30b323ceceffac43c0a8168b3e2d288714297a0905e60779d00161e93d8f5773b SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 +AUX chronyd.conf 389 BLAKE2B 12ce24ef0455876ca9b74c5fb03000d720526c4da7dabf1dffb3c959861d5b0f677e2efb96bb5c00f7cc26b79cc77c0b6dfa161551bda5506a5eaac8d16dc46e SHA512 81400fb47fdac472c7508bb301e0dd662429c6ac3243e13d2719b1d237057a8b996163fbc14fa85a498144728d9ddf78275251d630e6800b0144a43792d8c414 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872 -AUX chronyd.init-r1 1637 BLAKE2B 046896f6eaf0a9311a9b3cb7cc6360f4bffaee95067efded8358e1a925da5468e3aa3eed972818aa171ea14c0a3625793588ba6853968cc541a942ccc3597f92 SHA512 cbfafe8210cc3d86d417d590fa6c54924ef9f3487c3766a17fffb34d2421a5fc2dfb98ce53dcc33c5811e7c2fd428a235bfde68d999cb50c7d9e5100f769a37b AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da -AUX chronyd.service-r2 261 BLAKE2B ac29cdd2e717060b5af68608db8a7b3dd8aeb90225edc5b48ea84a8537017d531519a00fb394934c270eb965a615b0b53188bf8bd16edd645074b497ba91fa9e SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe -DIST chrony-3.1.tar.gz 424109 BLAKE2B eb6bc13905a05eab15b00919577cceb4c8c881b4881fbd0e19d966dca86ed6973c31618b1ae56b59cad989144bf59a0206328d50d9eb436fdb058684e74a1661 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427 -DIST chrony-3.3.tar.gz 443571 BLAKE2B cc35f55b8d63eed85495f88b71c9285c68867a28b27c6c5e7d4475a77857ce4a09fbe561906757d66fee13b19d9ee750d41518050048776b2c0ef600407632e9 SHA512 36975d863599141e8e5b071d35cf67326b27f5b0da7ec942dbb4530377d10472b0729eea632e0702718b515cb2d5fd41a7eba158e6dade7f05adfb1bdffa5df0 -DIST chrony-3.4.tar.gz 453056 BLAKE2B 088eb18bfc9ae4a7a3d656dfabddc565bc4a0da995c172183bed12bc5df59e87ab7363ba64e3579cdb414da77bd7f1fe05b66e33474282df57daf1fd8a55e182 SHA512 4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918 DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3518c953591f43224dc3da79f627027a6cd4bf9c4227e9f8659a69adbdb634252ff3920d2ef677e32012456 SHA512 c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c -EBUILD chrony-3.1.ebuild 2823 BLAKE2B 6646382ab32032bcff541f7675457b39c2a2c4b38cf9c33aca7168f497fff39814caffdb531d774631fde56c6b91b004755517c8ff416cdd82da2ee2df9527b8 SHA512 311efdfc25c4d4efa7f85cfa20eb3eb1a9198460b4176127fe08f004faddf92f3c848343f92f02f09977b91a53e66fe106a953f355a3223cb46739b69d526367 -EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf -EBUILD chrony-3.4.ebuild 2912 BLAKE2B 0b8948414c95862295efec709f2f4467974c2955fc03153d5d2bfa15a74fcee2714f012425b4b1002b90cafe9008fa7ce02f0f40582b7b4b0917d82363cc9c77 SHA512 13c6caf8f3d813e1caa515d1ab00f1e5c1539198ee51913f649ee2ef2562bffee15b0f78c78ff5419728740a867d02a90eb889f2711a32db85f7756c3bdda3b3 +DIST chrony-4.0-pre1.tar.gz 506735 BLAKE2B f06afaa0ae653b549760e3b8e2e8a33f70450895cda99773e49fa70358bea637434fd18e55a73e53a2f8ccd92ae9ee4555dcea98afbcae9317b122bf1e1cb5b3 SHA512 0b850d57fded23ac3cfe5907edb2a2b8441397a37575ce3b4af54f3b8f28ae7ae74f92926f619e4907a24d9bc10bb6b416bfe3ccc9d567720e3511d7f9513c59 EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 3567ca621e71777dc34c90b77005e192f564bb8dba5f0705711eaa720262bebafde656da678b2d47130dee19caf8d2e52106ae27a0ee81e292b2defe1dadf5fa SHA512 2c8799bc3ac6e1759e048e37e6e4765d5a199fff043954e19a2640a060609c6281b397dc2834d10ecb34e5bb09b7b80c55b5bc96d0fa10a43b451799a1d53f3a -EBUILD chrony-9999.ebuild 2934 BLAKE2B 325fccb1baf09e65dee2fd3d4a7f1fa1e665ae95daf36a8b9a00ffa9770f69bf29940584595c9cb13bd32ef8695169dc3d19c6d2f34812da00540efc67b6a57a SHA512 2414c0b1f95ae47de1ec308dabacc4a791982af9dad4fa8a45297c336695298df826bca0a5a565adc6667a69166a41910aa093bd4c120827aba4a1d533fe0a9c -MISC metadata.xml 1566 BLAKE2B 88bf43a72fed47580395641d87651a7828fa3fb443a36568bc8ee44f2d09117aa296f8b214f1560279cce2e9bad189a3d941708fe37c1760b053f3669f25ed8e SHA512 acdca169396f72dbbfd3c2ca781024818133ec4af07661a0c8b5a619ca6a43713910aadc28e6d8e5b3d0d8da960ac1bfba05ec5cb5c49d80b17fdf9c1c5d1b1d +EBUILD chrony-3.5-r3.ebuild 3651 BLAKE2B a2ec4dc2e05214e1e61ecc256e17b14c842f8c8c62da916e3bcacae1f3089fd9057a68ec82e141758929ab2d1dba463a339d506572ede8636e3858ff8e82eb25 SHA512 35237e6f351ec77c44c7437bc0a53b0dbcaa6a19ed2e8969e6fb3e6c6fb603878eccef91ab23555b77d64f61c2d22dae85826658e23abf93b71097f3e3577e5e +EBUILD chrony-4.0_pre1-r1.ebuild 3774 BLAKE2B c631e7b12e294c70158f789711630774dcdb9272b370ff48ef6b215b4cd83a5b56c48d0e51d73622c382382d60192da31d6b7f55f47149049827a0e7c968b8d7 SHA512 6d45e89cf89fcd804fc1a1712a3c57a3098270bab932c8ce9c06a6f46f4524c259926b58dffc7578f1e07b18510d245bb4aefc1fa8da5df61db55165130d46dd +EBUILD chrony-4.0_pre1.ebuild 3165 BLAKE2B 2cfc0aa1e9a15db8ab1f7e9b6da1a25c0bcacc91158ab654109b5c5f4b89a4934ca382ca5be9605f266c06a8b01a2dabf83d65fe3362712bc8664bd2cb570f7d SHA512 9fd7e540db1f7a8161010c8a84d0aa658046c124d0df798827a1913bbdebb426b1c0b144793194fac6df1a49bfd4954b4ee1b816db344790f314f9141784f7d2 +EBUILD chrony-9999.ebuild 3536 BLAKE2B 8f2ff768eeb09b12197ea48b330c77eb415c43f6b498f98de9eb5f66637fd04dc653095afa5a7e6783832bfe4234e8ba82c3d70f39c0a7f61fff1f4c3963c3b1 SHA512 66030f49f80ea862fa18891572fc4dd231898f879790867a239878b46cefb647a2017d70a3aa3f8055b94337b0e06c251bacc1e816cf6b4e07877eca926b4eca +MISC metadata.xml 1712 BLAKE2B 61db049bb8b0a659d24e10a25e9b36662607af7437a550615220a789342296a204d0e5c1240c8a5176f8eb2b98a5565956860ebb22c92cdb9b280ee817e68074 SHA512 c568b728b8939d8bca8809bfffed71c8e0cd57dcb5eed33d6d7af0ac2cfebbc2189568ef41bf0c8541b984c38b5351f040e0ac3fbeccf4f329d02c988177c9a2 diff --git a/net-misc/chrony/chrony-3.1.ebuild b/net-misc/chrony/chrony-3.1.ebuild deleted file mode 100644 index edc3c363eb8b..000000000000 --- a/net-misc/chrony/chrony-3.1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils systemd toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="http://chrony.tuxfamily.org/" -SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86" -IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns" -REQUIRED_USE=" - ?? ( libedit readline ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - readline? ( >=sys-libs/readline-4.1-r4:= ) -" -DEPEND=" - ${CDEPEND} - html? ( dev-ruby/asciidoctor ) - pps? ( net-misc/pps-tools ) -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -RESTRICT=test - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - sed -i \ - -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ - -e 's:/var/run:/run:g' \ - conf.c doc/*.man.in examples/* || die - - default -} - -src_configure() { - tc-export CC - - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - - # not an autotools generated script - local CHRONY_CONFIGURE=" - ./configure \ - $(usex caps '' --disable-linuxcaps) \ - $(usex cmdmon '' --disable-cmdmon) \ - $(usex ipv6 '' --disable-ipv6) \ - $(usex ntp '' --disable-ntp) \ - $(usex phc '' --disable-phc) \ - $(usex pps '' --disable-pps) \ - $(usex rtc '' --disable-rtc) \ - $(usex refclock '' --disable-refclock) \ - $(usex adns '' --disable-asyncdns) \ - ${CHRONY_EDITLINE} \ - ${EXTRA_ECONF} \ - --docdir=/usr/share/doc/${PF} \ - --chronysockdir=/run/chrony \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ - --disable-sechash \ - --without-nss \ - --without-tomcrypt - " - - # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || die -} - -src_compile() { - emake all docs $(usex html '' 'ADOC=true') -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r1 chronyd - newconfd "${FILESDIR}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - if use html; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service - systemd_enable_ntpunit 50-chrony chronyd.service -} diff --git a/net-misc/chrony/chrony-3.3.ebuild b/net-misc/chrony/chrony-3.3.ebuild deleted file mode 100644 index a34cf9102e49..000000000000 --- a/net-misc/chrony/chrony-3.3.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils systemd toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/" -SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86" -IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns" -REQUIRED_USE=" - ?? ( libedit readline ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - readline? ( >=sys-libs/readline-4.1-r4:= ) - seccomp? ( sys-libs/libseccomp ) -" -DEPEND=" - ${CDEPEND} - html? ( dev-ruby/asciidoctor ) - pps? ( net-misc/pps-tools ) -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -RESTRICT=test - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - sed -i \ - -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ - -e 's:/var/run:/run:g' \ - conf.c doc/*.man.in examples/* || die - - default -} - -src_configure() { - tc-export CC - - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - - # not an autotools generated script - local CHRONY_CONFIGURE=" - ./configure \ - $(use_enable seccomp scfilter) \ - $(usex adns '' --disable-asyncdns) \ - $(usex caps '' --disable-linuxcaps) \ - $(usex cmdmon '' --disable-cmdmon) \ - $(usex ipv6 '' --disable-ipv6) \ - $(usex ntp '' --disable-ntp) \ - $(usex phc '' --disable-phc) \ - $(usex pps '' --disable-pps) \ - $(usex refclock '' --disable-refclock) \ - $(usex rtc '' --disable-rtc) \ - ${CHRONY_EDITLINE} \ - ${EXTRA_ECONF} \ - --docdir=/usr/share/doc/${PF} \ - --chronysockdir=/run/chrony \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ - --disable-sechash \ - --without-nss \ - --without-tomcrypt - " - - # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || die -} - -src_compile() { - emake all docs $(usex html '' 'ADOC=true') -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r1 chronyd - newconfd "${FILESDIR}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - if use html; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service - systemd_enable_ntpunit 50-chrony chronyd.service -} diff --git a/net-misc/chrony/chrony-3.4.ebuild b/net-misc/chrony/chrony-3.4.ebuild deleted file mode 100644 index 749bf8e23efe..000000000000 --- a/net-misc/chrony/chrony-3.4.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils systemd toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/" -SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns" -REQUIRED_USE=" - ?? ( libedit readline ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - readline? ( >=sys-libs/readline-4.1-r4:= ) - seccomp? ( sys-libs/libseccomp ) -" -DEPEND=" - ${CDEPEND} - html? ( dev-ruby/asciidoctor ) - pps? ( net-misc/pps-tools ) -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -RESTRICT=test - -S="${WORKDIR}/${P/_/-}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.4-systemd-gentoo.patch -) - -src_prepare() { - default - sed -i \ - -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ - doc/* examples/* || die -} - -src_configure() { - tc-export CC - - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - - # not an autotools generated script - local CHRONY_CONFIGURE=" - ./configure \ - $(use_enable seccomp scfilter) \ - $(usex adns '' --disable-asyncdns) \ - $(usex caps '' --disable-linuxcaps) \ - $(usex cmdmon '' --disable-cmdmon) \ - $(usex ipv6 '' --disable-ipv6) \ - $(usex ntp '' --disable-ntp) \ - $(usex phc '' --disable-phc) \ - $(usex pps '' --disable-pps) \ - $(usex refclock '' --disable-refclock) \ - $(usex rtc '' --disable-rtc) \ - ${CHRONY_EDITLINE} \ - ${EXTRA_ECONF} \ - --chronysockdir=/run/chrony \ - --disable-sechash \ - --docdir=/usr/share/doc/${PF} \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - --without-nss \ - --without-tomcrypt - " - - # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || die -} - -src_compile() { - emake all docs $(usex html '' 'ADOC=true') -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${FILESDIR}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - if use html; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit examples/chronyd.service -} diff --git a/net-misc/chrony/chrony-3.5-r3.ebuild b/net-misc/chrony/chrony-3.5-r3.ebuild new file mode 100644 index 000000000000..a654a6eb489f --- /dev/null +++ b/net-misc/chrony/chrony-3.5-r3.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd tmpfiles toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="https://chrony.tuxfamily.org/" +SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE=" + +adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc + +seccomp selinux +" +REQUIRED_USE=" + ?? ( libedit readline ) +" + +CDEPEND=" + caps? ( sys-libs/libcap ) + libedit? ( dev-libs/libedit ) + readline? ( >=sys-libs/readline-4.1-r4:= ) + seccomp? ( sys-libs/libseccomp ) +" +DEPEND=" + ${CDEPEND} + caps? ( acct-group/ntp acct-user/ntp ) + html? ( dev-ruby/asciidoctor ) + pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" + +RESTRICT=test + +S="${WORKDIR}/${P/_/-}" + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch + "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch +) + +src_prepare() { + default + sed -i \ + -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ + doc/* examples/* || die + + # Copy for potential user fixup + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf + cp examples/chronyd.service "${T}"/chronyd.service + + # Set config for privdrop + if ! use caps; then + sed -i \ + -e 's/-u ntp//' \ + "${T}"/chronyd.conf "${T}"/chronyd.service || die + fi + + if ! use seccomp; then + sed -i \ + -e 's/-F 1//' \ + "${T}"/chronyd.conf "${T}"/chronyd.service || die + fi +} + +src_configure() { + tc-export CC + + local CHRONY_EDITLINE + # ./configure legend: + # --disable-readline : disable line editing entirely + # --without-readline : do not use sys-libs/readline (enabled by default) + # --without-editline : do not use dev-libs/libedit (enabled by default) + if ! use readline && ! use libedit; then + CHRONY_EDITLINE='--disable-readline' + else + CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" + CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" + fi + + # not an autotools generated script + local myconf=( + $(use_enable seccomp scfilter) + $(usex adns '' --disable-asyncdns) + $(usex caps '' --disable-linuxcaps) + $(usex cmdmon '' --disable-cmdmon) + $(usex ipv6 '' --disable-ipv6) + $(usex ntp '' --disable-ntp) + $(usex phc '' --disable-phc) + $(usex pps '' --disable-pps) + $(usex refclock '' --disable-refclock) + $(usex rtc '' --disable-rtc) + ${CHRONY_EDITLINE} + ${EXTRA_ECONF} + --chronysockdir="${EPREFIX}/run/chrony" + --disable-sechash + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc/chrony" + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + --without-nss + --without-tomcrypt + ) + + # print the ./configure call to aid in future debugging + echo bash ./configure "${myconf[@]}" >&2 + bash ./configure "${myconf[@]}" || die +} + +src_compile() { + 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 + + insinto /etc/logrotate.d + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony + + systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chrony-wait.service + systemd_enable_ntpunit 50-chrony chronyd.service +} + +pkg_postinst() { + tmpfiles_process chronyd.conf +} diff --git a/net-misc/chrony/chrony-4.0_pre1-r1.ebuild b/net-misc/chrony/chrony-4.0_pre1-r1.ebuild new file mode 100644 index 000000000000..27386df76489 --- /dev/null +++ b/net-misc/chrony/chrony-4.0_pre1-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd tmpfiles toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="https://chrony.tuxfamily.org/" +SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE=" + +adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc + +seccomp +sechash selinux +" +REQUIRED_USE=" + ?? ( libedit readline ) + sechash? ( nettle ) +" + +CDEPEND=" + caps? ( sys-libs/libcap ) + libedit? ( dev-libs/libedit ) + nettle? ( dev-libs/nettle ) + readline? ( >=sys-libs/readline-4.1-r4:= ) + seccomp? ( sys-libs/libseccomp ) +" +DEPEND=" + ${CDEPEND} + caps? ( acct-group/ntp acct-user/ntp ) + html? ( dev-ruby/asciidoctor ) + pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" + +RESTRICT=test + +S="${WORKDIR}/${P/_/-}" + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch + "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch +) + +src_prepare() { + default + sed -i \ + -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ + doc/* examples/* || die + + # Copy for potential user fixup + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf + cp examples/chronyd.service "${T}"/chronyd.service + + # Set config for privdrop + if ! use caps; then + sed -i \ + -e 's/-u ntp//' \ + "${T}"/chronyd.conf "${T}"/chronyd.service || die + fi + + if ! use seccomp; then + sed -i \ + -e 's/-F 1//' \ + "${T}"/chronyd.conf "${T}"/chronyd.service || die + fi +} + +src_configure() { + tc-export CC + + local CHRONY_EDITLINE + # ./configure legend: + # --disable-readline : disable line editing entirely + # --without-readline : do not use sys-libs/readline (enabled by default) + # --without-editline : do not use dev-libs/libedit (enabled by default) + if ! use readline && ! use libedit; then + CHRONY_EDITLINE='--disable-readline' + else + CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" + CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" + fi + + # not an autotools generated script + local myconf=( + $(use_enable seccomp scfilter) + $(usex adns '' --disable-asyncdns) + $(usex caps '' --disable-linuxcaps) + $(usex cmdmon '' --disable-cmdmon) + $(usex ipv6 '' --disable-ipv6) + $(usex nettle '' --without-nettle) + $(usex ntp '' --disable-ntp) + $(usex phc '' --disable-phc) + $(usex pps '' --disable-pps) + $(usex refclock '' --disable-refclock) + $(usex rtc '' --disable-rtc) + $(usex sechash '' --disable-sechash) + ${CHRONY_EDITLINE} + ${EXTRA_ECONF} + --chronysockdir="${EPREFIX}/run/chrony" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc/chrony" + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + --without-nss + --without-tomcrypt + ) + + # print the ./configure call to aid in future debugging + echo bash ./configure "${myconf[@]}" >&2 + bash ./configure "${myconf[@]}" || die +} + +src_compile() { + 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 + + insinto /etc/logrotate.d + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony + + systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chrony-wait.service + systemd_enable_ntpunit 50-chrony chronyd.service +} + +pkg_postinst() { + tmpfiles_process chronyd.conf +} diff --git a/net-misc/chrony/chrony-4.0_pre1.ebuild b/net-misc/chrony/chrony-4.0_pre1.ebuild new file mode 100644 index 000000000000..3f2cb339c288 --- /dev/null +++ b/net-misc/chrony/chrony-4.0_pre1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="https://chrony.tuxfamily.org/" +SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE=" + +adns caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc + seccomp +sechash selinux +" +REQUIRED_USE=" + ?? ( libedit readline ) + sechash? ( nettle ) +" + +CDEPEND=" + caps? ( sys-libs/libcap ) + libedit? ( dev-libs/libedit ) + nettle? ( dev-libs/nettle ) + readline? ( >=sys-libs/readline-4.1-r4:= ) + seccomp? ( sys-libs/libseccomp ) +" +DEPEND=" + ${CDEPEND} + html? ( dev-ruby/asciidoctor ) + pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" + +RESTRICT=test + +S="${WORKDIR}/${P/_/-}" + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch + "${FILESDIR}"/${PN}-3.5-systemd-gentoo.patch +) + +src_prepare() { + default + sed -i \ + -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ + doc/* examples/* || die +} + +src_configure() { + tc-export CC + + local CHRONY_EDITLINE + # ./configure legend: + # --disable-readline : disable line editing entirely + # --without-readline : do not use sys-libs/readline (enabled by default) + # --without-editline : do not use dev-libs/libedit (enabled by default) + if ! use readline && ! use libedit; then + CHRONY_EDITLINE='--disable-readline' + else + CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" + CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" + fi + + # not an autotools generated script + local myconf=( + $(use_enable seccomp scfilter) + $(usex adns '' --disable-asyncdns) + $(usex caps '' --disable-linuxcaps) + $(usex cmdmon '' --disable-cmdmon) + $(usex ipv6 '' --disable-ipv6) + $(usex nettle '' --without-nettle) + $(usex ntp '' --disable-ntp) + $(usex phc '' --disable-phc) + $(usex pps '' --disable-pps) + $(usex refclock '' --disable-refclock) + $(usex rtc '' --disable-rtc) + $(usex sechash '' --disable-sechash) + ${CHRONY_EDITLINE} + ${EXTRA_ECONF} + --chronysockdir="${EPREFIX}/run/chrony" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc/chrony" + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + --without-nss + --without-tomcrypt + ) + + # print the ./configure call to aid in future debugging + echo bash ./configure "${myconf[@]}" >&2 + bash ./configure "${myconf[@]}" || die +} + +src_compile() { + emake all docs $(usex html '' 'ADOC=true') +} + +src_install() { + default + + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd + newconfd "${FILESDIR}"/chronyd.conf chronyd + + insinto /etc/${PN} + newins examples/chrony.conf.example1 chrony.conf + + docinto examples + dodoc examples/*.example* + + if use html; then + docinto html + dodoc doc/*.html + fi + + keepdir /var/{lib,log}/chrony + + insinto /etc/logrotate.d + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony + + systemd_dounit examples/{chronyd,chrony-wait}.service + systemd_enable_ntpunit 50-chrony chronyd.service +} diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index e939129a01ac..543cabf61d5c 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 systemd toolchain-funcs +inherit git-r3 tmpfiles systemd toolchain-funcs DESCRIPTION="NTP client and server programs" HOMEPAGE="https://chrony.tuxfamily.org/" @@ -12,8 +12,8 @@ SLOT="0" KEYWORDS="" IUSE=" - +adns caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc - seccomp selinux + +adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc + +seccomp selinux " REQUIRED_USE=" ?? ( libedit readline ) @@ -27,6 +27,7 @@ CDEPEND=" " DEPEND=" ${CDEPEND} + caps? ( acct-group/ntp acct-user/ntp ) dev-ruby/asciidoctor pps? ( net-misc/pps-tools ) " @@ -39,7 +40,7 @@ S="${WORKDIR}/${P/_/-}" PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-3.5-systemd-gentoo.patch + "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch ) src_prepare() { @@ -47,6 +48,23 @@ src_prepare() { sed -i \ -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ doc/* examples/* || die + + # Copy for potential user fixup + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf + cp examples/chronyd.service "${T}"/chronyd.service + + # Set config for privdrop + if ! use caps; then + sed -i \ + -e 's/-u ntp//' \ + "${T}"/chronyd.conf "${T}"/chronyd.service || die + fi + + if ! use seccomp; then + sed -i \ + -e 's/-F 1//' \ + "${T}"/chronyd.conf "${T}"/chronyd.service || die + fi } src_configure() { @@ -102,7 +120,7 @@ src_install() { default newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${FILESDIR}"/chronyd.conf chronyd + newconfd "${T}"/chronyd.conf chronyd insinto /etc/${PN} newins examples/chrony.conf.example1 chrony.conf @@ -110,6 +128,8 @@ src_install() { docinto examples dodoc examples/*.example* + newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" + docinto html dodoc doc/*.html @@ -118,6 +138,11 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - systemd_dounit examples/{chronyd,chrony-wait}.service + systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chrony-wait.service systemd_enable_ntpunit 50-chrony chronyd.service } + +pkg_postinst() { + tmpfiles_process chronyd.conf +} diff --git a/net-misc/chrony/files/chrony-3.4-systemd-gentoo.patch b/net-misc/chrony/files/chrony-3.4-systemd-gentoo.patch deleted file mode 100644 index 63d6b7ed3398..000000000000 --- a/net-misc/chrony/files/chrony-3.4-systemd-gentoo.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ba3ddefc90f58d30a365104cf6e930333e3a2704 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Tue, 4 Sep 2018 13:01:06 -0400 -Subject: [PATCH] Tweak chronyd.service for Gentoo - ---- - examples/chronyd.service | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/examples/chronyd.service b/examples/chronyd.service -index 1777413..ceed830 100644 ---- a/examples/chronyd.service -+++ b/examples/chronyd.service -@@ -7,9 +7,8 @@ ConditionCapability=CAP_SYS_TIME - - [Service] - Type=forking --PIDFile=/var/run/chrony/chronyd.pid --EnvironmentFile=-/etc/sysconfig/chronyd --ExecStart=/usr/sbin/chronyd $OPTIONS -+PIDFile=/run/chrony/chronyd.pid -+ExecStart=/usr/sbin/chronyd - PrivateTmp=yes - ProtectHome=yes - ProtectSystem=full --- -2.18.0 - diff --git a/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch new file mode 100644 index 000000000000..0ea3c921980b --- /dev/null +++ b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch @@ -0,0 +1,12 @@ +--- a/examples/chronyd.service ++++ b/examples/chronyd.service +@@ -8,8 +8,7 @@ + [Service] + Type=forking + PIDFile=/run/chrony/chronyd.pid +-EnvironmentFile=-/etc/sysconfig/chronyd +-ExecStart=/usr/sbin/chronyd $OPTIONS ++ExecStart=/usr/sbin/chronyd -u ntp -F 1 + PrivateTmp=yes + ProtectHome=yes + ProtectSystem=full diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf index fc43a95c40fe..c04f3525f0b7 100644 --- a/net-misc/chrony/files/chronyd.conf +++ b/net-misc/chrony/files/chronyd.conf @@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf" # The combination of "-s -r" allows chronyd to perform long term averaging of # the gain or loss rate across system reboots and shutdowns. -ARGS="" +ARGS="-u ntp -F 1" diff --git a/net-misc/chrony/files/chronyd.init-r1 b/net-misc/chrony/files/chronyd.init-r1 deleted file mode 100644 index a76e2533f57d..000000000000 --- a/net-misc/chrony/files/chronyd.init-r1 +++ /dev/null @@ -1,69 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use dns -} - -checkconfig() { - # Note that /etc/chrony/chrony.keys is *NOT* checked. This - # is because the user may have specified another key - # file, and we don't want to force the user to use that - # exact name for the key file. - if [ ! -f "${CFGFILE}" ] ; then - eerror "Please create ${CFGFILE} and the" - eerror "chrony key file (usually /etc/chrony/chrony.keys)" - eerror "by using the" - eerror "" - eerror " chrony.conf.example" - eerror " chrony.keys.example" - eerror "" - eerror "files (from the documentation directory)" - eerror "as templates." - return 1 - else - # Actually, I tried it, and chrony seems to ignore the pidfile - # option. I'm going to leave it here anyway, since you never - # know if it might be handy - PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"` - fi - return 0 -} - -setxtrarg() { - if [ -c /dev/rtc ]; then - grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s" - fi - grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r" - return 0 -} - -start() { - checkconfig || return $? - setxtrarg - - [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid - - ebegin "Starting chronyd" - start-stop-daemon \ - --start \ - --quiet \ - --exec /usr/sbin/chronyd \ - --pidfile "${PIDFILE}" \ - -- -f "${CFGFILE}" ${ARGS} - eend $? "Failed to start chronyd" -} - -stop() { - checkconfig || return $? - - [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid - - ebegin "Stopping chronyd" - start-stop-daemon \ - --stop \ - --quiet \ - --pidfile "${PIDFILE}" - eend $? "Failed to stop chronyd" -} diff --git a/net-misc/chrony/files/chronyd.service-r2 b/net-misc/chrony/files/chronyd.service-r2 deleted file mode 100644 index 90255675c838..000000000000 --- a/net-misc/chrony/files/chronyd.service-r2 +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Chrony Network Time Service -After=ntpdate.service sntp.service network.target -Conflicts=ntpd.service systemd-timesyncd.service - -[Service] -Type=forking -ExecStart=/usr/sbin/chronyd -PIDFile=/run/chronyd.pid - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml index 290f9476459b..70ff1db23638 100644 --- a/net-misc/chrony/metadata.xml +++ b/net-misc/chrony/metadata.xml @@ -21,10 +21,12 @@ Chrony はコンピュータのシステム・クロックの精度を保つた Support for asynchronous DNS Support for command and monitoring Install HTML documentation +Use dev-libs/nettle for hash functions Support for the Network Time Protocol (NTP) Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface Support for the Linux Pulse Per Second (PPS) interface Support for reference clocks Support for the Linux Real Time Clock interface +Enable support for hashes other than MD5 diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest index c66ecff18be6..c14333311921 100644 --- a/net-misc/cmst/Manifest +++ b/net-misc/cmst/Manifest @@ -1,3 +1,5 @@ DIST cmst-2019.01.13.tar.gz 2576200 BLAKE2B 4b1c75c479651887a14d5b4266a99a36667c1d02f114c4a9886b5aaec445e320fc684d42793312d68e4eb3386ea8516aef3cecb705e37f8b9a88ea8bf5bcf512 SHA512 ba7cf94263b4908dc2a609216f82bd758ad727f623d65b2e876a02c1fd956b7090a8222e953a0cd2da9527eddaab918e9c735381c705b9943e9e8aaeeb00d835 +DIST cmst-2020.03.07.tar.gz 2722455 BLAKE2B d7119c6194596bc957793a9054f306ecedf84f8b57a8e7dcbbff0d49231c512cddbe530aa7f49428e8fe60abe3fb48616288a61d865845775958564da6d77a55 SHA512 43fd5fab8a2e4914557efd57dfa92d3dd7ec67f322b1eb1c25cfe90fa860254d1bcad9e31cddeddd3c1c5f8e1cca4cd33457a796607a6b008340d191c62ac5b2 EBUILD cmst-2019.01.13.ebuild 818 BLAKE2B 7fa6c5129b6a35dbe54d069ed904f99da29973cfeec447cbbfef7608f215dc6d93039601fb9887a761a32fc65c7077eeea9a91a5c2177408a3feab07d4c349af SHA512 e62a40db50996bf991f274930d9020039897c670a737953cef1785dbb0d25a8bfa6f1be74e0a5555ff7d705776499bbe4952a97b5641715958d0a1297d6eff1b +EBUILD cmst-2020.03.07.ebuild 800 BLAKE2B 7fe1807c6b0ebfc5a29baa3c9942b88a81d85a0edcffa90358fb1425fa64402bea20a922fc64a5a9ca1901199d96bf8614ad624e78f51db4343b7b809fcb9b2a SHA512 f614ca72fdd68535095c74d01d00bff5054fab2a2e9d0eb6c8e14a3019268de37dac6257c833b4a348262ef6106280d957bc7df8bc407ea5abde6613e03c833c MISC metadata.xml 389 BLAKE2B fa4bcb790a8e29dcfb5d87f3b675824dbd909a148253470189db24b6bd9b4282d1ddbd1dbedaec31f4d0dbe07cfdff0cc7331d6863842f5db7e597e7614698ee SHA512 b589825d436c4ad3b0781acc5b64cf044f056a70ca72f52cb0341b05e87bf8b269049dcef4e7a6acb8bd76c3a909eaa7c8a0bd77794e7266eb8e7cb7f6fbf7ad diff --git a/net-misc/cmst/cmst-2020.03.07.ebuild b/net-misc/cmst/cmst-2020.03.07.ebuild new file mode 100644 index 000000000000..7e44b788f094 --- /dev/null +++ b/net-misc/cmst/cmst-2020.03.07.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 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/${PV}.tar.gz -> ${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 +" + +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 +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index b78ff4c4b9ac..5e5c0a78d4c6 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -1,9 +1,6 @@ -AUX connman-1.33-polkit-configure-check-fix.patch 665 BLAKE2B ffe1a6ae19fe163ad84391f1d974df976fae943f73863200eb3acdde630c68db2979be03cc072c663a1e8198e7eb598ccfbe6ee5f20b8cadac4a6df6ff77194f SHA512 630ac9d147046f084a960795de87183c5c446006df7a6a74c02416e972a3bd55390e1ab9c3f0ea4449324d0fb7c271ebd6b64727ede834128ca8515853a9e905 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40 -DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a28014e6f4e5a89c8662194ad2e2ee6091b51445b88a885808461413b3aaf88eeb7b75a32f417b578d2da80a2e9f SHA512 5d5363105aedd0c9d609dd5c64eb832d9ff80923a944d9d3738337a61f180ded227f2ae1ff7912bed8826b35f0cfd20488e3ffd3801f0e53e90f98498e19efb6 DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4 -EBUILD connman-1.37.ebuild 2596 BLAKE2B 6c8ccfffaaad05f5a09b93b11dd9fc5000c3899db79f84d6bad9a959ebea5c01f21f0bef203fa1524aec6a16e384c0167167b8c3915bd230fb721b15e863ba8d SHA512 ff3f15f3258908c623d8ba0b6295a825984db6a905189595ae7fe506d316b3076d03b396324187852161245e555f257f4c0e8f560284bcdd38d3c593164bfb5c -EBUILD connman-1.38.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da +EBUILD connman-1.38.ebuild 2722 BLAKE2B ed9392bee5e97012fe13b77fd3ed5c50f15dd64aeea641695505c7c4f0d575c949e51e04e21ff801de9d8d8609807593b2d7279a5adc6aa87ac99da16473d654 SHA512 829b20d249c16a550819d00cba1b42afa44895f287c48a47176576280d3d6dd231c446c5bcae91ef662f78d0e0e828429377365482426d2b29115494c9247b70 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da MISC metadata.xml 1220 BLAKE2B 0d56b48507231a37eed6f84e5875ea55571a8cfc0379b7b16c3d74650fa011876b7466a96bfbcf7a9db9cc931c2662d678d33872082dec7b444dc404430e71bd SHA512 591edad65cd7efc59a63b207c5ea7b60b624ee91b3ab1d4aa165d4b2824640fffeca662d7f6ba34822e38777ceae9aa3caafd39d328294f245e988c77fbede5d diff --git a/net-misc/connman/connman-1.37.ebuild b/net-misc/connman/connman-1.37.ebuild deleted file mode 100644 index a81c15709fc8..000000000000 --- a/net-misc/connman/connman-1.37.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit autotools systemd tmpfiles - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://01.org/connman" -SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 x86" - -IUSE="${IUSE} bluetooth debug doc examples +ethernet +iptables iwd l2tp nftables" -IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager" - -REQUIRED_USE="^^ ( iptables nftables )" -RDEPEND=">=dev-libs/glib-2.16 - >=sys-apps/dbus-1.2.24 - sys-libs/readline:0= - iptables? ( >=net-firewall/iptables-1.4.8 ) - bluetooth? ( net-wireless/bluez ) - 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] ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.39 - virtual/pkgconfig" - -#PATCHES=( -# "${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch" -#) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --localstatedir=/var \ - --with-systemdunitdir=$(systemd_get_systemunitdir) \ - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --enable-client \ - --enable-datafiles \ - --enable-loopback=builtin \ - $(use_enable examples test) \ - $(use_enable ethernet ethernet builtin) \ - $(use_enable wifi wifi builtin) \ - $(use_enable iwd) \ - $(use_enable bluetooth bluetooth builtin) \ - $(use_enable l2tp l2tp builtin) \ - $(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 vpnc vpnc builtin) \ - $(use_enable wispr wispr builtin) \ - $(use_enable debug) \ - $(use_enable tools) \ - $(use_enable networkmanager nmcompat) \ - --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 /usr/lib/tmpfiles.d/connman_resolvconf.conf -} diff --git a/net-misc/connman/connman-1.38.ebuild b/net-misc/connman/connman-1.38.ebuild index 937b54ecf834..d2079bf83776 100644 --- a/net-misc/connman/connman-1.38.ebuild +++ b/net-misc/connman/connman-1.38.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" else SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 x86" fi DESCRIPTION="Provides a daemon for managing internet connections" diff --git a/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch b/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch deleted file mode 100644 index 57ef5e8ccbac..000000000000 --- a/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- connman-1.33/configure.ac.old 2016-10-09 11:26:43.137856416 -0700 -+++ connman-1.33/configure.ac 2016-10-09 11:26:52.819722799 -0700 -@@ -281,11 +281,11 @@ AM_CONDITIONAL(NMCOMPAT, test "${enable_ - - AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit], - [enable PolicyKit support]), - [enable_polkit=${enableval}], [enable_polkit="no"]) - if (test "${enable_polkit}" != "no"); then -- POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit`" -+ POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit-gobject-1`" - POLKIT_DATADIR="" - if (test -z "${POLKIT_DATADIR}"); then - POLKIT_DATADIR="${datadir}/polkit-1/actions" - fi - AC_SUBST(POLKIT_DATADIR) diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index f8b4e6729630..c60565c1b3b0 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,14 +1,14 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 -DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba1541011658892bb883e917541aaffe6ebfb0d2b9f18e2357059a7bc1e3a8db47b2aed7a74597b21c14f0892ad6e9eb68 SHA512 032c065c1d4bd07ba028625f8fab6a09e7cb8505a5f19339b3abdee5a9cda7d091c11f075fe3fc227d082690a66c558c770a4cd9fb17b52acc13794976a770c5 -DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be70740119879beeb08ff2a6ace7737efe1fb6d96ecaacaf8f90dc0142ceede2b90c84275ea8f72bcd09f21dba SHA512 fc4f041d3d6682378ce9eef2c6081e6ad83bb2502ea4c992c760266584c09e9ebca7c6d35958bd32a888702d9308cbce7aef69c431f97994107d7ff6b953941b DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35 DIST curl-7.67.0.tar.xz 2418548 BLAKE2B 818b3d03ac8c4adb8a629147feccebcbd3d89164a77d7cb457924bd44c3069f1b03326861b73c51a6427d7169d40485a509f74edd89b99b760649e7adcdce693 SHA512 1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29 DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c -EBUILD curl-7.65.0.ebuild 6954 BLAKE2B 8c09fd1fa5f32fe5acdf4be4fcf3049e1cca7961c189b8fdcbef68fb2d9d4da394f490849d11b0c1879cc19dce23c84f3c1c6349658fc808bbf6a370e0cfa060 SHA512 1a9cf55e36fe409683039cedf90056d1c261b01e854a31e54b6ecb1d4a8f584b8c216a2c20487d9447c4c35ff8d8dc99aef49893bd938933953b7a197d91ec99 -EBUILD curl-7.65.3.ebuild 7138 BLAKE2B 06732af10263c41e523f0b36637597fb81d51cd26eedbd198cc2cc59758da3c36e74fc2810296400df2576576b94255637e35c018751c91be9d8333a441b90ca SHA512 f13cbc01affb023970ec54686d09d56bf59660c634399383c709405074e9e77ffa476a418ca9b89aacadb1541b4f2e01c2180e871f1bf5885020b9f0e9ab6494 -EBUILD curl-7.66.0.ebuild 7565 BLAKE2B 4898aaa5d6c5503b6cb2cd213ae3757f7bb7a39cc59cb9bd28503a9fcf05e1856e1552a132901234b67d880c18bdc7f42ee9e48524acbc1592d59af04b2ed4d2 SHA512 1563036caf7e1702ac95b6f1f8d40276dff58618d1b21ab078a6febc57289c5156ea411c59ce44bf74ad7ddd63a244f79d180ffd43b4bf1b31a1b7403846471c -EBUILD curl-7.67.0-r1.ebuild 7591 BLAKE2B 49b533d4b4176b495b983e0e149934e3ae2ec694c2eeb8be7dd81c412ee7e4409243efca5ef01d395d8d46b78c9f6ad346b6d6bd35acb7e90393a2169b3b4106 SHA512 c633b9884c895558407cdaedd89bd1d71cd43bd9db97c7fc7952e2d6acad016115364a6da798b6ceb88d5e9880373041c25a53c943e35c01757d2cf9dc4bfb09 -EBUILD curl-7.68.0.ebuild 7613 BLAKE2B e3270e7970b9f046ab3cc598722aad13dc38cf6790f7872a9abdec78d888aaac62720bae5fc3ea62c98d481a1fcf1998956c28b2a5eed28713fe56ff43b1a060 SHA512 3d96b8aef75184f125df727cf3035af996b57fa089825636669200a0a50b0560750e6e248a42806b50a2e5b8d8bfa81edf9da989a15c978c86b502598b187aa9 +DIST curl-7.69.0.tar.xz 2466092 BLAKE2B e47abb6410dff25f642971646ce3bec3dd119e70a6eb53abc21826b315f88db2e180fb7cc0ea2a0435816a3b090cd2926fd1f27e02ba7aa75aad37ba0a298ceb SHA512 8c151201b09c51cc1437c2f6345036fce88ea5402cd1fd62b76c093e294b87d0c1f61e1dcf6f799f508d8dcfe381589a3815001a8c8bbc085aed0fdca6f2536d +DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937 SHA512 dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa +EBUILD curl-7.66.0.ebuild 7562 BLAKE2B e6243cdad0e39f7f8ce7d2feb5d1c1441760e53a57c7eb3b50310d32df906e1a415b7bfbf0b4a8aefcd9c8d3623bab48ace68d100d9168ccf12bb52c4d6068d3 SHA512 8fa782ad7fa2cdad090d7808306cd173f6a23cfdb80764463c81ba7e75a268c69b9995c6559635a061c29d7ff54ee62bdee4c2a7b93af502747d65f9287dc246 +EBUILD curl-7.67.0-r1.ebuild 7587 BLAKE2B ed4a1aa8562cb3f651a83363967e465a02fbacede801851d04160cea6c01ef24f31758e6019cad1ac8e306f2530c2b913cd11ea80d282edf05644be0f24eb2bc SHA512 4c5b26f9acdb0f71b2e3a18058216cd7ba7d9a42227a9f53d4a4d3cdb33f78e12ddf833bff00979f5cb9c30c522aa94569a2be7a313a8dbe1c11abebd2f1a1d7 +EBUILD curl-7.68.0.ebuild 7600 BLAKE2B cc01e76a04b7023aa8aca65e65338279137fcf943ce474518fb807e9b4eaeecfb18022c39e8157a964168f73f07ab32c1e2553ad829ed5335f4f347506c45e45 SHA512 77bac8d7fd71c7f760ded2c96085e48c0f78b782cbde0b0449164e64c10ef527b2540ee7b8dc2dd3666560dd074fcf6b05d8d289798db3e12be2cf5b3a15f3a7 +EBUILD curl-7.69.0.ebuild 7617 BLAKE2B b74548fa09e5f6dfd32cbdfb863c4f692d952782ed085fb1e99bba0627513a9ffc60a7c20abac16b1e05a2ed2a78d9c285ffee8f357ab34dfb969d2540185b88 SHA512 9fa053a7aa0f2d4d797c20ec63c56e16de279c6a78558339972d95edf7361f07875a431ab5dcb08070f59a2c138b82a478e0f21007e051ada08d801d05466e38 +EBUILD curl-7.69.1.ebuild 7617 BLAKE2B b74548fa09e5f6dfd32cbdfb863c4f692d952782ed085fb1e99bba0627513a9ffc60a7c20abac16b1e05a2ed2a78d9c285ffee8f357ab34dfb969d2540185b88 SHA512 9fa053a7aa0f2d4d797c20ec63c56e16de279c6a78558339972d95edf7361f07875a431ab5dcb08070f59a2c138b82a478e0f21007e051ada08d801d05466e38 MISC metadata.xml 1219 BLAKE2B 981090b46e9e66661074be920692e688ebd351ad1770b3a1b76ac6f3b6cc66c70c370031affdf5f72b2141e04ab7e4e073b4bc1fcd0295624e14a929cc3714d1 SHA512 9f86ffa85c0ac69c7289a97a92d5e592a17e5cc23b62be980540cdc8702cf6151361be4f171446fca317d2dcb1c5879ba8ae1ad0b0d99ffb54366ca35df4052d diff --git a/net-misc/curl/curl-7.65.0.ebuild b/net-misc/curl/curl-7.65.0.ebuild deleted file mode 100644 index a34b455658e7..000000000000 --- a/net-misc/curl/curl-7.65.0.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" -IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" -IUSE+=" elibc_Winnt" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - curl_ssl_gnutls? ( - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_libressl? ( - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_mbedtls? ( - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - http2? ( net-libs/nghttp2[${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}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${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] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_libressl - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ - docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch - eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch - eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 - - eapply_user - 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-polarssl --without-ssl --without-winssl ) - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls --with-nettle ) - elif use curl_ssl_libressl; then - einfo "SSL provided by LibreSSL" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - elif use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - elif use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - 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 - ECONF_SOURCE="${S}" \ - econf \ - --disable-alt-svc \ - --enable-crypto-auth \ - --enable-dict \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --disable-ntlm-wb \ - --enable-pop3 \ - --enable-rt \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - --enable-tls-srp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-hidden-symbols \ - $(use_enable ipv6) \ - --enable-largefile \ - --without-libpsl \ - --enable-manual \ - --enable-proxy \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - $(use_enable threads pthreads) \ - --disable-versioned-symbols \ - --without-amissl \ - --without-cyassl \ - --without-darwinssl \ - --without-fish-functions-dir \ - $(use_with idn libidn2) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - $(use_with metalink libmetalink) \ - $(use_with http2 nghttp2) \ - $(use_with rtmp librtmp) \ - $(use_with brotli) \ - --without-schannel \ - --without-secure-transport \ - --without-spnego \ - --without-winidn \ - --without-wolfssl \ - --with-zlib \ - "${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 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_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete - rm -rf "${ED}"/etc/ -} diff --git a/net-misc/curl/curl-7.65.3.ebuild b/net-misc/curl/curl-7.65.3.ebuild deleted file mode 100644 index b93ba55b05c5..000000000000 --- a/net-misc/curl/curl-7.65.3.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" -IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" -IUSE+=" elibc_Winnt" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - curl_ssl_gnutls? ( - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_libressl? ( - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_mbedtls? ( - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - http2? ( net-libs/nghttp2[${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}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${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] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_libressl - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ - docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch - eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch - eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 - - eapply_user - 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-polarssl --without-ssl --without-winssl ) - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls --with-nettle ) - elif use curl_ssl_libressl; then - einfo "SSL provided by LibreSSL" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - elif use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - elif use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - 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 - - ECONF_SOURCE="${S}" \ - econf \ - --disable-alt-svc \ - --enable-crypto-auth \ - --enable-dict \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --disable-ntlm-wb \ - --enable-pop3 \ - --enable-rt \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - --enable-tls-srp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-dateparse \ - --enable-dnsshuffle \ - --enable-doh \ - --enable-hidden-symbols \ - --enable-http-auth \ - $(use_enable ipv6) \ - --enable-largefile \ - --without-libpsl \ - --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-cyassl \ - --without-darwinssl \ - --without-fish-functions-dir \ - $(use_with idn libidn2) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - $(use_with metalink libmetalink) \ - $(use_with http2 nghttp2) \ - $(use_with rtmp librtmp) \ - $(use_with brotli) \ - --without-schannel \ - --without-secure-transport \ - --without-spnego \ - --without-winidn \ - --without-wolfssl \ - --with-zlib \ - "${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 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_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete - rm -rf "${ED}"/etc/ -} diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild index 2149bb3acbe1..85a43d480223 100644 --- a/net-misc/curl/curl-7.66.0.ebuild +++ b/net-misc/curl/curl-7.66.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" diff --git a/net-misc/curl/curl-7.67.0-r1.ebuild b/net-misc/curl/curl-7.67.0-r1.ebuild index 82221e8ad5e0..9fe9aaefbf2b 100644 --- a/net-misc/curl/curl-7.67.0-r1.ebuild +++ b/net-misc/curl/curl-7.67.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" diff --git a/net-misc/curl/curl-7.68.0.ebuild b/net-misc/curl/curl-7.68.0.ebuild index 31286cc893a0..3f2075b469f5 100644 --- a/net-misc/curl/curl-7.68.0.ebuild +++ b/net-misc/curl/curl-7.68.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" diff --git a/net-misc/curl/curl-7.69.0.ebuild b/net-misc/curl/curl-7.69.0.ebuild new file mode 100644 index 000000000000..cf06aa6240da --- /dev/null +++ b/net-misc/curl/curl-7.69.0.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools eutils prefix multilib-minimal + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.haxx.se/" +SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" +IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" +IUSE+=" nghttp3 quiche" +IUSE+=" elibc_Winnt" + +#lead to lots of false negatives, bug #285669 +RESTRICT="test" + +RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + curl_ssl_gnutls? ( + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + curl_ssl_libressl? ( + dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] + ) + curl_ssl_mbedtls? ( + net-libs/mbedtls:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + curl_ssl_openssl? ( + dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] + ) + curl_ssl_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}] ) + metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + sys-libs/zlib[${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] ) +# ) + +# ssl providers to be added: +# fbopenssl $(use_with spnego) + +DEPEND="${RDEPEND}" +BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + test? ( + sys-apps/diffutils + dev-lang/perl + )" + +# c-ares must be disabled for threads +# only one ssl provider can be enabled +REQUIRED_USE=" + curl_ssl_winssl? ( elibc_Winnt ) + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_libressl + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_winssl + ) + )" + +DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ + docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +src_prepare() { + eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch + eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch + eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch + + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 + sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 + + eapply_user + 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-polarssl --without-ssl --without-winssl ) + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl ; then + if use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls --with-nettle ) + elif use curl_ssl_libressl; then + einfo "SSL provided by LibreSSL" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + elif use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + elif use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss ) + elif use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + elif use curl_ssl_winssl; then + einfo "SSL provided by Windows" + myconf+=( --with-winssl ) + 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 + + ECONF_SOURCE="${S}" \ + econf \ + $(use_enable alt-svc) \ + --enable-crypto-auth \ + --enable-dict \ + --disable-esni \ + --enable-file \ + --enable-ftp \ + --enable-gopher \ + --enable-http \ + --enable-imap \ + $(use_enable ldap) \ + $(use_enable ldap ldaps) \ + --disable-ntlm-wb \ + --enable-pop3 \ + --enable-rt \ + --enable-rtsp \ + $(use_enable samba smb) \ + $(use_with ssh libssh2) \ + --enable-smtp \ + --enable-telnet \ + --enable-tftp \ + --enable-tls-srp \ + $(use_enable adns ares) \ + --enable-cookies \ + --enable-dateparse \ + --enable-dnsshuffle \ + --enable-doh \ + --enable-hidden-symbols \ + --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 \ + --without-cyassl \ + --without-darwinssl \ + --without-fish-functions-dir \ + $(use_with idn libidn2) \ + $(use_with kerberos gssapi "${EPREFIX}"/usr) \ + $(use_with metalink libmetalink) \ + $(use_with http2 nghttp2) \ + --without-libpsl \ + $(use_with nghttp3) \ + $(use_with nghttp3 ngtcp2) \ + $(use_with quiche) \ + $(use_with rtmp librtmp) \ + $(use_with brotli) \ + --without-schannel \ + --without-secure-transport \ + --without-spnego \ + --without-winidn \ + --without-wolfssl \ + --with-zlib \ + "${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_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete + rm -rf "${ED}"/etc/ +} diff --git a/net-misc/curl/curl-7.69.1.ebuild b/net-misc/curl/curl-7.69.1.ebuild new file mode 100644 index 000000000000..cf06aa6240da --- /dev/null +++ b/net-misc/curl/curl-7.69.1.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools eutils prefix multilib-minimal + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.haxx.se/" +SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" +IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" +IUSE+=" nghttp3 quiche" +IUSE+=" elibc_Winnt" + +#lead to lots of false negatives, bug #285669 +RESTRICT="test" + +RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + curl_ssl_gnutls? ( + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + curl_ssl_libressl? ( + dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] + ) + curl_ssl_mbedtls? ( + net-libs/mbedtls:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + curl_ssl_openssl? ( + dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] + ) + curl_ssl_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}] ) + metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + sys-libs/zlib[${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] ) +# ) + +# ssl providers to be added: +# fbopenssl $(use_with spnego) + +DEPEND="${RDEPEND}" +BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + test? ( + sys-apps/diffutils + dev-lang/perl + )" + +# c-ares must be disabled for threads +# only one ssl provider can be enabled +REQUIRED_USE=" + curl_ssl_winssl? ( elibc_Winnt ) + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_libressl + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_winssl + ) + )" + +DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ + docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +src_prepare() { + eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch + eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch + eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch + + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 + sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 + + eapply_user + 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-polarssl --without-ssl --without-winssl ) + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl ; then + if use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls --with-nettle ) + elif use curl_ssl_libressl; then + einfo "SSL provided by LibreSSL" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + elif use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + elif use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss ) + elif use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + elif use curl_ssl_winssl; then + einfo "SSL provided by Windows" + myconf+=( --with-winssl ) + 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 + + ECONF_SOURCE="${S}" \ + econf \ + $(use_enable alt-svc) \ + --enable-crypto-auth \ + --enable-dict \ + --disable-esni \ + --enable-file \ + --enable-ftp \ + --enable-gopher \ + --enable-http \ + --enable-imap \ + $(use_enable ldap) \ + $(use_enable ldap ldaps) \ + --disable-ntlm-wb \ + --enable-pop3 \ + --enable-rt \ + --enable-rtsp \ + $(use_enable samba smb) \ + $(use_with ssh libssh2) \ + --enable-smtp \ + --enable-telnet \ + --enable-tftp \ + --enable-tls-srp \ + $(use_enable adns ares) \ + --enable-cookies \ + --enable-dateparse \ + --enable-dnsshuffle \ + --enable-doh \ + --enable-hidden-symbols \ + --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 \ + --without-cyassl \ + --without-darwinssl \ + --without-fish-functions-dir \ + $(use_with idn libidn2) \ + $(use_with kerberos gssapi "${EPREFIX}"/usr) \ + $(use_with metalink libmetalink) \ + $(use_with http2 nghttp2) \ + --without-libpsl \ + $(use_with nghttp3) \ + $(use_with nghttp3 ngtcp2) \ + $(use_with quiche) \ + $(use_with rtmp librtmp) \ + $(use_with brotli) \ + --without-schannel \ + --without-secure-transport \ + --without-spnego \ + --without-winidn \ + --without-wolfssl \ + --with-zlib \ + "${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_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete + rm -rf "${ED}"/etc/ +} diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest index 2b1fcfa1e50b..dd6d883cf339 100644 --- a/net-misc/dahdi-tools/Manifest +++ b/net-misc/dahdi-tools/Manifest @@ -1,6 +1,9 @@ AUX dahdi-autoconf.conf2 1067 BLAKE2B f6c64135e4b47ce3eafd4b79b4e02ea8bc4d46ab36e30203cf061a5541fc2bdc9bdb2bf6050bc36c8d1e1b5f2ba07f72e83037eccd86ead45fdc97e8a4a3d767 SHA512 7de2ad496a48da487b0f54b0d3c98681e72ebb86107bdf091c74f410d0e2598fe21e1b876eea81d72ef5250570a67a2ece19de6d003b9bbc3def5fae9173189a AUX dahdi-autoconf.init2 5817 BLAKE2B c8186a6ff1188ed1d91b86db2b6e861297b5927c7a2cc95a95eb656d4149f2d01c2d8b91412e440f76e9fcb3ff530aef00dae04c38763bd84575cadecdfe2692 SHA512 0201e4555a8c3ccaceb4cfe1fe004dada847608ad6d8ad031f788f72b056e0d0ef0bdad653eb2f492ae08444c2094dc00ac73180a4107eaabc5f5258a91fa50d AUX dahdi-nondigium-blacklist.patch 507 BLAKE2B 5cd8264cfb6792db5fdb92b32dad33a224defb876807d260fbef9f72b943f56f8415a7f082752e261c03982c6b016fe1ce8034d98c6a1aac4cfee7c9d50b3ddb SHA512 4fdb4933e05e07812d1a94efb9bda9038aaadb8a1830cb9ba99d62346f2d007e827771f8de144ef09d6ee5adb1a571ca5ef8ae646c7f62bde8232af30468c2ac +AUX dahdi-tools-3.1.0-cplusplusexternc.patch 695 BLAKE2B 8b3cbe872786017759d11bf5d23e6eb41de29003e047ab7244188e0603df6ea669b870216e15cdf4c77a41f7b4f5d10169853aaf839b6dc4d491c0a23121924b SHA512 eecfdb73558b8f4ea8b5ffb55ced8f863960cb1ee92196995ca69e30df4a55f07f59a0b429cfad40271b71b585130438b11861d3459fab87f02ced7032f57ded +AUX dahdi-tools-3.1.0-execinfo.patch 1194 BLAKE2B da5ebde771ff1cc7099681854d5bc313f66eafadec00399f0d249decc4d1d28844b579d08b76641285df301f21aba8ba9fa1569573001370ed94ca9ffc2c5eb9 SHA512 638c7cf9f6a378bcf0aa5d184a59aac40a8bdaf206180cf3f9d30464d88545aa3d5205f652cf3ed793014d5a3cf5a6d358e623936add6137b65b29cf48136389 +AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7ccec7c99f9b9ada6207b6f8590d5da732a27cb77570ffb53fd43f312cded7e6783322436f18eaba44a8ee5fdb03447a895a77ac SHA512 0841ff6a8f1e551a088c36bfdc44bad185e884b055dc6b8655db489b4957398834c4a25eabaf32269eeecd3aef6d7b891dd87a89af9b15e3d92786ce0151656c AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb DIST dahdi-tools-2.10.0.tar.gz 655475 BLAKE2B da24593def6f1f08bc9a2cc98fcb06dafaf419410bac2f93b00d2085fb7ed2ad3b72ba7731ec368b54aad318057a2a1998bca5e56907729c9261c3c4bd0705fa SHA512 cf84d1117ac6b4dbd87db4a6ec072e945e64677fbd5dca169e06d954c599ce4ff9a80254aa3027bcc02f7770a5e0a3bcaca075aacfd28c62870d011801d0d225 @@ -20,5 +23,5 @@ EBUILD dahdi-tools-2.11.1.ebuild 1514 BLAKE2B db13d058b35176e206d3c01045af6487b5 EBUILD dahdi-tools-2.6.2.ebuild 1142 BLAKE2B e56f23fd0ad6e2a3d5739492826f257987788bdaeef5e5123ddf2ff05a15656fb39200089c0b6c292d03b0dfd03150501e1c76fce6c1bdc37061c9fb87d8e7fc SHA512 0a40014c9fc78a7242c871d4aeaa01e401ef5d1d97b16597c655cdcf97bc0315932b633cf13e6f3ccddfcea4f60d0e0a71d294e57e6be84eeeedacb61ee06307 EBUILD dahdi-tools-2.8.0.ebuild 1142 BLAKE2B 4bf03468a83e536ad1e378412ce9dde3292db6dd4910ef84ce0a80e14c95c83f8e0b3f87c7e2b52d722ad3a868e71c5dad6d1e2f09d62587381f8cfb4d14dae5 SHA512 2ce2e7f671fe45402bea42733b98c663de58f8197a2fdbf5b089aa57a8958115ed297ee89ca265566bd3e5af10763a1a38069322f9f3e0705cadd121f4e19feb EBUILD dahdi-tools-2.9.0.1.ebuild 1142 BLAKE2B 4bf03468a83e536ad1e378412ce9dde3292db6dd4910ef84ce0a80e14c95c83f8e0b3f87c7e2b52d722ad3a868e71c5dad6d1e2f09d62587381f8cfb4d14dae5 SHA512 2ce2e7f671fe45402bea42733b98c663de58f8197a2fdbf5b089aa57a8958115ed297ee89ca265566bd3e5af10763a1a38069322f9f3e0705cadd121f4e19feb -EBUILD dahdi-tools-3.1.0.ebuild 1458 BLAKE2B 17f482662ebf19be6f1463fdd7055c4f13287c93b0fc68a5071a05f5cb9841b86b59cabd1a8aadd450a7c866fb1e80b0140ba149da508d14843a6c1d613659d5 SHA512 39f513ce0e83c231f364ec08d2d75ed532fc52916e6a6ab0eff427182c1fefd83167cf773572446a004f678634b13c427ce540d3a65d223992555adede0e838f +EBUILD dahdi-tools-3.1.0.ebuild 1612 BLAKE2B bab8132ebe0dfba57b6e2c767b21f73dde3478aa39beb939e055acc1ab3338a7562bebbef34f63196ff897417d254b3f300435f9eedf111b845ca00a67082ac9 SHA512 ad53325c96d8e2e01157d7566a0258e8b50846f805605c3250bf449436983fbed5be54eb75bbf15f34dcd70fa76c179fad700202f0793aa691b7dc64eb358ae2 MISC metadata.xml 443 BLAKE2B 5a35a0f5e7aa8d8b19423f8aab317e7eef695b76f1b541a96af1c0f6194d3919a56260e3a461a0acbabd268f884265876b9601348179a976b620f39ca4bcab48 SHA512 d071770c4efce5c06137822cbf002d29c11b59f004afc537008417204851e05751df7b21140abc74e8439baa00d2e15bd596b4436f8e8aa5815ea8200018d007 diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild index 2a8c5a467685..3d949497d099 100644 --- a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild +++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild @@ -16,6 +16,9 @@ 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 diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch new file mode 100644 index 000000000000..37d1402c404f --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch @@ -0,0 +1,26 @@ +diff --git a/./dahdi-tools-3.1.0/xpp/hexfile.h.o b/./dahdi-tools-3.1.0/xpp/hexfile.h +index 33ff50d..3d03f98 100644 +--- a/xpp/hexfile.h ++++ b/xpp/hexfile.h +@@ -70,7 +70,9 @@ struct hexdata { + }; + + +-__BEGIN_DECLS ++#ifdef __cpluplus ++extern "C" { ++#endif + + typedef void (*parse_hexfile_report_func_t)(int level, const char *msg, ...) + #ifdef __GNUC__ +@@ -86,6 +88,9 @@ int dump_hexfile2(struct hexdata *hexdata, const char *outfile, uint8_t maxwidth + void dump_binary(struct hexdata *hexdata, const char *outfile); + void gen_hexline(const uint8_t *data, uint16_t addr, size_t len, FILE *output); + int bsd_checksum(struct hexdata *hexdata); +-__END_DECLS ++ ++#ifdef __cpluplus ++} ++#endif + + #endif diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch new file mode 100644 index 000000000000..b222a85d8cb9 --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch @@ -0,0 +1,40 @@ +--- a/configure.ac 2020-03-28 22:28:35.614340050 +0200 ++++ b/configure.ac 2020-03-28 22:28:55.084181570 +0200 +@@ -161,6 +161,7 @@ + # Checks for header files. + AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h]) + AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) ++AC_CHECK_HEADERS([execinfo.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_INLINE +--- a/xpp/xtalk/debug.c 2020-03-28 22:41:43.507810560 +0200 ++++ b/xpp/xtalk/debug.c 2020-03-28 22:41:10.538087608 +0200 +@@ -27,8 +27,10 @@ + #include + #include +-#include + #include + #include ++#ifdef HAVE_EXECINFO_H ++#include ++#endif + + int verbose = LOG_INFO; + int debug_mask; +@@ -61,6 +63,7 @@ + /* from glibc info(1) */ + void print_backtrace(FILE *fp) + { ++#ifdef HAVE_EXECINFO_H + void *array[10]; + size_t size; + char **strings; +@@ -71,4 +74,7 @@ + for (i = 0; i < size; i++) + fprintf(fp, "%s\n", strings[i]); + free(strings); ++#else ++ fprintf(fp, "backtrace information only available if execinfo.h is available.\n"); ++#endif + } diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch new file mode 100644 index 000000000000..3ca5bd2aa09b --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch @@ -0,0 +1,39 @@ +diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c +index fdb34f1..8fb3687 100644 +--- a/xpp/mpptalk.c ++++ b/xpp/mpptalk.c +@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) { + MEMBER(MPP, TWS_PORT_GET_REPLY); + MEMBER(MPP, TWS_PWR_GET); + MEMBER(MPP, TWS_PWR_GET_REPLY); +-} PACKED members; ++} PACKED; + + /* + * Statuses +diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c +index 49e47d5..251a502 100644 +--- a/xpp/xtalk/xtalk_raw.c ++++ b/xpp/xtalk/xtalk_raw.c +@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK, + + union XTALK_PDATA(XTALK) { + MEMBER(XTALK, ACK); +-} PACKED members; ++} PACKED; + + const struct xtalk_protocol xtalk_raw_proto = { + .name = "XTALK-RAW", +diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c +index 18a5cad..ffa79d2 100644 +--- a/xpp/xtalk/xtalk_sync.c ++++ b/xpp/xtalk/xtalk_sync.c +@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) { + MEMBER(XTALK, ACK); + MEMBER(XTALK, PROTO_GET); + MEMBER(XTALK, PROTO_GET_REPLY); +-} PACKED members; ++} PACKED; + + const struct xtalk_protocol xtalk_sync_proto = { + .name = "XTALK-SYNC", diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest index 9b44b43c46fd..8ef6e47e54f3 100644 --- a/net-misc/dahdi/Manifest +++ b/net-misc/dahdi/Manifest @@ -28,6 +28,7 @@ DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c13885447 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517 DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210 +DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304 DIST gentoo-dahdi-patchset-3.1.0.tar.bz2 2224 BLAKE2B f07b8a1ecf7996d9e970248216b3ceacd991ecfe4e6e9cbf408c47e7e29e827a5ebedd399d611bc7c286309095c109d30d6c7f03ed4c95c8e89ba816ed59e002 SHA512 ed88dcf023238a8cea33fc32957ec28a237eafd0315fd5b73bfcabb95ef5aa304a94ce38a6233f37810162cfc9467876128003e818145a6942e7133a68243d42 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 EBUILD dahdi-2.10.0.1-r1.ebuild 3619 BLAKE2B 78303522ad9ad22932719028da33f72baadeca7e380c535d10ed95c42941a19502175de1630dbf7dcd484d2189cef4d94813f69341f44527415f5d3da28843b0 SHA512 94273131542d58fcaec97471fd65a9503f1fffd833ef7632503a776c10805cda1f7da6163d2d5683adfbb47085fa920b8a527e37ee867df0ffac320d252fe8f9 @@ -36,5 +37,6 @@ EBUILD dahdi-2.10.1.ebuild 3617 BLAKE2B d4ca2fe5dea6d1c175224a3bd72d6f15073d17c0 EBUILD dahdi-2.10.2-r2.ebuild 3618 BLAKE2B 5105bc86b9eabe1deddde2196d6bf98646a00a49f47d59dc9aef61d25bdf858d496da6663ad72262a79e02a408ed9eb8c44876a8e13c48f66d67caae9fb7bbe3 SHA512 73784dc279ce84937e52cdf2df7df9da91af842944bf2dffbabf780da04d5477067f791aee701b4b3615a14a667520fee602f601021304d06b1154e401e0ba4f EBUILD dahdi-2.11.1-r1.ebuild 3668 BLAKE2B ca3be7eda7090e86fa17d221bd1b3764a40b180735a4b00acae5df0654b2a3857802054fd167ea35877c61f82521d6cf9f8c420df68375572f24c2bc9ddcd281 SHA512 62c84fad523c3c58e3d81e1a4bc5b956a7fcde28ee088060f579913e1fad4b6a02895a8c3a0cb2795ba52a156c1b252214bbda1c248a5802613a3cccef755ffd EBUILD dahdi-2.11.1.ebuild 3682 BLAKE2B 3ff22d2b78db250bcb1ba265500861e1bdbe920d9871567f26ae736f87e9859fbe6399c7a9466c33050a98f738aa46dd534d7c80bac92a528aacb41126a7ec58 SHA512 6434e30a359f02afcade7384dfe2511ae3ca829abb7553be74bfd6cbe9be27e98be73eec7cdf5af70a082110dcae9585cf4d94b58f924b00d6e33dbe37c9df4e +EBUILD dahdi-3.1.0-r1.ebuild 4374 BLAKE2B c8bc65cb6e2be989a0e0221864b04e6c30cac42bfa5431a36238878969e8c52daa75cbf209303393907201f6edd8c431d062f17f40ca79dbb3441574cc5bdbec SHA512 6c2afa6845389fc90e2fd256bfa0930aa875215947d5523a49e8bc5a82a0355d74192c0509192d74e4fc815bbba2f20202660f1e540f3f1762272d6f928df4c6 EBUILD dahdi-3.1.0.ebuild 4390 BLAKE2B 43d5c4b96e27fc01475ff5aa7ac852bbdd5c81688ccf8e183dbb91fb9287c49e824119f6d445859203d1da6b8f929d7adc04e0584888898c62c507805708f943 SHA512 12e015927e398f928df7ac74c54584c879ba7710dca044bbebacb356911d63ce2604b485b7d6e5d94370d500ddec67908196cec3c0470a0ad5493eae18d9a395 MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild new file mode 100644 index 000000000000..a37fb85b1303 --- /dev/null +++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-mod toolchain-funcs + +MY_P="${P/dahdi/dahdi-linux}" +JNET=1.0.14 +GENTOO=3.1.0-r1-v2 +S="${WORKDIR}/${MY_P}" + +JNET_DRIVERS="cwain qozap ztgsm" + +DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz + https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz + https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2 + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz +" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="flash oslec" + +PATCHES=( "${WORKDIR}/dahdi-patchset" ) + +CONFIG_CHECK="MODULES ~CRC_CCITT" + +pkg_pretend() { + use oslec && CONFIG_CHECK+=" ECHO" + check_extra_config +} + +src_unpack() { + unpack ${A} + # Copy the firmware tarballs over, the makefile will try and download them otherwise + for file in ${A} ; do + [[ "${file}" = dahdi-fw* ]] || continue + cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || + die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" + done + # But without the .bin's it'll still fall over and die, so copy those too. + mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || + die "Error moving firmware files into the right folders." + + for drv in ${JNET_DRIVERS}; do + ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || + die "Error linking ${drv}.c from jnet to DAHDI." + ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || + die "Error linking ${drv}.h from jnet to DAHDI." + done +} + +src_prepare() { + if use flash; then + sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || + die "Failed to define FXSFLASH" + sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ + include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" + fi + if use oslec; then + sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ + drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." + fi + default +} + +src_compile() { + unset ARCH + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ + DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ + LDFLAGS="$(raw-ldflags)" all +} + +src_install() { + einfo "Installing kernel module" + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ + DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ + LDFLAGS="$(raw-ldflags)" install + + rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules" +} diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 175f357456f3..5ab9050d103c 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -23,7 +23,7 @@ AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7 DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40 -EBUILD dhcp-4.4.1.ebuild 7905 BLAKE2B a6d29d223d131f97c96534d9d13511789582e43aee9cff7fed74d7c74c1bea95838ee21bb88029816daf6f82501289051a8ea193279ec0f97aef22a282405621 SHA512 e4a2e123ecbabe9b26a614a2f8037854f94cf69e328f2da85f9fa8b7897452bf19468e14dc56e8bbb86770d913ec2b55d459fedbf05c79a49b3c6a8f13fb2fbf -EBUILD dhcp-4.4.2-r2.ebuild 7961 BLAKE2B fc3e02637b6734000b8120783ed71dede090d258ff70fd189e591ef0558b5659ab24fc12bc97cdcd6ee396422d7532b1e16c1914d97e4a8814617a67c02dac4a SHA512 fdd448b6b2f214f479e0e848e6fdca61d9bec0ba15817cb354e73c910e5b952cc48bd0828cb88df9aa45ff891736e0295d3df1d77e8c4133de2a32a98beee568 -EBUILD dhcp-4.4.2.ebuild 7934 BLAKE2B 43944b83a3cf71d6461076d586e40c81853ca62af026f6890911d42803cc981278bfdd68bdb1b667351765c02c6b7005c01d6f9935436a1fda17f5358da975e4 SHA512 e9bfb118e7d6fc4258eed4a9ee2d0f18be76d4aa5241ab874a3cc6eec631bb675f7e83e2bde08d1898dbc0b3cef306bcdd2c8276bfd982d837dc825651b292ee +EBUILD dhcp-4.4.1.ebuild 7902 BLAKE2B 06574b801312668a19d8a8f55611c816c29507c3ad0dc187a1e35aa2bf6aeda7d1eda3bdda6e66943c627b7a7fc473c2772aee55ec3e33912ea8dde3bce2495d SHA512 b44efc8e344f8c08728fb92bd0550a4194e23c3277b46f8ecbb28c56cd62bc38eb908764eb3fb85b3f7ba84f21507710a81e6eff1c759a00765ef9bdea824cb7 +EBUILD dhcp-4.4.2-r2.ebuild 7957 BLAKE2B ea7bc2975df18db30c585ba954e7a051e6c1961c17d1a5265bbb705fe5f7d4eedc6ec59df9711105badf43038dea1535695272b61500b94fb8468578ea727476 SHA512 f9126e3b0827a8f1313c3ba9239e3c8798ebee0467d803d05513492b83cd33414b9c764a029cda31b535dec8d8c10d1003a67c0d95a3a134c8b862f84518af67 +EBUILD dhcp-4.4.2.ebuild 7930 BLAKE2B e4a9d780010707cf9f16816f29ccd1a9c0ebbf961bd89e6c05a1516a5a97c6900a3a04e6435ed4bd00bc8874dd126d6e87d95e1147933f72b1ae8deac2acc6dc SHA512 40b769fce9749bace22ebdabeabfaf44251b03a07bb8dd186c8af5238d1cbdd89a40e59205fac287f576b2fe5d2152371e7f1244c5d22daa2cf158d0814bc9df MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild index 3e2837952209..5adaa5ca5af1 100644 --- a/net-misc/dhcp/dhcp-4.4.1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" DEPEND=" diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild index 87b562df6029..650a485d9d6f 100644 --- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild +++ b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" DEPEND=" diff --git a/net-misc/dhcp/dhcp-4.4.2.ebuild b/net-misc/dhcp/dhcp-4.4.2.ebuild index 560df3f8af21..251ffeb42ec5 100644 --- a/net-misc/dhcp/dhcp-4.4.2.ebuild +++ b/net-misc/dhcp/dhcp-4.4.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" DEPEND=" diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 3a10fca206f3..8f923227a789 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,14 +1,17 @@ +AUX dhcpcd-9.0.0-no_ipv6_build_fix.patch 2670 BLAKE2B c35b0abcd0d20f9f142df2a33ab4bfa600b9bca184c598ec05e8d89553a573a20368404b387316384f625e45e136150c8cfc583ffb8392ae59c54cd296cd2a95 SHA512 f4bf108d63a88a9ab10525a1201bcd9dc95d1346d0e1be5b2c3a0cf9fddcc58f3aec69bec184e63e75edb2a82374682df630b4af29fdca188ac11830ea2452be AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f DIST dhcpcd-7.2.5.tar.xz 214124 BLAKE2B 7a5f32b66187afcaa2bb4a1cbcc0d704a28a27ff6d1f9fea409bab242ebf4d263d81590cb4a4959c9f1119966795e26fa582ed16a525c1e46a72dd0905868074 SHA512 ee0c70f3996f6a06031c2f663a4bdf4f147d637c31e54bb94fcb9d86282c33ad7b0f5569abe09acd7698efbb34c35afb228fe0825e4a95ad6a42832d1838ca72 DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193 -DIST dhcpcd-8.1.5.tar.xz 229212 BLAKE2B 9b60485a673001479d21727548266440eb44e070af873d014a43b3b0f189e2c6d3d1e3c04b7d67fd45f54edf75e0e24703f0bacb3c3ae114273b8428ca30d1d4 SHA512 59c8ae255b18b6678b22d4bd5f6797ac20e762d1d22e5ba4c0aefce5ec0d4f863876c06c03dd4c5e71f4d65884474cef9c29f95658eac55097603becd96e3846 DIST dhcpcd-8.1.6.tar.xz 229224 BLAKE2B ad3d024b5a62feb3c9cb39ada0323d336af831cb9892dc50b93c672e6ae2a5607526122a9a5f63a00915a182ea7e7a0ae6b19bbb965bd1fa9ca58cbcac81cd66 SHA512 f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df -EBUILD dhcpcd-7.2.3.ebuild 4386 BLAKE2B c9f1e817bbf184b16c43c5b974d824ee2b05c4a521f7ac77678fe79875f146db13d46495af840d13547e6ac5f31ccd637970e1a9a08cecad7d22f9c103cd256e SHA512 e799b52717072a3e5c1221b8cbb92aefada154db84c2faab07eda5597ab9dc8d8bdbe42cf9a2c2a472a57c6304208af91c6bcf97a33f61f9cf729b4540a8d0fb -EBUILD dhcpcd-7.2.5.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691 -EBUILD dhcpcd-8.0.6.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691 -EBUILD dhcpcd-8.1.5.ebuild 4398 BLAKE2B e6f1fcf4d35747e771896ee3c37bde2ce7e90eef8892a0d014a124fcb3dc111079ef4570eff535c86dff69c206356df8844c6b919ac9f2d7ec6aab8769d48285 SHA512 7047213143759d2740405fba60d6a617e18506fe6b050b8a34768cd850e830636045dc3ebb81704bf1ad8ec84b56004a525df0aa79cc33a7df799e3bfd68a270 -EBUILD dhcpcd-8.1.6.ebuild 4398 BLAKE2B e6f1fcf4d35747e771896ee3c37bde2ce7e90eef8892a0d014a124fcb3dc111079ef4570eff535c86dff69c206356df8844c6b919ac9f2d7ec6aab8769d48285 SHA512 7047213143759d2740405fba60d6a617e18506fe6b050b8a34768cd850e830636045dc3ebb81704bf1ad8ec84b56004a525df0aa79cc33a7df799e3bfd68a270 -EBUILD dhcpcd-9999.ebuild 4427 BLAKE2B c57c5170026230050182276f914c22963f077d960d5f695267ea46bc54c6ef37a4809da798c897ece97d019497aed04a2ba815047ebc265922265c5edf01ff9c SHA512 c2db16bd7e6c3b4e7ba256c6e652408cc5f4257c188e3b668e27fa12e437aeed806a7d2045532ae22f124da6732aceeac65d69f17b18793a175eeb6af0995d98 -MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a +DIST dhcpcd-8.1.7.tar.xz 230308 BLAKE2B 636daad77885b7f00f34c73413db4a0269bca844c33b630b5302cfcd9f5b2068ed95872dd92f3b8db25e7b2ca0a28a8053e1975a7ee50fd5403f8d58e97dff17 SHA512 ea58ef3db8254d677820c44b2842ef2f3697b2d90fcbd89b2ecfcbac87e705047cac17053bbe076a3f6d2775903c8e75eac38089d25c097e2f24a045c24977e8 +DIST dhcpcd-9.0.0.tar.xz 245336 BLAKE2B e206ba6f8e8c890247e308e5e181abf3eec2f5abc0f4b8fa05b220529018d16c806cb8ae29525b9bf7e39b465377016b55fe1c08b2f0b83d8e7a3432b6ea71b5 SHA512 5b04d9ecb75c45e7f883e29aed4862ae7fc186a6ca161353ed59ffed4dbc266e03596a26d09ae60e87806047659d6ce238b26d264b5a96b21643849343d2da0b +EBUILD dhcpcd-7.2.3.ebuild 4384 BLAKE2B e1572ed7ff0b2a854b080a7583b2a0632b5d1c5aa018bb7d1f515f5deeff1bebaf2f0312fac7163a0e4b70cace2d859a0d214ccbb134debca4311213558bf30c SHA512 f243719ff6dae2092f5236df9e6893a9313bdee5665d3bfeb140ffd02778a16eabcf2d1516fe59cd0b4e5421e30e703f74966eb7cb8288d87a4fded126b584b0 +EBUILD dhcpcd-7.2.5.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780 +EBUILD dhcpcd-8.0.6.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780 +EBUILD dhcpcd-8.1.6.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780 +EBUILD dhcpcd-8.1.7.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780 +EBUILD dhcpcd-9.0.0.ebuild 5335 BLAKE2B 792e26c5df03845cb0251395977bcbe16803817bade78bcb7c8949e6730607f8bb76aef4fa14f98a5579fb6a705e2f6beb43135a3bcdcc84464ea5e971b205c2 SHA512 7c4b27d692d5e9c5e1b2979cdbaab4bf721911eeb5b44da899eb700c212e1ceb4669cfc8bd1675f4489a12aa64b45ba41e77cd7182b30cda3d1487b76cef6729 +EBUILD dhcpcd-9999.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a +MISC metadata.xml 661 BLAKE2B 079dd7ae7da62777750cda972982faec3a7040018c57a40b33874b20bbfcdf60a00487f38daaba2fcf10c2325c6d582d70983f5bb6fca64f309eaa81c615de93 SHA512 3b2db0737e02439895ee5d7fc06b9344c64282d4014ef1f7cc8ce19f93e8744aa929f85fba8f04c0a865f477a5066dfa083b568546665e870137c2989999e5e0 diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild index f7b4a7148b85..199319334079 100644 --- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild +++ b/net-misc/dhcpcd/dhcpcd-7.2.3.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 sh sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild index 97babad6cfa4..504876b53cf8 100644 --- a/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild +++ b/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild index 97babad6cfa4..504876b53cf8 100644 --- a/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild +++ b/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/dhcpcd/dhcpcd-8.1.5.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.5.ebuild deleted file mode 100644 index 4526f6e55cd7..000000000000 --- a/net-misc/dhcpcd/dhcpcd-8.1.5.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2020 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://roy.marples.name/git/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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://roy.marples.name/projects/dhcpcd" -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" - -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable embedded) - $(use_enable ipv6) - $(usex elibc_glibc '--with-hook=yp.conf' '') - $(usex kernel_linux '--rundir=${EPREFIX}/run' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.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-8.1.6.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.6.ebuild index 4526f6e55cd7..504876b53cf8 100644 --- a/net-misc/dhcpcd/dhcpcd-8.1.6.ebuild +++ b/net-misc/dhcpcd/dhcpcd-8.1.6.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild new file mode 100644 index 000000000000..504876b53cf8 --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2020 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://roy.marples.name/git/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://roy.marples.name/projects/dhcpcd" +LICENSE="BSD-2" +SLOT="0" +IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" + +COMMON_DEPEND="udev? ( virtual/udev )" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +src_configure() { + local myeconfargs=( + --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" + --localstatedir="${EPREFIX}/var" + --prefix="${EPREFIX}" + --with-hook=ntp.conf + $(use_enable embedded) + $(use_enable ipv6) + $(usex elibc_glibc '--with-hook=yp.conf' '') + $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + $(usex udev '' '--without-dev --without-udev') + CC="$(tc-getCC)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + keepdir /var/lib/dhcpcd + newinitd "${FILESDIR}"/${PN}.initd ${PN} + systemd_dounit "${FILESDIR}"/${PN}.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.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-9.0.0.ebuild new file mode 100644 index 000000000000..52553bf20cc2 --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-9.0.0.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2020 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://roy.marples.name/cgit/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://roy.marples.name/projects/dhcpcd" +LICENSE="BSD-2" +SLOT="0" +IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +privsep +udev" + +COMMON_DEPEND="udev? ( virtual/udev )" +DEPEND="${COMMON_DEPEND}" +RDEPEND=" + ${COMMON_DEPEND} + privsep? ( + acct-group/dhcpcd + acct-user/dhcpcd + ) +" + +PATCHES=( "${FILESDIR}/${P}-no_ipv6_build_fix.patch" ) + +src_configure() { + local myeconfargs=( + --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" + --localstatedir="${EPREFIX}/var" + --prefix="${EPREFIX}" + --with-hook=ntp.conf + $(use_enable debug) + $(use_enable embedded) + $(use_enable ipv6) + $(use_enable privsep) + $(usex elibc_glibc '--with-hook=yp.conf' '') + $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + $(usex privsep '--privsepuser=dhcpcd' '') + $(usex udev '' '--without-dev --without-udev') + CC="$(tc-getCC)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + keepdir /var/lib/dhcpcd + newinitd "${FILESDIR}"/${PN}.initd ${PN} + systemd_dounit "${FILESDIR}"/${PN}.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 + + # dhcpcd-9 introduced privesep support in a chroot + if use privsep ; then + local dhcpcd_libdir="/var/lib/dhcpcd" + local chroot_base="${EROOT}/var/chroot/dhcpcd" + local chroot_dir="${chroot_base}${dhcpcd_libdir}" + local chroot_retval=0 + # Set up proper chroot. + if [[ ! -e "${chroot_dir}" ]] ; then + mkdir -p "${chroot_dir}" || chroot_retval=1 + cp -a "${EROOT}${dhcpcd_libdir}" "${chroot_dir}" || chroot_retval=1 + chown -R dhcpcd:dhcpcd "${chroot_dir}" || chroot_retval=1 + elif [[ ! -d "${chroot_dir}" ]] ; then + ewarn "${chroot_dir} is not a directory!" + ewarn "Did not set up ${PN} chroot!" + fi + if [[ "${chroot_retval}" -ne 0 ]] ; then + ewarn "There were issues setting up ${PN} chroot." + fi + fi + + # Warn about removing stale files + if [[ -n "${old_files[@]}" ]] ; then + elog + elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" + elog "${EROOT}/etc to ${dbdir}" + elog "and copied leases in ${dbdir} to new files with the dhcpcd-" + elog "prefix dropped." + elog + elog "You should remove these files if you don't plan on reverting" + elog "to an older version:" + local old_file= + for old_file in ${old_files[@]}; do + elog " ${old_file}" + done + fi + + if [ -z "${REPLACING_VERSIONS}" ]; then + elog + elog "dhcpcd has zeroconf support active by default." + elog "This means it will always obtain an IP address even if no" + elog "DHCP server can be contacted, which will break any existing" + elog "failover support you may have configured in your net configuration." + elog "This behaviour can be controlled with the noipv4ll configuration" + elog "file option or the -L command line switch." + elog "See the dhcpcd and dhcpcd.conf man pages for more details." + + elog + elog "Dhcpcd has duid enabled by default, and this may cause issues" + elog "with some dhcp servers. For more information, see" + elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" + fi + + if ! has_version net-dns/bind-tools; then + elog + elog "If you activate the lookup-hostname hook to look up your hostname" + elog "using the dns, you need to install net-dns/bind-tools." + fi +} diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index e83bb217a35a..9656eabee928 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi @@ -21,11 +21,17 @@ DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" HOMEPAGE="https://roy.marples.name/projects/dhcpcd" LICENSE="BSD-2" SLOT="0" -IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +udev" +IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +privsep +udev" COMMON_DEPEND="udev? ( virtual/udev )" DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" +RDEPEND=" + ${COMMON_DEPEND} + privsep? ( + acct-group/dhcpcd + acct-user/dhcpcd + ) +" src_configure() { local myeconfargs=( @@ -37,8 +43,10 @@ src_configure() { $(use_enable debug) $(use_enable embedded) $(use_enable ipv6) + $(use_enable privsep) $(usex elibc_glibc '--with-hook=yp.conf' '') $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + $(usex privsep '--privsepuser=dhcpcd' '') $(usex udev '' '--without-dev --without-udev') CC="$(tc-getCC)" ) @@ -105,6 +113,26 @@ pkg_postinst() { cp "${lease}" "${dbdir}/${new_lease}" done + # dhcpcd-9 introduced privesep support in a chroot + if use privsep ; then + local dhcpcd_libdir="/var/lib/dhcpcd" + local chroot_base="${EROOT}/var/chroot/dhcpcd" + local chroot_dir="${chroot_base}${dhcpcd_libdir}" + local chroot_retval=0 + # Set up proper chroot. + if [[ ! -e "${chroot_dir}" ]] ; then + mkdir -p "${chroot_dir}" || chroot_retval=1 + cp -a "${EROOT}${dhcpcd_libdir}" "${chroot_dir}" || chroot_retval=1 + chown -R dhcpcd:dhcpcd "${chroot_dir}" || chroot_retval=1 + elif [[ ! -d "${chroot_dir}" ]] ; then + ewarn "${chroot_dir} is not a directory!" + ewarn "Did not set up ${PN} chroot!" + fi + if [[ "${chroot_retval}" -ne 0 ]] ; then + ewarn "There were issues setting up ${PN} chroot." + fi + fi + # Warn about removing stale files if [[ -n "${old_files[@]}" ]] ; then elog diff --git a/net-misc/dhcpcd/files/dhcpcd-9.0.0-no_ipv6_build_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.0.0-no_ipv6_build_fix.patch new file mode 100644 index 000000000000..a210982c340b --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-9.0.0-no_ipv6_build_fix.patch @@ -0,0 +1,92 @@ +From 12ddbee51f0e1cf4372146f8d42ea404dd07dba3 Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Thu, 2 Apr 2020 19:54:19 +0000 +Subject: Fix build without INET or INET6 + +--- + src/dhcpcd.c | 2 +- + src/if-bsd.c | 2 ++ + src/if-options.c | 6 ++++++ + src/privsep-root.c | 2 ++ + 4 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/dhcpcd.c b/src/dhcpcd.c +index 057a1fd9..9208f37c 100644 +--- a/src/dhcpcd.c ++++ b/src/dhcpcd.c +@@ -2169,7 +2169,7 @@ printpidfile: + } + #endif + +-#ifdef BSD ++#if defined(BSD) && defined(INET6) + /* Disable the kernel RTADV sysctl as early as possible. */ + if (ctx.options & DHCPCD_IPV6 && ctx.options & DHCPCD_IPV6RS) + if_disable_rtadv(); +diff --git a/src/if-bsd.c b/src/if-bsd.c +index dbe5c359..d6c38903 100644 +--- a/src/if-bsd.c ++++ b/src/if-bsd.c +@@ -1524,6 +1524,8 @@ if_missfilter0(struct dhcpcd_ctx *ctx, struct interface *ifp, + #ifdef INET6 + if (sa->sa_family == AF_INET6) + ifa_setscope(satosin6(sa), ifp->index); ++#else ++ UNUSED(ifp); + #endif + + cp = ctx->rt_missfilter + ctx->rt_missfilterlen; +diff --git a/src/if-options.c b/src/if-options.c +index 7850ff2e..1280cfbd 100644 +--- a/src/if-options.c ++++ b/src/if-options.c +@@ -573,6 +573,8 @@ set_option_space(struct dhcpcd_ctx *ctx, + return; + } + #endif ++#else ++ UNUSED(arg); + #endif + + #ifdef INET +@@ -1275,6 +1277,7 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo, + memset(ifo->nomask6, 0xff, sizeof(ifo->nomask6)); + + /* Allow the bare minimum through */ ++#ifdef INET + del_option_mask(ifo->nomask, DHO_SUBNETMASK); + del_option_mask(ifo->nomask, DHO_CSR); + del_option_mask(ifo->nomask, DHO_ROUTER); +@@ -1286,11 +1289,14 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo, + del_option_mask(ifo->nomask, DHO_RENEWALTIME); + del_option_mask(ifo->nomask, DHO_REBINDTIME); + del_option_mask(ifo->nomask, DHO_DNSSEARCH); ++#endif + ++#ifdef INET6 + del_option_mask(ifo->nomask6, D6_OPTION_DNS_SERVERS); + del_option_mask(ifo->nomask6, D6_OPTION_DOMAIN_LIST); + del_option_mask(ifo->nomask6, D6_OPTION_SOL_MAX_RT); + del_option_mask(ifo->nomask6, D6_OPTION_INF_MAX_RT); ++#endif + + break; + #ifdef INET +diff --git a/src/privsep-root.c b/src/privsep-root.c +index f88f56dd..0f099bb7 100644 +--- a/src/privsep-root.c ++++ b/src/privsep-root.c +@@ -435,8 +435,10 @@ ps_root_dispatchcb(void *arg, struct ps_msghdr *psm, struct msghdr *msg) + struct dhcpcd_ctx *ctx = arg; + ssize_t err; + ++#ifdef INET + err = ps_bpf_dispatch(ctx, psm, msg); + if (err == -1 && errno == ENOTSUP) ++#endif + err = ps_inet_dispatch(ctx, psm, msg); + return err; + } +-- +cgit v1.2.3 + diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml index 783090038eda..48f8ca1c55a8 100644 --- a/net-misc/dhcpcd/metadata.xml +++ b/net-misc/dhcpcd/metadata.xml @@ -16,5 +16,8 @@ Embed the definitions of dhcp options in the dhcpcd executable + + Enable support for privilege separation through chroot + diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index 6b4b75cf8aca..0096a350edf6 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -1,10 +1,6 @@ AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b395d4731807895761a3cec76de8fcc154db85bb4913214ecac4f65a85489e0091d36c213be38b7b1f7719d5694 SHA512 071a346dbd98490a1ad967b582bb54ef07c45bb25e3b130eb7f22405dd361d6a54061a800e687385f37b2efd4057efcac8e4d07506b9100e51a334c0be12e2d6 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8 -DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4 -DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f -EBUILD dropbear-2017.75.ebuild 2478 BLAKE2B 8d5313e48243fd3196376321bc1e5df6e6d0f5e74de2da0cc807ef5575537325346bd442c2e2eb36f4d67341f766efeba42ccc12e22a15e1695a440b8e21463d SHA512 c43c2c4788a153bad5c0a5c02d5ca290305e6efe27dadbd30fb11906dcdce78be4ff8928cee4b3c261c4b2ae8bb78c1923adf0526451180dd5c1bd3177202d8f -EBUILD dropbear-2018.76.ebuild 2657 BLAKE2B b58bc6b4acdabdc63ddee489c8d5bf3c6a56f5fc5fa26ec4c66e37df2724a7abc4d5ce5bba3eaf0532b82cf146cbe33271f945dff645a9a35a534f50cf13960a SHA512 7449a450bfdc03364dbff6a32d63b720ef0ac7ab47fcf5aee15da7e4db1cbb6abf7a69b73eecee4cc81d4c81779b01b471bbd975831cf47eb0740dcd4a4b332e -EBUILD dropbear-2019.78.ebuild 2704 BLAKE2B 3ff6a6aebafe7b3d31f83a890b56323b727d3f5830d5b4f92ef3a57050caf364ececec071bc1285e23a4c03b1b52ae8840c205eaef6636abf4f99c7543b96633 SHA512 bc1e300042447bfa9f781363246f996159e18718af69229d2a9dec0dc38b3d4df75438603dbb577fe76e7d0e6aec85f90eaa0c8ef470752d6fb6d02ae151f168 +EBUILD dropbear-2019.78.ebuild 2690 BLAKE2B 58ac379737d390a72a35eeebd8e27d686421b43f3387b14f16694a4751811edfde42cd35215f5ae18bef870a3a4fca6cf96720b8c73de3bf17010d527dbb337a SHA512 729f1766bb1ab0b167d0cd2e0f835bc328e04721fbd03be58e3c0ed9180aa8ec6e2e038c9598b6ccfca4cd7af9015682995dae50641bec74df19df296c866985 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314 diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild deleted file mode 100644 index f0abfda41d03..000000000000 --- a/net-misc/dropbear/dropbear-2017.75.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils savedconfig pam user - -DESCRIPTION="small SSH 2 client/server designed for small memory environments" -HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html" -SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 - https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib" - -LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] ) - dev-libs/libtommath[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )" - -REQUIRED_USE="pam? ( !static )" - -set_options() { - progs=( - dropbear dbclient dropbearkey - $(usex minimal "" "dropbearconvert scp") - ) - makeopts=( - MULTI=$(usex multicall 1 0) - STATIC=$(usex static 1 0) - ) -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch - sed -i \ - -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ - options.h || die - sed -i \ - -e '/pam_start/s:sshd:dropbear:' \ - svr-authpam.c || die - restore_config options.h -} - -src_configure() { - # XXX: Need to add libtomcrypt to the tree and re-enable this. - # --disable-bundled-libtom - econf \ - $(use_enable zlib) \ - $(use_enable pam) \ - $(use_enable !bsdpty openpty) \ - $(use_enable shadow) \ - $(use_enable syslog) -} - -src_compile() { - set_options - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" -} - -src_install() { - set_options - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install - doman *.8 - newinitd "${FILESDIR}"/dropbear.init.d dropbear - newconfd "${FILESDIR}"/dropbear.conf.d dropbear - dodoc CHANGES README TODO SMALL MULTI - - # The multi install target does not install the links right. - if use multicall ; then - cd "${ED}"/usr/bin - local x - for x in "${progs[@]}" ; do - ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" - done - rm -f dropbear - dodir /usr/sbin - dosym ../bin/dropbearmulti /usr/sbin/dropbear - cd "${S}" - fi - save_config options.h - - if ! use minimal ; then - mv "${ED}"/usr/bin/{,db}scp || die - fi - - pamd_mimic system-remote-login dropbear auth account password session -} - -pkg_preinst() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild deleted file mode 100644 index cc44e579cc2a..000000000000 --- a/net-misc/dropbear/dropbear-2018.76.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils savedconfig pam user - -DESCRIPTION="small SSH 2 client/server designed for small memory environments" -HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html" -SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 - https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib" - -LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] ) - dev-libs/libtommath[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )" - -REQUIRED_USE="pam? ( !static )" - -set_options() { - progs=( - dropbear dbclient dropbearkey - $(usex minimal "" "dropbearconvert scp") - ) - makeopts=( - MULTI=$(usex multicall 1 0) - STATIC=$(usex static 1 0) - ) -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch - sed \ - -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ - default_options.h > localoptions.h || die - sed -i \ - -e '/pam_start/s:sshd:dropbear:' \ - svr-authpam.c || die - restore_config localoptions.h -} - -src_configure() { - # XXX: Need to add libtomcrypt to the tree and re-enable this. - # --disable-bundled-libtom - # We disable the hardening flags as our compiler already enables them - # by default as is appropriate for the target. - econf \ - --disable-harden \ - $(use_enable zlib) \ - $(use_enable pam) \ - $(use_enable !bsdpty openpty) \ - $(use_enable shadow) \ - $(use_enable syslog) -} - -src_compile() { - set_options - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" -} - -src_install() { - set_options - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install - doman *.8 - newinitd "${FILESDIR}"/dropbear.init.d dropbear - newconfd "${FILESDIR}"/dropbear.conf.d dropbear - dodoc CHANGES README SMALL MULTI - - # The multi install target does not install the links right. - if use multicall ; then - cd "${ED}"/usr/bin - local x - for x in "${progs[@]}" ; do - ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" - done - rm -f dropbear - dodir /usr/sbin - dosym ../bin/dropbearmulti /usr/sbin/dropbear - cd "${S}" - fi - save_config localoptions.h - - if ! use minimal ; then - mv "${ED}"/usr/bin/{,db}scp || die - fi - - pamd_mimic system-remote-login dropbear auth account password session -} - -pkg_preinst() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} diff --git a/net-misc/dropbear/dropbear-2019.78.ebuild b/net-misc/dropbear/dropbear-2019.78.ebuild index 0ebbf5215899..ff63556dcb56 100644 --- a/net-misc/dropbear/dropbear-2019.78.ebuild +++ b/net-misc/dropbear/dropbear-2019.78.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib" LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] ) diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index b11f18aa7b67..362b8f80cdb8 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,19 +1,13 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85 -DIST dropbox-lnx.x86-89.3.268.tar.gz 92308961 BLAKE2B 4b1a229eca8e96b49360404fc3a03277343f1dcea9b2065b637d8531b266233215e3f3c21163d20ed104db90b4d37dcd873bc1353036a14f89ac50b78180a518 SHA512 25195ef1f44641ca3aee00c4b5cb52006d9610b9d067ea1ade4717dd47729db98e5b0556b5c61ea881ee84e8f8aafec868555591d8d3f4c1ecc81974159e3321 -DIST dropbox-lnx.x86-89.4.278.tar.gz 92309633 BLAKE2B 47f886ab9f81335b8cb0a9133ad0b47e55d53aab6d6d99b89f2b266bd0345e4a788b950dd3fce7b24ff91ffc45c2ba5e8e5154d28a1c3690ed1d200d4d06e9ee SHA512 7f3731f32ef7869c31b18ca7b167ed5695deb8c8130aff3bb7783799dddd1ae3472bd49ef4069dd5ccda76a02b518f7eaba0209fbaf94b974e7caed4c0f8b9ee -DIST dropbox-lnx.x86-90.4.307.tar.gz 92672302 BLAKE2B 4323a379cbfe4428db63bb36c78b9eb83dc6026242eeb6f6f68687f0868c2d03edcf40ff2c9312e5a432458814c96a4df749640f0a256ecc675f3a5e860a8772 SHA512 b3248397d8b83436ccaf671528a2dd333c8bcb3073b3248f1826a63c5b1f542a7bebfd8ee184e3eb5feb74070116c681a3c71816c4a8ae817ed992cc9b07aa00 -DIST dropbox-lnx.x86-91.4.548.tar.gz 93309539 BLAKE2B 8e0349ad072c6aabfd0b0b8c6b75acede9bb0765945a49186362f2f511ee73a989ef408d1634110cabc9116002d5f046d7fb723db7d4748ca192e652ccdb7535 SHA512 f4c6c2883da728ab9ad811183680ffdb34600af8da48e3c54dc65d6ca533e92d1f44a878e5f2f9379e26049e184a0d6943a886d7af194969c92ec83289a0d9d5 -DIST dropbox-lnx.x86-92.3.365.tar.gz 93818688 BLAKE2B 670b1ae458f7ba76290478860f06cf58379f94a639887dfb738715a3cdcb1191635adc26b10363575cd0d131b096bdfd9191a09ed2cbe228b6ba9e3eb807ea29 SHA512 25ed1f1f257694fa1f249f97ec2e0da66bef10cee94dae8e5bc3e1643c7c561689c6ff8a9699d1140ef5400771c08706f44295fb8c7f7f09be2f7042b24d11a5 -DIST dropbox-lnx.x86_64-89.3.268.tar.gz 96723713 BLAKE2B 5bfb7721303b466f9015709f1a235045263fa0db46ff4f0ad7e772c4dc1261b8c7549d63c0ac4a9d98e35581c630ad5ed851d0c63334267b196bec7dc93c0ddf SHA512 627bf49df5a6da76bf04484912c7be686f4e9adc51be619fd613b56fdd514088c173c39cab5fb5a6757074130efc54edf192c7df43090965ba9066de5d0f1755 -DIST dropbox-lnx.x86_64-89.4.278.tar.gz 96726025 BLAKE2B 152be18f9b15e9e2a4c188ea6f4649da09b6d50571bacf42068db1abe16a375612e5db9c86369cc4d3e582b660d79df1f35af03504abfed64e728a8515630eed SHA512 5bfc29ff40a3b423eb03ad44e0212ebf015b877bd128432f76ff3103aa43ea6f87575247a5b0b815951c203dfd4b54345e6ab880ab47deb21e29d659e5819755 -DIST dropbox-lnx.x86_64-90.4.307.tar.gz 97077393 BLAKE2B 2271b740d381ad5748ec0b5986991b1b3e5ef9d9553e101eca787ff0db5eb03dd91934b7024cdb2eb545dff7ecb5dd64bb95d3b0b8b5f709fb27f90081a1a0e4 SHA512 464ba52e6fe3376c1bd8cb0806a65918e2fd3ff0e5b8379c6c19f9b302cc64b64cdc80f9b8ee2a072fa6564d8c9de0502a9474c72ef5560d7a0b62faf9c5633a -DIST dropbox-lnx.x86_64-91.4.548.tar.gz 97671093 BLAKE2B 589d92f99809b59b84075c827de697c15ad566eaa6269b5c017f781115db391c09738b2032a0e0215b304d58bf324686cb1db9a41d822f99259fa205daa5c38a SHA512 b6868fa07258423c22f6d800a33e220b3b8d19b06f5a99ec16890e4a1f7e2c9112d3e16cfa64f145cb9287ee149c20c4ce91bf434ebe5b4393bad91ba76edb8b -DIST dropbox-lnx.x86_64-92.3.365.tar.gz 98181418 BLAKE2B f9ac16e13fc52b0e875617ef161beb902fd75956af9fd3194d2bab5be2d2454d5e0dc510b8b62ca4c892c57f76c9598aca770dc2608f691faa53ae9d45b1721a SHA512 64f26097838fd8d49ce7a25cf303422e9c742fa867a58c145f30cacf85e559a9d0f124715057c0149cb576fb09706372d5518188df7ccb3ec56cd9f7e0de14ae -EBUILD dropbox-89.3.268-r1.ebuild 2749 BLAKE2B 3c7d18fefef5596d9dd6c7e140a4fce617f897090a64ed36fc07695a9bc4006b0d0137353e83dd7aba32d6aa4d7464eaf88b411671e7aefa92b9345fb3d0215c SHA512 6955781d8b1fdbf8d5e9e04f262f8f50bf6e4fc69f9061e9ff1a09e47c79ba32dcff0d2feb80da4edc4aba9c7b0d1b2b4bf0f4d66f0d69de27cd3ad193abc513 -EBUILD dropbox-89.4.278.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64 -EBUILD dropbox-90.4.307.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64 -EBUILD dropbox-91.4.548.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64 -EBUILD dropbox-92.3.365.ebuild 2563 BLAKE2B 4bfdeb547c2f0ac9e3d98d647c8d8178567780460463e029205309a946c1f46a6f89badf6916fff113ff6317cd5bafc7b311a8017d6f0203087f55baff939ef7 SHA512 eedc17753481143c2b258f8a8b1527394667120be4f88e6969c927207009ec14ffcdbd5b7e928924c009ddf19e2e76a8d7a613fa849897aec3a567719e8102a4 +DIST dropbox-lnx.x86-93.4.273.tar.gz 94058022 BLAKE2B 436f861aa569d6468031a841d9a5f5e592e7a1213d3eb84d3029deb842e5a03cfa54a570c5f20efa7e66ead62aff44f599b8c3eb99fceacccadda95a45123bee SHA512 fd8e1fc05ded55fadaae484605f36d14779432d843d9e7ead20e77f33cad2b45ddc3f35c6dc1acd8b544d152998682ec3c5cf28b96c08143b85c60a75e063015 +DIST dropbox-lnx.x86-94.3.371.tar.gz 94249950 BLAKE2B a3e798b55e54dbfe9f8e3cea5c05405e2280b81654cb6ebd6957c0b1492c6ce6ec341be25c8708bd9b53d03fa9629e4861ac408e169aa2525dda31de1746afb9 SHA512 363da23ea0ae18bf4e09b8be13901c9bfd87a14747f9c4ed65cebbf57f2992d120bd6004dcb3d4162cb3246d4dc03aa3d64953819cc8919adff2e758da19c072 +DIST dropbox-lnx.x86-94.4.384.tar.gz 94254443 BLAKE2B 4d12d0268ea71f4d06304dbe29bcd54f3af4c39e10ba8be4892724c6dc556dd844e587f789cc957dad66d7bd44ae8fdac398cefbfb714a8b01d7f8c06b1d6d50 SHA512 710af644cdaf88a6db26f86b2cafd1bb729b4cd52aab4a3328c9c3061183db32db016adb6d8dc9c5a2fc860a55c3abc712a774ac3e635459c605e91c0178c37e +DIST dropbox-lnx.x86_64-93.4.273.tar.gz 98410343 BLAKE2B fa9828aa695521d64d911a7f958e9b7df926a4457b6613759d769ed78b7d7111448069d18855f0184c7228e9ca6dbd811b5739fd0763f23952d0b33ab9ea8514 SHA512 98829692f4b662bfafd709c99708067f172a10cafc32af1e53ecc9592ab0d5b15dae2da492c24f6b6079a2ad66eff1293416453e03090aca427b4ea7a5ea059b +DIST dropbox-lnx.x86_64-94.3.371.tar.gz 98551058 BLAKE2B 6c4051cc81e490a28c34f52ef7f9f74e0e263f24ebc409fe67ac86d371db89ef250ade98a3701a0101d6e90bfd6835eda17176ed6413dbb774b2b9b43f2d7aa9 SHA512 c12ffe8a5051cc396ea188e7907449fb49d103b476c1070952fcb815bec29c72ec02bec5826898b3aee5230c195620a62499440b5ea27b4d97f55ad8914ab143 +DIST dropbox-lnx.x86_64-94.4.384.tar.gz 98561877 BLAKE2B ff1ec6a8f76b9b79ed3cfe34d5dd5642886d01631bba062ba15528929e1068425fadc403c8a7fb3242b08c2d2742a2f4ccd255c8772691ee1e4f1b8693be4dcb SHA512 e905b283ef435d7b6c0d7973f49e8c0a4a5e7c25c2570967b24bb8476ef1889f63d01e7951f1c6d78a5c6851e1a30737b9297032dede1540e3bf391c56bc0c8b +EBUILD dropbox-93.4.273.ebuild 2561 BLAKE2B 9c6df8557694385a3817b26c068731524c3cfd72b8fc6514be8fd1646ee1c7073a101cc24e82f5dae9bc16fdb2cebcdad621d8d9a963aaa486659b2adc32b7ec SHA512 5de8951c0dfb17269b659ed76fc3260c93e1c2c3ea91f3a1070cb7b2b02a15b252696ecf4d8223d1d3cc1f46df08d9ba2c365a177c4c9632e1a129c054428188 +EBUILD dropbox-94.3.371.ebuild 2563 BLAKE2B 4bfdeb547c2f0ac9e3d98d647c8d8178567780460463e029205309a946c1f46a6f89badf6916fff113ff6317cd5bafc7b311a8017d6f0203087f55baff939ef7 SHA512 eedc17753481143c2b258f8a8b1527394667120be4f88e6969c927207009ec14ffcdbd5b7e928924c009ddf19e2e76a8d7a613fa849897aec3a567719e8102a4 +EBUILD dropbox-94.4.384.ebuild 2561 BLAKE2B 9c6df8557694385a3817b26c068731524c3cfd72b8fc6514be8fd1646ee1c7073a101cc24e82f5dae9bc16fdb2cebcdad621d8d9a963aaa486659b2adc32b7ec SHA512 5de8951c0dfb17269b659ed76fc3260c93e1c2c3ea91f3a1070cb7b2b02a15b252696ecf4d8223d1d3cc1f46df08d9ba2c365a177c4c9632e1a129c054428188 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839 diff --git a/net-misc/dropbox/dropbox-89.3.268-r1.ebuild b/net-misc/dropbox/dropbox-89.3.268-r1.ebuild deleted file mode 100644 index c62cee3a6ea0..000000000000 --- a/net-misc/dropbox/dropbox-89.3.268-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 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 )" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" -IUSE="+librsync-bundled selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -DEPEND="librsync-bundled? ( dev-util/patchelf )" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - || ( - dev-qt/qtgui:5[-gles2,X(-)] - dev-qt/qtgui:5[-gles2,xcb(-)] - ) - dev-qt/qtopengl:5[-gles2] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5[-gles2] - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5[-gles2] - media-libs/fontconfig - media-libs/freetype - virtual/jpeg - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libXxf86vm - x11-libs/pango[X] - x11-misc/wmctrl - x11-themes/hicolor-icon-theme - ) - !librsync-bundled? ( =sys-devel/gcc-4.2.0 - sys-libs/zlib - sys-libs/ncurses-compat:5" - -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 - - rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die - # tray icon doesnt load when removing libQt5* (bug 641416) - #rm -vrf libQt5* libicu* qt.conf plugins/ || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf PyQt5* *pyqt5* images || die - fi - if use librsync-bundled ; then - patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die - else - rm -vf librsync.so.1 || die - fi - 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" - - use X && doicon -s 16 -c status "${T}"/status - - 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} -} diff --git a/net-misc/dropbox/dropbox-89.4.278.ebuild b/net-misc/dropbox/dropbox-89.4.278.ebuild deleted file mode 100644 index 21752c395069..000000000000 --- a/net-misc/dropbox/dropbox-89.4.278.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 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 )" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="+librsync-bundled selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -DEPEND="librsync-bundled? ( dev-util/patchelf )" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - || ( - dev-qt/qtgui:5[-gles2,X(-)] - dev-qt/qtgui:5[-gles2,xcb(-)] - ) - dev-qt/qtopengl:5[-gles2] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5[-gles2] - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5[-gles2] - media-libs/fontconfig - media-libs/freetype - virtual/jpeg - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libXxf86vm - x11-libs/pango[X] - x11-misc/wmctrl - x11-themes/hicolor-icon-theme - ) - !librsync-bundled? ( =sys-devel/gcc-4.2.0 - sys-libs/zlib - sys-libs/ncurses-compat:5" - -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 - - rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die - # tray icon doesnt load when removing libQt5* (bug 641416) - #rm -vrf libQt5* libicu* qt.conf plugins/ || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf PyQt5* *pyqt5* images || die - fi - if use librsync-bundled ; then - patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die - else - rm -vf librsync.so.1 || die - fi - 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" - - use X && doicon -s 16 -c status "${T}"/status - - 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} -} diff --git a/net-misc/dropbox/dropbox-90.4.307.ebuild b/net-misc/dropbox/dropbox-90.4.307.ebuild deleted file mode 100644 index 21752c395069..000000000000 --- a/net-misc/dropbox/dropbox-90.4.307.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 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 )" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="+librsync-bundled selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -DEPEND="librsync-bundled? ( dev-util/patchelf )" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - || ( - dev-qt/qtgui:5[-gles2,X(-)] - dev-qt/qtgui:5[-gles2,xcb(-)] - ) - dev-qt/qtopengl:5[-gles2] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5[-gles2] - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5[-gles2] - media-libs/fontconfig - media-libs/freetype - virtual/jpeg - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libXxf86vm - x11-libs/pango[X] - x11-misc/wmctrl - x11-themes/hicolor-icon-theme - ) - !librsync-bundled? ( =sys-devel/gcc-4.2.0 - sys-libs/zlib - sys-libs/ncurses-compat:5" - -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 - - rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die - # tray icon doesnt load when removing libQt5* (bug 641416) - #rm -vrf libQt5* libicu* qt.conf plugins/ || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf PyQt5* *pyqt5* images || die - fi - if use librsync-bundled ; then - patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die - else - rm -vf librsync.so.1 || die - fi - 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" - - use X && doicon -s 16 -c status "${T}"/status - - 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} -} diff --git a/net-misc/dropbox/dropbox-91.4.548.ebuild b/net-misc/dropbox/dropbox-91.4.548.ebuild deleted file mode 100644 index 21752c395069..000000000000 --- a/net-misc/dropbox/dropbox-91.4.548.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 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 )" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="+librsync-bundled selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -DEPEND="librsync-bundled? ( dev-util/patchelf )" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - || ( - dev-qt/qtgui:5[-gles2,X(-)] - dev-qt/qtgui:5[-gles2,xcb(-)] - ) - dev-qt/qtopengl:5[-gles2] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5[-gles2] - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5[-gles2] - media-libs/fontconfig - media-libs/freetype - virtual/jpeg - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libXxf86vm - x11-libs/pango[X] - x11-misc/wmctrl - x11-themes/hicolor-icon-theme - ) - !librsync-bundled? ( =sys-devel/gcc-4.2.0 - sys-libs/zlib - sys-libs/ncurses-compat:5" - -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 - - rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die - # tray icon doesnt load when removing libQt5* (bug 641416) - #rm -vrf libQt5* libicu* qt.conf plugins/ || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf PyQt5* *pyqt5* images || die - fi - if use librsync-bundled ; then - patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die - else - rm -vf librsync.so.1 || die - fi - 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" - - use X && doicon -s 16 -c status "${T}"/status - - 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} -} diff --git a/net-misc/dropbox/dropbox-92.3.365.ebuild b/net-misc/dropbox/dropbox-92.3.365.ebuild deleted file mode 100644 index ff5503155916..000000000000 --- a/net-misc/dropbox/dropbox-92.3.365.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 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 )" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="+librsync-bundled 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? ( - dev-libs/glib:2 - media-libs/fontconfig - media-libs/freetype - virtual/jpeg - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libXxf86vm - x11-libs/pango[X] - x11-misc/wmctrl - x11-themes/hicolor-icon-theme - ) - !librsync-bundled? ( =sys-devel/gcc-4.2.0 - sys-libs/zlib - sys-libs/ncurses-compat:5" - -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 - - rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die - # tray icon doesnt load when removing libQt5* (bug 641416) - #rm -vrf libQt5* libicu* qt.conf plugins/ || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf PyQt5* *pyqt5* images || die - fi - if use librsync-bundled ; then - patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die - else - rm -vf librsync.so.1 || 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" - - use X && doicon -s 16 -c status "${T}"/status - - 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} -} diff --git a/net-misc/dropbox/dropbox-93.4.273.ebuild b/net-misc/dropbox/dropbox-93.4.273.ebuild new file mode 100644 index 000000000000..48bae48934d8 --- /dev/null +++ b/net-misc/dropbox/dropbox-93.4.273.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 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 )" + +LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" +SLOT="0" +KEYWORDS="amd64 x86 ~x86-linux" +IUSE="+librsync-bundled 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? ( + dev-libs/glib:2 + media-libs/fontconfig + media-libs/freetype + virtual/jpeg + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXinerama + x11-libs/libXxf86vm + x11-libs/pango[X] + x11-misc/wmctrl + x11-themes/hicolor-icon-theme + ) + !librsync-bundled? ( =sys-devel/gcc-4.2.0 + sys-libs/zlib + sys-libs/ncurses-compat:5" + +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 + + rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die + # tray icon doesnt load when removing libQt5* (bug 641416) + #rm -vrf libQt5* libicu* qt.conf plugins/ || die + if use X ; then + mv images/hicolor/16x16/status "${T}" || die + else + rm -vrf PyQt5* *pyqt5* images || die + fi + if use librsync-bundled ; then + patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die + else + rm -vf librsync.so.1 || 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" + + use X && doicon -s 16 -c status "${T}"/status + + 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} +} diff --git a/net-misc/dropbox/dropbox-94.3.371.ebuild b/net-misc/dropbox/dropbox-94.3.371.ebuild new file mode 100644 index 000000000000..ff5503155916 --- /dev/null +++ b/net-misc/dropbox/dropbox-94.3.371.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 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 )" + +LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="+librsync-bundled 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? ( + dev-libs/glib:2 + media-libs/fontconfig + media-libs/freetype + virtual/jpeg + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXinerama + x11-libs/libXxf86vm + x11-libs/pango[X] + x11-misc/wmctrl + x11-themes/hicolor-icon-theme + ) + !librsync-bundled? ( =sys-devel/gcc-4.2.0 + sys-libs/zlib + sys-libs/ncurses-compat:5" + +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 + + rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die + # tray icon doesnt load when removing libQt5* (bug 641416) + #rm -vrf libQt5* libicu* qt.conf plugins/ || die + if use X ; then + mv images/hicolor/16x16/status "${T}" || die + else + rm -vrf PyQt5* *pyqt5* images || die + fi + if use librsync-bundled ; then + patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die + else + rm -vf librsync.so.1 || 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" + + use X && doicon -s 16 -c status "${T}"/status + + 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} +} diff --git a/net-misc/dropbox/dropbox-94.4.384.ebuild b/net-misc/dropbox/dropbox-94.4.384.ebuild new file mode 100644 index 000000000000..48bae48934d8 --- /dev/null +++ b/net-misc/dropbox/dropbox-94.4.384.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 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 )" + +LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" +SLOT="0" +KEYWORDS="amd64 x86 ~x86-linux" +IUSE="+librsync-bundled 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? ( + dev-libs/glib:2 + media-libs/fontconfig + media-libs/freetype + virtual/jpeg + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXinerama + x11-libs/libXxf86vm + x11-libs/pango[X] + x11-misc/wmctrl + x11-themes/hicolor-icon-theme + ) + !librsync-bundled? ( =sys-devel/gcc-4.2.0 + sys-libs/zlib + sys-libs/ncurses-compat:5" + +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 + + rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die + # tray icon doesnt load when removing libQt5* (bug 641416) + #rm -vrf libQt5* libicu* qt.conf plugins/ || die + if use X ; then + mv images/hicolor/16x16/status "${T}" || die + else + rm -vrf PyQt5* *pyqt5* images || die + fi + if use librsync-bundled ; then + patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die + else + rm -vf librsync.so.1 || 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" + + use X && doicon -s 16 -c status "${T}"/status + + 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} +} diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest index 3b17f27eaa4f..ac8177d37e51 100644 --- a/net-misc/ena-driver/Manifest +++ b/net-misc/ena-driver/Manifest @@ -1,5 +1,5 @@ -DIST ena-driver-2.0.2-linux.zip 271852 BLAKE2B e2bf85a70abc0914fafb786bde2a24020ddf0e88e0a051f59938b0091e92fb8f11407567b384610f7838e85903eb734338f5af7f1045a05055566af83ddc1908 SHA512 8c1328ae6907f7e56d3398a6502db51dfb15772fbbb0eb075062ffa3f49b4b3697ec357c77f44701e33bd794e0b5858c619cad97581bbfb27ab010f7dd97da6b DIST ena-driver-2.0.3-linux.zip 446695 BLAKE2B 43d4dc947f53c42c6ccda7a0fd3e32cda2c49aadee67ac7d719739f49c91b704aff04fa47f943667c7dd29f6ee0a573ceb43001a9dcdc6492cdbeb85091dd957 SHA512 08e8c1caecff3d7e19fd847e102506e501aafbefec1867fcc88d535fa728abfa7f0d292bdc9c4dff6c3d4d303002ab8b9a62bfc855cfda5130880fb237eb57c2 -EBUILD ena-driver-2.0.2.ebuild 871 BLAKE2B 0e73e54e2b3ce04eaf4077bc8405812ff2748efc20d9f583e7355181716d6790e0dd60e8747377a21a5c113ad5f7a3ca44aa3bd5919fbab39501e6c6eb480c93 SHA512 c5c743f8b5dc8829e76cd608759e85723a3eaeb67d5e776ddbfc6eb33312ec7a5a9e6a25f9bc53399d7975d53887b62153a4a1b6ef201f4d8249ee2d79a72b3b +DIST ena-driver-2.2.3-linux.tar.gz 406557 BLAKE2B 3e77bcb8e5bd00e0a643c17ad780e3abb5ff71859cdcb1257f9c73c7d5a14b0922cf97132ed40195a69e233b2850cb62f1854b49c8ab5c92b6b83dadb32bd7bd SHA512 257c959a6727213df6600cfb09741f5036d4efb950c1460be85bab3026d7f0fa5af252550bf395665dcf0de5dbee75f751516ac80ecf3d470aee996d12796770 EBUILD ena-driver-2.0.3.ebuild 893 BLAKE2B 8206c7e71f08c03fb2908a0de8da0cd42d12499b8e8d2b08f8ad6359db548d8b31e17eee7e735e2dd49a4d1edac4ac911f86b90f41044dc726d63d66ba55a801 SHA512 45f828a496371489102214d177aaea7ac5b85e40cf552f9da323b484462206d399751dbba9c20332105561a97ccdd503f72825b16b96acb5c3dd6a1dcce58eea +EBUILD ena-driver-2.2.3.ebuild 946 BLAKE2B b1952dc511209d94c71ac948c737d39931b2ecf7bdc7b868adbda31fc8e907a448b9a36172f9e15b368ff1c4c2d152a3d28792533a4e3a02833bf2c15f4bafea SHA512 1808fb697249bbbce14f426a5a41103632a56cf9d3e6dc90e1ea0e35631b1f31e421bd8a5791abffa936bace814bf9d91b9b907ee5c828db36be77d8ab95452d MISC metadata.xml 346 BLAKE2B 52871ec0869c595fe75316469f0ad9174ebf75131f1d894ee9ce31c44ef34869c834c95ddd59efa150a80c086c9c1c5beac71089727359e9594c32687735c9ad SHA512 89d1251ed79b0ec69632b6f672cc4282ff6e10ba42bd6b8f2affe3e59bbd066cbee11d82fcdd136ca2eaba12965ab5f8ead246b69907a99c862a561171d83b1f diff --git a/net-misc/ena-driver/ena-driver-2.0.2.ebuild b/net-misc/ena-driver/ena-driver-2.0.2.ebuild deleted file mode 100644 index 04db47eb4f2c..000000000000 --- a/net-misc/ena-driver/ena-driver-2.0.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info linux-mod - -DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" -HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" -SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.zip -> ${P}-linux.zip" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" - -MODULE_NAMES="ena(net:${S}:${S})" -BUILD_TARGETS="all" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}" -} - -src_prepare() { - eapply_user - - sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \ - "Makefile" || die "Unable to fix Makefile" -} - -src_install() { - linux-mod_src_install - dodoc README RELEASENOTES.md -} diff --git a/net-misc/ena-driver/ena-driver-2.2.3.ebuild b/net-misc/ena-driver/ena-driver-2.2.3.ebuild new file mode 100644 index 000000000000..2a4bc1e592ab --- /dev/null +++ b/net-misc/ena-driver/ena-driver-2.2.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info linux-mod + +DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" +HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" +SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="app-arch/unzip" + +S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" + +MODULE_NAMES="ena(net:${S}:${S})" +BUILD_TARGETS="all" + +CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}" +} + +src_prepare() { + default + + sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \ + "Makefile" || die "Unable to fix Makefile" +} + +src_install() { + linux-mod_src_install + dodoc README RELEASENOTES.md +} diff --git a/net-misc/ethertypes/Manifest b/net-misc/ethertypes/Manifest index 2c835b3bdd98..83dbd61a6fda 100644 --- a/net-misc/ethertypes/Manifest +++ b/net-misc/ethertypes/Manifest @@ -1,3 +1,3 @@ DIST ethertypes-0.gz 770 BLAKE2B d3d14fd99da30d5c4b366edc003653089468358323a58afd71770de1432588413d38ddf3c3f77b0b79a90d761e1e9c677efe594b64a995f6acdcda2b92da61f0 SHA512 62a88a76b3c3ce54b7c4b457cfdd7ea0d13e9deeebd485d37cfcbfa1cc1adba4bd82944e8d0a093c07594b88726376ff53bf70f61ca91a90af5550a455fe6643 -EBUILD ethertypes-0.ebuild 599 BLAKE2B e724cdb629831a9bcc0a4545dc272b8a2c1f5de9e503153fb575d46b5d1296577fdc81e7a15566c7e1862ff2b3f74536eb009004dfc2f41463c601c1e8d47319 SHA512 8a34ff916bde75a3f3fe325e157ab2dbacdb6a28388beadfab1ddcbedb6c0ef03e1e8ed6e3432fbd63284aaa50e5a644355d023f4c25ef9a1e477daf657bfee0 +EBUILD ethertypes-0.ebuild 595 BLAKE2B f32f78543d2264f7a8503faabca6703226af10f40c758b74dae4e64931cf196894b311d0f45507f06b7e87c08e5d9c279f1507401467874cbc14cecea96abae6 SHA512 b2c461767099705bfb146fc0861dbec9f37604a73aeefdc5a4fd439f86cb76115e315b6036c80a5b4ce04c32ac27fa6470d4bbf43329c5660f9634e776d93edb MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb diff --git a/net-misc/ethertypes/ethertypes-0.ebuild b/net-misc/ethertypes/ethertypes-0.ebuild index eee8b62d6f16..55613d1c6a54 100644 --- a/net-misc/ethertypes/ethertypes-0.ebuild +++ b/net-misc/ethertypes/ethertypes-0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" RDEPEND=" ! +Date: Fri, 10 Apr 2020 14:11:15 +0200 +Subject: [PATCH] Fixed return type for subsystem entry + +--- + channels/client/CMakeLists.txt | 2 +- + channels/client/tables.h | 2 +- + channels/urbdrc/client/libusb/libusb_udevman.c | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt +index a0d3a73581..eb0c80f129 100644 +--- a/channels/client/CMakeLists.txt ++++ b/channels/client/CMakeLists.txt +@@ -97,7 +97,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) + set(STATIC_SUBSYSTEM_ENTRY "${STATIC_SUBSYSTEM_NAME}_freerdp_${STATIC_MODULE_CHANNEL}_client_subsystem_entry") + endif() + set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ \"${STATIC_SUBSYSTEM_NAME}\", \"${STATIC_SUBSYSTEM_TYPE}\", ${STATIC_SUBSYSTEM_ENTRY} },") +- set(SUBSYSTEM_IMPORT "extern void ${STATIC_SUBSYSTEM_ENTRY}(void);") ++ set(SUBSYSTEM_IMPORT "extern UINT ${STATIC_SUBSYSTEM_ENTRY}(void*);") + set(CLIENT_STATIC_SUBSYSTEM_IMPORTS "${CLIENT_STATIC_SUBSYSTEM_IMPORTS}\n${SUBSYSTEM_IMPORT}") + endforeach() + set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ NULL, NULL, NULL }\n};") +diff --git a/channels/client/tables.h b/channels/client/tables.h +index fd998a6ae1..b6b3f9ca27 100644 +--- a/channels/client/tables.h ++++ b/channels/client/tables.h +@@ -37,7 +37,7 @@ struct _STATIC_SUBSYSTEM_ENTRY + { + const char* name; + const char* type; +- void (*entry)(void); ++ UINT (*entry)(); + }; + typedef struct _STATIC_SUBSYSTEM_ENTRY STATIC_SUBSYSTEM_ENTRY; + +diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c +index 67360ad430..7509326c22 100644 +--- a/channels/urbdrc/client/libusb/libusb_udevman.c ++++ b/channels/urbdrc/client/libusb/libusb_udevman.c +@@ -861,9 +861,9 @@ static DWORD poll_thread(LPVOID lpThreadParameter) + #else + #define freerdp_urbdrc_client_subsystem_entry FREERDP_API freerdp_urbdrc_client_subsystem_entry + #endif +-int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints) ++UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints) + { +- int rc; ++ UINT rc; + UINT status; + UDEVMAN* udevman; + ADDIN_ARGV* args = pEntryPoints->args; +@@ -922,5 +922,5 @@ int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS p + return 0; + fail: + udevman_free(&udevman->iface); +- return -1; ++ return ERROR_INTERNAL_ERROR; + } +From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Fri, 10 Apr 2020 14:16:19 +0200 +Subject: [PATCH] Fixed URBDRC DEVICE_ADD_FLAG definitions + +--- + channels/urbdrc/client/urbdrc_main.h | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h +index 5ec839983b..749aaf8727 100644 +--- a/channels/urbdrc/client/urbdrc_main.h ++++ b/channels/urbdrc/client/urbdrc_main.h +@@ -222,14 +222,12 @@ struct _IUDEVMAN + UINT32 status; + }; + +-enum +-{ +- DEVICE_ADD_FLAG_BUS, +- DEVICE_ADD_FLAG_DEV, +- DEVICE_ADD_FLAG_VENDOR, +- DEVICE_ADD_FLAG_PRODUCT, +- DEVICE_ADD_FLAG_REGISTER +-} device_add_flag_t; ++#define DEVICE_ADD_FLAG_BUS 0x01 ++#define DEVICE_ADD_FLAG_DEV 0x02 ++#define DEVICE_ADD_FLAG_VENDOR 0x04 ++#define DEVICE_ADD_FLAG_PRODUCT 0x08 ++#define DEVICE_ADD_FLAG_REGISTER 0x10 ++ + #define DEVICE_ADD_FLAG_ALL \ + (DEVICE_ADD_FLAG_BUS | DEVICE_ADD_FLAG_DEV | DEVICE_ADD_FLAG_VENDOR | \ + DEVICE_ADD_FLAG_PRODUCT | DEVICE_ADD_FLAG_REGISTER) diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild new file mode 100644 index 000000000000..07e0c2846dd4 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 2011-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} != 9999 ]]; then + 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 ~x86" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="http://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="0/2" +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +RESTRICT="!test? ( test )" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + client? ( + 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? ( + libav? ( media-video/libav:0= ) + !libav? ( 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? ( virtual/jpeg:0 ) + openh264? ( media-libs/openh264 ) + 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 + client? ( X? ( doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) ) ) +" + +PATCHES=( + "${FILESDIR}"/2.0.0-backports.patch +) + +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_CLIENT=$(usex client ON OFF) + -DWITH_CUPS=$(usex cups ON OFF) + -DWITH_DEBUG_ALL=$(usex debug ON OFF) + -DWITH_MANPAGES=$(usex doc ON OFF) + -DWITH_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_SWSCALE=$(usex ffmpeg ON OFF) + -DWITH_CAIRO=$(usex ffmpeg OFF ON) + -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) + -DWITH_JPEG=$(usex jpeg ON OFF) + -DWITH_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 +} diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild new file mode 100644 index 000000000000..48ee51c92773 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -0,0 +1,125 @@ +# Copyright 2011-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~x86" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="http://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="0/2" +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +RESTRICT="!test? ( test )" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + client? ( + 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? ( + libav? ( media-video/libav:0= ) + !libav? ( 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? ( virtual/jpeg:0 ) + openh264? ( media-libs/openh264 ) + 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 + client? ( 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_CLIENT=$(usex client ON OFF) + -DWITH_CUPS=$(usex cups ON OFF) + -DWITH_DEBUG_ALL=$(usex debug ON OFF) + -DWITH_MANPAGES=$(usex doc ON OFF) + -DWITH_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_SWSCALE=$(usex ffmpeg ON OFF) + -DWITH_CAIRO=$(usex ffmpeg OFF ON) + -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) + -DWITH_JPEG=$(usex jpeg ON OFF) + -DWITH_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 +} diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 1ca075a5d92c..48ee51c92773 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -1,18 +1,21 @@ -# Copyright 2011-2019 Gentoo Authors +# Copyright 2011-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit cmake -if [[ ${PV} != 9999 ]]; then +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 ~x86" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index cdd25187de8f..0d2f42e3d39a 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -4,7 +4,7 @@ DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3 DIST geoipupdate-4.0.3.tar.gz 107019 BLAKE2B 55978bb6fc37b02706d4f48b76dc8b85f3aacc86f1192a0d31cee5c55fb4d0feb8d5ddb2b6a13d4a85d80133ccaa318bd9ad3e7d3d5b818fea2a3a0fa09a62d3 SHA512 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397 DIST geoipupdate-4.0.4.tar.gz 107115 BLAKE2B 1ab08a34c41ac08aa26faf2078e7a964350c09c65871829023928dc25011a931f9be4aff32300778ab645831b8786898a986e15aec8bceb31f77715be77f857a SHA512 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8 -EBUILD geoipupdate-2.3.1.ebuild 561 BLAKE2B eb83fe3b18c53dec0fba3b6587d3b1e2664736e26c969211eb71c92555a6634814975e7b6761329a4bc65a0ba3ef609470bff167c33d90646eedfea2ab10bfb8 SHA512 c5e7884d3325ce2efb11c09ac6e81c5efafb28ef4b1a67493ac8daf80d6b50b830f154b6dd77c0bca22fe21760c4f0ee5712e6f21b8e07972fce56f7cd5c1704 +EBUILD geoipupdate-2.3.1.ebuild 562 BLAKE2B 55046822ba135562d7b4daeb837f62e370ec1b292bf328ee284689bdf3ef58fdabf06d01cb7d319b427b2640daff288cf1594fe922921f21020415a9ba4eb77c SHA512 c01067e1aeb180cbcc4d1070afac894f5973a16a60e9450ff3cf5b1e045f1372a462e87720d5f328f1c0519d8d47f67a52813f74ece00c9fadbb2dd3af0a9daf EBUILD geoipupdate-3.1.0.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9 EBUILD geoipupdate-3.1.1.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9 EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678 diff --git a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild index 1cdcbc7551cd..1ee87b066134 100644 --- a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild +++ b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" DEPEND=" net-misc/curl diff --git a/net-misc/getdate/Manifest b/net-misc/getdate/Manifest index 06a61e29d1ed..5dfe3074c562 100644 --- a/net-misc/getdate/Manifest +++ b/net-misc/getdate/Manifest @@ -1,3 +1,5 @@ +AUX getdate-glibc-2.31.patch 403 BLAKE2B 7fb09ee4c4f6e610c7fadabc5739ede341d037e4c54288603ff351df9dae6105292b47768e6674fc921a67e753d833ce97d29aaafd2f49dba46c6e1d6d98d0a3 SHA512 6602d57061cc9116b7d7a4c649b8829a1b968378167a384e06adfa57661836617d63bfa27af060a84cddcf28be5ea7fa9e9ac085ed233dc123277fa74e671df7 DIST getdate_rfc868-1.2.tar.gz 8323 BLAKE2B 03b9a9c0dd656fbb45785792484cfbce6e1f403f238a841bfc144401ad0deee257d88dcd214d617be2fd1ed0289e5ec63f0509effd51bd94b61be924b5f31836 SHA512 f4ce167e42f2ef54cb961923f15d8101c5d047659991b0f3859a0282d024b0e0273517b94b663a90f8d6af1d3e4acf46b96b17d39cd6b2f3ee25bc89995b1404 EBUILD getdate-1.2-r1.ebuild 747 BLAKE2B 2485cf11fd9fb09a7955bce9d9b8c1e6d47673bf12e9bdabfcf27065e670373b4083b14b932f3f53ecbc9b7c9988c0c7c77ac1149da7f93e0f47e32ef3cc2d15 SHA512 b565d91d623326b4e5f2223d837b79176adbeda6ff174952766203501a766355eeaa6787e792c38700b0f37b54d1ba66e37ebdf57f7dca6296b93a977242b5f4 +EBUILD getdate-1.2-r2.ebuild 808 BLAKE2B 9817a685505940d2432f905da4438fb6de9bf06ab2a6dfa73f348385fb8414f783215fab93b1f41e35a3dd00a14299d5360a9590bfae4ec11e065b9c7c5334ea SHA512 9ba63991a44a9bc495900ebd0ae12a025c7981b20beb546b131f5d80749eec54feaa50790bca78362968fc49030cf690309bf9c770ab43da25360dfffc97e53e MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/getdate/files/getdate-glibc-2.31.patch b/net-misc/getdate/files/getdate-glibc-2.31.patch new file mode 100644 index 000000000000..2926f7c7a2bc --- /dev/null +++ b/net-misc/getdate/files/getdate-glibc-2.31.patch @@ -0,0 +1,13 @@ +--- a/getdate.c ++++ b/getdate.c +@@ -214,7 +214,9 @@ + /* Dangerous! Could upset cron and other + * timer related events. + */ +- stime(&new_time); ++ struct timespec s = {0}; ++ s.tv_sec = new_time; ++ clock_settime(CLOCK_REALTIME, &s); + print_samples(host, first_sample, second_sample); + printf("getdate: set time to %s to match host %s\n", + time_to_str(new_time), diff --git a/net-misc/getdate/getdate-1.2-r2.ebuild b/net-misc/getdate/getdate-1.2-r2.ebuild new file mode 100644 index 000000000000..93e4e9d1d8e6 --- /dev/null +++ b/net-misc/getdate/getdate-1.2-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="${PN}_rfc868" +MY_P="${MY_PN}-${PV}" + +inherit toolchain-funcs + +DESCRIPTION="Network Date/Time Query and Set Local Date/Time Utility" +HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/network/misc/" +SRC_URI="http://www.ibiblio.org/pub/Linux/system/network/misc/${MY_P}.tar.gz" + +LICENSE="GPL-1+" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~x86" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-glibc-2.31.patch" +) + +src_prepare() { + sed -i -e "/errno.h/ a\#include " getdate.c || die + # Respect CFLAGS + sed -i -e "/CFLAGS/d" Makefile || die + + default +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin getdate + doman getdate.8 + dodoc README getdate-cron +} diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest index 65666ec4b83e..357ea493ae73 100644 --- a/net-misc/gnome-online-miners/Manifest +++ b/net-misc/gnome-online-miners/Manifest @@ -1,3 +1,5 @@ DIST gnome-online-miners-3.30.0.tar.xz 273700 BLAKE2B 146777d6fcdbb2e17ca360e515de6f373bf74063240c579a1e39c0083aad9b0d908754c78046713b027b1b062cf279e0dbe58d211d0341a0179b1d179aa77a2b SHA512 de1d9281978b985d777c1b4900128c6a3b83ef9d0c905b4441f9683a6a03de992ce921e8094d43b903e8547436db51aced91d93bd0cf74f7a385a1d5a5e8b726 +DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464 EBUILD gnome-online-miners-3.30.0.ebuild 897 BLAKE2B 0d9cf3a45e2401db5562ef0a6ded32827b94a2dae4e536f66404f8c3b8424ca2bfa5e5ae2ab94ac1a5fc3e92faa9ef7abdd0112eccce2564d1c8b8d2a4b03565 SHA512 ed9665197a123f060c7647772f099f64aa997711abe82e86a8e018fbcbc87895df2f6ec6349d8317fda112fd9b96b5a7ab8c5c083390cedc37bcf6800ac793c5 +EBUILD gnome-online-miners-3.34.0.ebuild 899 BLAKE2B 04647e19c2892308e389c20d0c37ea0ce89c414f2decaae808aaaca1447e918d48ca393917674ea9e93b68d4bef492e7ab2751e0752b426073f4c45c5fe44d19 SHA512 e24422c70254d8f8fef45de264815b29a8ef047554d6ccab3f8a0269832ffd7c16b0480f768279cef11613ebc8d3bcc24591e91fd1da503052261b086f487f19 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild new file mode 100644 index 000000000000..0a6232092ce3 --- /dev/null +++ b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 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 ~x86" + +# libgdata[gnome] needed for goa support +RDEPEND=" + >=app-misc/tracker-2:= + >=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/htpdate/Manifest b/net-misc/htpdate/Manifest index 99f7ca948a22..811676386744 100644 --- a/net-misc/htpdate/Manifest +++ b/net-misc/htpdate/Manifest @@ -3,7 +3,7 @@ AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba979979 DIST htpdate-1.0.7.tar.gz 16848 BLAKE2B 2e7350f186af09d8876c9caddf3d3bdd1b3d361169417e1c672eb04e499d07391ec93c56fad7e6d0f947a5bf60580a9f52ba564f213662a65dbbd67df875399e SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360 DIST htpdate-1.2.0.tar.gz 13618 BLAKE2B a94f08738d08c0caacc876d2e25e1dba43bbe371b0a31f957a1d5ff522b0ae5bd7bf5abcde63802843b1c32799e4cc38bacda657a9efb3a56a1eaccdb4f8c35c SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4 DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0 -EBUILD htpdate-1.0.7.ebuild 1104 BLAKE2B f8430b15362130cc425a75b6b296b274e8f26ae4bc30085bd9d4d5d7330fa16560e19809e65dbf55d346f96a7f70901b8165526a0842b0b3a9cc2d9bf21671ad SHA512 b94a56bd7230572bc2b52fcba820a7606abd26254b202ad2c7be1ccbe29bb7a4fcce4e211576e06fe08d04d7b88979e4116b823254d9dd406cff61dd9b21fed5 -EBUILD htpdate-1.2.0.ebuild 1006 BLAKE2B ffd29371c97e36a023bbc436bc584bb00424cf1317e9fb2003e8d66f4ffaa971efba6e1244eb44807af776cdba3353a37232c774ac57b0c4e4e35e91ea996327 SHA512 d9a33a5e3ec3eb7f24e8853b3d9903f4206379ca94d49c80d7d74e5bf1628d5cd092545fd11e364d0a30d007cb8cc0ed18d06d5935a76ce2b455f9aa5aae0a7f -EBUILD htpdate-1.2.2.ebuild 1013 BLAKE2B fc54769cb76b36f7aa5a571e5f079b30d99e51f1f20400b2cb7cf7644f1b15db75427b0090fe0b58870a9466a8921798242a1510e48fe1372608fb53362ac4f8 SHA512 93e35fd309c8c1d44f96bc7f40cc32ca571559b45b16c78ee2124b1ac2f011d91218fdcfb92baa3d4910e587db089ec20f630ee3f38f49ac8446035872f0d7e7 +EBUILD htpdate-1.0.7.ebuild 1101 BLAKE2B cab6a0c40b071a196763a898cd89a029c8f0ba6a228028a2849b39d57ae384fff86334635db182fa1037f45c1cff2f5e96353e91425cd1ef44028c64800e14ef SHA512 ef3bf42d6ea2a17f4814b3769c50e367fa052a477f6030aeddfe50126a8a2e15ff66006881b360137a5fb0bec866e022e03556c54ee1bc2af4349b650b14100a +EBUILD htpdate-1.2.0.ebuild 1002 BLAKE2B 9e050c3834fdf710950f480e432ccd39ad237b5ad38522cf5dc75786ea955e587abe2597f509c5ae6781b27fc6a259e1fc6366599f49e9a948bc2957c27006b7 SHA512 13751db31eb949ae2ccb104946371c9387e1b75a15fb774802407131a2b1b6542e51121729bb041cae8672c3c4783f36e311a3702434b97a4305426f8b666ebc +EBUILD htpdate-1.2.2.ebuild 1009 BLAKE2B 1cd2c0f415c3f296b48377549f0b4f9c1010d0ca0990183e53b6db481c83285598a63cba5be9dba902954ca059498cb9b0730fea7f001d0f937d7ddce15bbc0b SHA512 7df407fb876c2fec7afa66719f4e3daa57a5694ad03d47874372d6720bfd1032c783fbb1841cfd74edc83377e6a0bf4e06221d76e5bca82f7b757ce4127c0c12 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e diff --git a/net-misc/htpdate/htpdate-1.0.7.ebuild b/net-misc/htpdate/htpdate-1.0.7.ebuild index a5d577a24e4f..e44a2ee46ba9 100644 --- a/net-misc/htpdate/htpdate-1.0.7.ebuild +++ b/net-misc/htpdate/htpdate-1.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 sh x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux" DEPEND="" RDEPEND="" diff --git a/net-misc/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild index 4e36dc3cd673..c438c8666e1a 100644 --- a/net-misc/htpdate/htpdate-1.2.0.ebuild +++ b/net-misc/htpdate/htpdate-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 ~sh x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux" DEPEND="" RDEPEND="" diff --git a/net-misc/htpdate/htpdate-1.2.2.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild index e004eb864aca..40bf07ab11b8 100644 --- a/net-misc/htpdate/htpdate-1.2.2.ebuild +++ b/net-misc/htpdate/htpdate-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" DEPEND="" RDEPEND="" diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest index 9e6dec56ddc4..d2a02317b74d 100644 --- a/net-misc/ipcalc/Manifest +++ b/net-misc/ipcalc/Manifest @@ -1,3 +1,3 @@ DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc07716f8ec2322f8ff60f6098b89727b6c08d8d0c810974a8f046c0487910073db3390b803802820453d9b7 SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d -EBUILD ipcalc-0.41.ebuild 529 BLAKE2B 1d09930c6218e28360cea902da539e9ab9a7b39abb48405d73c5b82844b9e1a9d9a4fe6f331e6e8070e350fae2bc5885d58d7f9bce0c71384a16ff0f226c7621 SHA512 56476c42915fb2177ccca26da748cf7af2e04f4fe0531a8b3959b83ee333f65b55af1c0dd97adc47f6097e45d10260c59fcf6ec941eacd559dc3604130b8e8e7 +EBUILD ipcalc-0.41.ebuild 527 BLAKE2B 667a37107ed4f346d4a4f7b9f9c2b909a38dd90855ed336ffe7766668bba206229a856c2aba26f6edb36e474ecb00a509fc04185f238d72cdb788d6d5f0c75f4 SHA512 10133935b6510c91944acd7ff5b43e5dfce8eda29fc7ebd46aad529537da2d2d9414ddacb0b86d7451e9bfebbc8b8eeb577dbfe7a8631d79e3cc07a7f97101d2 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild index 18d8276b4331..d316b75bd459 100644 --- a/net-misc/ipcalc/ipcalc-0.41.ebuild +++ b/net-misc/ipcalc/ipcalc-0.41.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="http://jodies.de/ipcalc" SRC_URI="http://jodies.de/ipcalc-archive/${P}.tar.gz" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" RDEPEND=">=dev-lang/perl-5.6.0" diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index becb8b106725..7e08effac1cd 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -2,6 +2,9 @@ AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aa AUX iputils-20180629-fix-ping-on-musl.patch 1514 BLAKE2B 32085fa6a7b21a6d5d0d5bba9ca59931f01489dd69ef57f1422e95d3fb2cac151fbfd437b933feb00753a6d3f3eaa0c63ed7eea81021e8a1bb8b26ec7dd6584d SHA512 d78aeaf4c746412855344b248c518218570103c082afd6fe8ee0c38ae2bf9a33d34c85ce5a846accd6442f8ec0f7a8727b5b747bd8a5adada53e1188e6e770df AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d AUX iputils-20190515-fix-setcap.patch 1706 BLAKE2B e90392bfe79201cbf88e2c6356b9f24d014e845cd65b29d66532dcabc8672df7f47e2bde0d6f267c4aff63f55bd4949ac91ab9d411c71c183586cbe47d6064f9 SHA512 769111d6bfd124d37125554993ea8c47dde2f6d917226597af9521db92fc31417b48648945bffb54f11201f230cb46d820f5a1ded027e1ee8e781d935841507b +AUX iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch 1134 BLAKE2B cb6a700f3b0681e6abf5bfcfed3b5b4736aeba481e1b5334193cc32dab8e21134ed729d1b6b098495e46f59416f9d2c29f186b87143adcb2824f08058c7792ce SHA512 4e8bd9d4ae752dcdcb169eec1c42bc16d3f89cd1579140db74c3883da54145faea875513aca4bf8241208253b8950590fd615fe2ea7e448d431d509ff2e8dc03 +AUX iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch 2852 BLAKE2B a9375c41ba6dde249ec2a0a287eef68228198c7132dd145550c55a6f42b29d2e53160ef9a99455e0f60e2bb738f1a2dbeff016f2ce6903ead58c75bdcafeb618 SHA512 e9f322620ce2e10830c7127fdb64e68ea7bad59620e8b1ffd10ec9ee9f49f74500f0efe25de62feb0e1dd3cbd37af744263b53deeae8d78d44a6b9d335686afc +AUX iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch 7935 BLAKE2B 550fc998feb6accae244baf8334d522ffcd6c464756f465c17298bef5338c8e746345026b72c95ff86aa14ef85223ca8cad4e00040f66b4e7aab3526296fc411 SHA512 1da0f189d47cb0b31cea5d1ea8081fbb2be0e55fb5b206cb366dce467bf0e557a2b77b2c8007993bdc91006a5f290269ae70e5d7e50f7fa5bdde93b0079d4e07 AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 @@ -10,8 +13,9 @@ DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd367ba6abc0377bca45ddc439803d177bf668f7dfc7bd3da7a06e89d9ffdd68f2bb0dbb9aa0ac150c98cd1f2b207a68d4fb46 SHA512 4013fe05c592ccc09d6b947ee59d56515bfe49e9a9d5610225d4a2b8c5034a7f1e8dc41c214cf03ce909d36bc5a8438541ad302cddeb1f0b4359a9b9c85ad4b2 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066 -EBUILD iputils-20180629.ebuild 3969 BLAKE2B d48b246f78d0da70cb869550a250c83fca055b5e77ec4a962fc6ac615c40c8cbd737d474b3bb042d848870f3ec8eca5fd75484142ab07aa433cc606acd1449b5 SHA512 52fb6be372a3ca7ae303cd1a1cf3599a52304c9d593a2eed32fe50cbc75f64b1d413a97451c6f9129c0a45a5cbb57888d2aa8c1bf8135b30b278de85d3923f94 -EBUILD iputils-20190515.ebuild 4923 BLAKE2B e7c4bb2ac6393f93e3294559091b4a339a76a2e21e0b787b92cf631b9799486a701ca5e5e5f1b77910a9edecc00b68661f5e789f336fce9c9321ec3656e4faa9 SHA512 48037b05394e88e60ee399d9560f59529e3b195e10b8a5137b11377a6e4240a11aa2409f0e5d74ac753a72fd42c414edff975fff78d77c20de6e46a9c7c116a5 -EBUILD iputils-20190709.ebuild 4836 BLAKE2B 55184f1602f8880d6d19661768a573ae4af056d8283deb4bf0d530902eca962c6c764c4e9e8a33251805197881b6ace917b996405640968dc63818676ba60222 SHA512 c86911890d5848509a3bcdbb3d50050e7ee8f95b9bc0eb40fa7f502edcc49ef554fe9c1ab14654432859f0b3392a2efe662bec3f7c6c3cd9d4b3f6d18dadb066 -EBUILD iputils-99999999.ebuild 4843 BLAKE2B a866f2ad14eaeabca1136cf5376da08c219f3106bedff2cf880936c6afb38edcf04ed9852111614f2bbcf9b4d2b34e5bd41f0fb50c5572394666c604321b904f SHA512 d93c23ba2a5ffcb252c5adbab9502ac65e0628a8a8847bc2cd9ea720253eb5f96206326be7f605385a27b0270d5a2baeb88955d6712f8cf3d28b27e12d060f52 +EBUILD iputils-20180629.ebuild 3967 BLAKE2B af20e42d35c953f1ffe002bdd9f93f43933cccabdac0ea577e51d38cf11d6b5f0ba4302ff4117c953168e9a2ec032e2e35b33161123ad925104ed99502b20743 SHA512 8d36e3d54595762dd29cf0591b4d0c40bebdbd799aa201adcbf799183d02e88c8b9cb16e4be83ef31b93a92e4f452cff312b01e4fdee6820b05129d7148a57bc +EBUILD iputils-20190515.ebuild 4919 BLAKE2B 4971db4c7e34487f58cd8475e5d5f1a8c4019ff74c14d9cb0dbbebe34c75d98033073c8faae6a6bbfc0b9ec70cead5bcbf3d69c532e418bb72b6c07a98f5323c SHA512 fcd0be342b6f865ca0b12e30d98f347b44d11dcf2871914a0e657c27d0cb9dfdae9c289cde19825fbd2c7aa7a3d5d10ce5cd31d0f585df58196977e1606f6cbe +EBUILD iputils-20190709-r1.ebuild 5063 BLAKE2B d97633c9ce56d4b155467cfd4b638f2ab5a132fe5636661e7d75b4e82b58ec6414dfa4e7c6d8cfddbfe26dfdb7fe028f87a5188e02777789482a5c8dde027ccb SHA512 2e0b5202f12a6ab5c0123b57a56de6d88f76094237517a37434f61b7f304687df6dedc1fd18697ed9a2954632aa30847dc40680486ee28e9e72db0f517a1032d +EBUILD iputils-20190709.ebuild 4832 BLAKE2B 568c48b41ebc6130dd0bc57a300bebd1e3f1994c5cea2f844dd43573e3e9fc24488784307649048ea83a30bcdc0696c56974f83a3a9a07a87d94c539d1fee6af SHA512 861e080265a15292a6c45adff6aec359b2f4cee26ce91d3d3a1ae01a9b06325f421d9016b27d68ff878e0432bd48a7adfade6b1828747ddbf1b90b9a924f02b0 +EBUILD iputils-99999999.ebuild 4839 BLAKE2B 36de576375669cde223c1a8e37225d9527969434238e1a12475679968ef2a76b1d696214c2b2e029d4480246e8d047a797484499da1324ad783296afd4c334ac SHA512 c600edbeb543af780408ac536c5fd89384c3b487aab5ea02cc0c17184b1f351f1d9ecde4f018085d16daf58ddaf2907378683b2f3ae450b91705461d3e54f404 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e diff --git a/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch b/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch new file mode 100644 index 000000000000..715ed45041b5 --- /dev/null +++ b/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch @@ -0,0 +1,34 @@ +From 18f14be80466ddc8fb17a400be82764a779c8dcd Mon Sep 17 00:00:00 2001 +From: Sami Kerola +Date: Wed, 31 Jul 2019 21:28:12 +0100 +Subject: [PATCH] arping: revert partially - fix sent vs received packages + return value + +Commit 84ca65ca980315c73f929fed8b6f16bbd698c3a0 caused regression. The +arping -D needs return value evaluation that was the earlier default, in +other cases the new return value should be correct. + +Addresses: https://github.com/iputils/iputils/issues/209 +See-also: https://github.com/void-linux/void-packages/issues/13304 +Signed-off-by: Sami Kerola +--- + arping.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/arping.c b/arping.c +index 77c9c56..2c87c15 100644 +--- a/arping.c ++++ b/arping.c +@@ -792,7 +792,11 @@ static int event_loop(struct run_state *ctl) + close(tfd); + freeifaddrs(ctl->ifa0); + rc |= finish(ctl); +- rc |= (ctl->sent != ctl->received); ++ if (ctl->dad && ctl->quit_on_reply) ++ /* Duplicate address detection mode return value */ ++ rc |= !(ctl->brd_sent != ctl->received); ++ else ++ rc |= (ctl->sent != ctl->received); + return rc; + } + diff --git a/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch b/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch new file mode 100644 index 000000000000..9814707d7239 --- /dev/null +++ b/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch @@ -0,0 +1,86 @@ +From: Benjamin Poirier +Date: Thu, 26 Dec 2019 10:44:03 +0900 +Subject: ping: fix main loop over multiple addrinfo results + +Despite what the log of commit f68eec0eafad ("ping: perform dual-stack ping +by default") says, main() was not designed to loop over multiple addresses +returned by getaddrinfo(). This is apparent because until commit +db11bc96a68c ("ping: make command to return from main()"), ping{4,6}_run() +never returned (they always exited). After commit db11bc96a68c, we +encounter unexpected situations if getaddrinfo returns multiple results and +ping{4,6}_run() return != 0. + +For example (notice echo reply is not received): + + root@vsid:/src/iputils# ./builddir/ping/ping -w1 google.com + PING google.com(nrt12s22-in-x0e.1e100.net (2404:6800:4004:80c::200e)) 56 data bytes + + --- google.com ping statistics --- + 1 packets transmitted, 0 received, 100% packet loss, time 0ms + + PING (216.58.197.142) 56(84) bytes of data. + + --- ping statistics --- + 1 packets transmitted, 0 received, 100% packet loss, time -1002ms + + root@vsid:/src/iputils# + +Establish the following convention: + +* return value >= 0 -> exit with this code (same behavior as before commit + db11bc96a68c) + +* return value < 0 -> go on to next addrinfo result + +The second case will be used in the following patch. + +Fixes: db11bc96a68c ("ping: make command to return from main()") +Signed-off-by: Benjamin Poirier +Origin: https://github.com/iputils/iputils/commit/c249e48bb865e731896b7d8ceaf4bca7d28768b6 +Bug-Debian: https://bugs.debian.org/947921 +See-also: https://github.com/iputils/iputils/pull/244 +--- + ping.c | 6 +++++- + ping6_common.c | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/ping.c b/ping.c +index 34653be..ae687b4 100644 +--- a/ping.c ++++ b/ping.c +@@ -495,8 +495,11 @@ main(int argc, char **argv) + error(2, 0, _("unknown protocol family: %d"), ai->ai_family); + } + +- if (ret_val == 0) ++ if (ret_val >= 0) + break; ++ /* ret_val < 0 means to go on to next addrinfo result, there ++ * better be one. */ ++ assert(ai->ai_next); + } + + freeaddrinfo(result); +@@ -504,6 +507,7 @@ main(int argc, char **argv) + return ret_val; + } + ++/* return >= 0: exit with this code, < 0: go on to next addrinfo result */ + int ping4_run(int argc, char **argv, struct addrinfo *ai, socket_st *sock) + { + static const struct addrinfo hints = { +diff --git a/ping6_common.c b/ping6_common.c +index 6cc5404..731dc6d 100644 +--- a/ping6_common.c ++++ b/ping6_common.c +@@ -551,6 +551,7 @@ int niquery_option_handler(const char *opt_arg) + return ret; + } + ++/* return >= 0: exit with this code, < 0: go on to next addrinfo result */ + int ping6_run(int argc, char **argv, struct addrinfo *ai, struct socket_st *sock) + { + static const struct addrinfo hints = { +-- +2.25.0.rc2 + diff --git a/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch b/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch new file mode 100644 index 000000000000..a308fb7c9f63 --- /dev/null +++ b/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch @@ -0,0 +1,190 @@ +From: Benjamin Poirier +Date: Wed, 25 Dec 2019 13:33:12 +0900 +Subject: ping: try next addrinfo on connect failure + +On hosts that have routing rules matching on the outgoing interface [1], +getaddrinfo() may return results sorted in a suboptimal order because it is +not aware of the network interface passed to ping via the "-I" option. In +particular, address reachability detection may fail and getaddrinfo() will +return ipv6 results first, even though the only routes available are ipv4. + +Improve user experience by trying next addrinfo entry if we encounter a +failure at connect() time because of missing or unreachable routes. + +[1] For example, on switches running Cumulus Linux, the default VRF is used +for front ports and a "mgmt" VRF is used for the management interface, which +also handles all DNS traffic. (VRFs apply different routing rules based on +the iif/oif, ie. influenced by SO_BINDTODEVICE.) In the default vrf, it's +possible to ping an ipv4 address via the mgmt vrf by specifying "-I mgmt". +However, that will fail if the target host is specified by name, has a AAAA +record and there is no ipv6 route to it. + +Since libc commit 5ddb5bf5fb, getaddrinfo() does a udp connect to result +addresses to check if there is a route to them. This is to implement +RFC3484 §6 Rule 1 ("Avoid unusable destinations") which is part of the +algorithm to order results. getaddrinfo() is unaware of ping's "-I" option +and tries to connect its socket via the default vrf, which has no ipv6 route +to the target host (and, in fact, no ipv4 route either). Following this +failure, getaddrinfo() returns results ordered according to +/etc/gai.conf (Rule 6) - by default, ipv6 first. + +ping tries only the first entry returned by getaddrinfo() and fails to +connect to it because there is no ipv6 route to the host, even in the mgmt +vrf. However, if getaddrinfo() had ordered the ipv4 result first or ping +had tried the next addrinfo entry (the ipv4 one), ping could connect a udp +socket to it and later successfully exchange icmp messages with it. + +Example: + + cumulus@act-5812-10:~$ ip vrf list + Name Table + ----------------------- + mgmt 1001 + cumulus@act-5812-10:~$ ip vrf identify + cumulus@act-5812-10:~$ # --> default vrf + cumulus@act-5812-10:~$ + cumulus@act-5812-10:~$ ip rule + 99: from all to 10.230.0.53 ipproto udp dport 53 lookup mgmt + 99: from all to 10.20.249.1 ipproto udp dport 53 lookup mgmt + 1000: from all lookup [l3mdev-table] + 32765: from all lookup local + 32766: from all lookup main + 32767: from all lookup default + + cumulus@act-5812-10:~$ ip route + + cumulus@act-5812-10:~$ ip -6 route + ::1 dev lo proto kernel metric 256 pref medium + + cumulus@act-5812-10:~$ ip route show vrf mgmt + default via 10.230.130.1 dev eth0 + unreachable default metric 4278198272 + 10.230.130.0/24 dev eth0 proto kernel scope link src 10.230.130.211 + 127.0.0.0/8 dev mgmt proto kernel scope link src 127.0.0.1 + + cumulus@act-5812-10:~$ ip -6 route show vrf mgmt + ::1 dev mgmt proto kernel metric 256 pref medium + anycast fe80:: dev eth0 proto kernel metric 0 pref medium + fe80::/64 dev eth0 proto kernel metric 256 pref medium + ff00::/8 dev eth0 metric 256 pref medium + unreachable default dev lo metric 4278198272 pref medium + + cumulus@act-5812-10:~$ host google.com + google.com has address 172.217.0.46 + google.com has IPv6 address 2607:f8b0:4005:802::200e + google.com mail is handled by 30 alt2.aspmx.l.google.com. + google.com mail is handled by 40 alt3.aspmx.l.google.com. + google.com mail is handled by 20 alt1.aspmx.l.google.com. + google.com mail is handled by 10 aspmx.l.google.com. + google.com mail is handled by 50 alt4.aspmx.l.google.com. + +Success with numeric address + + cumulus@act-5812-10:~$ ping -n -c1 -I mgmt 172.217.0.46 + ping: Warning: source address might be selected on device other than mgmt. + PING 172.217.0.46 (172.217.0.46) from 10.230.130.211 mgmt: 56(84) bytes of data. + 64 bytes from 172.217.0.46: icmp_seq=1 ttl=51 time=4.68 ms + + --- 172.217.0.46 ping statistics --- + 1 packets transmitted, 1 received, 0% packet loss, time 0ms + rtt min/avg/max/mdev = 4.675/4.675/4.675/0.000 ms + +Failure with host by name + + cumulus@act-5812-10:~$ ping -n -c1 -I mgmt google.com + connect: No route to host + +Success when running in the mgmt vrf because getaddrinfo()'s address +reachability test is effective and ipv4 result(s) are ordered first. + + cumulus@act-5812-10:~$ ip vrf exec mgmt ping -n -c1 google.com + PING google.com (172.217.0.46) 56(84) bytes of data. + 64 bytes from 172.217.0.46: icmp_seq=1 ttl=51 time=4.65 ms + + --- google.com ping statistics --- + 1 packets transmitted, 1 received, 0% packet loss, time 0ms + rtt min/avg/max/mdev = 4.650/4.650/4.650/0.000 ms + +For demonstration purposes, the following configuration allows one to +reproduce a similar problem. Starting from a host with a vanilla +configuration, default ipv4 route using eth0, no ipv6 global routes: + + root@vsid:~# ip route + default via 192.168.15.1 dev eth0 + 192.168.15.0/24 dev eth0 proto kernel scope link src 192.168.15.100 + + root@vsid:~# ip -6 route + ::1 dev lo proto kernel metric 256 pref medium + fe80::/64 dev eth0 proto kernel metric 256 pref medium + + root@vsid:~# ip rou flush table main + + root@vsid:~# ip rou add table 1 192.168.15.0/24 dev eth0 + + root@vsid:~# ip rou add table 1 default via 192.168.15.1 + + root@vsid:~# ip rule + 0: from all lookup local + 32766: from all lookup main + 32767: from all lookup default + root@vsid:~# ip rule add pref 1 to 192.168.15.1 ipproto udp dport 53 lookup 1 + root@vsid:~# ip rule add pref 2 oif eth0 lookup 1 + root@vsid:~# ping -c1 -I eth0 google.com + + ping: connect: Network is unreachable + +With the current patch + + root@vsid:~# /src/iputils/builddir/ping/ping -c1 -I eth0 google.com + PING (172.217.174.110) from 192.168.15.100 eth0: 56(84) bytes of data. + 64 bytes from nrt12s28-in-f14.1e100.net (172.217.174.110): icmp_seq=1 ttl=53 time=11.3 ms + + --- ping statistics --- + 1 packets transmitted, 1 received, 0% packet loss, time 0ms + rtt min/avg/max/mdev = 11.313/11.313/11.313/0.000 ms + +Signed-off-by: Benjamin Poirier +Origin: https://github.com/iputils/iputils/commit/2705c8248281fbb8efaa5326ab1d0ed0a670bd3d +Bug-Debian: https://bugs.debian.org/947921 +See-also: https://github.com/iputils/iputils/pull/244 +--- + ping.c | 3 +++ + ping6_common.c | 7 ++++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/ping.c b/ping.c +index 34653be..013c4e6 100644 +--- a/ping.c ++++ b/ping.c +@@ -628,6 +628,9 @@ int ping4_run(int argc, char **argv, struct addrinfo *ai, socket_st *sock) + error(2, errno, _("cannot set broadcasting")); + if (connect(probe_fd, (struct sockaddr *)&dst, sizeof(dst)) == -1) + error(2, errno, "connect"); ++ } else if ((errno == EHOSTUNREACH || errno == ENETUNREACH) && ai->ai_next) { ++ close(probe_fd); ++ return -1; + } else + error(2, errno, "connect"); + } +diff --git a/ping6_common.c b/ping6_common.c +index 6cc5404..bc1030b 100644 +--- a/ping6_common.c ++++ b/ping6_common.c +@@ -651,8 +651,13 @@ int ping6_run(int argc, char **argv, struct addrinfo *ai, struct socket_st *sock + firsthop.sin6_family = AF_INET6; + + firsthop.sin6_port = htons(1025); +- if (connect(probe_fd, (struct sockaddr *)&firsthop, sizeof(firsthop)) == -1) ++ if (connect(probe_fd, (struct sockaddr *)&firsthop, sizeof(firsthop)) == -1) { ++ if ((errno == EHOSTUNREACH || errno == ENETUNREACH) && ai->ai_next) { ++ close(probe_fd); ++ return -1; ++ } + error(2, errno, "connect"); ++ } + alen = sizeof source6; + if (getsockname(probe_fd, (struct sockaddr *)&source6, &alen) == -1) + error(2, errno, "getsockname"); +-- +2.25.0.rc2 + diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild index db782177e0bc..2136a71b72f7 100644 --- a/net-misc/iputils/iputils-20180629.ebuild +++ b/net-misc/iputils/iputils-20180629.ebuild @@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" diff --git a/net-misc/iputils/iputils-20190515.ebuild b/net-misc/iputils/iputils-20190515.ebuild index 4e88cd742043..dbeb6834c857 100644 --- a/net-misc/iputils/iputils-20190515.ebuild +++ b/net-misc/iputils/iputils-20190515.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -19,7 +19,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild new file mode 100644 index 000000000000..de8b4a40ad6e --- /dev/null +++ b/net-misc/iputils/iputils-20190709-r1.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2020 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 depedencies. +# To regenerate man/html pages emerge iputils-99999999[doc] with +# EGIT_COMMIT set to release tag and tar ${S}/doc folder. + +EAPI="7" + +PLOCALES="ja" + +inherit fcaps flag-o-matic l10n meson 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/s${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 ~ppc-aix ~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 gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6" + +BDEPEND="virtual/pkgconfig" + +LIB_DEPEND=" + caps? ( sys-libs/libcap[static-libs(+)] ) + idn? ( net-dns/libidn2:=[static-libs(+)] ) + ipv6? ( + ssl? ( + gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) + !gcrypt? ( + nettle? ( dev-libs/nettle[static-libs(+)] ) + !nettle? ( + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + ) + ) + ) + ) + nls? ( sys-devel/gettext[static-libs(+)] ) +" + +RDEPEND=" + arping? ( !net-misc/arping ) + rarpd? ( !net-misc/rarpd ) + traceroute6? ( !net-analyzer/traceroute ) + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) +" + +DEPEND=" + ${RDEPEND} + virtual/os-headers + static? ( ${LIB_DEPEND} ) +" + +if [[ ${PV} == "99999999" ]] ; then + DEPEND+=" + 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 + +[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" + +PATCHES=( + "${FILESDIR}"/${P}-arping-revert-partially-fix-sent-vs-received-package.patch + "${FILESDIR}"/${P}-ping-try-next-addrinfo-on-connect-failure.patch + "${FILESDIR}"/${P}-ping-fix-main-loop-over-multiple-addrinfo-results.patch +) + +src_prepare() { + use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) + + default + + l10n_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 ipv6 $(usex traceroute6 true false) false)" + -DBUILD_NINFOD="false" + -DNINFOD_MESSAGES="false" + -DNO_SETCAP_OR_SUID="true" + -Dsystemdunitdir="$(systemd_get_systemunitdir)" + -DUSE_GETTEXT="$(usex nls true false)" + ) + + if use ipv6 && use ssl ; then + emesonargs+=( + -DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))" + ) + else + emesonargs+=( + -DUSE_CRYPTO="none" + ) + fi + + 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_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 + + if use tracepath ; then + dosym tracepath /usr/bin/tracepath4 + fi + + if use ipv6 ; then + dosym ping /bin/ping6 + + if use tracepath ; then + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 + fi + 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-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild index a0cc3dfdbee1..bdf494ae2e6f 100644 --- a/net-misc/iputils/iputils-20190709.ebuild +++ b/net-misc/iputils/iputils-20190709.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 c93df8292544..cc025fe8be3e 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest index 5c2feaf436a4..4567777fadf1 100644 --- a/net-misc/jwhois/Manifest +++ b/net-misc/jwhois/Manifest @@ -1,4 +1,4 @@ AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae -EBUILD jwhois-4.0-r1.ebuild 681 BLAKE2B 785e3c729d1366c5c114f3a6a01bc87e45b1e1268a37fbb1cd21eb69f5f74fb9f868152ec90994889bc7635ad4109840a228c11f719277554c99d89c823bcec0 SHA512 61308b752f2053f67084bbd6154587a8f6b845378db1cd601099a70bf2c8f28d9a3e89fce9aa0009bb668316cca61ae144d0d21e72ffb6a513a267e80a57f614 +EBUILD jwhois-4.0-r1.ebuild 679 BLAKE2B 15eff8ce07107b10c26859e2b801fbbdd580824564ac723898337f13c98a99ede49bd4a3adb444aa4742c646a1f3c5057dabb6a4c8951fa4662b02fa7677c0d6 SHA512 dc36e476951d117d13f5b8cefc2ad13a830d2ae8a674a4468f0df97eee5fa3f8f4c3a73e21cbdff22ad3b78e791886fe8e945a05543383c2581f4b13529b1eea MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild index 366d00b2c380..639d0c75a4bb 100644 --- a/net-misc/jwhois/jwhois-4.0-r1.ebuild +++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86" IUSE="idn nls" RDEPEND="idn? ( net-dns/libidn )" diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index dbb944ea57bc..399826077dc7 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,8 +1,8 @@ AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31 -DIST kea-1.7.4.tar.gz 7322221 BLAKE2B 8042f0d0ecce90635d41aa07599c475adfd17ab8145d14fdd92b3c4442ddf44e4495c63d67c9e5bc30d81cf42eb4393a111762c6f308fcf597cd364360d05bd5 SHA512 ae2117b5add65abed1603be2393cc300fea181376c598c2facdd76cc868d53fabb5714d41f7a5647b0ae508d05e98b50fa101a7917503835928f274a157ed6ca DIST kea-1.7.5.tar.gz 7337326 BLAKE2B 9fa3b16cdbe90503715987d72d5560da13ff619be85040c49572cc24ed83fe0e155c9c7be9785d6f918b1c5a5777ac3d59153fc313d6622d68025d6af4a34956 SHA512 1e31a9b2031d5dfdef18178abcdc30c1fe20ac4013c070cf01e2a2af56d4594fc8ae1edcc9e98483cd8feb8d9d916b893e42cfdd41e195c2d79d0c8800040034 -EBUILD kea-1.7.4.ebuild 1751 BLAKE2B e4a91eaa51eca00d5bab01cb9b73c352ab977993ceb4e55aa3b83d878315fcbccb431a69918f2e706967083548ca3e373cd1607f37f160a27db419b8e0c37660 SHA512 d5f21137b0058fd900db1e50f4c8cac895366e110189ebcc5b9a0ad0dee6f33457b4da20c2983e621a29626b0b208c3d83f6e40c63537aa2b38d16d931caebf8 +DIST kea-1.7.6.tar.gz 7362882 BLAKE2B 09b508f1f3b025c4e732f67f78757b7617e82453319348bc8550d6035331cb51347233057872085e967c6ad3fca56046c21eb64da77beef23039ea61512c4fc6 SHA512 5f48dc8fa60c9e8614237b27a5eff2857854e2878397c5d9cbb388abc94f35aedecedf696582b7ba4dbcd79c38c42af6557e013d5a9db4756d6e525af279287a EBUILD kea-1.7.5.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb +EBUILD kea-1.7.6.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb EBUILD kea-9999.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975 diff --git a/net-misc/kea/kea-1.7.4.ebuild b/net-misc/kea/kea-1.7.4.ebuild deleted file mode 100644 index 171da871a926..000000000000 --- a/net-misc/kea/kea-1.7.4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs user - -MY_PV="${PV//_p/-P}" -MY_PV="${MY_PV/_/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="http://www.isc.org/kea/" -if [[ ${PV} = 9999* ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/isc-projects/kea.git" -else - SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz - ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz" - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -IUSE="mysql +openssl postgres samples" - -DEPEND=" - dev-libs/boost:= - dev-cpp/gtest - dev-libs/log4cplus - mysql? ( dev-db/mysql-connector-c ) - !openssl? ( dev-libs/botan:2= ) - openssl? ( dev-libs/openssl:0= ) - postgres? ( dev-db/postgresql:* ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - [[ ${PV} = *9999 ]] && eautoreconf - # Brand the version with Gentoo - sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ - configure || die -} - -src_configure() { - local myeconfargs=( - --disable-static - --enable-perfdhcp - --localstatedir="${EPREFIX}/var" - --without-werror - $(use_with mysql) - $(use_with openssl) - $(use_with postgres pgsql) - $(use_enable samples install-configurations) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - newconfd "${FILESDIR}"/${PN}-confd ${PN} - newinitd "${FILESDIR}"/${PN}-initd ${PN} - keepdir /var/{lib,run}/${PN} /var/log - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_preinst() { - enewgroup dhcp - enewuser dhcp -1 -1 /var/lib/dhcp dhcp -} diff --git a/net-misc/kea/kea-1.7.6.ebuild b/net-misc/kea/kea-1.7.6.ebuild new file mode 100644 index 000000000000..2f6a4dc21e8a --- /dev/null +++ b/net-misc/kea/kea-1.7.6.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_PV="${PV//_p/-P}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" +HOMEPAGE="http://www.isc.org/kea/" +if [[ ${PV} = 9999* ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/isc-projects/kea.git" +else + SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz" + [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +IUSE="mysql +openssl postgres samples" + +DEPEND=" + dev-libs/boost:= + dev-cpp/gtest + dev-libs/log4cplus + mysql? ( dev-db/mysql-connector-c ) + !openssl? ( dev-libs/botan:2= ) + openssl? ( dev-libs/openssl:0= ) + postgres? ( dev-db/postgresql:* ) +" +RDEPEND="${DEPEND} + acct-group/dhcp + acct-user/dhcp" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + [[ ${PV} = *9999 ]] && eautoreconf + # Brand the version with Gentoo + sed -i \ + -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + configure || die +} + +src_configure() { + local myeconfargs=( + --disable-static + --enable-perfdhcp + --localstatedir="${EPREFIX}/var" + --without-werror + $(use_with mysql) + $(use_with openssl) + $(use_with postgres pgsql) + $(use_enable samples install-configurations) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + newconfd "${FILESDIR}"/${PN}-confd ${PN} + newinitd "${FILESDIR}"/${PN}-initd ${PN} + keepdir /var/{lib,run}/${PN} /var/log + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest index 679965d39db4..88361d3ce49f 100644 --- a/net-misc/keychain/Manifest +++ b/net-misc/keychain/Manifest @@ -1,5 +1,5 @@ DIST keychain-2.8.1.tar.gz 43866 BLAKE2B 7b861d9ded273341da47ee8db77b5b665a81cbb82e6ea9b434c0901f2310161fdc504ba9ed728c942c93b21069954e0ab87319f949cd96fb135c2e4991b8cefa SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024 -EBUILD keychain-2.8.1.ebuild 659 BLAKE2B 760b82fb9cdf4894f8b6bea7463c07de13b696511d0f2db2fdd88ea3e783d27af6eb704069852ee87a7e498158817e3ff8bb5e221e9cb8d608de5fa800fe4673 SHA512 6b19a5fadf2d30f024d8d5c9d36b4c5de8ece80c846b1140f4a68a3778c9de50bddaf50a3119a8efb194392bf7e4b5ba5b293c543b263d1b535ef9a5921e5f58 -EBUILD keychain-2.8.5.ebuild 660 BLAKE2B 086540eabf808b841f1ec6e7ad74b6919a284dcec0349ebf33d380ddd2ee6ac3213b0f68368a26334b265afaa87f39ada4dd5ed0814df71ea3c51427b82ad72f SHA512 441b515f3356bde6c9336b0d21adf46817dc299261fb5468e910faec332294ad702ced41f3e276e7ae0da3149bd4f2d85de944a75927031840afcdd6ca8c1065 +EBUILD keychain-2.8.1.ebuild 657 BLAKE2B 1c641617c958a31b35824dac97f6a55ab1ca0ce7af7164aaa4437723500396fedf3f5fa73042757ea067602fc0d1a55d576bd1a027861d2a067fb81f06501068 SHA512 61ea8f0e1fd6ff0fda76ab59874a3d7e99677412218c03663ae28142174ac0becf2b99702efdb20e25ed14f04c1b8b5394c08623c33eae0eb3942eda62afd512 +EBUILD keychain-2.8.5.ebuild 657 BLAKE2B 2d137854bae6eb59fefc55da476013dc164a2dd66f99284932d784cf099e141155773b16069a55f19218f12d837c31936dd2c0023e50a4d31ad3aac855ac767e SHA512 d3106e36aa8195fc7abbc7fb93f649923ab933a2ce4816b2c445d27a2fdee0edc902af92a621abb5d71532a397775da39e2764a54e6b0c16b3284761358bf080 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a diff --git a/net-misc/keychain/keychain-2.8.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild index ac818ce2e562..38f015c20104 100644 --- a/net-misc/keychain/keychain-2.8.1.ebuild +++ b/net-misc/keychain/keychain-2.8.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="dev-lang/perl" diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild index 9e9b72b800d0..4de9af19d8cf 100644 --- a/net-misc/keychain/keychain-2.8.5.ebuild +++ b/net-misc/keychain/keychain-2.8.5.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="dev-lang/perl" diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest index 41386e5cd80f..73f1ab6be0fc 100644 --- a/net-misc/lksctp-tools/Manifest +++ b/net-misc/lksctp-tools/Manifest @@ -2,6 +2,6 @@ AUX lksctp-tools-1.0.18-install-sctp.h.patch 335 BLAKE2B 513aca706f701591bca2e08 AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46215fcd8bb4f1b7cf9e860f9574c14d4f96f5f535f969aa827296e38017f3c56831ce820a2c5469ff9ef6b0afa39b553f SHA512 f64962208c270fbf39ba73b71801c27f5c2e45e4382c53bf3728e14c1300970b0d2a86d34132a4e8d24f8eb694bd234b11cefb7cc31eb232557d090c34d830e5 DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055 -EBUILD lksctp-tools-1.0.17.ebuild 1259 BLAKE2B de38f2f5fa016f758c50ab838b79512505f0331ee75d1e56db4269ac49f3d8a07cd1994159f39d108b761f4ef6bc74da7d5cfc264215dfce7d3d5e78d031c02d SHA512 19a60c2c213b4810907d504243c7b479957fa2be4ca2748773ebdae738d847918ea4185070605b7c5d2a7cd4e422483326c684f0116d5cfd52ea4791f8334130 -EBUILD lksctp-tools-1.0.18-r1.ebuild 1346 BLAKE2B d1b98efb451a2101122c304a8f2bfd2d03a94eba700f40f084ddb3cbf09b01290a0f576122f3693931eed9ba3525902d134381ca3471b3d01ee78ad799a9be5a SHA512 9d3fdd04ab31a89d98c5f34b40bf9b4df45dab3413443c5b3c1eceb10e02f0444a53aab6a6fb3bc4c8eeafc15e29c2a0608f9524c1f47386df71ca438797678e +EBUILD lksctp-tools-1.0.17.ebuild 1255 BLAKE2B de959f74224dc3fff1d5f30529ab4d84152aada29f766ab989056e6a789a4d6b093e558eee57a267f4ef9362ae73c5ec023d24108aadfd776f3f9402447f6284 SHA512 36c7ad56089b6d7b8f350e99a642603c7d183396f8654e35eaf9057c153f5f7af71afa9d7b81cc65f42f184a9048592a14c2a2b8f6df65ba0872b6b896fb0233 +EBUILD lksctp-tools-1.0.18-r1.ebuild 1342 BLAKE2B 81841c1b3c26f67637dcdbe94d37051512c38039499e5415f3926ca120d7ba46bfac02bed477f4ee97ab25f3eb4077f4815d011ba7ac5bd58b024726178b72fd SHA512 08d9a4b7093124719d66096dc277fbad5a25298d9da80850ad5e28522f70fe5691fa97257bbdaa7b914bc9c6bfd9ba6d7447e2c20f1e1f42147f08c739cff848 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild index 216d04ab0560..a6b2e1760bda 100644 --- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild +++ b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz" LICENSE="|| ( GPL-2+ LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86" IUSE="kernel_linux static-libs" # This is only supposed to work with Linux to begin with. diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild index 7b8e8421b759..3f696ca7327d 100644 --- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild +++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( GPL-2+ LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" IUSE="kernel_linux static-libs" # This is only supposed to work with Linux to begin with. diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest index 92edf8cb767f..64dee373e930 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -9,6 +9,8 @@ AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1 DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9 +DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 91a6ce4d2e1503f2bbff6f29c5819202e069a9fa06b033438ff4d98525fe389f8d11104ff4a058a83301e7ddea473599e277d6e2c8ba01db2bc0d0605761bcff SHA512 c828991bae9872304317d2436445df7d0db20f97a8902ba2a4effd12d6730bd66ec7b9130766baee6b7b31b076efed529afb811ca2f96b10298eadb4400a15ff EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663 +EBUILD lldpd-1.0.5.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511 diff --git a/net-misc/lldpd/lldpd-1.0.5.ebuild b/net-misc/lldpd/lldpd-1.0.5.ebuild new file mode 100644 index 000000000000..92e05bbf1444 --- /dev/null +++ b/net-misc/lldpd/lldpd-1.0.5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils user systemd bash-completion-r1 autotools + +DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" +HOMEPAGE="https://vincentbernat.github.com/lldpd/" +SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers + seccomp sonmp snmp static-libs test readline xml zsh-completion" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/libbsd + >=dev-libs/libevent-2.0.5:= + sys-libs/readline:0= + snmp? ( net-analyzer/net-snmp[extensible(+)] ) + xml? ( dev-libs/libxml2:= ) + seccomp? ( sys-libs/libseccomp:= ) + zsh-completion? ( app-shells/zsh )" +DEPEND="${RDEPEND} + test? ( dev-libs/check )" +BDEPEND="virtual/pkgconfig + doc? ( + graph? ( app-doc/doxygen[dot] ) + !graph? ( app-doc/doxygen ) + )" + +REQUIRED_USE="graph? ( doc )" + +PATCHES=( + "${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch" + "${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch" + "${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch" +) + +pkg_setup() { + ebegin "Creating lldpd user and group" + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} + eend $? +} + +src_prepare() { + default + + eautoreconf + elibtoolize +} + +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 + systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf +} diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 5cc5d269d357..5cf0c7407621 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -3,13 +3,14 @@ AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 BLAKE2B 1d0d66a9ec44855215a AUX memcached-1.4.17-EWOULDBLOCK.patch 506 BLAKE2B e6e7c597dc227f42c0af0cb45d99a802b2bbcf5af3f7bcc1de26305951e0396c879ceb2b651f21b199df0ffabdfcb739626111d0e086d12736603500860453bd SHA512 6ddd823154a384e7502e138528b8d391b9fe203366c56f14ae38ddb6d8b6394fd0297e5fad90cf94f7bc1e7d90e04e0aab17b545fe3f1d2a55f0e2158e9a98dc AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec1ffe6f9d47a5a1e3b676f70d25a675d4b4762a4d69915a81cc0e30036e74254ce08f93b625bc842ae0e4a6d7520798f85 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e AUX memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch 1470 BLAKE2B 987f8ff094ae43e8fe94458b70f413b994f0125b16987b7aca56bb0847f3c6ff10372cff4a4f12fa651cad72601fef6b4a45cfe0c05036e264f9c53f5846e686 SHA512 c0c139d82762c397cfb86307ab989b3c0a31547e3bccb8b13b4537e78b7f62a4b92aafc60e5cb092098a95038a9f93e8ee6be8702b130fafa11c81112a1fce69 +AUX memcached-1.6.0-gcc10.patch 1345 BLAKE2B 11c090522e694b640880606615f97303e07b35e1fe399bde38ff5fb22355287b3cee2690fc3f00ac05b2c834e5bf94bec48b8ee64b47c226e2517ea0694dba72 SHA512 59c7cc5060dc3e09d991223f5eca8b951c114e2b6e61a56089ad559d376e1e002b653a1ac8ae5556dafeb6d3fda911a4ab07f41b89e1a4474aba00921a393a10 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 -AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c05648e75dddea47cdacee09d073e138e72d3b8671c3538e2005049dcd05440083b03e25136b3fd206c4d9 SHA512 b7b68362a4e4b24e9db893b85c3959184d17ea0bf8346a38561235461cfc8c94cf6d546f1c31bbe34bb7ca3409db2209171dd08214d5f057d00c65885663992a +AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 -DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed -DIST memcached-1.5.21.tar.gz 532631 BLAKE2B eaed8eae81c7874c48dfc6df5611d83d21a69a19c9b79bddbf909d15f1c84b3c03416002bf0beff07a8e6502741ad6f776e1cc86cf4b16840ea83c727db3c80b SHA512 4ade3e15e6821b76f086b4933f5599248f8de7e7b2ae106dc8ecbc8a5073a1966e4c3956413fd57387bb88fca2c0e95b9a3ce7bfce19c42bec584a3268f06998 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa -EBUILD memcached-1.5.14.ebuild 2931 BLAKE2B 7e7051a674ed35ed33e0b1b4ded10a9191c408ee49d504c9fd8b5a039428b3a8db13402702591ec66ad642681416902386084b85702093864700c8e154b7c4cb SHA512 be0362596b9d6054de0423d6b450fb883889e2f548d4c2a105e3b26a97fea4194100b18ab64fa52926e5f5b4dce663435200e12857d2967e9e2ecd4e0fc5f8ae -EBUILD memcached-1.5.21-r1.ebuild 2966 BLAKE2B 21167f473b440b4a392dab1f34fa5db31365ffc0374d575a7f2159229edbfc10bc7e00cd2f0b63608ec69156c9f7cd28c51effba799635f4467efce2f39ba198 SHA512 bd16b38322d1aa577c85563aac5c115536b97102d97e655af5b84d69cacadf8bcb714143e695d2afd668eea62e01fcb1064bce948d6862d88ea2ca006fe4f4f8 -EBUILD memcached-1.5.22.ebuild 2968 BLAKE2B 18bd2d8ae49c0c0ad850e316b388ae752d782ee548a85924c0ef6163d4ad6a13d52f208596dbbb2ed23a31164a69f8ecd7efa091119de26c588dfac044b30099 SHA512 160923ef6bb1ed42c839ba16473188af5c86ce9db62c4780bae33ba882128a58f395d6b598fcf7bf10d9c1187983789706dc4f75922590e0956acc3bace4c921 +DIST memcached-1.6.2.tar.gz 536527 BLAKE2B e350ee10ed74d68206baa009fa49e30e6563a21fd617fc30c1c2695642f6a5f85662acc40471d903a54c26153ca904d1ce9fb3bcbc7bae5d06431069872ca812 SHA512 e695c1292fc85280be3d337990c37f6fcf85e1a73870d541b993335b12f33b31516b477c30169a40c7b5d24fac8c842fdc5f1f48348c5cafa593040229349640 +DIST memcached-1.6.3.tar.gz 538890 BLAKE2B 06d18dcfa00bead3d0d5e46a2660568544b0e6bf27b4f2c1759d9bf8170c0b5b78028303a530d651b4002053ec747b4c6a2dabc231b57cbbfa276ff1cc59f9f1 SHA512 f51248906f59eca3025dd8b56adcd49dcacbf706f66b0fbdafeb054a213d5595a8e13dc38a365cf852d3b1058f90a981f464e24025a4f33dccd09aa579f7cbbd +EBUILD memcached-1.5.22.ebuild 2956 BLAKE2B 149c5f1c78050f0b36086811f632ead56840a56edec63b1da22a3642c223b6fbe9eb01b55dd5f032cfad3ce540d6eeb68e34787dfca382c921fa85cc324033f2 SHA512 e05ce60c58028f51ef572dde0319d669aa9aa21c227cf7490bee0a9678144b3f11fe0a525421a2ae1c016cf0027d74bd3ec861c7aa1d83119a2d16301f29b490 +EBUILD memcached-1.6.2.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a +EBUILD memcached-1.6.3.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 diff --git a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch b/net-misc/memcached/files/memcached-1.6.0-gcc10.patch new file mode 100644 index 000000000000..d250b31e9129 --- /dev/null +++ b/net-misc/memcached/files/memcached-1.6.0-gcc10.patch @@ -0,0 +1,34 @@ +Subject: [PATCH] crc32c: fix multiple definitions + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Reported-By: Toralf Förster +Bug: https://bugs.gentoo.org/711982 +Signed-off-by: Robin H. Johnson + +diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.c memcached-1.6.0/crc32c.c +--- memcached-1.6.0.orig/crc32c.c 2019-10-21 01:48:04.000000000 -0700 ++++ memcached-1.6.0/crc32c.c 2020-03-10 22:19:07.610247164 -0700 +@@ -390,6 +390,7 @@ + #endif + /* Compute a CRC-32C. If the crc32 instruction is available, use the hardware + version. Otherwise, use the software version. */ ++crc_func crc32c; + void crc32c_init(void) { + #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__) + int sse42; +diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.h memcached-1.6.0/crc32c.h +--- memcached-1.6.0.orig/crc32c.h 2019-10-21 01:48:04.000000000 -0700 ++++ memcached-1.6.0/crc32c.h 2020-03-10 22:17:12.086974212 -0700 +@@ -2,7 +2,7 @@ + #define CRC32C_H + + typedef uint32_t (*crc_func)(uint32_t crc, const void *buf, size_t len); +-crc_func crc32c; ++extern crc_func crc32c; + + void crc32c_init(void); + diff --git a/net-misc/memcached/files/memcached.init2 b/net-misc/memcached/files/memcached.init2 index 4bdfec6b945c..412e8e0a953b 100644 --- a/net-misc/memcached/files/memcached.init2 +++ b/net-misc/memcached/files/memcached.init2 @@ -10,7 +10,7 @@ if [ -n "${CONF}" ]; then PIDFILE="${PIDBASE}.${CONF}.pid" CONFSRC="${CONFBASE}.${CONF}" if [ -f "${CONFSRC}" ]; then - source "${CONFSRC}" + . "${CONFSRC}" else eerror "The configuration file $CONFSRC was not found!" fi diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild deleted file mode 100644 index a2494271f3e9..000000000000 --- a/net-misc/memcached/memcached-1.5.14.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic systemd user - -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 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug sasl seccomp selinux slabs-reassign 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 )" -DEPEND="${RDEPEND} - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch" - epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" - 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 - default -} - -src_configure() { - econf \ - --disable-docs \ - $(use_enable sasl) - # 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_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() { - enewuser memcached -1 -1 /dev/null daemon - - 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" -} - -src_test() { - emake -j1 test -} diff --git a/net-misc/memcached/memcached-1.5.21-r1.ebuild b/net-misc/memcached/memcached-1.5.21-r1.ebuild deleted file mode 100644 index 98253142de8a..000000000000 --- a/net-misc/memcached/memcached-1.5.21-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools eutils 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug sasl seccomp selinux slabs-reassign 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 )" -DEPEND="${RDEPEND} - acct-user/memcached - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" - -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" - "${FILESDIR}/${PN}-1.5.21-hash-fix-build-failure-against-gcc-10.patch" -) - -src_prepare() { - 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 - default -} - -src_configure() { - econf \ - --disable-docs \ - $(use_enable sasl) - # 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_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" -} - -src_test() { - emake -j1 test -} diff --git a/net-misc/memcached/memcached-1.5.22.ebuild b/net-misc/memcached/memcached-1.5.22.ebuild index 4bd4eefadece..3fb1c6eddbcc 100644 --- a/net-misc/memcached/memcached-1.5.22.ebuild +++ b/net-misc/memcached/memcached-1.5.22.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/memcached/memcached-1.6.2.ebuild b/net-misc/memcached/memcached-1.6.2.ebuild new file mode 100644 index 000000000000..75cbb9370f34 --- /dev/null +++ b/net-misc/memcached/memcached-1.6.2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools eutils 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug sasl seccomp selinux slabs-reassign 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 )" +DEPEND="${RDEPEND} + acct-user/memcached + test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" + +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() { + 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 + default +} + +src_configure() { + econf \ + --disable-docs \ + $(use_enable sasl) + # 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_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" +} + +src_test() { + emake -j1 test +} diff --git a/net-misc/memcached/memcached-1.6.3.ebuild b/net-misc/memcached/memcached-1.6.3.ebuild new file mode 100644 index 000000000000..75cbb9370f34 --- /dev/null +++ b/net-misc/memcached/memcached-1.6.3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools eutils 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug sasl seccomp selinux slabs-reassign 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 )" +DEPEND="${RDEPEND} + acct-user/memcached + test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" + +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() { + 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 + default +} + +src_configure() { + econf \ + --disable-docs \ + $(use_enable sasl) + # 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_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" +} + +src_test() { + emake -j1 test +} diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index 68d3dcc4914b..4d04f5d719f9 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -1,5 +1,7 @@ AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856 DIST miniupnpd-2.1.20191006.tar.gz 243255 BLAKE2B 38654cfc0238cdd413600216b01465cbecda69589249df5b6500db7e0719053dae351ab8c61d763a7586924f68b6d634266a1020084f30261442ac62fbd17a5e SHA512 5de2dc5ffb6df7b06bcb6ab8d8fbb34aa5a229a8310938e980b4caf6b957ceab104c455cebb57d7083736fde2db9569fcdf98783a36c915d362f7ff2987e3599 +DIST miniupnpd-2.1.20200329.tar.gz 243725 BLAKE2B a9ca048744bc8f397e10bcc5e27638285d0000700855952cce4c2ba7959b2c9099e18045bd5e9103c67da79c90d04a2e505e064bcb1bbca5574437d4625101a5 SHA512 3f6a1a6f08924505a6db5ca5b1dbf7c59f8b48647c59a600799b020146422497248367767e41df0715bd9774129f2d8f95c4a63493af2db849bbe006231e6edf EBUILD miniupnpd-2.1.20191006.ebuild 1973 BLAKE2B 06623d2fd8d2b2e31c1c9515ffa34aa5f083662f78c3b4478ae7003768e4a272419a9654bdc4e201bb2871bb5c11dc16ca52144687786c2593c690afd40d2a7d SHA512 b231ba28a2dbbb676b76cc07706167d194f5d628f228d5585dd3dfd7effd1e79a2526d9f53912b3c32ee0e3ba1ce32f45d15d636afee3435ed6c59845c539cda -MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8 +EBUILD miniupnpd-2.1.20200329.ebuild 1973 BLAKE2B 37124c901c4055cca0a10b90e135fb31a85bb90f40d330ec765d28c9742173c38f856ebbde4cdf9e9f40c759ec090b53732fe4814b4297a2e6ef8b907a454e43 SHA512 2cad4ddaa9ea78cc1c8425499a268164fe4f4d93d34c27c5d88693946262a4490a9ff8047984dda9d7088ca82ed2a95e63c04ca5ee971e4eb014341f733005ba +MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135 diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml index 5f2aabe1313d..869bdf4a8a2f 100644 --- a/net-misc/miniupnpd/metadata.xml +++ b/net-misc/miniupnpd/metadata.xml @@ -9,9 +9,6 @@ mgorny@gentoo.org Michał Górny - - MiniUPnP Internet Gateway Device Deamon, used to allow UPnP enabled clients to forward ports. - Enable lease file. Build for IGDv2 instead of an IGDv1 diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild new file mode 100644 index 000000000000..a2f14c2708f1 --- /dev/null +++ b/net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="MiniUPnP IGD Daemon" +HOMEPAGE="http://miniupnp.free.fr/" +SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" + +RDEPEND=" + dev-libs/gmp:0= + sys-apps/util-linux:= + dev-libs/openssl:0= + !nftables? ( + >=net-firewall/iptables-1.4.6:0=[ipv6?] + net-libs/libnfnetlink:= + net-libs/libmnl:= + ) + nftables? ( + net-firewall/nftables + net-libs/libnftnl:= + net-libs/libmnl:= + )" +DEPEND="${RDEPEND} + sys-apps/lsb-release" + +src_prepare() { + default + + # Prevent overriding CFLAGS. + sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die + + mv "Makefile.linux$(usex nftables _nft '')" Makefile || die + + # Prevent gzipping manpage. + sed -i -e '/gzip/d' Makefile || die +} + +src_configure() { + local -a opts + opts=( + --vendorcfg + $(usex igd2 '--igd2' '') + $(usex ipv6 '--ipv6' '') + $(usex leasefile '--leasefile' '') + $(usex portinuse '--portinuse' '') + $(usex pcp-peer '--pcp-peer' '') + $(usex strict '--strict' '') + ) + + CONFIG_OPTIONS="${opts[*]}" emake config.h +} + +src_compile() { + # By default, it builds a bunch of unittests that are missing wrapper + # scripts in the tarball + emake CC="$(tc-getCC)" STRIP=true miniupnpd +} + +src_install() { + emake PREFIX="${ED}" STRIP=true install + + local confd_seds=() + if use nftables; then + confd_seds+=( -e 's/^iptables_scripts=/#&/' ) + else + confd_seds+=( -e 's/^nftables_scripts=/#&/' ) + fi + if ! use ipv6 || use nftables; then + confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) + fi + + newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} + newconfd - ${PN} < <(sed "${confd_seds[@]}" \ + "${FILESDIR}"/${PN}-conf.d-r2 || die) +} + +pkg_postinst() { + elog "Please correct the external interface in the top of the two" + elog "scripts in /etc/miniupnpd and edit the config file in there too" +} diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index 3b88b0182a65..51d6692d8b6d 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -1,3 +1,3 @@ DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a -EBUILD mobile-broadband-provider-info-20190618.ebuild 469 BLAKE2B 0e6a8f13b86c8721465f08ba1e2b31351fbf7827b7d03318adb2cbb6c5d9f83fc227f7e79a978233e1619cb20ef9a3ebde49c3b0baaa7288737ccaa69fcf39c6 SHA512 2dc183364ce0e2f0aa1c9d5ee11d26c0454dcb81d532dc303f6cc26e21ae87cc8e6888797b4f0cdc007a5d53e7be014f2bfe8f3be4599e5e34fc0fa32589430b +EBUILD mobile-broadband-provider-info-20190618.ebuild 470 BLAKE2B 9d9d40ba30f303390087623124a532137b5dc1e79fa28bafde4a6f38c85183866eabb271352a8e9519e0e67a2bafa97488ff7ff0aa231eedc032d3830d7956a8 SHA512 423cd903b8700934ca9d326022f35f578d93ebe0c1395205c0200872abe59b42a1a34c9737a2f472cd6cf1574a9b014a3434e78f2c69c2e46f4a5180ac1512b3 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild index 978626b1c2b6..f66c775c81e8 100644 --- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.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 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest index cf902111ef0a..02b36945a996 100644 --- a/net-misc/mosh/Manifest +++ b/net-misc/mosh/Manifest @@ -1,5 +1,5 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 -EBUILD mosh-1.3.2.ebuild 1508 BLAKE2B 0c1a6003e7bcf8e79c2c4709604ec71b5c9803993d66e994d6245aae6f35bb35b8a034a16a7778e85dcafca45afffb832147c0c47f27fec099747b69d3695cd0 SHA512 b2d59bf102a1596dfea8df9a5bf05d7e941c631722dfbed957452e38f450236f89138a934d45a65c0d901f017ab9c66e250f53ca56c8849f68a874dc93baeae7 +EBUILD mosh-1.3.2.ebuild 1509 BLAKE2B c4d9e6d0b10d7f97b1f43afbe5ed8069a1fca302877ac6b0abe91761d0486ed5e39fb70bf9e0acde444e91bd3ac4f9c0899da3b6b1e2c0c087f66edb3ad12913 SHA512 1de597aed7f93ad5081031c8e582620e2ae31e6b3b5410211c896f09ed37ec98c5e18112c60433d068fff62743d8473b3912f6f557db2f900d1324b8bd43002d EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e MISC metadata.xml 1046 BLAKE2B b82f683b0b6a236f78d9e46378e5bf14bfd1ff232045c9a56490e1d19a58767ba1f78647e57b60217aa3851059c4a96c4c8218fbd5387203ad34ee5f577e0f32 SHA512 a4d754df5abc7fec2838525e5fec6386086a4afbbd1132cb4360fcea8211f6bf1629a00b5ddc64faad8e89ccc9a8bc82a9467b6bbdedc6a7503447d84407589a diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild index 495e1433235b..bfd31a5abc1a 100644 --- a/net-misc/mosh/mosh-1.3.2.ebuild +++ b/net-misc/mosh/mosh-1.3.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+client examples libressl +mosh-hardening +server ufw +utempter" REQUIRED_USE=" diff --git a/net-misc/ncman/Manifest b/net-misc/ncman/Manifest index b3336633207a..21b244307952 100644 --- a/net-misc/ncman/Manifest +++ b/net-misc/ncman/Manifest @@ -1,4 +1,5 @@ DIST ncman-0.0.1_p20190327.tar.gz 51925 BLAKE2B 020092e64ccb55563cc891699550911411b67b749a49fb6bab4962857b59c93fb05109afacb88a5e42abc9030683af66aed2e44aaf0bd1cd8931c9df019bdc52 SHA512 24a3b3eec57987e290cc319e409e8da00f14e260360c606b3a89ee2e092976d0b1c256a4b1be40870bcaea620a482477c4aed53fa0e1719c297fc9edd524235e +EBUILD ncman-0.0.1_p20190327-r1.ebuild 796 BLAKE2B 65d65b1572418507a518e13d1b4e0861ff9cc3d7757dce42ddf7988449938857696e51a45360b535e59fc355574c972210e207469e70e1f0aed445ed648fa5eb SHA512 679cb7ff2b81998de0eb38ccf26bac798db605db0d750170ff98ee968d032663bba2c679675f96af3f3d9ecacace2a1f6c08cee2d7688c3d1822bf9fd0889d64 EBUILD ncman-0.0.1_p20190327.ebuild 536 BLAKE2B 55e75c03200470f58100bac93c67877aa380757a4715a12b14aaf572f6524e115d799c2d3c80a60a6469647c7a44f55853ccb221d26205bf3896d6c952c6896e SHA512 d480d1afc2c4909802177bc39c2326877775d02567b9e748cc4d8cef50b5d5996a534dda0b27936a9dfd064e787a6f5fcad97793350247e30c0a9001c833d124 -EBUILD ncman-9999.ebuild 487 BLAKE2B 5053e65e76f7e4bee0ddedf8297633252ce43539def4d979d8aae3b9badd84bf28e62819144530c85e0450f98d511c371b0a621c3b10d58f50eb9b2ea1a91791 SHA512 94392c706462a03c3ae0b495c8b88a22ad6b6d2e5e52e44184d69f4a8477b88cb79fcb07207212126786ad7a6dfa6410f34880b4f8e0caf6832da26429469669 +EBUILD ncman-9999.ebuild 756 BLAKE2B 5e763d6ee99f25641fec73594f59fa808c56e57a1cd12e424c85f48ad917f4215bfd8db2421f7b552d22c305648451fa2f2174b15c58cdbe25087111bb682205 SHA512 5eebcf6839e40d0abdf91a721f36d172ce69fd306b36ef021c4ed498fb9c7e3480125ea7d084f852df8485fdde0ecba32d1658085f61e3a0ef495c7b11957ffa MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8 diff --git a/net-misc/ncman/ncman-0.0.1_p20190327-r1.ebuild b/net-misc/ncman/ncman-0.0.1_p20190327-r1.ebuild new file mode 100644 index 000000000000..415581b6f27c --- /dev/null +++ b/net-misc/ncman/ncman-0.0.1_p20190327-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic meson +COMMIT="21a55145ddbc5d085e91352586875abe92cff73b" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI=https://github.com/l4rzy/ncman.git +else + SRC_URI="https://github.com/l4rzy/ncman/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="An ncurses UI for connman, forked from connman-json-client" +HOMEPAGE="https://github.com/l4rzy/ncman" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND="dev-libs/json-c:0= + >=sys-apps/dbus-1.4 + sys-libs/ncurses:0=" +DEPEND="${RDEPEND}" + +[[ ${PV} == *9999* ]] || S="${WORKDIR}/${PN}-${COMMIT}" + +src_prepare() { + default + append-cflags "-D_POSIX_C_SOURCE=200809L" +} diff --git a/net-misc/ncman/ncman-9999.ebuild b/net-misc/ncman/ncman-9999.ebuild index 54dde8ba11c3..045965709b3d 100644 --- a/net-misc/ncman/ncman-9999.ebuild +++ b/net-misc/ncman/ncman-9999.ebuild @@ -1,21 +1,34 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit meson git-r3 -COMMIT="bca0dc0a835f8a267be28d32b49775a50543d081" +inherit flag-o-matic meson +COMMIT="" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI=https://github.com/l4rzy/ncman.git +else + SRC_URI="https://github.com/l4rzy/ncman/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +fi DESCRIPTION="An ncurses UI for connman, forked from connman-json-client" HOMEPAGE="https://github.com/l4rzy/ncman" -EGIT_REPO_URI=https://github.com/l4rzy/ncman.git LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="" RDEPEND="dev-libs/json-c:0= >=sys-apps/dbus-1.4 sys-libs/ncurses:0=" DEPEND="${RDEPEND}" + +[[ ${PV} == *9999* ]] || S="${WORKDIR}/${PN}-${COMMIT}" + +src_prepare() { + default + append-cflags "-D_POSIX_C_SOURCE=200809L" +} diff --git a/net-misc/netdate/Manifest b/net-misc/netdate/Manifest index 344ff1c2121f..a32308e48492 100644 --- a/net-misc/netdate/Manifest +++ b/net-misc/netdate/Manifest @@ -1,3 +1,3 @@ DIST netdate-1.2.tar.bz2 7516 BLAKE2B b044f8294716a5660cab8c77cc9bfccf0f606a89f8b4d73d93a760f69bcdb4e48aaad7b6c0fbf7a22468e1f3aa1f026647159270456a989d9df65c3af458e3db SHA512 a6c3dde42dfb886a01a137485b1a52f4cfb00150bec3a9603a7475405cecd621c5604fe66e2d3e4fd50feee18ac9d60423231a377fc5629e465530b16b0ce918 -EBUILD netdate-1.2-r1.ebuild 476 BLAKE2B 67e8471dc38d62bdbd837c1e3a3655dda7fe785c243706566dec63134df7e7ec6aa3d7dc724611c6fbba0539abaf7b1b48cc3b25980e612f09dad8db4168e2ea SHA512 9f9ccb6349632ac4c48426c99f8e381f10ca9c160e93f733a3537c0161dc6c83d015962c78343df420327e56ad1e65a5c3ba0333701dc04a70377ec38e27ade9 +EBUILD netdate-1.2-r1.ebuild 473 BLAKE2B 92e3680499ffb503f7b3ae1b9a7c26df040e1511e4773e10170d884aa68ec018b638fa71705eeba4160924394da0f7997a381b58abf86465aa179ba60297bd18 SHA512 516bef64b437efacce16635bdb12c1404383f1e1be63a1978a2e00cea4a58bf047a6d47eaf5bb27382bda310eb3e5b5c82fcc62c582941ea4439527dc16d0c9c MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd diff --git a/net-misc/netdate/netdate-1.2-r1.ebuild b/net-misc/netdate/netdate-1.2-r1.ebuild index 6e61ada26064..64967d98b5cd 100644 --- a/net-misc/netdate/netdate-1.2-r1.ebuild +++ b/net-misc/netdate/netdate-1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 arm ~mips s390 sh sparc x86" +KEYWORDS="amd64 arm ~mips s390 sparc x86" S="${WORKDIR}/${PN}" diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest index 891f220eb614..3937b6317354 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -10,17 +10,17 @@ DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0 DIST netifrc-0.6.0.tar.bz2 83349 BLAKE2B d9be118aa2aa13891091f7b5060d06ce0bc1eb9740c5adec04b985785e7bd7afe77bc03751d178b8e09c967b04581b12cfbf50aa49b7226ab580081e420f22bc SHA512 de47d146619bd716a0eda8149063691d9d71a895579ac50d3fea60bf0e48c516d6b37aed81c33083dc6e7d4bb74841bb6b143c23972669de9d76b8f7df7a5d23 DIST netifrc-0.6.1.tar.gz 79791 BLAKE2B e38236d189ce0e40eaa5ba7b94e2e74e444bbd185fbacf515c65ca1f0ff441525cdc44696e12ff33e4ae1f80f2766a91866cfef8f9b737d34e1c59290248f49b SHA512 798a882f87f153c31b415d77a06a2beca94a958ea982aca20bbc2cf6a7d800aedbd99a577734ea41d6a75807b13d640dd7fa5a51aa5a27055e9c552634ac7bdb DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057 -EBUILD netifrc-0.2.2.ebuild 1728 BLAKE2B 54f3a6c3e18928fa3345fe3942fadb9a007a6692dde5c2627f18fd529818b1781be82170c2052c8f26bb653617c8d354e52b37a05a97f9e6c27453a4a477d3a8 SHA512 7039613715bc8913a04345951db59baf0f11f7aa17c2cce41f6d4aaef14fadfd0e45cc1bb7ad19419e27e5282867c2a3880f8755f9a7a94929938fbab9f49bc9 -EBUILD netifrc-0.2.3.ebuild 1740 BLAKE2B 9b13cd16968df313771ad16e1ae8d506bbe0814d882892742049b77940d11a7cdd54b0f8e227acfdc0c94797ac8148265fe61ee786db549edeaff8d628d7b623 SHA512 181f6a44fdb6e045f7edf84d910052c7a8b9c5457137cd876009eb74e72d09aa3b210439c615385eb9bc709b1f5e52aa5bf85d08c3f82ec37324dc345a0efce5 -EBUILD netifrc-0.2.4.ebuild 1750 BLAKE2B 518753a13579c8a81cc4f63756c1439b581f1e819c06a78ed62d05057404be20d5c2767c65031b3b87e997b8ea0146b7649f05b0d2c9e0fb46be148cc1f2f45d SHA512 3604201c0686ef814436476b7ee6f85d154af6c458d8563643e74808d8f40686bf35fc0171f1457afd6ca15670318d4ec4ebbc3c25d8d2c5d19e549e92c0cf80 -EBUILD netifrc-0.3.0.ebuild 2037 BLAKE2B 34b10741c38a3e825315fa26dfa612277f54e895a47ed29cb4ae724f2e280d9da5ab5bd360dcb85d4bec94a7255288067447a676bda4a5a5e49994bd005fd9ba SHA512 bf59226ccc042aee17251f8db873e98aa7ab50c36c0499c0de6866f7715ba4923c9763b9c552051470c281e9a8bbebc516c2dffb4fe2dffafead86b6aeeb4dcb -EBUILD netifrc-0.3.1.ebuild 2077 BLAKE2B 53b8474b989d61b1a5f90f611ffa3990292ba62206a8e8a8653ef4e6c5d94eb82f90560752728919782a1b8a67bb83ba40363f971bfaae21b12b9a959e0f21cb SHA512 677453b6f75e3c84119344754e33eaeda0872595ed35b3c3605459d08f45a3d234003c5ff696825f93a0e4cf19570c229a43281358fb5076490aa883e406cfb2 -EBUILD netifrc-0.4.0-r1.ebuild 2164 BLAKE2B fc4be5ab81283a5b19d74a5bdc1b20af2c92b695670004ff13c8f340e41ddafc2fe4e79436c031acb5ce9dfdb5de680a875100aa612192c7b5130dcd1175790a SHA512 c6e5401a004cecbaf1ff3071f959cc9ae4a26fea0b6ec7ed5928d3e462330f56d56e36177bab4c770e51fcb3c0990fd031abd3228b58bf5c253cba3d4fff8d10 -EBUILD netifrc-0.4.0.ebuild 2077 BLAKE2B 53b8474b989d61b1a5f90f611ffa3990292ba62206a8e8a8653ef4e6c5d94eb82f90560752728919782a1b8a67bb83ba40363f971bfaae21b12b9a959e0f21cb SHA512 677453b6f75e3c84119344754e33eaeda0872595ed35b3c3605459d08f45a3d234003c5ff696825f93a0e4cf19570c229a43281358fb5076490aa883e406cfb2 -EBUILD netifrc-0.5.0.ebuild 2107 BLAKE2B cb511b7877a11311c99e442cbfd0c9509ec61a24c1fef7bced478921fd4c0eca4fbca2dae2294b7010e888bd541199cbb68be5e343664dfe1202cf48e224413d SHA512 e34604ba3cc0a2e1202b87859c41203e02ede79414e5cf9ffea0e83e3df643c576a8d67a9ecfe6f4f09cbc3443391e2412996e2c3c2cfc1f80a69e7dcd8ddc40 -EBUILD netifrc-0.5.1.ebuild 2102 BLAKE2B c5ed290ef8807ea158fd8b84d741e482098e3fdecd2151a53bf02cb2d63fa42d26c2ee7e90ddf6054f0ba426f45f19ba2f9926a30e90a5682d382543b24d4666 SHA512 2f2b183f4878da96cadffaee07fab5298d22edce617fa5620e48b6fb5e414f9f2382dc9988d9b62f00a2771e7a564573f6591930535c32d4cfd16b71ec00c752 -EBUILD netifrc-0.6.0.ebuild 2114 BLAKE2B 80565920a07a1de3fe6112cae523a21c7354c5bd876e6fbe53d88660179c80994b9cb433cd2ca58d9deb747b1dcacb4909c025d7ba4a95e2b51a46c1815797bf SHA512 2401252fce0214771c6faa2f55fa102036737e52fc015e4cf6144159843ef33830bec346886233ab47152f86e50517e6c3bc0dda473f170abd8ff1fada6709da -EBUILD netifrc-0.6.1.ebuild 2111 BLAKE2B a8f3d6ca6878a471b23ad17adba890be84dae7b3cd649a5aeb03a6c5e7d3b67a0078d95b683e87306911575993c76bd9d05cf2f8d654416b5485518a8d6cde65 SHA512 bedf3327eb612ac56f1235d36f3e4df76a5b5289cad01f1c55c825bf14494e692912eba61afd76f2751e5caf25742a58c0f00ef7a34568cd65a6e11363c551d4 -EBUILD netifrc-0.7.1.ebuild 2111 BLAKE2B a8f3d6ca6878a471b23ad17adba890be84dae7b3cd649a5aeb03a6c5e7d3b67a0078d95b683e87306911575993c76bd9d05cf2f8d654416b5485518a8d6cde65 SHA512 bedf3327eb612ac56f1235d36f3e4df76a5b5289cad01f1c55c825bf14494e692912eba61afd76f2751e5caf25742a58c0f00ef7a34568cd65a6e11363c551d4 -EBUILD netifrc-9999.ebuild 2111 BLAKE2B a8f3d6ca6878a471b23ad17adba890be84dae7b3cd649a5aeb03a6c5e7d3b67a0078d95b683e87306911575993c76bd9d05cf2f8d654416b5485518a8d6cde65 SHA512 bedf3327eb612ac56f1235d36f3e4df76a5b5289cad01f1c55c825bf14494e692912eba61afd76f2751e5caf25742a58c0f00ef7a34568cd65a6e11363c551d4 +EBUILD netifrc-0.2.2.ebuild 1726 BLAKE2B 286e8e33de6ed86e91f871489aa3a4a67f8733e517794fa954fe819d5d6b1dda195a80e1f8248748aa705084b6c6877136ab2d14793ae79dc276407e7eb036d6 SHA512 c765c9d967942769b08d9270e888d98f9dd87dcbb52ab94489f2a512fbd2be2312dfbac6ac36f95bc4137101f3a2422b79002c4bed94a291f6bc2df5bdc0b09d +EBUILD netifrc-0.2.3.ebuild 1736 BLAKE2B 8254d8d6ad1556cb2ede16ccc02c30c9fd3f23ec80dd8847f7a692a93f323a436d798f3322b82fb7f74e1d18526ee004a1bc25c783f07a73d851b234a25bc3cf SHA512 e7ecd34f99f1e9b935cd7430ae1541dd204286685196d9d0989a726cb5397b054018f9020e70a79cf20af7b852bbcbe59ec218d2bf18b17bcbdaa84548253a4d +EBUILD netifrc-0.2.4.ebuild 1746 BLAKE2B 16eed1c70419ef978d1e44d90058a941e7629eea19ae92a25ccd28b54d0377f4cc7207c2d49a2db6e149c28a0ccf3255ed8a368decf37e3a6ac76fe75a826be9 SHA512 44d2f887fb4b193e2b27ba848a76937d873afb69a46b14c7f38b0195fceb75655d2e087b0918335c5b79efaf97719416ddec488b1e5e95e434e7de384cb041c3 +EBUILD netifrc-0.3.0.ebuild 2033 BLAKE2B 51b308529343a408c5ad021545b736518c1637acf495cece0f11679b3b736468f0ec25a33cab18991a6c2e0654fdacf1c7ac2a1dab3145e26bbe81cc0a6b1748 SHA512 1ae2345f33360a84b629633b3a364ee2f650e82d4582ef8c10df005ee829935b454d94f1c2549b78836e843f4f15a7646d1b8d3bec61f92916cea8164ea42f12 +EBUILD netifrc-0.3.1.ebuild 2073 BLAKE2B eebb8de22d87dd16ecda5b266f927822b0a350433315ad1e8cf2674b53ded995d4185640f795180590275126aa0ae5609608ab97a2fe2b3a932527d0d86320af SHA512 61c4fe4eb645ab0d839fb45251119a74bb469183275535dd08ab7d4704c1fc0013d16f8e3912ea4a40b1e43b22091ad63f4d57ad883c46b669fba7a66ffa4069 +EBUILD netifrc-0.4.0-r1.ebuild 2160 BLAKE2B 58a4797e0c9c275422adbfecd1129cbc3ad782ddd4ff9b63fff85816083a9c95e036856eb875a0edfb142418e2a675ac49da610ab78def618d37650b9f8c4400 SHA512 e2dde7da1b20191bf75c245f867f95e6e16541817b7bd5486ab108c5e239f9dde70af7e38c727fbb1d521e67b1728a73bab4417e78545a2a2971b3691b361f90 +EBUILD netifrc-0.4.0.ebuild 2073 BLAKE2B eebb8de22d87dd16ecda5b266f927822b0a350433315ad1e8cf2674b53ded995d4185640f795180590275126aa0ae5609608ab97a2fe2b3a932527d0d86320af SHA512 61c4fe4eb645ab0d839fb45251119a74bb469183275535dd08ab7d4704c1fc0013d16f8e3912ea4a40b1e43b22091ad63f4d57ad883c46b669fba7a66ffa4069 +EBUILD netifrc-0.5.0.ebuild 2103 BLAKE2B c87544a899e967ce56be77e677664a588a9c6222de1d08e2838b1ccc04229b1c1fb3a9efda6bf047f762a0d1550fe4f61b3071773437fd5ab102980e8e042a49 SHA512 97a9e16495d9ef221d8e14379a287c05dfd96b3d8cb47ed3823b32a99569524df5e663c7bf2a5e50e3659aec0db0dcedc8124dba784654005c8f643d6b0cc734 +EBUILD netifrc-0.5.1.ebuild 2100 BLAKE2B e51e6dd472a669be9ac50acf33e0dbaac22cf28e8fb1834258e44225cd01084dfbada84baa3a1e2598d3e2236b3f96ce0c61e837a13ca5dfa10f8cf771fa8321 SHA512 f71dab7d8c77f0e8f90806b73820bdbf1af64e9dec859d37364195500f01654606e6848ff43ba43d02f92ad27ffd1ca8360457a0ee68005a9c13b62b32362c5e +EBUILD netifrc-0.6.0.ebuild 2110 BLAKE2B 1cc7cf7c26c984109a6c39dde54971f88b0e434bf130ecc6c740ba957521c1f91de21304bc24177eb5fccf62b6ea0e8708aff923062fe9eb1cf04fa9207b8229 SHA512 0af435ff1c2e5ba82f9409b2d99bbfe383c28af573f136e2a4ac8c9b23140eb6f7a26632ac7a8fc15ff476a4ac74c0194bf6478e742d8bef8fcd8beb8f060fb6 +EBUILD netifrc-0.6.1.ebuild 2107 BLAKE2B df9887c875af7324b522afdfaf8ee0651d0b1164d3b98dfe327def8e55723166a545dda9488d31f305201155bb6ce5c56869cd87066a5e9066681872288cff0a SHA512 05e08326565c87263228f4f854336fdfaedfa0ff762c8fd8e36a5ebd82c9d81ead2817ba7ffb858c2ee3259dd6484a433e0af0d9fab8d27789b23fb1c7dd71fe +EBUILD netifrc-0.7.1.ebuild 2099 BLAKE2B a8469f41f1feb23313425d4f4224fe4c93a73d226667bfb2965940491b71bb9d7272a0feaf76eaf820a56b4e69c2d2975833d55aa715e5f8e9365e38c641d4d0 SHA512 4d344118f4d6878a3e6b2461ce013457b211103248b8d8945e76559300e29544012c28d087a0f2f855a8f6bff960b9cc1b99fd0216d945e228770c2c7b6196ba +EBUILD netifrc-9999.ebuild 2107 BLAKE2B df9887c875af7324b522afdfaf8ee0651d0b1164d3b98dfe327def8e55723166a545dda9488d31f305201155bb6ce5c56869cd87066a5e9066681872288cff0a SHA512 05e08326565c87263228f4f854336fdfaedfa0ff762c8fd8e36a5ebd82c9d81ead2817ba7ffb858c2ee3259dd6484a433e0af0d9fab8d27789b23fb1c7dd71fe MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5 diff --git a/net-misc/netifrc/netifrc-0.2.2.ebuild b/net-misc/netifrc/netifrc-0.2.2.ebuild index 6081f5a93550..70a9a797878c 100644 --- a/net-misc/netifrc/netifrc-0.2.2.ebuild +++ b/net-misc/netifrc/netifrc-0.2.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-2 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.2.3.ebuild b/net-misc/netifrc/netifrc-0.2.3.ebuild index b319f4a06c18..de75c551b62c 100644 --- a/net-misc/netifrc/netifrc-0.2.3.ebuild +++ b/net-misc/netifrc/netifrc-0.2.3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-2 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.2.4.ebuild b/net-misc/netifrc/netifrc-0.2.4.ebuild index a2917e7c6a10..1badea6f8fe3 100644 --- a/net-misc/netifrc/netifrc-0.2.4.ebuild +++ b/net-misc/netifrc/netifrc-0.2.4.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-2 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.3.0.ebuild b/net-misc/netifrc/netifrc-0.3.0.ebuild index d592a9dd0ce7..84585ecbe754 100644 --- a/net-misc/netifrc/netifrc-0.3.0.ebuild +++ b/net-misc/netifrc/netifrc-0.3.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.3.1.ebuild b/net-misc/netifrc/netifrc-0.3.1.ebuild index 08120d913607..d3bea305aa39 100644 --- a/net-misc/netifrc/netifrc-0.3.1.ebuild +++ b/net-misc/netifrc/netifrc-0.3.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild index 93fcd558f62e..d7ce7aded1a4 100644 --- a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild +++ b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.4.0.ebuild b/net-misc/netifrc/netifrc-0.4.0.ebuild index 08120d913607..d3bea305aa39 100644 --- a/net-misc/netifrc/netifrc-0.4.0.ebuild +++ b/net-misc/netifrc/netifrc-0.4.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.5.0.ebuild b/net-misc/netifrc/netifrc-0.5.0.ebuild index 229ea9afb268..2b64f017563b 100644 --- a/net-misc/netifrc/netifrc-0.5.0.ebuild +++ b/net-misc/netifrc/netifrc-0.5.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild index bd74069f6d4f..ec5504ee9114 100644 --- a/net-misc/netifrc/netifrc-0.5.1.ebuild +++ b/net-misc/netifrc/netifrc-0.5.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.6.0.ebuild b/net-misc/netifrc/netifrc-0.6.0.ebuild index 98c3339d853b..bb7be675c2be 100644 --- a/net-misc/netifrc/netifrc-0.6.0.ebuild +++ b/net-misc/netifrc/netifrc-0.6.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.6.1.ebuild b/net-misc/netifrc/netifrc-0.6.1.ebuild index 2718eb87d9b2..fa0a59bb5e63 100644 --- a/net-misc/netifrc/netifrc-0.6.1.ebuild +++ b/net-misc/netifrc/netifrc-0.6.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-0.7.1.ebuild b/net-misc/netifrc/netifrc-0.7.1.ebuild index 2718eb87d9b2..6e2ab1bd5d2c 100644 --- a/net-misc/netifrc/netifrc-0.7.1.ebuild +++ b/net-misc/netifrc/netifrc-0.7.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="BSD-2" diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild index 2718eb87d9b2..fa0a59bb5e63 100644 --- a/net-misc/netifrc/netifrc-9999.ebuild +++ b/net-misc/netifrc/netifrc-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="BSD-2" diff --git a/net-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest index e7a4dc2a0f8d..ad7414090632 100644 --- a/net-misc/netkit-fingerd/Manifest +++ b/net-misc/netkit-fingerd/Manifest @@ -2,5 +2,5 @@ AUX fingerd.xinetd 250 BLAKE2B 0b9a1e2af0bcf4223ae8919245c1b9696693c07adc9c6aed2 AUX netkit-fingerd-0.17-name-check.patch 681 BLAKE2B 89b120b47f3d3ad0599b28586e455a8c5a25f93d9afe81ab55e69e12474c9706e63845d86c6405e4e3a31b2b5205b132b7c7d371c5e7d9c5e7b68dfc15ce2446 SHA512 832afddbf7c5d9985fd5ffd87f3354be1c2aba4a82146e2ebfca81045c80b91238b31f94ef72409042e8fd8c250108d2d29feb3a1ce1acd77769d3df8a09c23a AUX netkit-fingerd-0.17-r2-gentoo.diff 603 BLAKE2B c17544baf5fb2cdec8172a4f9d833d575858b606e1dced6793ae4d7d6593d6ec416b7c35324c0dd39dad38a322d8cdbaa0135f79ee8bc2114a2bcaf30b7b4dc0 SHA512 1948a9c350a31497fa681aa6061ac859a5a3b18b9efb4b87a323a45a1472c6ddc31e50da33b891701f2e7196ea6fa07a40c31575ba261f9c2f3a6e28b35dbbb1 DIST bsd-finger_0.17.orig.tar.gz 25521 BLAKE2B 4b8eb07d057d2ef2bfea5987820ad6aed7c73e2365fc78c7dcf76be0f74a3056ccf5115c3b58f3235384caaacda76dc38e4ce51713fa1c28c10160232213f348 SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0 -EBUILD netkit-fingerd-0.17-r3.ebuild 1139 BLAKE2B 5db9d63732450e8366817d0e88df0089f39aea097415de2cef1169d0b2a8460e0e588c8f5fe546ab19b1407e2e05df0ac1ce90f5fa7aaee008c8bc6e57f72beb SHA512 067e21ef6837f259444306737d4fc381c06ed2a2e9b8e1f18ad7d437c288c24484e9c867f58322131b4cbefc19de42e6ab4df69fee2b79a9ddc16135da919b72 +EBUILD netkit-fingerd-0.17-r3.ebuild 1137 BLAKE2B bcb8970ac6ead95d7f0e0268617f9f45fbdcafbf36af694467a8a3434ccb30f6069e5a5a6625ff5be178bba7bea858bd56a5c80e91e37be359000e49dd9ed6df SHA512 a76888bda9548c73513b1d12afe43c79986f1c77752b8c706f76aa7501b5cfad3945cc5f4070fbbf469cb67c858aa7d8821bd5e8d38fb8ae8fc3e8f880658c4c MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 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 05b6c4462dfd..481fc0b95a56 100644 --- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild +++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86" IUSE="" S=${WORKDIR}/${MY_PN}-${PV} diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest index 87bc4ec300df..609e5e8c4272 100644 --- a/net-misc/netkit-rsh/Manifest +++ b/net-misc/netkit-rsh/Manifest @@ -7,5 +7,5 @@ AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f9388156 DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48ec178c1d2c58e49f454eadd514ed76e3653fde1d21cd19f7a3400762e6fb4d4bb2f9cfefebbf042ef5bf1903d67ebbe17254515 SHA512 0d9c6a8a8d13264b8f2eb6b62e6c65b67cf8b09bd36043acae405c7b2154724733db15d653e4f7ac7d21feebcfa6cd365ca89993fc77eabc5a709d7a6383b187 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a -EBUILD netkit-rsh-0.17-r10.ebuild 1759 BLAKE2B 12f49955c1763f9d5bccd2fe9aecf641e7dd55802647f0cdf46b0ded063860dd931cd5b57b227e89daafae5d774bc81939219bb846e723e748ebbb76ce3a6d00 SHA512 aab8bfb775964f37055f461b668d8cceeec9df6ca3d0fc80ee561ecc9435defab7726a36a86488ce108c298953c25bb11215cacb9a5f4ae257b27cb5f23ff0e8 +EBUILD netkit-rsh-0.17-r10.ebuild 1757 BLAKE2B cbf61cba73e84a9a5641722e8f8fe73cab27fe8c8303b6e0d3df8a98fdb81b32262d8b0e42d100b278fcc798d38ad88847c2e7982aa3d17772a7275b15df8d73 SHA512 1b8a2beb0ba0edda04ff1b321a5946d036cb8900dc009a39916de72f4956d1590f35ca856fa17e3178f08434d2bcb9fa21e0757ba78c4958f7f71a7e52e3ded9 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild index 7202e33be2d8..9e6546a5c818 100644 --- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild +++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild @@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="pam" RDEPEND=">=sys-libs/ncurses-5.2 diff --git a/net-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest index a23f405f0706..f5a2de7bd467 100644 --- a/net-misc/netkit-talk/Manifest +++ b/net-misc/netkit-talk/Manifest @@ -2,5 +2,5 @@ AUX netkit-talk-0.17-ipv6.diff 1587 BLAKE2B 82947b16ee0a8fbe3622de9109dd3dbb504d AUX netkit-talk-0.17-time.patch 385 BLAKE2B 5b49b4d562507c6b60911379e0623e17a2c5b25ec6ea1dc5f85c72e67823fac86b6152cde241e9823feb118c7e706b502031c583e216481cda7b5a47804ecbd1 SHA512 4da0417515e8e357cdc3b5b46b3edaa324dba767ae9dea6aa374ac8e4cf835dc0a4766684edc1e2b254840858721558a1e29940ea95ae274b06ded99fbf5499f AUX talk.xinetd 265 BLAKE2B 94381bf30fa51682b9dd272174cd8a3fed94233ff8ec654044419016a3adedbfac4e0db1f86c3851c9f7aa1c63d6e7411def635ecd3aa8cc88ec4d50656985c8 SHA512 f4f29a6e57aa80ffd6acc45b3c4a5bc5086fc6061f8d9bdfbe4fea4f874cedbdd5f85f60e311aa473e53119c16c42289161011699d24b944992aee0aec9ccb1f DIST netkit-ntalk-0.17.tar.gz 37396 BLAKE2B cdc7af27bb5f0b6b1139e3d8b33ecc3d4c661a76ee9de4cca8f5954251a30b5b3dc926ff906a7b51223b1c8590ff99a408ca07642c454bfd095b91fff482dffb SHA512 5a886c0f73179060f926d4af781a6b9d4de7b62562a69db7b93c4fd783ad12b488ee967af18e5a11f98e7f94d659c1688d2a3d4ba4a00bdec31869aa39a321c5 -EBUILD netkit-talk-0.17-r5.ebuild 1186 BLAKE2B 874313cefcb77f50c1c8756d887f02d67f5df14097bbe9ac16790124409ff43b4dd608476d000be12eeecd28301b6f1864ca86172a30edf5f9d02f83eefb7873 SHA512 09c5cde48424343d6652c92d0a72e793140ba8c482b1dd3c245b3835c843d526149f7d5bf2d9842fb00f1c88c01c86c180ccd93f9f2ff5935e081c0b71ed33b8 +EBUILD netkit-talk-0.17-r5.ebuild 1187 BLAKE2B 93752a7e929e07adc49dbb65a2d224e2dd962695928e174c536578e2e5703937f7ebd5f508c86f3b9bd7067df58fca4881df4c1ad78225e65e8a2063590a04f3 SHA512 f59ef2addaae30f34bb7362c364e79209eeac176837a4669ee3e35f34d8740f12f76f292bb92ef29db56af5af528d813a8a4515c85415b011666354548cb7116 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild index f0de376d0ffe..6a101eac63ab 100644 --- a/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild +++ b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild @@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="ipv6" COMMON_DEPEND=">=sys-libs/ncurses-5.2" diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest index e825a8d3472b..2e95696b66cc 100644 --- a/net-misc/netkit-telnetd/Manifest +++ b/net-misc/netkit-telnetd/Manifest @@ -4,6 +4,6 @@ AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d45 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3 DIST netkit-telnet_0.17-36.diff.gz 27226 BLAKE2B c19370f6462295bb7e8d09307121ec3356e9d1751b3ce5b7985844f54506351f633de381ffb3cd3209995c1826aaaa9ce716084742d4689d626b28aee8a3eb43 SHA512 7cd1ec5f96fcacee551700d65f62b6c217e0d9b5220a218aa60fceb3883d0754831606a247355dc2bf6486a02175b8d9b27058d6bc788de8e1b80545fdedbf9a DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c -EBUILD netkit-telnetd-0.17-r10.ebuild 2479 BLAKE2B 83a574cc11e77c557021f9b81f0a2d06791241503aeac7b5abe5a4938dd2f24fc276cad2945c30e144f355d347ff58d857f6a5d61b2b452cb2523e6fb75b8bf3 SHA512 9f74811026e3c390606edfcbda7b2c5aef36bb131621aa919581ad768ee97302da974995e8b433464a7adf62b3dcffe3443a90dcec3d753427912406ece33181 -EBUILD netkit-telnetd-0.17-r12.ebuild 2510 BLAKE2B ab803c9689175733cc7daea94d042815c81834d1c62a4e0bc1655eda5b862334950d81515711d289d3e4da4b62a64292e9bf6c15f43510f00cb5ea4ed6062b3e SHA512 a9e8ee0c760810d365bab47f6278840076c52ebdcabe0d63175a2f3cc13fe0138bb7c926c1a034588737679ada21d09a9a28c9ab8316a18f5075f7e5b97a9c00 -MISC metadata.xml 598 BLAKE2B d8e784ee117674b8820d1dda844282c296535255872239741bd8fd731a27979ea6b4e2fa276ff16bae355934a34f87cc0fe1bfe99e1d4d36f824d806a22dd735 SHA512 0e67cc6f6f92fd784726eb82124652850e84be55006f00fd4b8071272219f7d9581d2f52c82df26a509a6dd1abcfe8ea7cb0c1eb442750a3700d637163335f83 +EBUILD netkit-telnetd-0.17-r10.ebuild 2477 BLAKE2B 7719524ef10775ac242aff780e1d272cd1b064577dcc45b83c3a974ac4923a88735859071c5c1403c3d5118a8e5944fe05b3f4f52b4818279e157146a6b2676a SHA512 dc261e2c8a9cbc0555fb6d4016f6914002630449fe74ce152d0eba4db15f31cc88d0608b40d8a2c12d2c0de999abd333ee8f571ac28370ac3cfa565d6415810d +EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 6024fe44a87d4598e78056042911ac5144d68536f24c5135fdace3a408772aeda0ba6741d081048858392037c97d75d20f1f936b3b3500cba1d53b90480df7fc SHA512 d9bc334131caca69607979d1416d909188c367f0e9fcc6d2494bac8ad2f558cf668a3d448daa19da87adf455adf4ce37802fde2bea0dab1c4d5a052805c2e5d5 +MISC metadata.xml 462 BLAKE2B 430d6a3e7d34a5dd9a1601da947199fbd2c5b7baed723525064ae6335e02b59e6cbd8309a82f864cf9a8bb245f49ae01155f7effa8412ea91dd792585decd296 SHA512 f607e0ea0ea03ae7f941c5e27672b8b46bd14164460a8b2c86e4d57df68b549668f9298413f7293dd96dab53d18bd19c46f55e7e77a88ed581553c4502a8f3c2 diff --git a/net-misc/netkit-telnetd/metadata.xml b/net-misc/netkit-telnetd/metadata.xml index 428ad1b85200..bd198f872437 100644 --- a/net-misc/netkit-telnetd/metadata.xml +++ b/net-misc/netkit-telnetd/metadata.xml @@ -9,7 +9,6 @@ proxy-maint@gentoo.org Gentoo Proxy Maintainers Project - The telnetd program is a server which supports the DARPA telnet interactive communication protocol. netkit-telnet diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild index a543bc37a961..9d8090cf6e5b 100644 --- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild +++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="" DEPEND=">=sys-libs/ncurses-5.2:= diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild index e041e858c76c..aacfc0d9e905 100644 --- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild +++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" DEPEND=">=sys-libs/ncurses-5.2:= @@ -46,7 +46,7 @@ src_prepare() { # Fix portability issues. sed -i \ - -e 's:echo -n:printf %s:' \ + -e 's/echo -n/printf %s/' \ configure || die default } @@ -58,9 +58,9 @@ src_configure() { ./configure --prefix=/usr || die sed -i \ - -e "s:-pipe -O2:${CFLAGS}:" \ - -e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \ - -e "s:-Wpointer-arith::" \ + -e "s/-pipe -O2/${CFLAGS}/" \ + -e "s/^\(LDFLAGS=\).*/\1${LDFLAGS}/" \ + -e "s/-Wpointer-arith//" \ MCONFIG || die } diff --git a/net-misc/netpipe/Manifest b/net-misc/netpipe/Manifest index 18db9b28e2db..3915423bd76e 100644 --- a/net-misc/netpipe/Manifest +++ b/net-misc/netpipe/Manifest @@ -1,3 +1,3 @@ DIST netpipe-1.0.0_beta2.tar.gz 30593 BLAKE2B 862f2a104a1d195d1a5244b1ed4183f8cff70807e22de60b13631b7c3653eb628e6c4736c9d8b1e755bf0ab6f31b813f99f1700427ec9e62cd333e7195736014 SHA512 ce21a8bd298db990b7981a5501e70bbf8d6eac9d802d1f01c41d47f02ee9afb6fb095478496590f470318463491ec36da920047d668d2a8abe1e7559f53b1a37 -EBUILD netpipe-1.0.0_beta2-r2.ebuild 651 BLAKE2B 3659cabb524d9f7c0c52250572c69ac33d596bccb6f350a4e116ac45086eeed2a7282bad0fac850f4b4c320572388d3dc8a78f298ce88d3f037bcdcb6620facb SHA512 5a5eca89d93808a13d7447ebf3ea2d988846fe5e6de8cf7b86fa48152e66ede3b29b2a4623e324db81e954b667f0f739288819c12d0defb11565c3d56832cf60 +EBUILD netpipe-1.0.0_beta2-r2.ebuild 651 BLAKE2B 09ad541b293569f4bda401e83414fb29d9f6d107c02a51274a942d7c6ea961698d7e0b45a4480d6b3dcd6931e84866c9c8dc0fb97f0bad753b977c565192055b SHA512 8449fbd5002b99d911337e4057d576a8fa33311095b6f5185fd9be53868c35c328bc379795a570a7ffbd4376960e287750449749b53a24ffa1ce0982ed6dccea MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild b/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild index 21048b7642dc..8aa545bdb714 100644 --- a/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild +++ b/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,8 +18,8 @@ S="${WORKDIR}/${PN}" src_prepare() { sed -i \ - -e "s:^OPT=.*:OPT = ${CFLAGS} ${LDFLAGS}:" \ - -e "s:^CC=.*:CC = $(tc-getCC):" \ + -e "s|^OPT=.*|OPT = ${CFLAGS} ${LDFLAGS}|" \ + -e "s|^CC=.*|CC = $(tc-getCC)|" \ Makefile || die "sed failed" default } diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index ed38bc14311e..dcf02dbd49ea 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -3,8 +3,13 @@ AUX 1.18.4-iwd1-compat.patch 3033 BLAKE2B 4f25f0f425ad13a91776d11d3df4d153f0ebdd AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658 +AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 179dfdcdb97bfc66adbeb58ca0e0b8f95f6d1cc0687fef338bc25ac59b4dc83e20e547d419ef8cea482c6302a05bbce8279c868f00c0cb173f42ebdc6a4bdcae SHA512 ab3e96bbd88b4a5c0aac59dc8de437be78f2e77762d6bc9c99e3b1ff1d7db39a054c4fd9ba9e2f6f9907da1ef66c8af310562addaa79ecd9e9812564f609a273 AUX networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch 1350 BLAKE2B 4cffb7d29c1ffdff7106485e2fe1a74ec403c8b9cb5235a066021fd91d0231aef7b9f621cd82706e58adbe27085d13600a651f5957e6a20f3ca241af483cf88c SHA512 f541c873f097b8424e04fdc0fb2ca6256a3e17cb60021f1c931908ff39bbf95de3e40975ea62b19c18aa35476a5f7e07fc96135a0fb0bc1128acc5b62724bd3e DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350 +DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1 +DIST NetworkManager-1.22.8.tar.bz2 6291982 BLAKE2B f02ca4006c7ccedc30f2a54cc15f9e0e44fb0fd00114ea1f634a1c72b422083d6bcd0b4ac23404da4eb2d278d97708776e925bb37a13394e97563053e3330e3d SHA512 af598bcb192a2f48703cd7a995823b3f9c53c3f658e29a0cc939f4436d38417ae57f44dc7da75581a9caff32bc572b57bae7ad4a56930178ae0f0003e0a44973 EBUILD networkmanager-1.18.4-r1.ebuild 11313 BLAKE2B 64307633192d02edf3d4d623588cfe7ab009e2a668daee04c0261d2c9a5b40abe8e8fc840a546a626b2fd32d2ec6aca0bc92aff7480e34e0d79d3f750d817347 SHA512 1b8db6b06a3974cdc746312797a4adb736c389596cc54ef6ed27f23a0aaf2fce401f92e5a1fc4d6ec57bb056bb1c0fa4e3dd8f2460409ad21529c3412d901d7a EBUILD networkmanager-1.18.4-r3.ebuild 11452 BLAKE2B b403c667180b5ea673f148a5eb0557ac11c45b5cc3928306b5d4b9b544d3c806ae2ea050169ea58158ff3a75e511b08cc87582128efec7cac31856bef691ea5e SHA512 2ca15626a85fe5cace717fe776e6dc8e62e677b32a7fd5dde3d34d5d6bec81a641331cb7d001023d45de5f40229c1a41f7f4d12d132e339e50984d9db147ec2e -MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0 +EBUILD networkmanager-1.22.10.ebuild 8727 BLAKE2B 81a7b84763845eadf9f0c59287e5614e59512eb9898c57cf833c2d80fddf222a64dc05761a856a0fe7fe97e07ed0b26c57a307166bd8c01c92813c36f8ad5488 SHA512 a486dfdbbf34a2fe0682a4b6a120b8ea6929e835886be3cddc1bdada285d604bf53811ec4858c2c26dddb0e6d03b67a31559e1de5c039ff2b0b30111f8b51817 +EBUILD networkmanager-1.22.8-r1.ebuild 8743 BLAKE2B 63da97dfbfa7261008058851103906a508cee8f98f197c7d05ae808a07687fb5e1566c7ed1bd615b1afe38441695d829c71c0d38de4ae7cd7324250865b0bd57 SHA512 d9a5e70fa609566366aae80af887175760bf9ee98869055ab2d7297f7bc72943f160d5c1213dd27bedc84786ff8ca06124f1b01ed3f1ccd0eb28eedb198c0b4a +MISC metadata.xml 2274 BLAKE2B c7c338380ebe7344d1d41d83b843e33388d890fc497301657519643eeb63d3f0b739d367aa27ac3a5826c36bdea9f0b48c588d1779872337763f5aaa810a1107 SHA512 bb57e8de13843938e7218c85631be6796a6976e88da2ccb9197c0495e655f639a54ec5aec61c04c59564132876850f3e56b9b40a6de8a0420388345fe38c7e89 diff --git a/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch b/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch new file mode 100644 index 000000000000..f7ce742c5d53 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch @@ -0,0 +1,12 @@ +We don't have sed in /usr/bin + +--- NetworkManager-1.20.6/data/84-nm-drivers.rules ++++ NetworkManager-1.20.6/data/84-nm-drivers.rules +@@ -7,6 +7,6 @@ + # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) + ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" + DRIVERS=="?*", GOTO="nm_drivers_end" +-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" ++PROGRAM="/bin/sh -c 'ethtool -i $$1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" + + LABEL="nm_drivers_end" diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml index 3345447e4f99..91e9ff45256e 100644 --- a/net-misc/networkmanager/metadata.xml +++ b/net-misc/networkmanager/metadata.xml @@ -6,6 +6,7 @@ Gentoo GNOME Desktop + Enable connectivity checking support Use net-dns/dnsmasq and net-firewall/iptables for connection sharing Use sys-auth/consolekit for session @@ -18,6 +19,8 @@ net-wireless/wpa_supplicant for wifi support by default Enable JSON validation via dev-libs/jansson in libnm. + Link against libpsl + Link-time optimization Enable support for mobile broadband devices using net-misc/modemmanager Use dev-libs/nss for cryptography @@ -31,6 +34,7 @@ systemd-resolved, disable this flag and create a symlink to /run/systemd/resolve/stub-resolv.conf. Enable Teamd control support + Build cli tools such as nmcli, nmtui and nm_cloud_setup Enable support for wifi and 802.1x security Enable support for the deprecated Wext (Wireless Extensions) API; needed for some older drivers (e.g. ipw2200, diff --git a/net-misc/networkmanager/networkmanager-1.22.10.ebuild b/net-misc/networkmanager/networkmanager-1.22.10.ebuild new file mode 100644 index 000000000000..dc42b9360620 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.22.10.ebuild @@ -0,0 +1,333 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit meson linux-info python-any-r1 systemd udev vala + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" +SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${PV}/NetworkManager-${PV}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd " +IUSE+="debug doc elogind examples +gnutls introspection iwd json kernel_linux " +IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux " +IUSE+="syslog systemd teamd test +tools vala wext +wifi" + +REQUIRED_USE=" + doc? ( introspection ) + iwd? ( wifi ) + vala? ( introspection ) + ^^ ( gnutls nss ) + ?? ( consolekit elogind systemd ) + ?? ( dhclient dhcpcd ) + ?? ( syslog systemd ) +" + +DEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + net-libs/libndp + sys-apps/dbus + sys-kernel/linux-headers + virtual/libudev + audit? ( sys-process/audit ) + bluetooth? ( net-wireless/bluez ) + concheck? ( net-misc/curl ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + net-firewall/iptables + ) + consolekit? ( sys-auth/consolekit ) + dhclient? ( net-misc/dhcp[client] ) + dhcpcd? ( net-misc/dhcpcd ) + doc? ( dev-util/gtk-doc ) + elogind? ( sys-auth/elogind ) + gnutls? ( + dev-libs/libgcrypt:0= + net-libs/gnutls + ) + introspection? ( dev-libs/gobject-introspection:= ) + json? ( dev-libs/jansson ) + libpsl? ( net-libs/libpsl ) + modemmanager? ( + net-misc/mobile-broadband-provider-info + net-misc/modemmanager + ) + nss? ( dev-libs/nss ) + ofono? ( net-misc/ofono ) + ovs? ( dev-libs/jansson ) + policykit? ( sys-auth/polkit ) + ppp? ( net-dialup/ppp[ipv6] ) + resolvconf? ( net-dns/openresolv ) + selinux? ( sys-libs/libselinux ) + systemd? ( sys-apps/systemd:= ) + teamd? ( + dev-libs/jansson + net-misc/libteam + ) + tools? ( + dev-libs/newt + sys-libs/ncurses + sys-libs/readline:0= + ) +" +RDEPEND="${DEPEND} + acct-group/plugdev + || ( + net-analyzer/arping + net-misc/iputils[arping(+)] + ) + wifi? ( + iwd? ( net-wireless/iwd ) + !iwd? ( net-wireless/wpa_supplicant[dbus] ) + ) +" +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-libs/libxslt + dev-lang/perl + ) + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}"/NetworkManager-${PV} + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch" +) + +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 " + eerror "your kernel 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, " + ewarn "NetworkManager will not work correctly." + ewarn "See https://bugs.gentoo.org/333639 for more info." + fi + fi +} + +pkg_setup() { + CONFIG_CHECK="~BPF" + + 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 + fi + + linux-info_pkg_setup + + # if use introspection || use test; then + if use introspection; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + default + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + -D systemdsystemunitdir=$(systemd_get_systemunitdir) + -D system_ca_path=/etc/ssl/certs + -D udev_dir=$(get_udevdir) + -D dbus_conf_dir=/usr/share/dbus-1/system.d + -D kernel_firmware_dir=/lib/firmware + -D iptables=/sbin/iptables + #-D dnsmasq= + #-D dnssec_trigger= + + -D dist_version=${PVR} + $(meson_use policykit polkit) + -D modify_system=true + $(meson_use policykit polkit_agent) + $(meson_use policykit config_auth_polkit_default) + $(meson_use selinux) + $(meson_use systemd systemd_journal) + -D hostname_persist=gentoo + -D libaudit=$(usex audit yes no) + + $(meson_use wext) + $(meson_use wifi) + $(meson_use iwd) + $(meson_use ppp) + #-D pppd='path to pppd binary' + #-D pppd_plugin_dir='path to the pppd plugins directory' + $(meson_use modemmanager modem_manager) + $(meson_use ofono) + $(meson_use concheck) + $(meson_use teamd teamdctl) + $(meson_use ovs) + $(meson_use tools nmcli) + $(meson_use tools nmtui) + $(meson_use tools nm_cloud_setup) + $(meson_use bluetooth bluez5_dun) + -D ebpf=true + + -D config_plugins_default=keyfile + -D ifcfg_rh=false + -D ifupdown=false + + $(meson_feature resolvconf) + -D netconfig=disable + -D config_dns_rc_manager_default=symlink + + $(meson_feature dhclient) + -D dhcpcanon=disable + $(meson_feature dhcpcd) + + $(meson_use introspection) + $(meson_use vala vapi) + $(meson_use doc docs) + # $(meson_use debug more_asserts) + -D more_asserts=0 + $(meson_use debug more_logging) + -D valgrind=no + -D valgrind_suppressions= + $(meson_use debug ld_gc) + $(meson_use libpsl) + $(meson_use json json_validation) + -D qt=false + + $(meson_use lto b_lto) + ) + + if use consolekit; then + emesonargs+=( -D session_tracking_consolekit=true ) + emesonargs+=( -D session_tracking=no ) + emesonargs+=( -D suspend_resume=consolekit ) + elif use systemd; then + emesonargs+=( -D session_tracking_consolekit=false ) + emesonargs+=( -D session_tracking=systemd ) + emesonargs+=( -D suspend_resume=systemd ) + elif use elogind; then + emesonargs+=( -D session_tracking_consolekit=false ) + emesonargs+=( -D session_tracking=elogind ) + emesonargs+=( -D suspend_resume=elogind ) + else + emesonargs+=( -D session_tracking_consolekit=false ) + emesonargs+=( -D session_tracking=none ) + emesonargs+=( -D suspend_resume=auto ) + fi + + if use syslog; then + emesonargs+=( -D config_logging_backend_default=syslog ) + elif use systemd; then + emesonargs+=( -D config_logging_backend_default=journal ) + else + emesonargs+=( -D config_logging_backend_default=default ) + fi + + if use dhclient; then + emesonargs+=( -D config_dhcp_default=dhclient ) + elif use dhcpcd; then + emesonargs+=( -D config_dhcp_default=dhcpcd ) + else + emesonargs+=( -D config_dhcp_default=internal ) + fi + + if use nss; then + emesonargs+=( -D crypto=nss ) + else + emesonargs+=( -D crypto=gnutls ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + newinitd "${FILESDIR}/init.d.NetworkManager-r1" 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* || die + + # 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" + + if use iwd; then + insinto /usr/lib/NetworkManager/conf.d/ + newins - iwd.conf <<- _EOF_ + [device] + wifi.backend=iwd + _EOF_ + fi + + if use examples; then + dodoc -r "${S}"/examples/ + + insinto /usr/lib/NetworkManager/conf.d + doins "${S}"/examples/nm-conf.d/{30-anon,31-mac-addr-change}.conf + + # Temporary workaround + cp "${ED}"/usr/share/doc/NetworkManager/examples/server.conf \ + "${ED}"/usr/share/doc/${PF}/examples/ || + die "Failed to copy server.conf example." + fi + + # Temporary workaround, + # The file will be installed regargless of 'examples' USE. + rm "${ED}"/usr/share/doc/NetworkManager/examples/server.conf || die + rm -r "${ED}"/usr/share/doc/NetworkManager || die + + # Empty dirs + rm -r "${ED}/var" || die +} + +pkg_postinst() { + systemd_reenable NetworkManager.service +} diff --git a/net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild b/net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild new file mode 100644 index 000000000000..08e86947d2ea --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.22.8-r1.ebuild @@ -0,0 +1,333 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit meson linux-info python-any-r1 systemd udev vala + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" +SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${PV}/NetworkManager-${PV}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd " +IUSE+="debug doc elogind examples +gnutls introspection iwd json kernel_linux " +IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux " +IUSE+="syslog systemd teamd +tools vala wext +wifi" + +REQUIRED_USE=" + doc? ( introspection ) + iwd? ( wifi ) + vala? ( introspection ) + ^^ ( gnutls nss ) + ?? ( consolekit elogind systemd ) + ?? ( dhclient dhcpcd ) + ?? ( syslog systemd ) +" + +DEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + net-libs/libndp + sys-apps/dbus + sys-kernel/linux-headers + virtual/libudev + audit? ( sys-process/audit ) + bluetooth? ( net-wireless/bluez ) + concheck? ( net-misc/curl ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + net-firewall/iptables + ) + consolekit? ( sys-auth/consolekit ) + dhclient? ( net-misc/dhcp[client] ) + dhcpcd? ( net-misc/dhcpcd ) + doc? ( dev-util/gtk-doc ) + elogind? ( sys-auth/elogind ) + gnutls? ( + dev-libs/libgcrypt:0= + net-libs/gnutls + ) + introspection? ( dev-libs/gobject-introspection:= ) + json? ( dev-libs/jansson ) + libpsl? ( net-libs/libpsl ) + modemmanager? ( + net-misc/mobile-broadband-provider-info + net-misc/modemmanager + ) + nss? ( dev-libs/nss ) + ofono? ( net-misc/ofono ) + ovs? ( dev-libs/jansson ) + policykit? ( sys-auth/polkit ) + ppp? ( net-dialup/ppp[ipv6] ) + resolvconf? ( net-dns/openresolv ) + selinux? ( sys-libs/libselinux ) + systemd? ( sys-apps/systemd:= ) + teamd? ( + dev-libs/jansson + net-misc/libteam + ) + tools? ( + dev-libs/newt + sys-libs/ncurses + sys-libs/readline:0= + ) +" +RDEPEND="${DEPEND} + acct-group/plugdev + || ( + net-analyzer/arping + net-misc/iputils[arping(+)] + ) + wifi? ( + iwd? ( net-wireless/iwd ) + !iwd? ( net-wireless/wpa_supplicant[dbus] ) + ) +" +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-libs/libxslt + dev-lang/perl + ) + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}"/NetworkManager-${PV} + +# Not implemented yet. +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch" +) + +python_check_deps() { + if use introspection; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + + # test requirements here +} + +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 " + eerror "your kernel 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, " + ewarn "NetworkManager will not work correctly." + ewarn "See https://bugs.gentoo.org/333639 for more info." + fi + fi +} + +pkg_setup() { + CONFIG_CHECK="~BPF" + + 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 + fi + + linux-info_pkg_setup + + # if use introspection || use test; then + if use introspection; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + default + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + -D systemdsystemunitdir=$(systemd_get_systemunitdir) + -D system_ca_path=/etc/ssl/certs + -D udev_dir=$(get_udevdir) + -D dbus_conf_dir=/usr/share/dbus-1/system.d + -D kernel_firmware_dir=/lib/firmware + -D iptables=/sbin/iptables + #-D dnsmasq= + #-D dnssec_trigger= + + -D dist_version=${PVR} + $(meson_use policykit polkit) + -D modify_system=true + $(meson_use policykit polkit_agent) + $(meson_use policykit config_auth_polkit_default) + $(meson_use selinux) + $(meson_use systemd systemd_journal) + -D hostname_persist=gentoo + -D libaudit=$(usex audit yes no) + + $(meson_use wext) + $(meson_use wifi) + $(meson_use iwd) + $(meson_use ppp) + #-D pppd='path to pppd binary' + #-D pppd_plugin_dir='path to the pppd plugins directory' + $(meson_use modemmanager modem_manager) + $(meson_use ofono) + $(meson_use concheck) + $(meson_use teamd teamdctl) + $(meson_use ovs) + $(meson_use tools nmcli) + $(meson_use tools nmtui) + $(meson_use tools nm_cloud_setup) + $(meson_use bluetooth bluez5_dun) + -D ebpf=true + + -D config_plugins_default=keyfile + -D ifcfg_rh=false + -D ifupdown=false + + $(meson_feature resolvconf) + -D netconfig=disable + -D config_dns_rc_manager_default=symlink + + $(meson_feature dhclient) + -D dhcpcanon=disable + $(meson_feature dhcpcd) + + $(meson_use introspection) + $(meson_use vala vapi) + $(meson_use doc docs) + # $(meson_use debug more_asserts) + -D more_asserts=0 + $(meson_use debug more_logging) + -D valgrind=no + -D valgrind_suppressions= + $(meson_use debug ld_gc) + $(meson_use libpsl) + $(meson_use json json_validation) + -D qt=false + + $(meson_use lto b_lto) + ) + + if use consolekit; then + emesonargs+=( -D session_tracking_consolekit=true ) + emesonargs+=( -D session_tracking=no ) + emesonargs+=( -D suspend_resume=consolekit ) + elif use systemd; then + emesonargs+=( -D session_tracking_consolekit=false ) + emesonargs+=( -D session_tracking=systemd ) + emesonargs+=( -D suspend_resume=systemd ) + elif use elogind; then + emesonargs+=( -D session_tracking_consolekit=false ) + emesonargs+=( -D session_tracking=elogind ) + emesonargs+=( -D suspend_resume=elogind ) + else + emesonargs+=( -D session_tracking_consolekit=false ) + emesonargs+=( -D session_tracking=none ) + emesonargs+=( -D suspend_resume=auto ) + fi + + if use syslog; then + emesonargs+=( -D config_logging_backend_default=syslog ) + elif use systemd; then + emesonargs+=( -D config_logging_backend_default=journal ) + else + emesonargs+=( -D config_logging_backend_default=default ) + fi + + if use dhclient; then + emesonargs+=( -D config_dhcp_default=dhclient ) + elif use dhcpcd; then + emesonargs+=( -D config_dhcp_default=dhcpcd ) + else + emesonargs+=( -D config_dhcp_default=internal ) + fi + + if use nss; then + emesonargs+=( -D crypto=nss ) + else + emesonargs+=( -D crypto=gnutls ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + # ---- openrc untested, this is copied from current networkmanager ebuild. + newinitd "${FILESDIR}/init.d.NetworkManager-r1" 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* || die + + # 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" + # ---- + + if use iwd; then + insinto /usr/lib/NetworkManager/conf.d/ + newins - iwd.conf <<- _EOF_ + [device] + wifi.backend=iwd + _EOF_ + fi + + if use examples; then + dodoc -r "${S}"/examples/ + + insinto /usr/lib/NetworkManager/conf.d + doins "${S}"/examples/nm-conf.d/{30-anon,31-mac-addr-change}.conf + + # Temporary workaround before patching, + cp "${ED}"/usr/share/doc/NetworkManager/examples/server.conf \ + "${ED}"/usr/share/doc/${PF}/examples/ || + die "Failed to copy server.conf example." + fi + + # Temporary workaround, can be patched later. + # The file will be installed regargless of 'examples' USE. + rm "${ED}"/usr/share/doc/NetworkManager/examples/server.conf || die + rm -r "${ED}"/usr/share/doc/NetworkManager || die + + # Empty dirs + rm -r "${ED}/var" || die +} + +pkg_postinst() { + systemd_reenable NetworkManager.service +} diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 5101bce42900..3ab775046742 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -2,7 +2,9 @@ AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c3 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae DIST nextcloud-client-2.6.2.tar.gz 18982053 BLAKE2B 53f4d13b42f50a272012909ed5c937b0a37543f11b8ef0119db670107ed10629d79cb2fcfbbe9148ff847f7ef9e38183f613ae3162206bf9e8f7424ae8280b72 SHA512 b56a7d6751381ffb546b0c8a4b9dbb7991f523ac2ff06dbc87ee36927a4326f57f520ea96a2116ead5d36db6b9900f552834ec9dff8ad5adf80e896829428199 DIST nextcloud-client-2.6.3.tar.gz 18983292 BLAKE2B 89fdb35c12f4d126c19f31d09d54e027f9edf684fa4904bfba0e7c49a628295aabe00f2b6bc79496876a252dbc9d82772a95bcc59ae4220f8c91dd09bd2661d9 SHA512 ddeb8a32e0208bc415bf421cb3ce05713adb617fa78c0b5cb4d894c9e8d3499dcc495c115de3ea7abb0c402eef4bc64ede8c59a7f056acda47779096fedc8025 +DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17 EBUILD nextcloud-client-2.6.2.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d EBUILD nextcloud-client-2.6.3.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d +EBUILD nextcloud-client-2.6.4.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4 diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild new file mode 100644 index 000000000000..0efd5f09b271 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils 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 shibboleth test" + +COMMON_DEPEND=">=dev-db/sqlite-3.4:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain[qt5(+)] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-fs/inotify-tools + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + shibboleth? ( dev-qt/qtwebkit:5 )" + +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 + 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 + )" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch ) + +S=${WORKDIR}/desktop-${PV/_/-} + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + if ! use nautilus; then + pushd shell_integration > /dev/null || die + cmake_comment_add_subdirectory nautilus + popd > /dev/null || die + fi + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) + -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) + -DNO_SHIBBOLETH=$(usex !shibboleth) + -DUNIT_TESTING=$(usex test) + ) + + cmake-utils_src_configure +} + +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/ntp/Manifest b/net-misc/ntp/Manifest index eab5db1b4a36..4ccb278c8d04 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -6,6 +6,7 @@ AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9 AUX ntp-4.2.8_p12-libressl-2.8.patch 741 BLAKE2B 8b5542b216710da46a59d2cefa82142bfe1590ca351833c5a3b91fd3c14c37ddfbcee89aa819a9b254f3ba9f3ef8997aa81c881fc04a71da0c2bb1e727be5215 SHA512 4b8e2b79c0922a5a2d9eb1857679996fffc0dc807e01221c0b5be7a547fe700f715899d66f946a6626848bca89973b807b3b171b7cc3ae153d238a2da64f49e1 +AUX ntp-4.2.8_p14-add_cap_ipc_lock.patch 474 BLAKE2B 5045ea1d6b07de0bd3ea46e0dc63a424f01f34241414f192cd73cb09ff080864ca1b94600d0f494772b06df87db1e7adc32c5bfc3c88c57efb2b04fd2cafee41 SHA512 8a852794095c650ce75707d2fb5ded1e575b7d2167d5c0ef79c1007a3bb45f6b21f8a5bd4deb0e966b7ed9b8941e5c7746eef73b1f0f6e5fd4f7d8e32a6b007f AUX ntp-client.confd 776 BLAKE2B 7c65232560d4443f21bea7e5e0e8183f8397e092b6c489faa18188b9df9f8678244cd816e6d8d6e12b8d89a2b33873b9d0a2173957217879320db20744b3876c SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 AUX ntp-client.rc 720 BLAKE2B 5662d2f6635b8d5bb07fbc82c259a8af7871b8312ebff0184005d3ea24f239a1d3e2b63a5a7e9eef8f385a72fcd9370a2e68031a7c54bf3ef28e8c26c97c0298 SHA512 557cb44fc911dcf34d21227c5d92c2ab56ca3fd855a5d2715c5f7343ae45a91c4b5492a84ac01a712bc251ea2a83810f4eb33e467b456b42c79052454a68dc81 AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781372bdb0e6b06d46c009890a0a2ab4b60b6759bc650324994a2b81ef9b9d0bc922047add9bc SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c @@ -22,7 +23,9 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075 -EBUILD ntp-4.2.8_p13-r1.ebuild 4495 BLAKE2B 2fb958de52ac85e7af5cbe20b1fac82b8a33415239ac96bfbf94b73efa042b49fcb3c55e8c122470cbcc499147050a7906dba6452cffa35d21c7ea3363e183ea SHA512 16db38e303bcfa94d79e838b84bd332036384e69c8a2f1c806fbe9acabc067ecec5077a701fa227b88639f79d6fc02962d9f30487f0aa3b5cf8ef88f955a5e84 -EBUILD ntp-4.2.8_p13-r2.ebuild 4546 BLAKE2B 028b33ad5444fee81b17541344646840f0e706201abdea75275571d93a437a00f638da5c02da57041ef10e71c43f4e5d29033ea471f95230370dd07363febdec SHA512 90c66fcc4fab35213e2c48874a1a90f0fa1ac5bceea1ea6bdcd447a98fb750a988d41c27d6a6e61866dc9ee81eb8ba83e26ae7d97b501b2d308fbd47bb28ca80 -EBUILD ntp-4.2.8_p13.ebuild 4483 BLAKE2B c7f84b00bc604050d58f17a3ed8856d51cb3763509232d0f3221f7c062e938a0aeaae723a4dac8251a907bd4580b6f4e47c1b7109be899c6ae04c62ebec0122b SHA512 5b2c40c77e8c6ff15804a14a5c43035a3b2d8ca7c16e5f81d16fe716da169130dacb03d6a80493a705e87b3c80421cf6b51883e500db3ebc37402a5b473e7ee5 +DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1 +DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8 +EBUILD ntp-4.2.8_p13-r2.ebuild 4542 BLAKE2B fb88e178f76f757530d020a9987f8fd3f70b81e22486e8e30c997635c500795b04eb5bcfcd5cd6acfa0db7fd480f3903e65a91763cb68d9b3e3a3b77f3dde2be SHA512 bf5dddbd1d8b3b387864275b70edb49440696e846e2631227f8092e737c97d9346b1b52cbf02033f61833912907a16442fa46464098aed0ff471ba2d1f7c4914 +EBUILD ntp-4.2.8_p13.ebuild 4481 BLAKE2B 35a95ffdd991d752d7163afebde84df0069c7c61495ce8bf62f98a217c35570d8f03470e8096891b219b7e9b1ed3b578db99a91228e0b78644c4237149c69bd9 SHA512 cae546394d68a3f5ccbe2d08f419de01ad596b33ebbf660c5c4f3afeb89651cc0bc3e607d18ab32652a60663e4391a8baf0e0a421b229f3234d93d0f7ede4cec +EBUILD ntp-4.2.8_p14-r2.ebuild 4554 BLAKE2B 53716498d82265c1db38cff06915df334754d5af5a17b587fb39e3a36ea2c78198a4c6a635e822164458f9b4c8c85cf6c514172a8444ef4fb5fc16b82d59a97c SHA512 8c946674cd2407c27d870e890a575a70cf7866a9a52941f32f599bb8d6153e34a3cfae78d78b9c9f87eaa03267baed7bc241d2e402763a88d01fa34f995a2384 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 diff --git a/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch new file mode 100644 index 000000000000..183b6d8d475a --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/711530 + +--- ntp-4.2.8p14/ntpd/ntpd.c ++++ ntp-4.2.8p14/ntpd/ntpd.c +@@ -1189,7 +1189,7 @@ + * drop privileges in this case. + */ + cap_t caps; +- caps = cap_from_text("cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe"); ++ caps = cap_from_text("cap_ipc_lock,cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe"); + if ( ! caps) { + msyslog( LOG_ERR, "cap_from_text() failed: %m" ); + exit(-1); diff --git a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild deleted file mode 100644 index d3cc13c50464..000000000000 --- a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools toolchain-funcs flag-o-matic user 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" - -CDEPEND="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? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - parse-clocks? ( net-misc/pps-tools )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - 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_p10-fix-build-wo-ssl-or-libressl.patch - "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch -) - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -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} - # Increase the default memlimit from 32MiB to 128MiB. #533232 - local myeconfargs=( - --with-lineeditlibs=readline,edit,editline - --with-yielding-select - --disable-local-libevent - --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-r1 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/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild index 2150ef08bd90..a50710aa1a3e 100644 --- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild index 1a92b7b4bcec..8fb052e8771e 100644 --- a/net-misc/ntp/ntp-4.2.8_p13.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p13.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild new file mode 100644 index 000000000000..b2cbb8b926a9 --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs 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 ~m68k-mint" +IUSE="caps debug ipv6 libressl 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? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl: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_p10-fix-build-wo-ssl-or-libressl.patch + "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 +) + +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} + # Increase the default memlimit from 32MiB to 128MiB. #533232 + local myeconfargs=( + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + --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-r1 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/Manifest b/net-misc/ntpsec/Manifest index 4a4a9b09c81c..79cd3a7096af 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -1,9 +1,12 @@ AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba4037308ac1e3c83fc49700c1c0d6ee2e3f274dcb76bc13bfaeefdc9cd533a56cef9454ee27eb SHA512 5b55618b870e436b2160e46ede5e1b8031dab368d72bf376a6a9664f1cb528ae37e10eedeb7d438fee8155e3c50139ac240af95a14215aebbfef3133f3b68694 -AUX ntpd-r1.service 597 BLAKE2B a1185493452a57f3b7b8c506bedecca93dc7e92b7ce6a817792f812a5cb6d035fb7a13398aa5b1259f88d57d88d0b0cca2931019a2baefea820dcb8cfdb40cc6 SHA512 e7052fbc5f369f13497f365b91b5f6d154c2024bc535b226d650851c0f0ff843c6fda4ea7c1f47adce86c8acffb6c4ad679f6e8f344fff9e94920d415d4837f3 +AUX ntpd-r1.service 613 BLAKE2B 9e0d0fdefa670c2ac25142bfb37880ce4ba0662f70f7cf9acb02f9016bfeabd94a043e92d1b1be11e74b838e9cc91d7d7c1144539917c927537e67f92b45003e SHA512 cdfbc735e157306597ff3c37b5aea34d64c66a69bbb9dbfba6c7eb57d6b201c9d2e86969e5be9b8331e75e1de8eaa17ee4d8f72bed9bc058a6198bf5a2d717c6 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31 AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9 AUX ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch 736 BLAKE2B 63188a7fc1350b1ba4230f9d5080f81f703bd8bbb1fd59c1d79610fd0a650ee47c5f0679fa7679bc12daddfb7d12727b95099c46ede7d7b11718c16fbc225b5b SHA512 74807a33b59be2d65421b8a8bd1f83ec2861066740f8ede07e3424316f23528c4d23cd3850b04721f11af755163edf5217e4bf8b7005c915209ac703694e40d8 +AUX ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch 854 BLAKE2B dc063775eee0248e24c174056581979582dd1dbc4e4fd0901add3f26b63cbb342469598f1fd2be8af8c1da561c1f225349cec258fcfb4af9355d47e33bcf77eb SHA512 a5c6d652c4d696af126f199df7ec1e8a9c33f55b3a0d02b5576898d34016780f51e06aa4e0e84a1d2862f57d08fd4285dd0888bac5aac9fec94c26a2e9b99043 +AUX ntpsec-1.1.8-fix-asciidoc-version-detect.patch 14369 BLAKE2B 5f2152463b0a551202f07b535bcd14ef8a94a599643ab5e6dedf481eacc97ba7f8e7491ead10473b2988b07cef41a65c6c3612b564a155df4a01fb6df7bdb0db SHA512 b171e5b0f3f493db6a2d10b0e9ecacf3cd8b6ed49f363d431c8d4a5fc3314acdbc4c82882967f4ef72193c6e3851a3aed5d667820175f75e43b413a277f31a19 +AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0ec22b8d95dbb16118d7603c74a7d4c873422de65451f5ddd74b7d9aceb51714d842ef7c4a37ea638212487d6db99ebfa201b01b9654b732538c SHA512 c54b3304ca467e8434e29d312e5839c788becd8ae9068737ec9725a42f22073ea0e86355999dc6d606c12f4c733497cbe48bd49b6e150c39e6540e581df6087e AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302 DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941 @@ -12,6 +15,6 @@ DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e EBUILD ntpsec-1.1.4.ebuild 4119 BLAKE2B 944627f2d6cd0f9c0a83d6258d857a63d66832115ca3ebbbf72d3d4bb9f4d2857df26cde6650d4d8a8f1eb2d0a04d0b2e0188640729b991e2e5059a8283e6bdb SHA512 2ef78287947e9c6a59d17be67bd15049f14f266beb8733295de0f532ac30c6e39088a5888ca0029443582201d9f3ccb44cf2e52202f84547ef8c52cf3063f6e7 EBUILD ntpsec-1.1.6.ebuild 4077 BLAKE2B 24f82c887bdd8d2f5cdac4580d5803629cac818b91168d0bf205562419c399f664b4fc1264c6f88ef8d0fd167f66f4cb6fc343a1220032ec65729e9ca721dd11 SHA512 082e35dc0322737d9077deb8cb240d011d0d74d90b612e8a4d60c5d08f672c4c2f195f15ba8bd8c9dca01e67e769b1d1941534bb12242b7808123d539837eae4 EBUILD ntpsec-1.1.7-r1.ebuild 4170 BLAKE2B 830f468ccc34883d9606155d68a46e0ad5182414de78b0a6754edac475bc19b383be80c1ca79b2b0ade771ff66fe52e4643f5cb3f3243dd2d02e6c7865648676 SHA512 eb7e62f61a523a1af060957ba74d7bd8e7705230aa0597570e478191c18d586d8bd92b89e3a5f9d59de77e5f456a05e0ceb32a37012e9a3c1d803358d731ab8c -EBUILD ntpsec-1.1.8.ebuild 4099 BLAKE2B e7d09ff800876d66809ebd6ca10be4b2efe3acd439b37574e6502834b32b39ba6c44ae9f591f18718904c528cfd808eebc7fe2bae89eb08bca2ac9006a25bcc7 SHA512 356d43ef08bbc079b95518074e50770302d3bdb29d2d26c26149993d8db3d8b977eb539e0e576162fe75fad60bb26d40bb56a5cb43005a307e2ebae3b7689f15 -EBUILD ntpsec-9999.ebuild 4099 BLAKE2B e7d09ff800876d66809ebd6ca10be4b2efe3acd439b37574e6502834b32b39ba6c44ae9f591f18718904c528cfd808eebc7fe2bae89eb08bca2ac9006a25bcc7 SHA512 356d43ef08bbc079b95518074e50770302d3bdb29d2d26c26149993d8db3d8b977eb539e0e576162fe75fad60bb26d40bb56a5cb43005a307e2ebae3b7689f15 +EBUILD ntpsec-1.1.8.ebuild 4361 BLAKE2B b347f6c6d8ba5266c2be0f88ff08a32008843c1147bb3cdac066ddf7e5ec28d201d7092f3e391edbb9c8cc59964f82148377a1398ada715f64db4e1dc143405e SHA512 7aa6666fd37bfdfdcacd8ebe7849c976b88fd91b712885673384b2922cf96dc212b40c69892371a1831e3805579174986915a364cdc5f668e97b9c8cc9cc0c79 +EBUILD ntpsec-9999.ebuild 4105 BLAKE2B 3acb680474e27deb351ea4fdb0cea659995103c7f7f3ffe2670851b551ee7567d98b5db094cfadc56fdbf551296d37074d6747f5cedbcfd700801ee7e04ed2e3 SHA512 4f35b54362bbb6eba38e93ba05d725cf5a8b5fa0bcaa4f9a4a0b15537b1e0939450ba1b23892a9a6b19c1fee74454d1f50af7ff4025761fbd36dedd6eeb3c48f MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc diff --git a/net-misc/ntpsec/files/ntpd-r1.service b/net-misc/ntpsec/files/ntpd-r1.service index 5da473805aa0..8bc16f9f634a 100644 --- a/net-misc/ntpsec/files/ntpd-r1.service +++ b/net-misc/ntpsec/files/ntpd-r1.service @@ -4,10 +4,9 @@ After=network.target nss-lookup.target Conflicts=systemd-timesyncd.service [Service] -Type=forking +Type=simple PrivateTmp=true -EnvironmentFile=-/etc/conf.d/ntp -ExecStart=/usr/sbin/ntpd ${NTPD_OPTS} +ExecStart=/usr/sbin/ntpd --configfile=/etc/ntp.conf --panicgate --user=ntp:ntp --nofork # Specifying -g on the command line allows ntpd to make large adjustments to # the clock on boot. However, if Restart=yes is set, a malicious (or broken) # server could send the incorrect time, trip the panic threshold, and when diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch new file mode 100644 index 000000000000..caeaf1824cc5 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch @@ -0,0 +1,23 @@ +From ccdd9d4b941b30fc44b301595e42809dbe48628d Mon Sep 17 00:00:00 2001 +From: James Browning +Date: Sun, 26 Jan 2020 09:58:36 -0800 +Subject: [PATCH] Externalize sys_maxclock from include/ntpd.h ... + +I think this will shut up the Fedora Rawhide runners +--- + include/ntpd.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/ntpd.h b/include/ntpd.h +index c4f9b9e45..ee16678e1 100644 +--- a/include/ntpd.h ++++ b/include/ntpd.h +@@ -369,7 +369,7 @@ extern int peer_associations; /* mobilized associations */ + * System variables are declared here. See Section 3.2 of the + * specification. + */ +-int sys_maxclock; /* maximum candidates */ ++extern int sys_maxclock; /* maximum candidates */ + struct system_variables { + uint8_t sys_leap; /* system leap indicator */ + uint8_t sys_stratum; /* system stratum */ diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-asciidoc-version-detect.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-asciidoc-version-detect.patch new file mode 100644 index 000000000000..aabd83654334 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-asciidoc-version-detect.patch @@ -0,0 +1,372 @@ +diff --git a/wafhelpers/asciidoc.py b/wafhelpers/asciidoc.py +index b6aa1f116..a2218bb69 100644 +--- a/wafhelpers/asciidoc.py ++++ b/wafhelpers/asciidoc.py +@@ -1,73 +1,173 @@ +-import re +- +-from waflib import Task +-from waflib.TaskGen import extension +- +-# asciidoc -b html5 -a linkcss -a stylesdir=/mnt/devel/ntp/commit/docs \ +-# -o asd driver32.adoc +- +-# Borrowed from waf/docs/book/wscript in the Waf Project. +-re_xi = re.compile('''^(include|image)::(.*?.(adoc|\\{PIC\\}))\[''', re.M) +- +- +-def ascii_doc_scan(self): +- p = self.inputs[0].parent +- node_lst = [self.inputs[0]] +- seen = [] +- depnodes = [] +- +- while node_lst: +- nd = node_lst.pop(0) +- if nd in seen: +- continue +- seen.append(nd) +- +- code = nd.read() +- for m in re_xi.finditer(code): +- name = m.group(2) +- if m.group(3) == '{PIC}': +- +- ext = '.eps' +- if self.generator.rule.rfind('A2X') > 0: +- ext = '.png' +- +- k = p.find_resource(name.replace('{PIC}', ext)) +- if k: +- depnodes.append(k) +- else: +- k = self.inputs[0].find_resource(name) +- if k: +- depnodes.append(k) +- node_lst.append(k) +- return [depnodes, ()] ++'''Most of the functionality for building HTML and man pages from AsciiDoc.''' + ++import re + +-# ASCIIDOC_FLAGS are almost always needed and need to be set by the user. +-class asciidoc(Task.Task): +- color = "BLUE" +- run_str = '${BIN_ASCIIDOC} -b html5 -a linkcss ${ASCIIDOC_FLAGS} ' \ +- '-o ${TGT[0].name} ${SRC[0].abspath()}' +- ext_out = ".html" ++from waflib import Task # pylint: disable=import-error ++from waflib.TaskGen import extension # pylint: disable=import-error ++ ++ ++def options(opt): ++ 'Add command line options for AsciiDoc processing.' ++ grp = opt.add_option_group('NTP documentation configure options') ++ grp.add_option('--disable-doc', action='store_true', ++ default=False, help='Disable HTML document building.') ++ grp.add_option('--enable-doc', action='store_true', ++ default=False, help='Enable HTML document building.') ++ grp.add_option('--disable-manpage', action='store_true', ++ default=False, help='Disable manpage building.') ++ grp.add_option('--enable-manpage', action='store_true', ++ default=False, help='Enable manpage building.') ++ ++ ++def configure(ctx): ++ 'Set options from the extended environment and command line arguments.' ++ ++ if ctx.options.disable_doc and ctx.options.enable_doc: ++ ctx.fatal('--disable-doc and --enable-doc conflict.') ++ if ctx.options.disable_manpage and ctx.options.enable_manpage: ++ ctx.fatal('--disable-manpage and --enable-manpage conflict.') ++ ++ ctx.env.BUILD_DOC = False ++ ctx.env.BUILD_MAN = False ++ if ctx.options.disable_doc and ctx.options.disable_manpage: ++ ctx.msg('AsciiDoc processor', 'unnecessary') ++ return ++ ++ # asciidoctor versions < 1.5.8 throw warnings for manpages and driver_shm. ++ # asciidoc versions 8.6.5-8.6.7 throw warnings for warp.adoc and versions ++ # < 8.6.4 have no HTML5 backend. ++ # asciidoc3 versions < 3.0.2 throw errors. ++ adoc_list = [['asciidoctor', (1, 5, 8)], ++ ['asciidoc', (8, 6, 8)], ++ ['asciidoc3', (3, 0, 2)], ++ ] ++ for progname, asciidocminver in adoc_list: ++ if 'BIN_ASCIIDOC' not in ctx.env or ctx.env.BIN_ASCIIDOC == []: ++ # used to make man and HTML pages ++ ctx.find_program(progname, var='BIN_ASCIIDOC', mandatory=False) ++ # make sure asciidoc is new enough. ++ # based on check_python_version() from waf ++ ++ if ctx.env.BIN_ASCIIDOC: ++ # https://lists.ntpsec.org/pipermail/devel/2016-July/001778.html ++ # Get asciidoc version string ++ cmd = ctx.env.BIN_ASCIIDOC + ['--version'] ++ # example output: asciidoc 8.6.9 ++ version_string = ctx.cmd_and_log(cmd).split()[1] ++ match = re.match(r'^(\d+)\.(\d+)\.(\d+)', version_string) ++ if match: ++ version_tuple = tuple(map(int, match.groups())) ++ if version_tuple >= asciidocminver: ++ if progname == 'asciidoc': ++ ctx.find_program('a2x', var='BIN_A2X', mandatory=False) ++ ctx.find_program('xsltproc', var='BIN_XSLTPROC', ++ mandatory=False) ++ elif progname == 'asciidoc3': ++ ctx.find_program('a2x3', var='BIN_A2X', mandatory=False) ++ ctx.find_program('xsltproc', var='BIN_XSLTPROC', ++ mandatory=False) ++ ++ if version_tuple >= asciidocminver: ++ color = 'GREEN' ++ else: ++ color = 'YELLOW' ++ ctx.env.BIN_ASCIIDOC = [] ++ ctx.msg('Checking for %s version >= %s' % ++ (progname, '%d.%d.%d' % asciidocminver), ++ version_string, color=color) ++ ++ if not ctx.env.BIN_ASCIIDOC: ++ if not (ctx.options.enable_doc or ctx.options.enable_manpage): ++ # The user did not require either, so this is fine. ++ return ++ ++ error = 'no AsciiDoc processor qualified' ++ if ctx.options.enable_doc: ++ error += ', remove --enable-doc' ++ if ctx.options.enable_manpage: ++ error += ', remove --enable-manpage' ++ ctx.fatal(error) ++ ++ ctx.env.BUILD_DOC = not ctx.options.disable_doc ++ ctx.env.BUILD_MAN = not ctx.options.disable_manpage ++ ++ if 'asciidoctor' in ctx.env.BIN_ASCIIDOC[0]: ++ ctx.env.ARGS_DOC = [ ++ ctx.env.BIN_ASCIIDOC[0], ++ '-a', 'attribute-missing=warn', ++ # To eliminate compat-mode: ++ # 'italics' needs to be changed to _italics_ ++ # +monospace+ needs to be changed to `monospace` ++ # https://asciidoctor.org/docs/migration/#migration-cheatsheet ++ '-a', 'compat-mode', ++ ] ++ ctx.env.ARGS_MAN = ctx.env.ARGS_DOC + [ ++ '-b', 'manpage', ++ ] ++ ctx.env.ARGS_DOC += [ ++ '-b', 'xhtml5', '-a', 'linkcss', ++ '-a', 'stylesheet=asciidoc.css', ++ ] ++ elif 'asciidoc' in ctx.env.BIN_ASCIIDOC[0]: ++ ctx.env.ARGS_DOC = [ ++ ctx.env.BIN_ASCIIDOC[0], ++ '-a', 'attribute-missing=warn', ++ '-b', 'html5', '-a', 'linkcss', ++ '-a', 'stylesheet=asciidoc.css', ++ ] ++ if ctx.env.BIN_A2X and ctx.env.BIN_XSLTPROC: ++ ctx.env.ARGS_MAN = [ ++ ctx.env.BIN_A2X[0], ++ '-a', 'attribute-missing=warn', ++ '-f', 'manpage', '--no-xmllint', ++ ] ++ else: ++ if ctx.options.enable_manpage: ++ ctx.fatal('a2x/xsltproc not found, remove --enable-manpage') ++ ctx.env.BUILD_MAN = False ++ ++ ++def build(ctx): ++ 'Set processor noise level and set HTML pages to build.' ++ from waflib.Logs import verbose # pylint: disable=import-error ++ if verbose > 1: # Pass verbosity to AsciiDoc toolchain ++ if ctx.env.ARGS_DOC: ++ ctx.env.ARGS_DOC += ['-v'] ++ if ctx.env.ARGS_MAN: ++ ctx.env.ARGS_MAN += ['-v'] ++ if ctx.env.BUILD_DOC and ctx.variant == 'main': ++ ctx.recurse('docs') ++ ++ ++class html(Task.Task): ++ 'Define HTML build process.' ++ # Optional weight to tune the priority for task instances. ++ # The higher, the earlier. The weight only applies to single task objects. ++ weight = 3 # set arbitrarily high to be first as to not slow down later tasks ++ run_str = '${ARGS_DOC} -o ${TGT[0].name} ${SRC[0].abspath()}' ++ ext_out = '.html' ++ ++ ++class man(Task.Task): ++ 'Define manpage build process.' ++ weight = 2 # set arbitrarily high to be second as to not slow down later tasks (Failed) ++ run_str = '${ARGS_MAN} ${SRC[0].abspath()}' + + + @extension('.adoc') +-def run_asciidoc(self, node): +- out = node.change_ext(".html") +- tsk = self.create_task("asciidoc", node, [out]) ++def run_html(self, node): ++ 'Add HTML build caller function.' ++ out = node.change_ext('.html') ++ tsk = self.create_task('html', node, [out]) + tsk.cwd = node.parent.get_bld().abspath() + + +-class a2x(Task.Task): +- color = "YELLOW" +- shell = True +- run_str = '${BIN_A2X} ${A2X_FLAGS} ${SRC[0].abspath()}' +- scan = ascii_doc_scan +- +- + @extension('.man-tmp') +-def run_a2x(self, node): ++def run_manpage(self, node): ++ 'Add manpage build caller function.' + n_file = node.path_from(self.bld.bldnode) +- out = "%s.%s" % (n_file.replace("-man.adoc.man-tmp", ""), self.section) ++ out = '%s.%s' % (n_file.replace('-man.adoc.man-tmp', ''), self.section) + out_n = self.bld.path.find_or_declare(out) +- self.create_task('a2x', node, out_n) +- self.bld.install_files("${MANDIR}/man%s/" % self.section, out_n) ++ self.create_task('man', node, out_n) ++ self.bld.install_files('${MANDIR}/man%s/' % self.section, out_n) ++ weight = 3 +diff --git a/wafhelpers/waf.py b/wafhelpers/waf.py +index 96f753ecb..4f2d562a4 100644 +--- a/wafhelpers/waf.py ++++ b/wafhelpers/waf.py +@@ -41,10 +41,7 @@ def manpage_subst_fun(self, code): + @conf + def manpage(ctx, section, source): + +- # ctx.install_files('${MANDIR}' + "/man%s/" % section, +- # source.replace("-man.adoc", ".%s" % section)) +- +- if not ctx.env.ENABLE_DOC or ctx.env.DISABLE_MANPAGE: ++ if not ctx.env.BUILD_MAN: + return + + ctx(features="subst", +diff --git a/wscript b/wscript +index c7c5468b1..601edaacd 100644 +--- a/wscript ++++ b/wscript +@@ -55,10 +55,12 @@ Usage: waf + + def options(ctx): + options_cmd(ctx, config) ++ ctx.load('asciidoc', tooldir='wafhelpers/') + ctx.recurse("pylib") + + + def configure(ctx): ++ ctx.load('asciidoc', tooldir='wafhelpers/') + class oc(Build.BuildContext): + cmd = 'oc' + +@@ -93,7 +95,6 @@ def configure(ctx): + ctx.run_build_cls = 'check' + ctx.load('waf', tooldir='wafhelpers/') + ctx.load('waf_unit_test') +- ctx.load('pytest') + ctx.load('gnu_dirs') + + with open("VERSION", "r") as f: +@@ -148,55 +149,6 @@ def configure(ctx): + ctx.find_program("awk", var="BIN_AWK", mandatory=False) + ctx.find_program("sh", var="BIN_SH", mandatory=False) + +- # used to make man and html pages +- ctx.find_program("asciidoc", var="BIN_ASCIIDOC", mandatory=False) +- # make sure asciidoc is new enough. +- # based on check_python_version() from waf +- if ctx.env.BIN_ASCIIDOC: +- # https://lists.ntpsec.org/pipermail/devel/2016-July/001778.html +- asciidocminver = (8, 6, 0) +- # Get asciidoc version string +- cmd = ctx.env.BIN_ASCIIDOC + ['--version'] +- # example output: asciidoc 8.6.9 +- lines = ctx.cmd_and_log(cmd).split()[1].split(".") +- assert len(lines) == 3, "found %r lines, expected 3: %r" \ +- % (len(lines), lines) +- asciidocver_tuple = (int(lines[0]), int(lines[1]), int(lines[2])) +- +- # Compare asciidoc version with the minimum required +- result = (asciidocver_tuple >= asciidocminver) +- +- asciidocver_full = '.'.join(map(str, asciidocver_tuple[:3])) +- asciidocminver_str = '.'.join(map(str, asciidocminver)) +- ctx.msg('Checking for asciidoc version >= %s' % (asciidocminver_str,), +- asciidocver_full, color=result and 'GREEN' or 'YELLOW') +- +- if not result: +- del ctx.env.BIN_ASCIIDOC +- ctx.find_program("a2x", var="BIN_A2X", mandatory=False) +- ctx.find_program("xsltproc", var="BIN_XSLTPROC", mandatory=False) +- +- ctx.env.ENABLE_DOC = False +- if ctx.env.BIN_ASCIIDOC and ctx.env.BIN_XSLTPROC and ctx.env.BIN_A2X: +- ctx.env.ENABLE_DOC = True +- +- if ctx.options.enable_doc and not ctx.env.ENABLE_DOC: +- ctx.fatal("asciidoc and xsltproc are required in order " +- "to build documentation") +- elif ctx.options.enable_doc: +- ctx.env.ASCIIDOC_FLAGS = [] +- ctx.env.ENABLE_DOC_USER = ctx.options.enable_doc +- +- # XXX: conditionally build this with --disable-man? +- # Should it build without docs enabled? +- ctx.env.A2X_FLAGS = ["--format", "manpage"] +- if not ctx.options.enable_a2x_xmllint: +- ctx.env.A2X_FLAGS += ["--no-xmllint"] +- +- # Disable manpages within build() +- if ctx.options.disable_manpage: +- ctx.env.DISABLE_MANPAGE = True +- + ctx.check_cfg( + package='systemd', variables=['systemdsystemunitdir'], + uselib_store='SYSTEMD', mandatory=False, +@@ -662,7 +614,7 @@ int main(int argc, char **argv) { + ('strlcat', ["string.h"]) + ) + for ft in optional_functions: +- probe_function(ctx, function=ft[0], prerequisites=ft[1]) ++ probe_function(ctx, function=ft[0], prerequisites=ft[1]) + + # This area is still work in progress + # Need to disable making symbols +@@ -897,8 +848,8 @@ int main(int argc, char **argv) { + msg_setting("Droproot Support", droproot_type) + msg_setting("Debug Support", yesno(ctx.options.enable_debug)) + msg_setting("Refclocks", ", ".join(sorted(ctx.env.REFCLOCK_LIST))) +- msg_setting("Build Manpages", +- yesno(ctx.env.ENABLE_DOC and not ctx.env.DISABLE_MANPAGE)) ++ msg_setting("Build Docs", yesno(ctx.env.BUILD_DOC)) ++ msg_setting("Build Manpages", yesno(ctx.env.BUILD_MAN)) + + ctx.recurse("pylib") + # Convert the Python directories to absolute paths. +@@ -1035,14 +986,6 @@ def build(ctx): + # the build directory never happens. This is how we foil that. + ctx.add_pre_fun(lambda ctx: ctx.exec_command("rm -f pylib/*.py[co]")) + +- if verbose > 0: # Pass Verbosity to asciidoc and a2x +- ctx.env.A2X_FLAGS += ["-v"] +- ctx.env.ASCIIDOC_FLAGS += ["-v"] +- +- if ctx.env.ENABLE_DOC_USER: +- if ctx.variant != "main": +- ctx.recurse("docs") +- + if ctx.variant == "host": + ctx.recurse("ntpd") + return diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch new file mode 100644 index 000000000000..ee75d103d2e6 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch @@ -0,0 +1,16 @@ +diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c +index 4e5ceaa36c1a7b452445023e201ddb6211625c52..78ac7aea263ed3d3394b2d32e79a6836f0387434 100644 +--- a/ntpd/ntp_sandbox.c ++++ b/ntpd/ntp_sandbox.c +@@ -428,6 +428,11 @@ int scmp_sc[] = { + /* gentoo 64-bit and 32-bit, Intel and Arm use mmap */ + SCMP_SYS(mmap), + #endif ++#if defined(__aarch64__) ++ SCMP_SYS(faccessat), ++ SCMP_SYS(newfstatat), ++ SCMP_SYS(renameat), ++#endif + #if defined(__i386__) || defined(__arm__) || defined(__powerpc__) + SCMP_SYS(_newselect), + SCMP_SYS(_llseek), diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild index 1316806dc69d..22989ca4d482 100644 --- a/net-misc/ntpsec/ntpsec-1.1.8.ebuild +++ b/net-misc/ntpsec/ntpsec-1.1.8.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE='threads(+)' inherit flag-o-matic python-r1 waf-utils systemd @@ -62,6 +62,10 @@ DEPEND="${CDEPEND} WAF_BINARY="${S}/waf" +PATCHES=( "${FILESDIR}/${P}-externalize-sys_maxclock-fix-for-bug-708522.patch" + "${FILESDIR}/${P}-fix-missing-scmp_sys-on-aarch64.patch" + "${FILESDIR}/${P}-fix-asciidoc-version-detect.patch") + src_prepare() { default # Remove autostripping of binaries @@ -147,7 +151,12 @@ src_install() { 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 + if use doc; then + mv -v "${ED}"/usr/share/doc/"${PN}" \ + "${ED}"/usr/share/doc/"${PF}"/html + else + rm -rf "${ED}"/usr/share/doc/"${PN}" + fi } pkg_postinst() { diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index 1316806dc69d..36dc8d080881 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE='threads(+)' inherit flag-o-matic python-r1 waf-utils systemd diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest index 92a05e22a754..e56110747565 100644 --- a/net-misc/oidentd/Manifest +++ b/net-misc/oidentd/Manifest @@ -1,5 +1,5 @@ AUX oidentd-2.0.7-init 837 BLAKE2B ab01ed3d6675f6196edcf7712c9f2e77369edc2481433788e63a3a82e591831869623723002f49a4498ed10ba7657f51dbc795895384213e473eba950e7ba7be SHA512 ebd072d86fa879017bb43f8f9cdd0ea563f337b558552ebdc27c980376889dfd22f2d6bdeb424ca3e2dbe62a78ceb80208ee26398aed0c38c4f973646d6d80d3 AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a DIST oidentd-2.4.0.tar.xz 188280 BLAKE2B e7a6cdcc78ae61b103b81335d6a4802bbc301adad256dbe9461245e7a2839e1f4786cf3bf7206df2f8fc6414351c4bb8f92c87d16d69f678e0793b9a760ee966 SHA512 3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0 -EBUILD oidentd-2.4.0.ebuild 1184 BLAKE2B c6b8651c9717c645d4a6d4b9b5aaccc5e40a7774614b1129d4123f7686ee9aa5a563f04bee60e07070d25ce92e83f429f2a905f36822a40dffd45101f98eb0a0 SHA512 edc0fe5a171966fbe5ea2c3a28aaa0d77ff98f7c1ea3f59063ee1fa16ffef01c8b9f9f91354bc839ec5332ebba60e274f375034d0ead3a367bf439ee04ee8c0c +EBUILD oidentd-2.4.0.ebuild 1181 BLAKE2B e7dfd55712c91fa3073ac2e49a7e2f6360fc4804bb3aa64971dae63addfa814de422657358ede9510087787b869b9f5c95aaad7b4e26f7cd9eed1549128ae06b SHA512 dcaba59488562d2758972307cb5ea0bd99d11ae2cec142d64fe54f2adfe9df085959f91733a117dd35ce3684899a3d7d087791230506339ca7bd3937346aede0 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84 diff --git a/net-misc/oidentd/oidentd-2.4.0.ebuild b/net-misc/oidentd/oidentd-2.4.0.ebuild index f47f07b80bf0..00f4dd339b44 100644 --- a/net-misc/oidentd/oidentd-2.4.0.ebuild +++ b/net-misc/oidentd/oidentd-2.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz" LICENSE="BSD-2 GPL-2 LGPL-2+ MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" IUSE="debug ipv6 masquerade selinux" DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )" diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest index 435503595ea2..1a78ed58e478 100644 --- a/net-misc/openntpd/Manifest +++ b/net-misc/openntpd/Manifest @@ -3,7 +3,7 @@ AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f0 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e DIST openntpd-6.0p1.tar.gz 432696 BLAKE2B 331214c5a77adf99974a665a157255857b295f49409721d8530fdd2eb6c00e458a2e6395105a527a4a8603e65efb33e16f752c70222e9f7697f8c871d51cffda SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50 -EBUILD openntpd-6.0_p1.ebuild 2967 BLAKE2B 5fe3b04828dbbc6467c3edf549a5d62ebdfc7aa1db7a4a5c57902efba5162b05a216c0d803b0eba356ec9d9225cfdfa778af275ea6f21a72c277caa1c225ef70 SHA512 dee32de36230a92a3040a8890cee68b60128c27cf6185a517806f484411ce4afd41b27759ec2194ac0829b30df5805b588a92cd657f73829fe4e9f9569ee921a -EBUILD openntpd-6.2_p3-r1.ebuild 1828 BLAKE2B 7813a2d7d4812115e70298d31672496804a96a3209174cc1008489402e7af8d6ad2352d2e7ba7cbdd0ef45d1c5811134e1503dd50e95bca672a4fa5954c5cc0e SHA512 89b35ea882953ca5ac63859ab30c8daebe48349aacd1bbd486be67ebb2bcccbd8e7f8c468f0def8f46a5b42f38d1d49bd3f6676688bbcf86afa9a610eb62cbfe -EBUILD openntpd-6.2_p3.ebuild 3142 BLAKE2B fd27664a830055da657731df5b3e36d6643d7b8d31d2b2c89885597bb26b7055dd00c57d1f3a629bfe1a57475fe913774c44c8d492f513779b104ab9be01b9ce SHA512 d1d25b88d27a4e7a59cf71929fc3a8245ef46ee28f5d2ac87281c9979406c64b4c2522ecb03333fdca0055a0d5a0c4e9db84e2329c4ac93c12cd7104abd16980 +EBUILD openntpd-6.0_p1.ebuild 2964 BLAKE2B 3c46ec39de60ac3b58f52b23f3c196077e6bcd2e0c05f5f1f8a218d4a0b64ee87d00db003b2913939df7bcdd5558c2e9c054ecb11cfd648697080e047876ca94 SHA512 b211e867e39bd9b0a52c43cab7f33aece4ca257c18b50d50f3c73a4d87b1d5fb06f3f2a20e55a3c7628d66d12e23fad0740457d5099188f2c06231b7598f1fc7 +EBUILD openntpd-6.2_p3-r1.ebuild 1824 BLAKE2B 80b4a5cf3a6b6056ffe20a50c903d5375efeecb5928e53fff99d451e32b07dde34f2d96f8d0cae9c3079ab305356b57c7ed357947e88ea989ce5fef3729bcfa7 SHA512 a9a99e0441b7dfd7278dce5ffe2f531055a02780e8ee60371b82d33f7fb51a3699cde093cf1e841e928263d373495830603315add6262d0873a4735427cb47e6 +EBUILD openntpd-6.2_p3.ebuild 3135 BLAKE2B ad1cf55027141cfe2e571788802f92844f2792d21dc551119760a72de2b7e41cef7aed7028e1071866de828f9cd5b70cb8a214cb16d87b2db26b9147102d7ee7 SHA512 c2f99c14eff42f9ad674b45636cb7b28686adee52d5037a79694356d18770c6d2d9766eece06efe99272f13356bd944b76db650420c9ed1069ca726c6c9cad8a MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361 diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild index 8b2c9daf99e0..eeb3ff507f8c 100644 --- a/net-misc/openntpd/openntpd-6.0_p1.ebuild +++ b/net-misc/openntpd/openntpd-6.0_p1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="libressl selinux" DEPEND="!<=net-misc/ntp-4.2.0-r2 diff --git a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild index db3edb458e54..acec71efebaf 100644 --- a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild +++ b/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="libressl selinux" DEPEND=" diff --git a/net-misc/openntpd/openntpd-6.2_p3.ebuild b/net-misc/openntpd/openntpd-6.2_p3.ebuild index d8fc96246d88..2250abea65c1 100644 --- a/net-misc/openntpd/openntpd-6.2_p3.ebuild +++ b/net-misc/openntpd/openntpd-6.2_p3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="libressl selinux" DEPEND=" diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index f3816a61d6ba..77a187243ea2 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -39,7 +39,9 @@ AUX openssh-8.1_p1-hpn-glue.patch 7830 BLAKE2B 81c239f57d252b3a9bb1c7aed56ac6719 AUX openssh-8.1_p1-tests-2020.patch 1332 BLAKE2B a400f6859a5d096729c9cb6047dce8612da7fe5f8d06cc891cfb6a4c88b568be3dfc7872d5be78ef349798f501828e1505bbd5ebd49d548dbbdc6bbf987dc843 SHA512 8f4c535d3ab15e4c761f6f5d4efe762ec2bc9b5de49ee369ce9186fe40095d2065418249c89161a8ef53e893079264fd9c95b73cd74937b08fa9f563a4f00290 AUX openssh-8.2_p1-GSSAPI-dns.patch 11647 BLAKE2B b904922f809a6616f488509a962c778837bc6003138efe79fb1ce9edf9611f14c209c11559a922497c50c3dff450286e40dfcb929414cb7f705357d2c4e3603d SHA512 f9256a80c75ae0db11df0e562ace026614f2f6d0f6c91eaed7786b2a3c37608e18ca45242385813fa34487e50f21e5d3a13bfb66adc854b7c34d278a164c3dc4 AUX openssh-8.2_p1-X509-12.4.2-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a +AUX openssh-8.2_p1-X509-12.4.3-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a AUX openssh-8.2_p1-X509-glue-12.4.2.patch 5118 BLAKE2B 6adb167f27a926ac591c023e0bec87d3d5df9fd331338eea16240133bb1f637c5b2b8c44358ace9d390c2e8ed5f627360b8928ab47415fc89dcc44c1c8f1de5a SHA512 e4121c9b454445613a38d68a6dcb7be27ede1878fba811678d8a8b4cd185db609b4ffe7efb6cab0121e00af84aa86c798ebcedfe43a1b1ba4c200fe8600ba7b5 +AUX openssh-8.2_p1-X509-glue-12.4.3.patch 5024 BLAKE2B 96568de2316e50d8390654aecbec7751eb9eb333b30fb30700161c626f93e97c5fb244d96baf32fa12d31760efdb10c80012f872412e90837f8b294082d7b087 SHA512 85c635ed067ec3c829fe4caee6bfe84e0f986f0513d744476e637c1af16af910604b879e6894300be1ce8a6a6e397149329e8fe09246e3654dcdef1ff44da4ed AUX openssh-8.2_p1-hpn-14.20-X509-glue.patch 4881 BLAKE2B 899065ef3b781e7e67ea630ff26ac8c3975073e9ef5b0cc345c6cee9fb2e45d2ff549b716a76211c88efb1e540ed7d79c4467e0342cfbea64fef8e6cafddac85 SHA512 d37d4fd8614bed8b1592697b911a04e2ca7d14d24e9c315a6695b4c88cdb5b4ae980e8cb68040fe54b4587675ebb3ac5694ea0d09093f8451aa65e427b6a5d95 AUX openssh-8.2_p1-hpn-14.20-glue.patch 5294 BLAKE2B 6a778eab95e05d371fd92a02f96b926cec5c6ff90dea36065b4857ddf243b5f95bb25aa339fddb1c662b628f26d0c11858d1ca0badece0a7268d6a51e99a09be SHA512 50289c60df01a59f134a0b283ec21d6a06beccdb68de67a46b4e0e9a9bc47855b0e4dbed47300c2f042f2eb9f63e4d6d0683f3092ee358a82e9d6337a3b173fe AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde @@ -75,16 +77,18 @@ DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab4 DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566 DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925 DIST openssh-8.2p1+x509-12.4.2.diff.gz 805574 BLAKE2B 4df31b634308ce074d820df24984d44fdde48e115f8c2ac62afb09f28602acf9e4b080a13e5ba2e6033fe92bc4289ef00ed7adbb4af334462fbc9c82c4e7b64f SHA512 770b269929df0b7c9709fa2d07693a3ae9ebaca12fe463f7eabdaab66ee115fc02afa46dc847493d5050bff105740f2c1453fc456271d723c6e5b98d5bf7fd43 +DIST openssh-8.2p1+x509-12.4.3.diff.gz 806905 BLAKE2B 8e0f0f3eeb2aafd9fc9e6eca80c0b51ffedbed9dfc46ff73bb1becd28f6ac013407d03107b59da05d9d56edbf283eef20891086867b79efd8aab81c3e9a4a32f SHA512 51117d7e4df2ff78c4fdfd08c2bb8f1739b1db064df65bab3872e1a956c277a4736c511794aa399061058fea666a76ee07bb50d83a0d077b7fa572d02c030b91 DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305 DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221 DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1877acdedeaee80172da469b5a62d0aaa43d6ed46c578e7893577b9d563835d89ca2044867fc561ad3f562bf504c025cf4c78421cf3d24397e9 SHA512 768db7cca8839df4441afcb08457d13d32625b31859da527c3d7f1a92d17a4ec81d6987db00879c394bbe59589e57b10bfd98899a167ffed65ab367b1fd08739 DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b -EBUILD openssh-7.5_p1-r4.ebuild 11181 BLAKE2B 05ab7ab14082824bc936d189cd72087e795d02b98ab73a1161ebd5ead95c9f466763f7a13aeb151edf99fc18d89d2fe4cd04ed1d514c97bf0139376e3eaad53b SHA512 7f94963a12667c41ce2a73d17ce8528fefe60a04b7c3a33daf76fb8066a1d9fcc3632925cdf338846e35234e6412dfb3d64485d810e18575ca3db1303de79d91 -EBUILD openssh-7.7_p1-r9.ebuild 15924 BLAKE2B b4c978f231feeadbd3ed5bde9424bc4ad0533ca6ac0cafe1a33417dbd1d04182e92444f4553c1762a0aa97c45cc20dc2f869638a788b1a2df9e89cfdfeba9f8d SHA512 6104ca756ad931f08b27e9f3b3ed6519ee5f89e30ece3607a4cee81081c9d15d7c39776dd3629671cc44074d79a96e923f5d08c8dc5920f77be03c174567d6c6 -EBUILD openssh-7.9_p1-r4.ebuild 16296 BLAKE2B 836063b7f82a97e473f042ef2f2fe87521f4c72f9a4d4289205f5530bce5cb7e14ac5fac889634f82cc01a6e5bf5b9907aad57ff5040a2b5587682f44580d092 SHA512 41c100d9918aac6fae825aee354329dc8eaf63361c3125636369441eed98e1e96831f5e7dc623958d56d62ec09e5f2f74c9f93da6af9e00f220c36b7cd3f2e49 -EBUILD openssh-8.0_p1-r4.ebuild 16679 BLAKE2B cc2c63682376443a11036e10182b7bef0c61bbb0a33fb3bf8e806a79d13f1bf9208f7c47519ddc35a95b3025b91026144e60480c92954eefff62791281d6c006 SHA512 674208389a7b7b28495a5145a948f1083a25b7697b6620677b3035111e8b73d9fcfeb091b516026c0edcd6dd4c37b939a1dc21738b372029acb68e0bbcdfaa5a -EBUILD openssh-8.1_p1-r2.ebuild 16426 BLAKE2B 42562396d6bc711b5489375dc76ecc4b3307a366e9a8500f483973a7b401f1e2b4e5dd1aba79cd4d307fee80429efa3d1d90c2acc76bd71a8f7687e3a5fddc9e SHA512 73d077862441a26a20c41acbc59bd047854bfaa77fe3ad64125ec7011bb6941147bff005310deacd0550c2156e6632732543835bb128856b83a55a553987f5da -EBUILD openssh-8.2_p1-r3.ebuild 16788 BLAKE2B f5b7d8c76dd487da270c3f4370fb69389855a2b816ecff6bda726cf6b58676f187766f521ded13c0fda33dab89acdd45d2d05a5595b0bec437e079a741a7250e SHA512 5d8bdc782ae8bc26cf534d6871dda1aef53d9bb2bde4b3ecf8999407c5b2b33c193b9be10b9076dad99bef00c5cadfb3d56d9101b03c1b49af4dd5c9735c3390 -MISC metadata.xml 2361 BLAKE2B 695d283e9b32826edf5d86ed1a26f3182d09ddf5ec40a35ac8273cf99ba042f4b6aeec563946e8c2b2ab5de798258c95810c8b23b9b725d1633b8ea7b0a105e7 SHA512 a532edee5daadb1390a02c124cf4dd0c80b956676bfe833bb5ffccc1cdc0d2aa9c5f9d10f61cb24af74aa7b731c2cc2f4b4418d94a2a75cc8f0c57ea98d57707 +EBUILD openssh-7.5_p1-r5.ebuild 11193 BLAKE2B 62b884f5ec9924d199c7c14a91aeed198013cba04716a0010c8254382dd55e95783fbc8641005cf1929900ed04804573ed39a407349ec1a450f6582bca6ba9aa SHA512 82b9eca54d021b995832b28f97dfae75e38dcdf426581dfe75704280b0a2818cafbc09f82ff7a43bbc7fd68e49a441844d1163411723d474bccd8905b82359b2 +EBUILD openssh-7.7_p1-r10.ebuild 15936 BLAKE2B 54042c1bf3f7d19e58c9d6e1970f3a3194e73d716652a669a1ea04c066112dae6dcd7e09fe2ae20e4a21a8dc18d513231bcf26b1917ab877b93c0e2fb18e3de3 SHA512 33896ad4ba6ee7b7238d8b1cc3ed04993e8e07e2456cd70295656b1522ad9eb2caeecdb897568ca13cb6f4f9e70fff7b238b634a8102ef5bff87f9654d11ddfc +EBUILD openssh-7.9_p1-r5.ebuild 16308 BLAKE2B ad98ce6cfd5be009c649c698993be93bdadcc959fc9bc4d43a4bbc45865c8bc802f6a4e179ed7d24af0181f3f454cb4c62992e1f66d86b475a48ccf995ce0ced SHA512 c5783252f16e4010c1466033c49e5a261206dd00203e9e01b55f09d9ad414def0532fc9067e1bf3cfb1e37b19db1bec2cd4c54dc89056c00f4d7c1f30d38a0fc +EBUILD openssh-8.0_p1-r5.ebuild 16691 BLAKE2B 901cd0ea83d38a5f611690ec603965923e0bae4ada7553ec7d8ed8aeac05588e81d21425f9808d245427af73f3be7023b759f69da4db84b7c6b70ee362ee0a65 SHA512 b4ffe6b7b488b27f38cf7948b81924aea39062443653f499682b3e45905598b1c882a0413dd042d9ff234af555bd21db574f732f9551f86c8d2e815ed49d5125 +EBUILD openssh-8.1_p1-r3.ebuild 16430 BLAKE2B 5f87ff43f472c467a8e4dc359556b970a2d9889d45d5eb09c5eac5c0d245027764ec4d6b99853baaf7324883e5be426e20515b53f48fcc7a445a05e84fb0edde SHA512 e07cf259d7a6476c5efa4db22710bd533f86188bd1f5139e2c306858dd67e3b2a83cf5c9236c9441171e25af20a14e9f1d04aa058020ac9a20e0b0d6e7d8d89d +EBUILD openssh-8.2_p1-r5.ebuild 16798 BLAKE2B 03dd8a663c89cb2185188a0fa9f72af49def3f44a9eaaa989c95f8b2812aab7a335547ff9d22edf64522576a04705e1f957d0edfe2ecf397df760f077eb846c5 SHA512 2a1714d7c8fa18a7b3bf5333625773e2125ca21dd3096766aad341663510503276db61fa42b9cc99d0531b4fcc55ae81e31c47de7502f7c2d83bdb49b91f1448 +EBUILD openssh-8.2_p1-r6.ebuild 16798 BLAKE2B 873c0b86b6c7613d7259e83f9b0377cdc9cc0b3a8dfb8db2821812a33f90f834714995c1c3d045f15691fd25412730165cc6b2fcbcc75d4f2ebfdff7824c1ccb SHA512 fa4007ec3b566c448d7fa5e257dc09aff7ab64491a7c54a19234bfd71fb165f5e46941e91c7d44f98c6819ae54b41c596869afe3e2da6a663dfab9e5db0e1c45 +MISC metadata.xml 2361 BLAKE2B c6fa43fd5cf20d97fa4d135bdef21d81b5b2ead3bcacbb9b9d7ceba7a699c9cbe7895a68a3d79e3d6afb145c8c35ed6a9a35ef7858a9474b26ee00137ea3f0f2 SHA512 7a2dacdc2a7ea1c1181b59152faeaa56c3ec563db2adb2e3b125a3819e32826edf6e8945d1a7c0328fa56f15c3d86d4dbe6afdad717cdcb0c1e92a08991d8f3e diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.3-tests.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.3-tests.patch new file mode 100644 index 000000000000..1c58d0d5d823 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.3-tests.patch @@ -0,0 +1,11 @@ +--- a/openbsd-compat/regress/Makefile.in 2020-02-15 10:59:01.210601434 -0700 ++++ b/openbsd-compat/regress/Makefile.in 2020-02-15 10:59:18.753485852 -0700 +@@ -7,7 +7,7 @@ + CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ ++CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ + EXEEXT=@EXEEXT@ + LIBCOMPAT=../libopenbsd-compat.a + LIBS=@LIBS@ diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.3.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.3.patch new file mode 100644 index 000000000000..e73c499d5c4e --- /dev/null +++ b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.3.patch @@ -0,0 +1,128 @@ +--- a/openssh-8.2p1+x509-12.4.3.diff 2020-03-21 11:15:05.939809371 -0700 ++++ b/openssh-8.2p1+x509-12.4.3.diff 2020-03-21 11:23:15.424752355 -0700 +@@ -39298,16 +39298,15 @@ + + install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf +-@@ -378,6 +379,8 @@ ++@@ -378,6 +379,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) +-@@ -386,11 +389,14 @@ ++@@ -386,11 +388,14 @@ + $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) + $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) + $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) +@@ -39326,7 +39325,7 @@ + $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 + $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 + $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 +-@@ -400,12 +406,12 @@ ++@@ -400,12 +405,12 @@ + $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5 + $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 + $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 +@@ -39340,7 +39339,7 @@ + + install-sysconf: + $(MKDIR_P) $(DESTDIR)$(sysconfdir) +-@@ -463,10 +469,9 @@ ++@@ -463,10 +468,9 @@ + -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) + -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) + -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) +@@ -39354,7 +39353,7 @@ + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 +-@@ -478,7 +483,6 @@ ++@@ -478,7 +482,6 @@ + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 +@@ -39362,7 +39361,7 @@ + + regress-prep: + $(MKDIR_P) `pwd`/regress/unittests/test_helper +-@@ -491,11 +495,11 @@ ++@@ -491,11 +494,11 @@ + $(MKDIR_P) `pwd`/regress/unittests/match + $(MKDIR_P) `pwd`/regress/unittests/utf8 + $(MKDIR_P) `pwd`/regress/misc/kexfuzz +@@ -39376,7 +39375,7 @@ + + regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS) + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \ +-@@ -546,8 +550,7 @@ ++@@ -546,8 +549,7 @@ + regress/unittests/sshkey/tests.o \ + regress/unittests/sshkey/common.o \ + regress/unittests/sshkey/test_file.o \ +@@ -39406,7 +39405,7 @@ + + regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ + ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ +-@@ -618,35 +619,18 @@ ++@@ -618,35 +618,18 @@ + -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) + + MISC_KEX_FUZZ_OBJS=\ +@@ -39444,7 +39443,7 @@ + regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ + regress/unittests/sshkey/test_sshkey$(EXEEXT) \ + regress/unittests/bitmap/test_bitmap$(EXEEXT) \ +-@@ -657,36 +641,29 @@ ++@@ -657,36 +640,29 @@ + regress/unittests/utf8/test_utf8$(EXEEXT) \ + regress/misc/kexfuzz/kexfuzz$(EXEEXT) + +@@ -39501,7 +39500,7 @@ + TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ + TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \ + TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ +-@@ -708,8 +685,6 @@ ++@@ -708,8 +684,6 @@ + TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ + TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ + TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ +@@ -39510,7 +39509,7 @@ + TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ + TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ + TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ +-@@ -717,17 +692,35 @@ ++@@ -717,17 +691,35 @@ + TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ + TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ + TEST_SSH_ECC="$${TEST_SSH_ECC}" \ +@@ -39549,7 +39548,7 @@ + + survey: survey.sh ssh + @$(SHELL) ./survey.sh > survey +-@@ -743,4 +736,8 @@ ++@@ -743,4 +735,8 @@ + sh buildpkg.sh; \ + fi + +@@ -98215,16 +98214,6 @@ + + return mbtowc(NULL, s, n); + +} + +#endif +-diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4.3/version.h +---- openssh-8.2p1/version.h 2020-02-14 02:40:54.000000000 +0200 +-+++ openssh-8.2p1+x509-12.4.3/version.h 2020-03-21 19:07:00.000000000 +0200 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_8.2" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4.3/version.m4 + --- openssh-8.2p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-8.2p1+x509-12.4.3/version.m4 2020-03-21 19:07:00.000000000 +0200 diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml index 6cc1ea784228..22ea5e88361e 100644 --- a/net-misc/openssh/metadata.xml +++ b/net-misc/openssh/metadata.xml @@ -36,7 +36,7 @@ ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and Enable XMSS post-quantum authentication algorithm - cpe:/a:openssh:openssh + cpe:/a:openbsd:openssh hpnssh diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild deleted file mode 100644 index 1614b7a9c148..000000000000 --- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild +++ /dev/null @@ -1,335 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils user flag-o-matic multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} - -HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz" -SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz" -LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz" -X509_VER="10.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="http://www.openssh.org/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}} - ${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )} - ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )} - ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} - " - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509" -RESTRICT="!test? ( test )" -REQUIRED_USE="ldns? ( ssl ) - pie? ( !static ) - ssh1? ( ssl ) - static? ( !kerberos !pam ) - X509? ( !ldap !sctp ssl ) - test? ( ssl )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) - ssl? ( - !libressl? ( - >=dev-libs/openssl-1.0.1:0=[bindist=] - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - >=sys-libs/zlib-1.2.3:=[static-libs(+)]" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/pkgconfig - virtual/os-headers - sys-devel/autoconf" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( virtual/shadow ) - X? ( x11-apps/xauth )" - -S=${WORKDIR}/${PARCH} - -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 - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use X509 && maybe_fail X509 X509_PATCH) - $(use ldap && maybe_fail ldap LDAP_PATCH) - $(use hpn && maybe_fail hpn HPN_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - 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 -} - -save_version() { - # version.h patch conflict avoidence - mv version.h version.h.$1 - cp -f version.h.pristine version.h -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - # keep this as we need it to avoid the conflict between LPK and HPN changing - # this file. - cp version.h version.h.pristine - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - if use X509 ; then - if use hpn ; then - pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null - epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch - popd >/dev/null - fi - save_version X509 - epatch "${WORKDIR}"/${X509_PATCH%.*} - fi - - if use ldap ; then - epatch "${WORKDIR}"/${LDAP_PATCH%.*} - save_version LPK - fi - - epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex - epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch - use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252 - use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} - use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch - use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch - - if use hpn ; then - EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ - EPATCH_MULTI_MSG="Applying HPN patchset ..." \ - epatch "${WORKDIR}"/${HPN_PATCH%.*.*} - save_version HPN - fi - - 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 - - epatch_user #473004 - - # Now we can build a sane merged version.h - ( - sed '/^#define SSH_RELEASE/d' version.h.* | sort -u - macros=() - for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done - printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}" - ) > version.h - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - - 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 ldap patch conditionally, so can't pass --without-ldap - # unconditionally else we get unknown flag warnings. - $(use ldap && use_with ldap) - $(use_with ldns) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use X509 || use_with sctp) - $(use_with selinux) - $(use_with skey) - $(use_with ssh1) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id - newinitd "${FILESDIR}"/sshd.rc6.4 sshd - newconfd "${FILESDIR}"/sshd.confd sshd - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - 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 - - # Gentoo tweaks to default config files - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config - - # Allow client to pass locale environment variables #367017 - AcceptEnv LANG LC_* - EOF - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config - - # Send locale environment variables #367017 - SendEnv LANG LC_* - EOF - - 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 - - if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then - insinto /etc/openldap/schema/ - newins openssh-lpk_openldap.schema openssh-lpk.schema - fi - - doman contrib/ssh-copy-id.1 - dodoc CREDITS OVERVIEW README* TODO sshd_config - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" \ - emake -k -j1 ${t} > /etc/portage/package.mask" + die "booooo" + 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 +} + +save_version() { + # version.h patch conflict avoidence + mv version.h version.h.$1 + cp -f version.h.pristine version.h +} + +src_prepare() { + sed -i \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ + pathnames.h || die + # keep this as we need it to avoid the conflict between LPK and HPN changing + # this file. + cp version.h version.h.pristine + + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + if use X509 ; then + if use hpn ; then + pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null + epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch + popd >/dev/null + fi + save_version X509 + epatch "${WORKDIR}"/${X509_PATCH%.*} + fi + + if use ldap ; then + epatch "${WORKDIR}"/${LDAP_PATCH%.*} + save_version LPK + fi + + epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex + epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + epatch "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch + epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch + epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch + use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252 + use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} + use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch + use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch + + if use hpn ; then + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ + EPATCH_MULTI_MSG="Applying HPN patchset ..." \ + epatch "${WORKDIR}"/${HPN_PATCH%.*.*} + save_version HPN + fi + + 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 + + epatch_user #473004 + + # Now we can build a sane merged version.h + ( + sed '/^#define SSH_RELEASE/d' version.h.* | sort -u + macros=() + for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done + printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}" + ) > version.h + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + + 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 ldap patch conditionally, so can't pass --without-ldap + # unconditionally else we get unknown flag warnings. + $(use ldap && use_with ldap) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use X509 || use_with sctp) + $(use_with selinux) + $(use_with skey) + $(use_with ssh1) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd.rc6.4 sshd + newconfd "${FILESDIR}"/sshd.confd sshd + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + 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 + + # Gentoo tweaks to default config files + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config + + # Allow client to pass locale environment variables #367017 + AcceptEnv LANG LC_* + EOF + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config + + # Send locale environment variables #367017 + SendEnv LANG LC_* + EOF + + 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 + + if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then + insinto /etc/openldap/schema/ + newins openssh-lpk_openldap.schema openssh-lpk.schema + fi + + doman contrib/ssh-copy-id.1 + dodoc CREDITS OVERVIEW README* TODO sshd_config + use X509 || dodoc ChangeLog + + diropts -m 0700 + dodir /etc/skel/.ssh + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" \ + emake -k -j1 ${t} > /etc/portage/package.mask" + die "booooo" + 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_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.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 + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + eapply "${WORKDIR}"/${X509_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' ) + + einfo "Disabling broken X.509 agent test ..." + sed -i \ + -e "/^ agent$/d" \ + "${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test" + + # The following patches don't apply on top of X509 patch + rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die + rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die + rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die + rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die + else + rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die + rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die + 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 know 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 + eapply "${WORKDIR}"/${HPN_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}\"" \ + "${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 hpn ; then + einfo "Patching packet.c for X509 and/or HPN patch set ..." + sed -i \ + -e "s/const struct sshcipher/struct sshcipher/" \ + "${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)" + 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 "${WORKDIR}"/patch/*.patch + + eapply_user #473004 + + 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 + + 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) + $(use_with skey) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + # stackprotect is broken on musl x86 + use elibc_musl && use x86 && myconf+=( --without-stackprotect ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" \ + emake -k -j1 ${t} > "${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.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + 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 + + keepdir /var/empty + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_preinst() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild deleted file mode 100644 index 675ab6bdd43e..000000000000 --- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild +++ /dev/null @@ -1,445 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit user flag-o-matic multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} - -HPN_VER="14v15-gentoo2" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz" -SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz" - -PATCH_SET="openssh-7.7p1-patches-1.2" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )} - ${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )} - ${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )} - " - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509" -RESTRICT="!test? ( test )" -REQUIRED_USE="ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp ssl ) - test? ( ssl )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) - ssl? ( - !libressl? ( - >=dev-libs/openssl-1.0.1:0=[bindist=] - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - >=sys-libs/zlib-1.2.3:=[static-libs(+)]" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/pkgconfig - virtual/os-headers - sys-devel/autoconf" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( virtual/shadow ) - X? ( x11-apps/xauth )" - -S="${WORKDIR}/${PARCH}" - -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 - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_PATCH) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - 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_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.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 - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - eapply "${WORKDIR}"/${X509_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' ) - - einfo "Disabling broken X.509 agent test ..." - sed -i \ - -e "/^ agent$/d" \ - "${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test" - - # The following patches don't apply on top of X509 patch - rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die - rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die - rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die - rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die - else - rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die - rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die - 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 know 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 - eapply "${WORKDIR}"/${HPN_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}\"" \ - "${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 hpn ; then - einfo "Patching packet.c for X509 and/or HPN patch set ..." - sed -i \ - -e "s/const struct sshcipher/struct sshcipher/" \ - "${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)" - 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 "${WORKDIR}"/patch/*.patch - - eapply_user #473004 - - 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 - - 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) - $(use_with skey) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 - use elibc_musl && use x86 && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" \ - emake -k -j1 ${t} > "${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.initd sshd - newconfd "${FILESDIR}"/sshd-r1.confd sshd - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - - 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 - - keepdir /var/empty - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_preinst() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} - -pkg_postinst() { - if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild deleted file mode 100644 index 0a3da9ab28e2..000000000000 --- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild +++ /dev/null @@ -1,468 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user flag-o-matic multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -#HPN_PV="${PV^^}" -HPN_PV="7.8_P1" - -HPN_VER="14.16" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="11.6" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -PATCH_SET="openssh-7.9p1-patches-1.0" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/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} )} - " - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509" -RESTRICT="!test? ( test )" -REQUIRED_USE="ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp ssl ) - test? ( ssl )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist=] - =dev-libs/openssl-1.1.0g:0[bindist=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - >=sys-libs/zlib-1.2.3:=[static-libs(+)]" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/pkgconfig - virtual/os-headers - sys-devel/autoconf" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( virtual/shadow ) - X? ( x11-apps/xauth )" - -S="${WORKDIR}/${PARCH}" - -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 - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - 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_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-openssl-1.0.2-compat.patch - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-7.8_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 - - if use X509 ; then - # patch doesn't apply due to X509 modifications - rm \ - "${WORKDIR}"/patches/0001-fix-key-type-check.patch \ - "${WORKDIR}"/patches/0002-request-rsa-sha2-cert-signatures.patch \ - || die - else - eapply "${FILESDIR}"/${PN}-7.9_p1-CVE-2018-20685.patch # X509 patch set includes this patch - fi - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" || die - eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch" - eapply "${FILESDIR}/${P}-X509-dont-make-piddir-${X509_VER}.patch" - popd || die - - if use hpn ; then - einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - HPN_DISABLE_MTAES=1 - fi - - eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.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 know 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}" - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" - pushd "${hpn_patchdir}" - eapply "${FILESDIR}"/${P}-hpn-glue.patch - use X509 && eapply "${FILESDIR}"/${P}-hpn-X509-glue.patch - use sctp && eapply "${FILESDIR}"/${P}-hpn-sctp-glue.patch - popd - - eapply "${hpn_patchdir}" - eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.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 - - 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 - - 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 ldns "${EPREFIX}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" \ - emake -k -j1 ${t} > "${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 - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - - 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 - - keepdir /var/empty - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_preinst() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} - -pkg_postinst() { - if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-7.9_p1-r5.ebuild b/net-misc/openssh/openssh-7.9_p1-r5.ebuild new file mode 100644 index 000000000000..0eedfd4b682e --- /dev/null +++ b/net-misc/openssh/openssh-7.9_p1-r5.ebuild @@ -0,0 +1,468 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user flag-o-matic multilib autotools pam systemd toolchain-funcs + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} +#HPN_PV="${PV^^}" +HPN_PV="7.8_P1" + +HPN_VER="14.16" +HPN_PATCHES=( + ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff +) + +SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" +X509_VER="11.6" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" + +PATCH_SET="openssh-7.9p1-patches-1.0" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )} + ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/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} )} + " + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509" +RESTRICT="!test? ( test )" +REQUIRED_USE="ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp ssl ) + test? ( ssl )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( + !libressl? ( + || ( + ( + >=dev-libs/openssl-1.0.1:0[bindist=] + =dev-libs/openssl-1.1.0g:0[bindist=] + ) + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + ) + >=sys-libs/zlib-1.2.3:=[static-libs(+)]" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/pkgconfig + virtual/os-headers + sys-devel/autoconf" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( !prefix? ( sys-apps/shadow ) ) + X? ( x11-apps/xauth )" + +S="${WORKDIR}/${PARCH}" + +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 + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_VER) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + 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_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-openssl-1.0.2-compat.patch + eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch + eapply "${FILESDIR}"/${PN}-7.8_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 + + if use X509 ; then + # patch doesn't apply due to X509 modifications + rm \ + "${WORKDIR}"/patches/0001-fix-key-type-check.patch \ + "${WORKDIR}"/patches/0002-request-rsa-sha2-cert-signatures.patch \ + || die + else + eapply "${FILESDIR}"/${PN}-7.9_p1-CVE-2018-20685.patch # X509 patch set includes this patch + fi + + [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + pushd "${WORKDIR}" || die + eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch" + eapply "${FILESDIR}/${P}-X509-dont-make-piddir-${X509_VER}.patch" + popd || die + + if use hpn ; then + einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" + HPN_DISABLE_MTAES=1 + fi + + eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.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 know 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}" + cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" + pushd "${hpn_patchdir}" + eapply "${FILESDIR}"/${P}-hpn-glue.patch + use X509 && eapply "${FILESDIR}"/${P}-hpn-X509-glue.patch + use sctp && eapply "${FILESDIR}"/${P}-hpn-sctp-glue.patch + popd + + eapply "${hpn_patchdir}" + eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.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 + + 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 + + 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 ldns "${EPREFIX}"/usr) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + # stackprotect is broken on musl x86 and ppc + use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" \ + emake -k -j1 ${t} > "${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 + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + 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 + + keepdir /var/empty + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_preinst() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild deleted file mode 100644 index 5153ebc19847..000000000000 --- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild +++ /dev/null @@ -1,465 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user-info eapi7-ver flag-o-matic multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -#HPN_PV="${PV^^}" -HPN_PV="7.8_P1" - -HPN_VER="14.16" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="12.1-gentoo" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -PATCH_SET="openssh-7.9p1-patches-1.0" - -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/~whissi/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )} - " - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss" -RESTRICT="!test? ( test )" -REQUIRED_USE="ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp ssl ) - test? ( ssl )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist=] - =dev-libs/openssl-1.1.0g:0[bindist=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl:0=[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} - static? ( ${LIB_DEPEND} ) - virtual/pkgconfig - virtual/os-headers - sys-devel/autoconf" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( virtual/shadow ) - X? ( x11-apps/xauth )" - -S="${WORKDIR}/${PARCH}" - -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 - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - 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_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.0_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.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch - eapply "${FILESDIR}"/${PN}-8.1_p1-tests-2020.patch - use X509 || eapply "${FILESDIR}"/${PN}-8.0_p1-tests.patch - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - # X509 12.1-gentoo patch contains the changes from below - #pushd "${WORKDIR}" &>/dev/null || die - #eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" - #eapply "${FILESDIR}/${P}-X509-dont-make-piddir-"${X509_VER}".patch" - #popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.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 know 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}" - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-glue.patch - if use X509; then - einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # X509 and AES-CTR-MT don't get along, let's just drop it - rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${PN}-7.9_p1-hpn-sctp-glue.patch - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - if ! use X509; then - eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.patch" - eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch" - fi - - 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 - - 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 - - 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 ldns "${EPREFIX}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ - emake -k -j1 ${t} > "${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 - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - - 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 - - keepdir /var/empty - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_postinst() { - if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-8.0_p1-r5.ebuild b/net-misc/openssh/openssh-8.0_p1-r5.ebuild new file mode 100644 index 000000000000..f292c8e6b003 --- /dev/null +++ b/net-misc/openssh/openssh-8.0_p1-r5.ebuild @@ -0,0 +1,465 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user-info eapi7-ver flag-o-matic multilib autotools pam systemd toolchain-funcs + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} +#HPN_PV="${PV^^}" +HPN_PV="7.8_P1" + +HPN_VER="14.16" +HPN_PATCHES=( + ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff +) + +SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" +X509_VER="12.1-gentoo" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" + +PATCH_SET="openssh-7.9p1-patches-1.0" + +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/~whissi/dist/openssh/${SCTP_PATCH} )} + ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} + ${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )} + " + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss" +RESTRICT="!test? ( test )" +REQUIRED_USE="ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp ssl ) + test? ( ssl )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( + !libressl? ( + || ( + ( + >=dev-libs/openssl-1.0.1:0[bindist=] + =dev-libs/openssl-1.1.0g:0[bindist=] + ) + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl:0=[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} + static? ( ${LIB_DEPEND} ) + virtual/pkgconfig + virtual/os-headers + sys-devel/autoconf" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( !prefix? ( sys-apps/shadow ) ) + X? ( x11-apps/xauth )" + +S="${WORKDIR}/${PARCH}" + +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 + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_VER) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + 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_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.0_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.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch + eapply "${FILESDIR}"/${PN}-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch + eapply "${FILESDIR}"/${PN}-8.1_p1-tests-2020.patch + use X509 || eapply "${FILESDIR}"/${PN}-8.0_p1-tests.patch + + [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + # X509 12.1-gentoo patch contains the changes from below + #pushd "${WORKDIR}" &>/dev/null || die + #eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" + #eapply "${FILESDIR}/${P}-X509-dont-make-piddir-"${X509_VER}".patch" + #popd &>/dev/null || die + + eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.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 know 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}" + cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" + pushd "${hpn_patchdir}" &>/dev/null || die + eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-glue.patch + if use X509; then + einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" + # X509 and AES-CTR-MT don't get along, let's just drop it + rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die + eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-X509-glue.patch + fi + use sctp && eapply "${FILESDIR}"/${PN}-7.9_p1-hpn-sctp-glue.patch + popd &>/dev/null || die + + eapply "${hpn_patchdir}" + + if ! use X509; then + eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.patch" + eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch" + fi + + 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 + + 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 + + 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 ldns "${EPREFIX}"/usr) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + # stackprotect is broken on musl x86 and ppc + use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ + emake -k -j1 ${t} > "${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 + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + 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 + + keepdir /var/empty + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff --git a/net-misc/openssh/openssh-8.1_p1-r2.ebuild b/net-misc/openssh/openssh-8.1_p1-r2.ebuild deleted file mode 100644 index 5921f6945b0c..000000000000 --- a/net-misc/openssh/openssh-8.1_p1-r2.ebuild +++ /dev/null @@ -1,468 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -HPN_PV="${PV^^}" - -HPN_VER="14.20" -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="12.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -PATCH_SET="openssh-7.9p1-patches-1.0" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - https://dev.gentoo.org/~chutzpah/dist/openssh/${P}-glibc-2.31-patches.tar.xz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/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} )} -" -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp ssl ) - test? ( ssl ) -" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist=] - =dev-libs/openssl-1.1.0g:0[bindist=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl: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} - static? ( ${LIB_DEPEND} ) - virtual/os-headers -" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( virtual/shadow ) - X? ( x11-apps/xauth ) -" -BDEPEND=" - virtual/pkgconfig - sys-devel/autoconf -" - -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 - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - 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_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.1_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.1_p1-tests-2020.patch - - [[ -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}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.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 know 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.1_p1-hpn-${HPN_VER}-glue.patch - if use X509; then - # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # # X509 and AES-CTR-MT don't get along, let's just drop it - # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-${HPN_VER}-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${PN}-8.1_p1-hpn-${HPN_VER}-sctp-glue.patch - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.0_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 - - 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 - - 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 ldns "${EPREFIX}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ - emake -k -j1 ${t} > "${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 - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - - 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 - - keepdir /var/empty - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_postinst() { - if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-8.1_p1-r3.ebuild b/net-misc/openssh/openssh-8.1_p1-r3.ebuild new file mode 100644 index 000000000000..75b805da4ddb --- /dev/null +++ b/net-misc/openssh/openssh-8.1_p1-r3.ebuild @@ -0,0 +1,468 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} +HPN_PV="${PV^^}" + +HPN_VER="14.20" +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="12.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" + +PATCH_SET="openssh-7.9p1-patches-1.0" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + https://dev.gentoo.org/~chutzpah/dist/openssh/${P}-glibc-2.31-patches.tar.xz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} + ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/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} )} +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp ssl ) + test? ( ssl ) +" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( + !libressl? ( + || ( + ( + >=dev-libs/openssl-1.0.1:0[bindist=] + =dev-libs/openssl-1.1.0g:0[bindist=] + ) + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl: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} + static? ( ${LIB_DEPEND} ) + virtual/os-headers +" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( !prefix? ( sys-apps/shadow ) ) + X? ( x11-apps/xauth ) +" +BDEPEND=" + virtual/pkgconfig + sys-devel/autoconf +" + +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 + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_VER) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + 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_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.1_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.1_p1-tests-2020.patch + + [[ -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}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.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 know 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.1_p1-hpn-${HPN_VER}-glue.patch + if use X509; then + # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" + # # X509 and AES-CTR-MT don't get along, let's just drop it + # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die + eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-${HPN_VER}-X509-glue.patch + fi + use sctp && eapply "${FILESDIR}"/${PN}-8.1_p1-hpn-${HPN_VER}-sctp-glue.patch + popd &>/dev/null || die + + eapply "${hpn_patchdir}" + + use X509 || eapply "${FILESDIR}/openssh-8.0_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 + + 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 + + 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 ldns "${EPREFIX}"/usr) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + # stackprotect is broken on musl x86 and ppc + use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ + emake -k -j1 ${t} > "${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 + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + 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 + + keepdir /var/empty + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff --git a/net-misc/openssh/openssh-8.2_p1-r3.ebuild b/net-misc/openssh/openssh-8.2_p1-r3.ebuild deleted file mode 100644 index 0579a0af345e..000000000000 --- a/net-misc/openssh/openssh-8.2_p1-r3.ebuild +++ /dev/null @@ -1,482 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -HPN_PV="8.1_P1" - -HPN_VER="14.20" -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="12.4.2" 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/hpnssh/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} )} -" -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp !security-key ssl !xmss ) - xmss? ( || ( ssl libressl ) ) - test? ( ssl ) -" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - security-key? ( dev-libs/libfido2:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist=] - =dev-libs/openssl-1.1.0g:0[bindist=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl: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} - static? ( ${LIB_DEPEND} ) - virtual/os-headers -" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( virtual/shadow ) - X? ( x11-apps/xauth ) -" -BDEPEND=" - virtual/pkgconfig - sys-devel/autoconf -" - -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 - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - 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_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.2_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 - - [[ -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}"/${P}-X509-${X509_VER}-tests.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 know 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}"/${P}-hpn-${HPN_VER}-glue.patch - if use X509; then - # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # # X509 and AES-CTR-MT don't get along, let's just drop it - # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-sctp-glue.patch - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.0_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 - - 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 - - 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 ldns "${EPREFIX}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(use_with security-key security-key-builtin) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ - emake -k -j1 ${t} > "${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 - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - - 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 - - keepdir /var/empty - - 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/openssh/openssh-8.2_p1-r5.ebuild b/net-misc/openssh/openssh-8.2_p1-r5.ebuild new file mode 100644 index 000000000000..83bb3bd37ed4 --- /dev/null +++ b/net-misc/openssh/openssh-8.2_p1-r5.ebuild @@ -0,0 +1,482 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} +HPN_PV="8.1_P1" + +HPN_VER="14.20" +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="12.4.2" 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/hpnssh/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} )} +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp !security-key ssl !xmss ) + xmss? ( || ( ssl libressl ) ) + test? ( ssl ) +" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + security-key? ( dev-libs/libfido2:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( + !libressl? ( + || ( + ( + >=dev-libs/openssl-1.0.1:0[bindist=] + =dev-libs/openssl-1.1.0g:0[bindist=] + ) + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl: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} + static? ( ${LIB_DEPEND} ) + virtual/os-headers +" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( !prefix? ( sys-apps/shadow ) ) + X? ( x11-apps/xauth ) +" +BDEPEND=" + virtual/pkgconfig + sys-devel/autoconf +" + +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 + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_VER) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + 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_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.2_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 + + [[ -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}"/${P}-X509-${X509_VER}-tests.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 know 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}"/${P}-hpn-${HPN_VER}-glue.patch + if use X509; then + # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" + # # X509 and AES-CTR-MT don't get along, let's just drop it + # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die + eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch + fi + use sctp && eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-sctp-glue.patch + popd &>/dev/null || die + + eapply "${hpn_patchdir}" + + use X509 || eapply "${FILESDIR}/openssh-8.0_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 + + 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 + + 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 ldns "${EPREFIX}"/usr) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + # stackprotect is broken on musl x86 and ppc + use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ + emake -k -j1 ${t} > "${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 + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + 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 + + keepdir /var/empty + + 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/openssh/openssh-8.2_p1-r6.ebuild b/net-misc/openssh/openssh-8.2_p1-r6.ebuild new file mode 100644 index 000000000000..55d2852ebb93 --- /dev/null +++ b/net-misc/openssh/openssh-8.2_p1-r6.ebuild @@ -0,0 +1,482 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} +HPN_PV="8.1_P1" + +HPN_VER="14.20" +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="12.4.3" 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/hpnssh/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} )} +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp !security-key ssl !xmss ) + xmss? ( || ( ssl libressl ) ) + test? ( ssl ) +" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + security-key? ( dev-libs/libfido2:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( + !libressl? ( + || ( + ( + >=dev-libs/openssl-1.0.1:0[bindist=] + =dev-libs/openssl-1.1.0g:0[bindist=] + ) + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl: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} + static? ( ${LIB_DEPEND} ) + virtual/os-headers +" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( !prefix? ( sys-apps/shadow ) ) + X? ( x11-apps/xauth ) +" +BDEPEND=" + virtual/pkgconfig + sys-devel/autoconf +" + +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 + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_VER) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + 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_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.2_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 + + [[ -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}"/${P}-X509-${X509_VER}-tests.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 know 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}"/${P}-hpn-${HPN_VER}-glue.patch + if use X509; then + # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" + # # X509 and AES-CTR-MT don't get along, let's just drop it + # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die + eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch + fi + use sctp && eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-sctp-glue.patch + popd &>/dev/null || die + + eapply "${hpn_patchdir}" + + use X509 || eapply "${FILESDIR}/openssh-8.0_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 + + 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 + + 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 ldns "${EPREFIX}"/usr) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + # stackprotect is broken on musl x86 and ppc + use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ + emake -k -j1 ${t} > "${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 + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + 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 + + keepdir /var/empty + + 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 c276271a38ce..5e5006fa2c3f 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -13,6 +13,6 @@ AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7 DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1 DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea133331b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789 -EBUILD openvswitch-2.10.2.ebuild 4449 BLAKE2B 0f8418207185c963276ec20048b2137196789a5f9e942c9a25e19e569a663e584c896174a868a161d0a4655fd7ece4000a3eb481c0f2828fcd095ceff91c8aa8 SHA512 dba3e5759f51b95c510f8b6077da60078fc11a6041e6d9525a4fe86dd287cb33addf2eb5cc4a2c025d7cee67e587ec1407cdb19111c168af6464172a2c76e1cb -EBUILD openvswitch-2.11.1-r1.ebuild 4533 BLAKE2B a5ac8cc83441d0985e8ad28bf20262c3c9b303b8723b3ca5b418837221a68b01165946d0e05ddb541e2678b5f908b410786c2b51906198fe5860c585fed8c90c SHA512 a3ebf4933a16c496042a03e48bdf6fd89a45c0a92eae8fad240845d2fad214d074a80c2de63d1d397fa81d6a02e6edff7aeed58f5ab9f3237a84dc157963fbe7 +EBUILD openvswitch-2.10.2.ebuild 4396 BLAKE2B 842b1b82753a3b970bcd22848e45d63997546229bb5551a38aaf7f20affdfb71a17fb7bd4b8036e7bc108be6b556f7a630597b63a75f550a2727bb3785f98aa2 SHA512 9bb48966b9fb99d11ec01de2ffd924353a0fef145edeb021ce267708df91c64d57546618a66470494ebbcb950127f5f0cc88f6609004c7f330daa838fbc6b360 +EBUILD openvswitch-2.11.1-r1.ebuild 4480 BLAKE2B 8470a55f5ad20de6dc3c241e19eb0fda32f665eb90f8dc1cbbc0aecca603b902b3eaad696533c00b05b8aa3cc87d2491e31b91ffe5e44b255706a1705c16b90b SHA512 908cba577cab3fcf7abed4f5c277ae3845855ca857704948caa9c7ba3029a2722c8bdb020cf71cedd9cbfe19af94035f325f8a03ca7eecb48ba42d871cd851fe MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36 diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild index a823c0b053fa..8a2e1ad91031 100644 --- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild @@ -21,10 +21,7 @@ RDEPEND=" ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} ~dev-python/ovs-2.10.0[${PYTHON_USEDEP}] - || ( - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/twisted-web[${PYTHON_USEDEP}] - ) + dev-python/twisted[conch,${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] debug? ( dev-lang/perl )" DEPEND="${RDEPEND} diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild index 091d255356dd..715a907910b9 100644 --- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild @@ -21,10 +21,7 @@ RDEPEND=" ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} ~dev-python/ovs-2.10.0[${PYTHON_USEDEP}] - || ( - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/twisted-web[${PYTHON_USEDEP}] - ) + dev-python/twisted[conch,${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] debug? ( dev-lang/perl )" DEPEND="${RDEPEND} diff --git a/net-misc/portfwd/Manifest b/net-misc/portfwd/Manifest index 5d9b43f3ea27..c6cd380a212f 100644 --- a/net-misc/portfwd/Manifest +++ b/net-misc/portfwd/Manifest @@ -2,5 +2,5 @@ AUX portfwd.confd 55 BLAKE2B f88e2d20a7d2bd40d78e7c313d91f289faea41a87175b2c0ed8 AUX portfwd.init 773 BLAKE2B 7db5df2739cbb535c6ed499fc03278f36fe738cc06166e15c3ea2e06f2cfd1cb525daa895fb81df50b93f13524987a063893d2cfbfe265436822be6d75f7cedd SHA512 380bb2e2ee7423e781d3b637afe60cd79f5fd35806e897d89885b3fdbe1b3aeff396acaa74b4b6158d874a31831c8393c549642468e2a5fc0926361c4d6869c8 AUX portfwd.service 128 BLAKE2B 620a5bd8bf82f0b91eaf333b597c85ed8153faf41ba45014dbacc98daa4951c71e4e6ec26c24d39daa6ba66d68ea76ae55eea9c1edf35ff7355347b4d8bd880e SHA512 1e15366d1d284db537d90d07857baaf44ba3447bed0b6cff35b957d787bf5893c8bdb7e01eb692cb26d68aea9256fbe9e6b012cbeb1899a40a531050a4521f04 DIST portfwd-0.29.tar.gz 168318 BLAKE2B 9bc323c2ec755835ff2f708746d4ebec19414085bb0241ab75e15b1fb8628f7ba69058d036b998beddfd95bfb7bbef752993e823b3bc2003f50c3a62a435ee02 SHA512 790d30afb42eb5e03846534e5098c7d1cb4241758df77fd56fc3f4fdbb05dae88ef84e16b27434035dd39a7c82beb77d490f64741181c38efc3b3928face51d1 -EBUILD portfwd-0.29-r1.ebuild 1239 BLAKE2B bfcd28339c19801ee9be622bca0088c49e54100d6875a5e3ba152d1c0c01ad6abe69a9afc3ee2e051f74a524f573ff0421e0d33a4724b0b54f685bdf8a7b498f SHA512 aa4cd8fc3c799345571ca0f0d443c316fb38de8a2fe296ab65f831c89cbd50341536ed1dfadea8452116a2e8bec6b8a36eaf3d195c89dbd00f0595a9b00c801e +EBUILD portfwd-0.29-r1.ebuild 1240 BLAKE2B 7fce7abdc342afc30e8972210a5871e439fb946459e68deaf4b0017809046721ff35931593554840bf37c5cf48d49245a89fc3a46813a985968cae80d5bc3a43 SHA512 f058a5d3070776dd6e8be703c0f32ea9072c619d6ae79b83505388dff877d012f4afba9e667be8f50e43c97634f501d884caebfbca14044e75a2bedc592e7d8f MISC metadata.xml 443 BLAKE2B 0d5c03b3b43242ba5bd5a4358e1f4e3bd906f63b10cc811cd1b2e5ae92660e66c38cfd83b554de30669a6b8400814294dfdc0604a4a1332035bbeb6a3537739b SHA512 97bcf064333617a9cd93fdc4994f979eebb8b5e259d2f2a72b1a68c6add80231058345cb2b9ee810f7eea115bb2d8617f7496263f43e74a9c582d6efe46700a3 diff --git a/net-misc/portfwd/portfwd-0.29-r1.ebuild b/net-misc/portfwd/portfwd-0.29-r1.ebuild index 30e0f893ba17..f88b08f22141 100644 --- a/net-misc/portfwd/portfwd-0.29-r1.ebuild +++ b/net-misc/portfwd/portfwd-0.29-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://portfwd.sourceforge.net" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ia64 ~ppc ~sparc x86" +KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86" IUSE="" DEPEND=">=sys-apps/sed-4" diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest index c0a4d68f897a..108323d2f224 100644 --- a/net-misc/pps-tools/Manifest +++ b/net-misc/pps-tools/Manifest @@ -9,5 +9,5 @@ DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30 DIST pps-tools-git-0.0.20120407.tar.gz 13619 BLAKE2B 9be7aacbcdb1c5ac2e53c66f97ba6c41f30c67b7d229f4f9797260d9b880a921e679e1c6cf847051fab0746cb2d9da0f4450411f4e992e42b0b5314bf6acf7cd SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de EBUILD pps-tools-0.0.20120407.ebuild 683 BLAKE2B 86c7a81d4a0d372967245aa0695f39d9c0e873d1532f305b8debaca5f55377b21f202e32fb8829409452882adde35cb1169184a0508ec504d5e9943e92058be7 SHA512 6ded78dfbb7ea4ff2221b0cf4d8833aa3b71d2bcce158d7467fc130402f0445c974da85f71bd3ba9f8311477a39c7e896fb2a0ed8514d9819070fb691471e473 EBUILD pps-tools-1.0.1.ebuild 592 BLAKE2B 54d5837caacda5372d5d8cc325d07f0902f54a146d866bae1b465402888124598fd344b5f93c312063d68db78deef34e3f310e7e7ef694770a70f374be6c9a23 SHA512 e31a33d7b608d05bfa547237db7dc8dceec909ebbd8d3daa0cb85da5c43306ca530ce67650d3e167828d2ea5228c48073643be8a2239ad83ad160f7d4db98e4a -EBUILD pps-tools-1.0.2.ebuild 546 BLAKE2B 2ec9fcf152f44414fd77be561266608cee51d1af08471b5bf2271199d2d747ea8441d2b42e86ea40db40ff0c6b9297686f8d9c03ddf7670865bedf32807836fd SHA512 f08f8363ac12f14b6e7cb25cc9285a4940a7c0fda147d48cd2ec11fa46d61559af0b5a198471f0209d8074fa7cc92bd32f90c12769516dcf27eb06b2ad1dfcca +EBUILD pps-tools-1.0.2.ebuild 550 BLAKE2B d6f457833bdf6edf1eb45a77c0ef0632c21240304a9d9104e960c59d477a3ef3745939930f8bd1ccd3c063f3f6c2dfea7656d6128dd940378a195d4a2eb9e953 SHA512 ec2cb49ede84c55b07f77cd60c31cad2952ca5ada15d90e056fac91e8364d809a8a8d75ea1db7520169696bb9b49a5bb0455cb7ebd1ed054451fa950e3f0f70c MISC metadata.xml 350 BLAKE2B 830a67ed8c6d022a971aa92ffbfa853a0254dcad97f7275c301edd8ce71e356835356a166e209e5f1b3807a5432da293307c034452217665dbe6b705ab677fb2 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06 diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2.ebuild index 7291f8a36e61..6c8b12af41eb 100644 --- a/net-misc/pps-tools/pps-tools-1.0.2.ebuild +++ b/net-misc/pps-tools/pps-tools-1.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="" PATCHES=( diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest index 507b94d72bd3..05d574546d44 100644 --- a/net-misc/proxytunnel/Manifest +++ b/net-misc/proxytunnel/Manifest @@ -1,7 +1,7 @@ AUX proxytunnel-1.9.1-gcc-10.patch 4076 BLAKE2B 13dcff92f5c440430b03b02abd2d3068fa1b95cd67d5830ab99ac077ca24b333dbfd7423d37c7e6cba8d92f820cc7c1ea5d407ac12f3ddd367fe48519113a310 SHA512 c031b884ee929cdae87fb03846a6f0a99b38fbea96c3fbbe94bd176d873e73a15f1a914795f85c9fb6cd107ec117e38dbce93a6aaa256ca516b41a0bd74f6929 AUX proxytunnel-allowTLS.patch 592 BLAKE2B 2c48bb1a1c2e2374043d9bc73e653a5f87f5bbda6a64a5572cbe3bdafe533205f619b7248c8f7b6cecf7de8c72940a6ccf64e054c5419e9ba656f773e9d7d346 SHA512 67b0103054c56c69cd9c0d1aa144498151f105004b400bcdbbb3df519d37424630554e101e5617faf075fd978edddfc4d06cca7524c51e28cd33c1165b6a22f9 DIST proxytunnel-1.9.1.tar.gz 48025 BLAKE2B 5a844d8fdbb9a1eae9c40c7621086b873ae89813b7c596da4416efcb777a8110ad7d224a0efa2e193cfbbb82dbfe69d44d4dd36db080b8e902630a464a85b953 SHA512 819dd11bc13fc279d2d475b89909c0eea414ff71d772d4bfed742dd8d425669dc502f2c22d983bb8c58e426a2bc7209526cb21492ca5f8e92ea1b9ea961fcfdc -EBUILD proxytunnel-1.9.1-r1.ebuild 1048 BLAKE2B 3e094ffb84e324cb426afb819cdf6ab0be3ce187fa792079a7b19b6df96e70ea2004d19d28e87b70fccb2cfb7f34c16d63cbcad6bbb778f52bc9f75f98445d55 SHA512 795116f573c2692ce2776b7cb4ccd6e3c19a88650750bdd2f87d5b5e8bdcf65efb08ed75dbbb93046ad85d4d80fc6072b4c721d80bca81ce0d3493206b9837d0 -EBUILD proxytunnel-1.9.1-r2.ebuild 1177 BLAKE2B 6fc1c7d33d2acd73828338bfa1ae44a89162988db8214c9371316d53f92c217454627cabf31191489330b5d4104d2c59247ab0931f3709e26660c4f6dd8da399 SHA512 9a3e1517dd97ad8a702e9d184bf1f4bb2d0a0a023760b52b0011f1a94929c142e87935e4ff6974ad8db0837c1fec33bf302ed206b1b13515e444e629741ba290 -EBUILD proxytunnel-9999.ebuild 1096 BLAKE2B 5bb10d54b3fb48b972d5e9907a4a8bb69a6c9619668c5b8e55e74db108020bd8eff1f3acf8e1bdfc58153952751a4071652a3168e0062f6ad253589cabf2da8d SHA512 265cac79e95bfaa8f639114a03b4f79f73f83450328259dd3ddfddf63b575a35536009bfd4ae39c1716b973644a8bd78aa28b3a229c74edb47bdc3ff10eaa215 +EBUILD proxytunnel-1.9.1-r1.ebuild 1041 BLAKE2B 7072f019baf871beffa674905ed05722d3b855576fff340f34eaa9521bbd524cec6122638d0d3882da4d1467ec7f1563add4a48767ee754ee79145129e58ec06 SHA512 de030c72e712b5c506d6f5fb47512f61451ac141ac3eb6cf17d3913650c79d2a6c898275b847051426bc9be9db4abc7249c387de6a3f44738dfffa8c059791cd +EBUILD proxytunnel-1.9.1-r2.ebuild 1173 BLAKE2B 4402bd59cd3d1e967577fe65274347e6630553491850c87417d667eb7ec2a403782ddc3d31aa7dcbb302c490e3a73e19eadff9f418456741cd36be3ea9631125 SHA512 9e395e52a362684eae2c0ec6003e1e193cfb4d539173fc117352162601c85bc8d56214e320a5b7440394b20deded395fb5d50c43497bede6f8c144958dc37a2c +EBUILD proxytunnel-9999.ebuild 1092 BLAKE2B 18e6074c8f467ab5f6f409775761b2be8c9d80515682e4a014b76e6d1b33bda791735d6b5974db97a7bfbd5fb6ec1f4f910d8687e0fcf39b026dafabab81c1e3 SHA512 e486dd5ceb3b4aa6d80be955640525b6edefb03df09e7d4d356d2510d11b2831e1ec0cd30935b998a95e8de6fe7b0d38af08d15aea6bd5c2f3078a196885ea55 MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild index 4807d1daeff2..64fea4ae5b4a 100644 --- a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild +++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/proxytunnel/proxytunnel/archive/${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="static" RDEPEND="dev-libs/openssl:=" diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild index a8815f6b96e4..0e62845f44f2 100644 --- a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild +++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild @@ -30,7 +30,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi src_prepare() { diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild index 2622cf670239..dff3deb21c61 100644 --- a/net-misc/proxytunnel/proxytunnel-9999.ebuild +++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi src_prepare() { diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest index 05fd0bd93d72..4f63f20a67ee 100644 --- a/net-misc/quagga/Manifest +++ b/net-misc/quagga/Manifest @@ -13,5 +13,5 @@ AUX systemd/ripngd.service 364 BLAKE2B e79e086c0bbe3ceb12fadc711a1c88a3403478080 AUX systemd/zebra.service 354 BLAKE2B e22f8e321c5116179937e9c681482e779436092a10548ea4e564a0005f102a8d6dbba17fe5ef2a3952752f1ca6b1539841ccfee25b4a7b03b9e9faca1618004b SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd -EBUILD quagga-1.2.4.ebuild 3712 BLAKE2B 67a925e3be9203279a35fad326d8957906609f37f7411408af8cb1d7c12b269e6fff1f4562d33c1378c9b3489a415c817d90316243a85f070a3bec8446359c94 SHA512 445a745b91ae3693fa5ffe5f1544d2c548c49e56f196849db368a9dd552af77f39b9309aa3c7916dabb878f7cc3d0f1aa922bbb2b8d3b16b1aba0f3ff31d3a39 +EBUILD quagga-1.2.4.ebuild 3742 BLAKE2B 9262fe4c11b606c2c8b099f3db6d9e5c5c1ac6ee6b4745ce492c36026a124adf6029c5db15311ae31e8806034003f7834253f477620456fabc7718bd92800868 SHA512 49c4c4bd935037b0375088652c062567582bf9eda5e8a7845586fb9d54396d420f13725492195443de9277dcb780a5eb384ab3b4c7d3dcc96b385821c815d5c5 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db diff --git a/net-misc/quagga/quagga-1.2.4.ebuild b/net-misc/quagga/quagga-1.2.4.ebuild index 7ae80aba9342..a3bf57e548c6 100644 --- a/net-misc/quagga/quagga-1.2.4.ebuild +++ b/net-misc/quagga/quagga-1.2.4.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch -inherit autotools eutils flag-o-matic ltprune multilib pam readme.gentoo-r1 systemd tmpfiles user +inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP" HOMEPAGE="https://www.quagga.net/" @@ -20,6 +20,8 @@ IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam pro RESTRICT="!test? ( test )" COMMON_DEPEND=" + acct-group/quagga + acct-user/quagga caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) @@ -48,11 +50,6 @@ starting one of the daemons. You can pass additional options to the daemon by setting the EXTRA_OPTS variable in their respective file in /etc/conf.d" -pkg_setup() { - enewgroup quagga - enewuser quagga -1 -1 /var/empty quagga -} - src_prepare() { # Classless prefixes for BGP # http://hasso.linux.ee/doku.php/english:network:quagga @@ -64,7 +61,8 @@ src_prepare() { } src_configure() { - append-flags -fno-strict-aliasing + # -fcommon is added as a workaround for bug #707422 + append-flags -fno-strict-aliasing -fcommon # do not build PDF docs export ac_cv_prog_PDFLATEX=no @@ -103,7 +101,7 @@ src_configure() { src_install() { default - prune_libtool_files + find "${D}" -name '*.la' -delete || die readme.gentoo_create_doc keepdir /etc/quagga diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 2f8145fe4b46..72f134648437 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,9 +1,6 @@ -AUX linux-4.15-2.patch 3248 BLAKE2B 376d3ba01865ed6cfcedc7900e4a034881abb0ff5a98bc4f40a51122a6950f92ecfbb9e36590be3e735f69f4639b889d1d4b5e215fccf92090e157d96ce49f77 SHA512 b4bfb0f1674c1add10b743438853abe3892d7355d251d30cc5ee927c161541e8bb32ec0e89db1db3ca96f29f3273fe53cbce58e75094216e7f7738a952c430aa -AUX linux-5.4.patch 531 BLAKE2B e928e157f0e77da1857715cc2c5d8ecc37e968dd4c2d2f4bf754b0f3c40abba148f8e2da33e1df9e2265022de2618a9aa9c1a45a3fe9ebd72f83fa5da35d0531 SHA512 8f200510dca69ca2ab3e856b4b0f43e5ca62035c1295d66562c88c596aa9aab3e361ec3090106cdc4fa489aa416b92f2417bf1e9847953d50822bb7d85325641 -DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563 -DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6 +AUX kernel56.patch 1863 BLAKE2B 8525effb79f50ca818797cb48f3eb225f5e50f7fe156186643c9639c7e30a5f03716b257c357e1f7b090792594025ba0525763a93b481a992822a8cc251c4332 SHA512 e50734adbd76627bccb4f0f08d6d1a3042a72fc7a836aac049c897ce9d7f37c41a0d0f7da1fc158d1ae8c14329ff2967687420bae0c72f7ebf9845f795d24aba DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a -EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629 -EBUILD r8168-8.047.05.ebuild 975 BLAKE2B e912aebc2db2f2e7e7da79d75936a9a471df2bbdb3e374074ef61aae409a0f4934de845a4a68bd149164b23e1b23cc9ed8b3f346ae7b05ddc6f6997ace963b42 SHA512 e997798c5fcb40b5434c2ff2c55f5215cdcea479f6b18dab48510ea5cdfd4ae897367849d701ff2ac4503c75c27eecc9b8e971303d15e363fa03d1e879aec158 -EBUILD r8168-8.048.00.ebuild 925 BLAKE2B 987ba8d46e4e68a176fe782df425e6be2c085d842853187cdb4aae9af0431e8a362af4329bdc99d5f892583138b0c78f84eed229738c26da216e2ecc8eb93876 SHA512 d49c5452662c5a59ebd0af45b87005e5f2931b65611dedd85984b69ab9c15e44dcf1848157ce4a5b6e8a705571dde34f3fcff4086aac30b8427cebe0ba09c818 +DIST r8168-8.048.02.tar.bz2 109232 BLAKE2B 24c04cd0e47fce427ef7de1a2e41e384fd7c0d8dd028715411cc6f47901b703c824dd9c15bc0ed90f649520bd5fd25dbd48cdc37f94ca8f838a07faa99c8aa84 SHA512 d9d828e4717d2857bd38e8c9b9005de19387419db9bc8d174f5c8a8ea120c81c3094770b164a1f92cec7833696d7a1302332ef473c5852146fff5dbf9a69196e +EBUILD r8168-8.048.00.ebuild 923 BLAKE2B b91f9d551f38d5fb82e480e0ebd299de9dcbb9671897c1c17d3a682ea6c70b79c7e26b41b7daa092c76a2d53c2d819e029afb0ab7de32e0128110a24525c4c25 SHA512 d0972fb69d9c97d5e5cb845d7dd124d8c48ba789e157575298a750656976c06655b3ace2d858d45f457adbca6d20e085f89092d4491aa49996f7d18a7cf30a76 +EBUILD r8168-8.048.02.ebuild 967 BLAKE2B 8205840245cf8b8cec33f205cf896114d51c5e86b7e391e4a7bcb1060f70636ab3aa77c5d80032207998dfdf1062a76d67cf23037e67fa266854833ca3f2eb92 SHA512 2f96f9a428e24dbe0240417e0889a3555ebe7404d5d0705c45bfa6078ca2b0c04b83e66a58b4f395bfeaa5ad8cfb7456472b289cfe4de1216f19030d2dfb9543 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f diff --git a/net-misc/r8168/files/kernel56.patch b/net-misc/r8168/files/kernel56.patch new file mode 100644 index 000000000000..23bb3a1856aa --- /dev/null +++ b/net-misc/r8168/files/kernel56.patch @@ -0,0 +1,50 @@ +--- r8168-8.048.00/src/r8168_n.c 2019-11-26 08:32:35.000000000 +0000 ++++ r8168-8.048.00/src/r8168_n.c 2020-03-16 12:34:04.893511463 +0000 +@@ -456,7 +456,13 @@ static void rtl8168_hw_config(struct net + static void rtl8168_hw_start(struct net_device *dev); + static int rtl8168_close(struct net_device *dev); + static void rtl8168_set_rx_mode(struct net_device *dev); ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) + static void rtl8168_tx_timeout(struct net_device *dev); ++#else ++static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue); ++#endif ++ + static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); + static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget); + static int rtl8168_change_mtu(struct net_device *dev, int new_mtu); +@@ -1616,12 +1622,21 @@ static int rtl8168_proc_open(struct inod + return single_open(file, show, dev); + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) + static const struct file_operations rtl8168_proc_fops = { + .open = rtl8168_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, + }; ++#else ++static const struct proc_ops rtl8168_proc_fops = { ++ .proc_open = rtl8168_proc_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = single_release, ++}; ++#endif + #endif + + /* +@@ -27844,7 +27859,11 @@ static void rtl8168_reset_task(struct wo + } + + static void ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) + rtl8168_tx_timeout(struct net_device *dev) ++#else ++rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue) ++#endif + { + struct rtl8168_private *tp = netdev_priv(dev); + unsigned long flags; \ No newline at end of file diff --git a/net-misc/r8168/files/linux-4.15-2.patch b/net-misc/r8168/files/linux-4.15-2.patch deleted file mode 100644 index 5f5f17c551ce..000000000000 --- a/net-misc/r8168/files/linux-4.15-2.patch +++ /dev/null @@ -1,85 +0,0 @@ -Author: Alois Nespor -Description: fix module build for Linux 4.15 -Origin: vendor, https://aur.archlinux.org/cgit/aur.git/tree/linux-4.15-2.patch?h=r8168-dkms - ---- a/src/r8168_n.c -+++ b/src/r8168_n.c -@@ -407,8 +407,14 @@ MODULE_VERSION(RTL8168_VERSION); - static void rtl8168_sleep_rx_enable(struct net_device *dev); - static void rtl8168_dsm(struct net_device *dev, int dev_state); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+static void rtl8168_esd_timer(struct timer_list *timer); -+static void rtl8168_link_timer(struct timer_list *timer); -+#else - static void rtl8168_esd_timer(unsigned long __opaque); - static void rtl8168_link_timer(unsigned long __opaque); -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+ - static void rtl8168_tx_clear(struct rtl8168_private *tp); - static void rtl8168_rx_clear(struct rtl8168_private *tp); - -@@ -22964,7 +22970,11 @@ static inline void rtl8168_request_esd_t - struct rtl8168_private *tp = netdev_priv(dev); - struct timer_list *timer = &tp->esd_timer; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+ timer_setup(timer, rtl8168_esd_timer, 0); -+#else - setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev); -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) - mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT); - } - -@@ -22978,7 +22988,11 @@ static inline void rtl8168_request_link_ - struct rtl8168_private *tp = netdev_priv(dev); - struct timer_list *timer = &tp->link_timer; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+ timer_setup(timer, rtl8168_link_timer, 0); -+#else - setup_timer(timer, rtl8168_link_timer, (unsigned long)dev); -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) - mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT); - } - -@@ -24717,12 +24731,19 @@ err_out: - #define PCI_DEVICE_SERIAL_NUMBER (0x0164) - - static void -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+rtl8168_esd_timer(struct timer_list *timer) -+{ -+ struct rtl8168_private *tp = from_timer(tp, timer, esd_timer); -+ struct net_device *dev = tp->dev; -+#else - rtl8168_esd_timer(unsigned long __opaque) - { - struct net_device *dev = (struct net_device *)__opaque; - struct rtl8168_private *tp = netdev_priv(dev); -- struct pci_dev *pdev = tp->pci_dev; - struct timer_list *timer = &tp->esd_timer; -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+ struct pci_dev *pdev = tp->pci_dev; - unsigned long timeout = RTL8168_ESD_TIMEOUT; - unsigned long flags; - u8 cmd; -@@ -24856,11 +24877,18 @@ rtl8168_esd_timer(unsigned long __opaque - } - - static void -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+rtl8168_link_timer(struct timer_list *timer) -+{ -+ struct rtl8168_private *tp = from_timer(tp, timer, link_timer); -+ struct net_device *dev = tp->dev; -+#else - rtl8168_link_timer(unsigned long __opaque) - { - struct net_device *dev = (struct net_device *)__opaque; - struct rtl8168_private *tp = netdev_priv(dev); - struct timer_list *timer = &tp->link_timer; -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) - unsigned long flags; - - spin_lock_irqsave(&tp->lock, flags); diff --git a/net-misc/r8168/files/linux-5.4.patch b/net-misc/r8168/files/linux-5.4.patch deleted file mode 100644 index 197983597be7..000000000000 --- a/net-misc/r8168/files/linux-5.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur r8168-8.047.05.orig/src/r8168_n.c r8168-8.047.05/src/r8168_n.c ---- r8168-8.047.05.orig/src/r8168_n.c 2019-07-23 10:22:09.000000000 +0800 -+++ r8168-8.047.05/src/r8168_n.c 2019-12-23 00:55:34.121947346 +0800 -@@ -56,7 +56,7 @@ - #include - #include - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) && LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) - #include - #endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37) diff --git a/net-misc/r8168/r8168-8.045.08.ebuild b/net-misc/r8168/r8168-8.045.08.ebuild deleted file mode 100644 index c9ecc0bee439..000000000000 --- a/net-misc/r8168/r8168-8.045.08.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info linux-mod eutils - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0010-${P}.tar.bz2 -> ${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" - -CONFIG_CHECK="!R8169" -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -PATCHES=( - "${FILESDIR}"/linux-4.15-2.patch -) - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild deleted file mode 100644 index beff876a09c2..000000000000 --- a/net-misc/r8168/r8168-8.047.05.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info linux-mod eutils - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -# "GBE Ethernet LINUX driver r8168 for kernel up to 4.15" from above link, -# we need to mirror it to avoid users from needing to fill a captcha to -# download -SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" - -CONFIG_CHECK="!R8169" -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -PATCHES=( - "${FILESDIR}"/linux-5.4.patch -) - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.048.00.ebuild b/net-misc/r8168/r8168-8.048.00.ebuild index 0ef2e5c2951e..3d0aad6e797e 100644 --- a/net-misc/r8168/r8168-8.048.00.ebuild +++ b/net-misc/r8168/r8168-8.048.00.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" MODULE_NAMES="r8168(net:${S}/src)" BUILD_TARGETS="modules" diff --git a/net-misc/r8168/r8168-8.048.02.ebuild b/net-misc/r8168/r8168-8.048.02.ebuild new file mode 100644 index 000000000000..299ab1010e46 --- /dev/null +++ b/net-misc/r8168/r8168-8.048.02.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info linux-mod + +DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +# "GBE Ethernet LINUX driver r8168 for kernel up to 4.15" from above link, +# we need to mirror it to avoid users from needing to fill a captcha to +# download +SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +MODULE_NAMES="r8168(net:${S}/src)" +BUILD_TARGETS="modules" + +CONFIG_CHECK="!R8169" +ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" + +PATCHES=( "${FILESDIR}/kernel56.patch" ) + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERNELDIR=${KV_DIR}" +} + +src_install() { + linux-mod_src_install + einstalldocs +} diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest index 37256c70c37b..18ce9fa2ac16 100644 --- a/net-misc/rabbitmq-server/Manifest +++ b/net-misc/rabbitmq-server/Manifest @@ -7,9 +7,11 @@ DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9 DIST rabbitmq-server-3.7.24.tar.xz 2867964 BLAKE2B 30d49a72f92a9adc4fe7de071e9369cb4d574249b1d414b2e5d492585ae0bc0e5f85ca0c287d73dbf661df4cb249f29d1bfccc7516e6ec5d6ff70a437a01ce00 SHA512 5bf2b69b555ddc89415ce7918d0ab23221d383742fc20036f608b4cf99852fb58b61a5d7616b6357f151e1f16ed660b35d7b54a1c2ea46cf5b4ef67c2d38bd28 DIST rabbitmq-server-3.8.2.tar.xz 15178744 BLAKE2B 11da75e48415d53f291fffc8fafd89b506e727714e6f9dfce6a0b7c605a0d56bb3b879c779bebbc21f2bc5ada21378f9ed30e6f729c2c71b61ebe00db16eb225 SHA512 ac8cfc002ccbff8cf95c3e5508956cf5622c1c145b730589308ec4ca9173e5efca338829e13aa7dc37db035868dc964ab0e3e0edba15de49c64e18c50247b918 +DIST rabbitmq-server-3.8.3.tar.xz 3304456 BLAKE2B 2ad04a1a8688cbbba71a82d44003f7ad632b26616dae977e8d326316baaaf7b475c4db37777b13aa8cb153373be0f9f85972aac7ad53c299e39615dd032e8ced SHA512 1547e7935ff34be278970c03b176d76e52a6968cc2955dc75fa00d184ed1ba567e095c5a56e0f2f7c868d41281897c53ec6f4baff019e144aa57afe99cd6adaa EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50 EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf EBUILD rabbitmq-server-3.7.24.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2 EBUILD rabbitmq-server-3.8.2.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2 +EBUILD rabbitmq-server-3.8.3.ebuild 2160 BLAKE2B 1ea1fb4a67301f670fc1c256dc2c32ea3f833e0b02adace4a1e34e03a4d5509d9e3e931385697b9dc749e0f24a70974ef0161798743fcef9106f0395c1953717 SHA512 ab51c206eb5d2d9c395aabc016b691784364b2220fea1feacdbf559ba809402491ba5282c513d312f82b897d36ccad9b8e15837bb6ed69d5f2484315b8959786 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701 diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild new file mode 100644 index 000000000000..2f702fd994a5 --- /dev/null +++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit python-any-r1 systemd user + +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-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RESTRICT="test" + +RDEPEND=">=dev-lang/erlang-21.3[ssl] + =net-dns/avahi-0.8-r2[dbus,gtk] =net-dns/avahi-0.8-r2[dbus,gtk] =net-dns/avahi-0.8-r2[dbus,gtk] =net-dns/avahi-0.8-r2[dbus,gtk] =urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too DEPEND=" $(python_gen_cond_dep ' - virtual/python-futures[${PYTHON_MULTI_USEDEP}] - virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}] >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}] >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}] dev-python/isodate[${PYTHON_MULTI_USEDEP}] diff --git a/net-misc/streamlink/streamlink-1.3.1.ebuild b/net-misc/streamlink/streamlink-1.3.1.ebuild index 28994a6a0f82..c55072c84f21 100644 --- a/net-misc/streamlink/streamlink-1.3.1.ebuild +++ b/net-misc/streamlink/streamlink-1.3.1.ebuild @@ -31,8 +31,6 @@ RESTRICT="!test? ( test )" # >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too DEPEND=" $(python_gen_cond_dep ' - virtual/python-futures[${PYTHON_MULTI_USEDEP}] - virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}] >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}] >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}] dev-python/isodate[${PYTHON_MULTI_USEDEP}] diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild index 28994a6a0f82..c55072c84f21 100644 --- a/net-misc/streamlink/streamlink-9999.ebuild +++ b/net-misc/streamlink/streamlink-9999.ebuild @@ -31,8 +31,6 @@ RESTRICT="!test? ( test )" # >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too DEPEND=" $(python_gen_cond_dep ' - virtual/python-futures[${PYTHON_MULTI_USEDEP}] - virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}] >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}] >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}] dev-python/isodate[${PYTHON_MULTI_USEDEP}] diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest index 6026d04b0ce9..feb8ffe4e390 100644 --- a/net-misc/taylor-uucp/Manifest +++ b/net-misc/taylor-uucp/Manifest @@ -1,5 +1,5 @@ AUX taylor-uucp-1.07-fprintf.patch 188 BLAKE2B 13900fdaffd964d5e38a4bc3d2acce2675ba74ee008676d97313b4b75ee5625aeff5b56fbdb1a89909fa4cb006102e43f65a2832a1805fb747608eb13054ebfe SHA512 468870a9e64f0ace876bc1254e264e634fc07011b9ffa5ca0ccecb23c925e2a4a5c4463e6741b265bc8df17d0a578710cc8ea135461a1dfcd1c782e991bc7623 AUX taylor-uucp-1.07-gentoo.patch 5049 BLAKE2B 3d010ff0841df59196d38e7450b85c4d36c2ccd770a4c31d29962e3c3f87d5a264977fa2f715a9bb91fec44f60dd5e045eed440e0fb482be525702497f3ad2a1 SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b -EBUILD taylor-uucp-1.07-r3.ebuild 1367 BLAKE2B 48208978c92ac8d3c3405289991c34a66e4dcf606c2a2b3518ccde80fa9dd8e8b23c2044d8915d7d0828eaee8a4927a26cc9738eed980289d63c02dcaded79c4 SHA512 f1f94f5a4db250c61a5dcef62787e101640ad5a59f056b06c966b7e302935291ea74f7b1682908a56b0538a8131cd29bb4417a1a668f4f444fb931c8cf719a70 +EBUILD taylor-uucp-1.07-r3.ebuild 1368 BLAKE2B af593bd0f85f6fdd57bc1834f3ca36d5a4299d66f4bdf08da2051db4e8d2a313260d29788d921f828a5ab2896be6e746f159f5c4b0456b6c6a406260f04d1c76 SHA512 c992c60e7c5f10f9ba617da965841d6c6c0342da8aa7b612e321e95b1b2bc8d534a351ad3a7e27287ce6604b94a207bd9baf14eaf4d835197e87388a677a07e9 MISC metadata.xml 319 BLAKE2B f7bd226c6082b2d19d38b6d20aa6d859e6076e226cf2ae3a4013ee5ff558f7dba27cee1fcd159785679fe03b37082d57232d7ecf6f86e832a60e3d8c4f528d57 SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild index b78e5191701f..c32b453cdeef 100644 --- a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild +++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ia64 ppc sparc x86" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86" S="${WORKDIR}/uucp-${PV}" diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest index 6b00ae62b50e..8ff1cd834215 100644 --- a/net-misc/teamviewer/Manifest +++ b/net-misc/teamviewer/Manifest @@ -5,7 +5,13 @@ DIST teamviewer_15.1.3937_amd64.tar.xz 12898448 BLAKE2B fea1d64c04c5c4f04237ab63 DIST teamviewer_15.1.3937_i386.tar.xz 13443796 BLAKE2B aa9c5f3cd42a123c38a567a117c919c829e089e4c81cf4b6fca0559351895c3824b7a117ac7dc64c9f1129e0cd44dd2347e57644080559a86640a9d8bffbe62a SHA512 8054e5e3901d60bbf210b03209da8afaab03ba95529d1a107a23401a7561c5ee0c33a43837f84490667f0fa282fe8a74087473b7f51f604b675e87d87522302d DIST teamviewer_15.2.2756_amd64.tar.xz 12925536 BLAKE2B 94029edb0c333bbab3dc8ed0ad881fc5e5de820a4a92f578781456315d746d1fbf94e7b4d1b651c250c23a32247d2ccf9ba9f9fe839ba188e572ffacebd71630 SHA512 9227388efd819689bd852de62b1dbe122e7081cbec19ba4c96546dd8f889c8b87884fe53231f00f39030882bc150aefaaeedab7d9b3ff28315273d95303eaf78 DIST teamviewer_15.2.2756_i386.tar.xz 13456056 BLAKE2B cd41db000d5d7fe67f888026146affcfd08495c4e275b1e66ffcc71224b75643713a6f59598eb94aae473d1ec3e9dd500c40e28017bec1f2d50f27f182a01ed7 SHA512 17c0da4599ae1c111ff1ac3069bbb7b613175253a13086c1d564e0ab268317e6249daa3453d686379b3c29cc5cd76a74c2e6654bed8326ee1c8f46e40cbb4888 +DIST teamviewer_15.3.2682_amd64.tar.xz 13066268 BLAKE2B 701a1c53486b186ebdeee8c4611aba5a96155345e2aa484c8aa1c917d6ef12297ae45946604ba23332e3ce40ec60ea5f85b272289630dc27782122b7c4bd87f2 SHA512 27ac18336339406d7aec30a8765ca61fad45756580e82cb506b52b9fb6f94aea96c67065750c2573430704247be93dca757526a97a7d9b41ade9c88fb66dd267 +DIST teamviewer_15.3.2682_i386.tar.xz 13602852 BLAKE2B 4a3ec9062dd2c670395953bdcc5beb923e37ed00ee315c1a051d10b15e16dfe9fcf00f6b1308180a007257edff931c9a210da4b8520963f2ef0df9406e27b9e8 SHA512 bc599059f5d2b9178db39c1d9cb55303493bd734642bc0aecceb8bbe025056a4a61a50055cfb4ed5841787bdf41a6c544603cde13a724f737677d0710157f077 +DIST teamviewer_15.4.4445_amd64.tar.xz 13056296 BLAKE2B f96bfa24fecec42cd591db8e1e4c471d02fa3de927169e449689507694d162d9b2dd0dce252699c81d18a83a5d58f33f70189cfe824e5388b391ed9b198b4459 SHA512 1fc2ff655f7455d3b11a913ef2342539c5845e0490f26c51e9cb4437185b1d0bd4371c9be3b8c4931ee0f1e97c59bbd06414788af6f8cce80579edf2e11a53b7 +DIST teamviewer_15.4.4445_i386.tar.xz 13631276 BLAKE2B f836e68c96d5b0e05c7033504c4b3624d7ab4eed4e0506535ab23e18d2611a506cdc57128bca1b27db3ecb8d4dcdda917f74deacefdd52a0ffc5626417ce62c6 SHA512 d4181241f2732310e9cb2fb7cfda3b9679b26bd9c11a8934d5c528878cb703611b86d95edb44e928b72ee5c127888aa7e27a466698d1ca5515e2a1077a921d52 EBUILD teamviewer-15.0.8397.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9 EBUILD teamviewer-15.1.3937.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9 EBUILD teamviewer-15.2.2756.ebuild 4095 BLAKE2B e8a01b0e7e749396705fafd6c178d8e85159a9e4a282ea8ea74c0279e39dc7c5933f8f07883cb57d788cbddf7efb33aebf299c2ee23555fac30fbb6a17b47864 SHA512 177d58dc814db1a593af2f1f64871d8964d4bbdf67f56017dfe0ba60b12fe5f9225e9ff72320f0e0b5e18cb767db814b4ab30f9945729cc3b9bac1d83c20a3de +EBUILD teamviewer-15.3.2682.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736 +EBUILD teamviewer-15.4.4445.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d diff --git a/net-misc/teamviewer/teamviewer-15.3.2682.ebuild b/net-misc/teamviewer/teamviewer-15.3.2682.ebuild new file mode 100644 index 000000000000..3441acea1e60 --- /dev/null +++ b/net-misc/teamviewer/teamviewer-15.3.2682.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=${PN}${PV/\.*} +inherit desktop gnome2-utils systemd + +DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet" +HOMEPAGE="https://www.teamviewer.com" +SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz ) + x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )" + +LICENSE="TeamViewer MIT" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" + +DEPEND="sys-apps/sed" +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + sys-apps/dbus + !sys-auth/consolekit +" + +# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956 + +RESTRICT="bindist mirror" + +# Silence QA messages +QA_PREBUILT="opt/${MY_PN}/*" + +S="${WORKDIR}"/teamviewer + +src_prepare() { + default + + # Switch operation mode from 'portable' to 'installed' + sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die + + sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \ + -i tv_bin/script/teamviewerd.service || die +} + +src_install() { + local dst="/opt/${MY_PN}" # install destination + + # Quirk: + # Remove Intel 80386 32-bit ELF binary 'libdepend' present in all + # archives. It will trip the 'emerge @preserved-libs' logic on amd64 + # when changing the ABI of one of its dependencies. According to the + # TeamViewer devs, this binary is an unused remnant of previous Wine- + # based builds and will be removed in future releases anyway + rm tv_bin/script/libdepend + + insinto ${dst} + doins -r tv_bin + + # Set permissions for executables and libraries + for exe in $(find tv_bin -type f -executable -or -name '*.so'); do + fperms 755 ${dst}/${exe} + done + + # No slotting here, binary expects this service path + newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd + systemd_dounit tv_bin/script/teamviewerd.service + + insinto /usr/share/dbus-1/services + doins tv_bin/script/com.teamviewer.TeamViewer.service + doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service + + insinto /usr/share/polkit-1/actions + doins tv_bin/script/com.teamviewer.TeamViewer.policy + + for size in 16 24 32 48 256; do + newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png + done + + # Install documents (NOTE: using 'dodoc -r doc' instead of loop will + # have the undesired result of installing subdirectory 'doc' in /usr/ + # share/doc/teamviewer-) + for doc in $(find doc -type f); do + dodoc ${doc} + done + + keepdir /etc/${MY_PN} + dosym ../../etc/${MY_PN} ${dst}/config + + # Create directory and symlink for log files (NOTE: according to Team- + # Viewer devs, all paths are hard-coded in the binaries; therefore + # using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer + # ') + keepdir /var/log/${MY_PN} + dosym ../../var/log/${MY_PN} ${dst}/logfiles + + dodir /opt/bin + dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd + dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer + + make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer +} + +pkg_postinst() { + gnome2_icon_cache_update + + elog "Please note that parallel installation of multiple versions of" + elog "TeamViewer is currently not supported at runtime. Bug #621818" + elog "" + elog "Before using TeamViewer, you need to start its daemon:" + elog "OpenRC:" + elog "# /etc/init.d/teamviewerd start" + elog "# rc-update add teamviewerd default" + elog + elog "Systemd:" + elog "# systemctl start teamviewerd.service" + elog "# systemctl enable teamviewerd.service" + elog + elog "To display additional command line options simply run:" + elog "$ teamviewer help" + elog + elog "Most likely TeamViewer will work normally only on systems with systemd" + elog "or elogind. See this thread for additional info:" + elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956" +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/net-misc/teamviewer/teamviewer-15.4.4445.ebuild b/net-misc/teamviewer/teamviewer-15.4.4445.ebuild new file mode 100644 index 000000000000..3441acea1e60 --- /dev/null +++ b/net-misc/teamviewer/teamviewer-15.4.4445.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=${PN}${PV/\.*} +inherit desktop gnome2-utils systemd + +DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet" +HOMEPAGE="https://www.teamviewer.com" +SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz ) + x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )" + +LICENSE="TeamViewer MIT" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" + +DEPEND="sys-apps/sed" +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + sys-apps/dbus + !sys-auth/consolekit +" + +# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956 + +RESTRICT="bindist mirror" + +# Silence QA messages +QA_PREBUILT="opt/${MY_PN}/*" + +S="${WORKDIR}"/teamviewer + +src_prepare() { + default + + # Switch operation mode from 'portable' to 'installed' + sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die + + sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \ + -i tv_bin/script/teamviewerd.service || die +} + +src_install() { + local dst="/opt/${MY_PN}" # install destination + + # Quirk: + # Remove Intel 80386 32-bit ELF binary 'libdepend' present in all + # archives. It will trip the 'emerge @preserved-libs' logic on amd64 + # when changing the ABI of one of its dependencies. According to the + # TeamViewer devs, this binary is an unused remnant of previous Wine- + # based builds and will be removed in future releases anyway + rm tv_bin/script/libdepend + + insinto ${dst} + doins -r tv_bin + + # Set permissions for executables and libraries + for exe in $(find tv_bin -type f -executable -or -name '*.so'); do + fperms 755 ${dst}/${exe} + done + + # No slotting here, binary expects this service path + newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd + systemd_dounit tv_bin/script/teamviewerd.service + + insinto /usr/share/dbus-1/services + doins tv_bin/script/com.teamviewer.TeamViewer.service + doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service + + insinto /usr/share/polkit-1/actions + doins tv_bin/script/com.teamviewer.TeamViewer.policy + + for size in 16 24 32 48 256; do + newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png + done + + # Install documents (NOTE: using 'dodoc -r doc' instead of loop will + # have the undesired result of installing subdirectory 'doc' in /usr/ + # share/doc/teamviewer-) + for doc in $(find doc -type f); do + dodoc ${doc} + done + + keepdir /etc/${MY_PN} + dosym ../../etc/${MY_PN} ${dst}/config + + # Create directory and symlink for log files (NOTE: according to Team- + # Viewer devs, all paths are hard-coded in the binaries; therefore + # using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer + # ') + keepdir /var/log/${MY_PN} + dosym ../../var/log/${MY_PN} ${dst}/logfiles + + dodir /opt/bin + dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd + dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer + + make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer +} + +pkg_postinst() { + gnome2_icon_cache_update + + elog "Please note that parallel installation of multiple versions of" + elog "TeamViewer is currently not supported at runtime. Bug #621818" + elog "" + elog "Before using TeamViewer, you need to start its daemon:" + elog "OpenRC:" + elog "# /etc/init.d/teamviewerd start" + elog "# rc-update add teamviewerd default" + elog + elog "Systemd:" + elog "# systemctl start teamviewerd.service" + elog "# systemctl enable teamviewerd.service" + elog + elog "To display additional command line options simply run:" + elog "$ teamviewer help" + elog + elog "Most likely TeamViewer will work normally only on systems with systemd" + elog "or elogind. See this thread for additional info:" + elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956" +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest index b73a84b8967b..bfe878ceedc2 100644 --- a/net-misc/telnet-bsd/Manifest +++ b/net-misc/telnet-bsd/Manifest @@ -2,5 +2,5 @@ AUX telnet-bsd-1.2-fbsd.patch 2523 BLAKE2B dd8625ecb4d2d82d80ce3ec14c56fc979e76c AUX telnet-bsd-1.2-format-security.patch 1419 BLAKE2B c605a5e4b92d009221ef9d9e54533779a66a6cb4d4f51684f7c366a35738c8e6ea38c3b2d3cf58c5e808808e1d61cedbd18205f332637c40c91a67b595565fdd SHA512 f5f4b2b7e6f3ec641f5160ab41427ea46a8dd83a9a00d9e15bbe08ed3ab4b7190db05476666e20967b225e63bbf4b43ff59471be7e8f26c0eeed433503bfb081 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d -EBUILD telnet-bsd-1.2-r1.ebuild 1147 BLAKE2B 8676dd12d7346529a9d92b45c2eedcee05ea229fc90d756d94ad958f2f7282aba1c57d7bfa7290ce3347ec3838b63298977b779a653428cf1e1191d0d9c08f21 SHA512 20e61d0d023d8f53c72a3fa804e69336320171d2b59daa214a0e21e7e9a5c9402dc37c78e241e479b9cf5a571c259d7f5056d48731da7829fcd3e7bc9d098cc4 +EBUILD telnet-bsd-1.2-r1.ebuild 1153 BLAKE2B 30e5dd2312f5fe500a3aff9bb3fc3c486f8d45543535c7e07399ae7814d95adf59291b69c0008b9f1dba93898903d2d82219fe8d322c95cfd20337297f0b4252 SHA512 9086323aadeace4cc4f291dd8e5187e49434afe8177fae0118920c41895eaf63bdbcc6d20be3ba303641e8474926168beb4fbe58fc5b07e831727e9ea5af6ec4 MISC metadata.xml 218 BLAKE2B 48f6dc072d599bb422bd1033c1b1ecc05aba8ac787c9a10425ecf89d08140c859a122f19502f1de050ea7341f4947aee0b88d10ee605b2a60ec4542ff29ac489 SHA512 c1894fa0ad03968827a0eb6410381bdaa9491a4b450f9a50959a93700f803ddc83f020040f4db06ed3ba68c12adb4a73b192525ef7e70c0bd10125e3da578c65 diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild index 8fc40fcfe235..e049877450ac 100644 --- a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild +++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild @@ -6,11 +6,11 @@ inherit eutils autotools toolchain-funcs DESCRIPTION="Telnet and telnetd ported from OpenBSD with IPv6 support" HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/" -SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2" +SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="nls xinetd" RDEPEND="sys-libs/ncurses:=" diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index f940ed7de241..a9bc966a1e3d 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -6,5 +6,5 @@ AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8 AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde -EBUILD tigervnc-1.9.0-r1.ebuild 4543 BLAKE2B b8511bbbd26837b372db8f50134827ff04ea784bb1e5c80381d21a87d4b47bb3ed71e8293e99040f769d9b462e2acb49f31ebd5d4e69907e34310d4c01221964 SHA512 a06caf72fafbe425b9b626b731a6b6cef18ee33dc7ca9c9e2c63d57dd5bc6f3cf1dee46d387e14f18097f7317274d3f3ddaaffa528943f83d0a0df06c59329b6 +EBUILD tigervnc-1.9.0-r1.ebuild 4540 BLAKE2B ff8f3c71c7bfc522a5f4ba7f028cebb9a6e01195f4dea198093171a0a860bdee4b0a34ac12513a75a78ad1b6936cad29b240e9491492c1bbc14ff7af6171f47f SHA512 709afdfba6be2772b1f99e1d2bea28e572bc99605864b6e4897595d47b0144a5290dbf78cfdf27ec49bff19170f82f0810bee3269c7fe57cfba9a4a3312b0d24 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997 diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild index cc9111542258..8e14c045fb53 100644 --- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild +++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule" CDEPEND=" diff --git a/net-misc/unix2tcp/Manifest b/net-misc/unix2tcp/Manifest index 6d30764dae4c..c917bd4af9df 100644 --- a/net-misc/unix2tcp/Manifest +++ b/net-misc/unix2tcp/Manifest @@ -1,3 +1,3 @@ DIST unix2tcp-0.8.2.tar.bz2 29636 BLAKE2B 37b67cdac5d2db9fbf5dd2fc4277213796727c66ca1c2ececf8545017f1475e6e61454146bb04a1c72adaef5408e2ac873604f21fcdc090b2b1cad4f454ee8f7 SHA512 0f46895b1693065b592915574142c6475d79701c2f2eca70cfb40603849af9bdb6be939119fcca1d50d069ace940da691cf554a33eb2ac357194cf729b2c7a20 -EBUILD unix2tcp-0.8.2-r1.ebuild 400 BLAKE2B 36fde35a833223f0fb04a2c88ea16e24a3054786d58c9d8cdfbf9fb01f0027c57a423295537fddb9e396b6bd378ccc1166db0611942f7431855837c4a4b1f093 SHA512 098d350d8268a73598db18c6c86c348ba1bfc5bff0c94daae0785db71f86b417b0470e530861bd6880cd339c73a792167c4859e8e991de92a9f65983c2d71401 +EBUILD unix2tcp-0.8.2-r1.ebuild 401 BLAKE2B 3b4b582634974e55d8b5ca5121e9999bd3b9931e20157d616cdc5913ec8f04d097f0c7490b02ca02e23c4def98b640bd4e9b60ecd5ac5de01259b1b18096fa60 SHA512 c67cf8fe8241a426f945944275c9f7fd8c5e87bfadf3bd216569f9339e01fad2a008b2e809025619a2af28417f41d9c3ecbf5e3563c81af87c87418466dc245e MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild b/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild index 07e7bdfb2d2a..6cd51a4a779c 100644 --- a/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild +++ b/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild @@ -9,6 +9,6 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm hppa ia64 ppc s390 x86" +KEYWORDS="amd64 arm hppa ~ia64 ppc s390 x86" DOCS=( ChangeLog README ) diff --git a/net-misc/utelnetd/Manifest b/net-misc/utelnetd/Manifest index eba94e7079f2..3d0e325713a5 100644 --- a/net-misc/utelnetd/Manifest +++ b/net-misc/utelnetd/Manifest @@ -1,4 +1,4 @@ AUX utelnetd.initd 349 BLAKE2B 7e071244e681cf048302a95372cb11698ab6f53a2ea1d3d79d2e08748c3741d65abedf864d76df91007e1b127e8fd5406c19e5861cd44d1fd935d51676806f11 SHA512 543f888cc0016bf374106bdc09504e15ad9eb2db67bc8c98c386ad50564bd24a9e481a977314c9a8734a9c8b43af26c20df36525ff249f8c6f0ef87344afc248 DIST utelnetd-0.1.11.tar.gz 14548 BLAKE2B bf87dd15b3bb40154b5db1bd707c8096bce04e40d203a7b0613d55535f19c98cc767db2bd6b6004568bd362ab115e95c7e1f05c77b3be0a3a594c55ec49842bb SHA512 96b34cba5b007ae0114810a1f7ef348b4db0f210b6f6a76b056420d4c7aa2c8f862253924d21add98d9db7736f9acb61a08084ddee7b8bfa1d4012776a0bb2db -EBUILD utelnetd-0.1.11-r1.ebuild 694 BLAKE2B 02987370dac281d9f70da8704b1baca3e0c49806df47983474cf875e4f6864429b157f5ef16deb19a988ad41ff7e170f4c1758d4f63a1125996b23482a512af4 SHA512 88084e00627f0a225882751f82ec4029c8c60243fae1a2819cd2e5419db1df55f2a1a6f7dec37bd600d7295408ad5b3a2a05c9a35572088774013f3ee0612c93 +EBUILD utelnetd-0.1.11-r2.ebuild 692 BLAKE2B e870fe461b58bff48b783bdd1955b89834aec4a5ebefd418d3c6044de6c47d263ed15c13534445f26bff2c39e72ce349a26170a25f4fcf30d8ba7a038e1e6b2e SHA512 e04467d29d625b2e63d6a90751546479f3b40c5c0f1fe9a044a70ebe0064c87f8d3a3481385d317af015e79cf07432e68f3286448455f8cb65fa4d664a6c6493 MISC metadata.xml 279 BLAKE2B b668e0f991510495e0fcac3f17d8a75e8b961bd4c5c53378f9154b649caa4fdd82e8640669659bf1eb7126ddc8e529f3d2780201b261c26ab6a6eb65ff75921b SHA512 58476718e664a2bb8b9cd57b1c056fa9dc2513ee3410f406cacc8963693ed032f77b4ab6de5dc4362084220f9df6058575a49d770c86a6d56673d388dc6c0c2e diff --git a/net-misc/utelnetd/utelnetd-0.1.11-r1.ebuild b/net-misc/utelnetd/utelnetd-0.1.11-r1.ebuild deleted file mode 100644 index 4d3e7fdfa6f1..000000000000 --- a/net-misc/utelnetd/utelnetd-0.1.11-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A small Telnet daemon, derived from the Axis tools" -HOMEPAGE="http://www.pengutronix.de/software/utelnetd/index_en.html" -SRC_URI="http://www.pengutronix.de/software/utelnetd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86" -IUSE="" - -DEPEND="virtual/shadow" - -src_prepare() { - sed -i \ - -e "/(STRIP)/d" \ - -e "/^CC/s:=.*:= $(tc-getCC):" \ - -e "/fomit-frame-pointer/d" \ - Makefile || die - - default -} - -src_install() { - dosbin utelnetd - dodoc ChangeLog README - - newinitd "${FILESDIR}"/utelnetd.initd utelnetd -} diff --git a/net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild b/net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild new file mode 100644 index 000000000000..f5d7e79c6651 --- /dev/null +++ b/net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="A small Telnet daemon, derived from the Axis tools" +HOMEPAGE="http://www.pengutronix.de/software/utelnetd/index_en.html" +SRC_URI="http://www.pengutronix.de/software/utelnetd/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86" +IUSE="" + +DEPEND="sys-apps/shadow" + +src_prepare() { + sed -i \ + -e "/(STRIP)/d" \ + -e "/^CC/s:=.*:= $(tc-getCC):" \ + -e "/fomit-frame-pointer/d" \ + Makefile || die + + default +} + +src_install() { + dosbin utelnetd + dodoc ChangeLog README + + newinitd "${FILESDIR}"/utelnetd.initd utelnetd +} diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest index fe7776167d7a..c91fcf74422e 100644 --- a/net-misc/vinagre/Manifest +++ b/net-misc/vinagre/Manifest @@ -2,5 +2,5 @@ AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9 AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312 AUX vinagre-3.22.0-gcc10-fno-common.patch 690 BLAKE2B 4f552f190f520fb1e09ae91fb8d88a4c31658f99c4e218df1d2362c8b2c20de1b7d67d04a6846041d26a0eaaf38236823381436c05abb2e293491fde2b17e94a SHA512 f6ec1a339aaf0d8a6a9f663cc51ae10c9a15e6c772dcc978c27a54842e8079d68079f5280cec34942921e4265f8fe94f61af9edc29946b6262d36ad321b6c37d DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f -EBUILD vinagre-3.22.0-r3.ebuild 1767 BLAKE2B 25c5a6267b4f08cbe60aa58693074e57bce9022fb01e06bdc7e7bf60bab79cf74c7fd3cf38e0b2af84833174917964da9cdd56862a29980dcd6aa67d5f40005e SHA512 dfcb08bbe6b39a8c2ed8e35538e365721f93589dd30e14e374e0b5811beea4fa2c1b25ab9c9e62e73f15e213537587f398969b8a9d0a25966e75a7d07d7729a5 +EBUILD vinagre-3.22.0-r3.ebuild 1806 BLAKE2B 4131e2a661c7ca2816096c70cc7672e5a054595fbec50ce5660378b84ed147943e6d4d5267869c58adbc7443fda9ec592c28dc89ac2df0318f8fd5fbed6c1df8 SHA512 f49739a732a1012c484eb2f4bd6bbdffdbced649f9f6539809d8a3544470438b05025aee92a5bcc04ddd7a777ef9ca947d2d655010ae7607f78c62c8ef57184d MISC metadata.xml 550 BLAKE2B 6f81c1e289dfcf1839030e45752fb4970ea84b3f8f8d187ae476f4fdbbce15739b8a5857b87bd4b426936f90554a9346f7abf3b9c60624fb39af4f6e2fab1b98 SHA512 3dbf3930996cc2cd2fd0ced60858094f3628eb08688fbec8d0bbf59880727e18f23402de48e04ef086924543d3d0085c9f75e4b070a5b3f6a4877774ade98840 diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild index dd6c7bc9f772..77ecdf41e187 100644 --- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild +++ b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild @@ -32,7 +32,7 @@ RDEPEND=" telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) - zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) + zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] -Date: Tue, 22 May 2018 20:45:45 +0200 -Subject: [PATCH] Do not restart service after unclean exit code - -Currently, the vino-server.service has Restart=on-failure, which means -that it is restarted in abnormal cases, but also in case of non-zero -exit code. It is restarted 5 times e.g. in case when X11 is not detected, -which doesn't make sense. Non-zero exit code is used only for states -which won't change with restart (invalid commandline, wayland and some -sanity checks). Change the value to Restart=on-abnormal in order to -prevent the useless restarts and to not spam journal. - -https://bugzilla.gnome.org/show_bug.cgi?id=761120 ---- - server/vino-server.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/vino-server.service.in b/server/vino-server.service.in -index a48b813..49e9c1f 100644 ---- a/server/vino-server.service.in -+++ b/server/vino-server.service.in -@@ -5,4 +5,4 @@ Description=Vino VNC server - Type=dbus - BusName=org.gnome.Vino - ExecStart=@libexecdir@/vino-server --Restart=on-failure -+Restart=on-abnormal --- -2.17.0 diff --git a/net-misc/vino/vino-3.22.0-r1.ebuild b/net-misc/vino/vino-3.22.0-r1.ebuild deleted file mode 100644 index 0cc7b6325b92..000000000000 --- a/net-misc/vino/vino-3.22.0-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 systemd - -DESCRIPTION="An integrated VNC server for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Vino" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib" -# bug #394611; tight encoding requires zlib encoding -REQUIRED_USE="jpeg? ( zlib )" - -# cairo used in vino-fb -# libSM and libICE used in eggsmclient-xsmp -RDEPEND=" - >=dev-libs/glib-2.26:2 - >=dev-libs/libgcrypt-1.1.90:0= - >=x11-libs/gtk+-3:3 - - x11-libs/cairo:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/pango[X] - - >=x11-libs/libnotify-0.7.0:= - - crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) - gnome-keyring? ( app-crypt/libsecret ) - jpeg? ( virtual/jpeg:0= ) - ssl? ( >=net-libs/gnutls-2.2.0:= ) - systemd? ( sys-apps/dbus[user-session] ) - telepathy? ( - dev-libs/dbus-glib - >=net-libs/telepathy-glib-0.18 ) - zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) - zlib? ( sys-libs/zlib:= ) -" -DEPEND="${RDEPEND} - app-crypt/libsecret - dev-util/glib-utils - >=dev-util/intltool-0.50 - virtual/pkgconfig -" -# libsecret is always required at build time per bug 322763 - -PATCHES=( - "${FILESDIR}/${PN}-segfaults-on-wayland.patch" - "${FILESDIR}/${PN}-return-error-if-X11-is-no-detected.patch" -) - -src_configure() { - gnome2_src_configure \ - $(use_enable ipv6) \ - $(use_with crypt gcrypt) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_with gnome-keyring secret) \ - $(use_with jpeg) \ - $(use_with ssl gnutls) \ - $(use_with telepathy) \ - $(use_with zeroconf avahi) \ - $(use_with zlib) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" -} diff --git a/net-misc/vino/vino-3.22.0.ebuild b/net-misc/vino/vino-3.22.0.ebuild deleted file mode 100644 index 4a26312965d1..000000000000 --- a/net-misc/vino/vino-3.22.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 systemd - -DESCRIPTION="An integrated VNC server for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Vino" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="crypt debug gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib" -# bug #394611; tight encoding requires zlib encoding -REQUIRED_USE="jpeg? ( zlib )" - -# cairo used in vino-fb -# libSM and libICE used in eggsmclient-xsmp -RDEPEND=" - >=dev-libs/glib-2.26:2 - >=dev-libs/libgcrypt-1.1.90:0= - >=x11-libs/gtk+-3:3 - - x11-libs/cairo:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/pango[X] - - >=x11-libs/libnotify-0.7.0:= - - crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) - gnome-keyring? ( app-crypt/libsecret ) - jpeg? ( virtual/jpeg:0= ) - ssl? ( >=net-libs/gnutls-2.2.0:= ) - telepathy? ( - dev-libs/dbus-glib - >=net-libs/telepathy-glib-0.18 ) - zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) - zlib? ( sys-libs/zlib:= ) -" -DEPEND="${RDEPEND} - app-crypt/libsecret - dev-util/glib-utils - >=dev-util/intltool-0.50 - virtual/pkgconfig -" -# libsecret is always required at build time per bug 322763 - -src_configure() { - gnome2_src_configure \ - $(use_enable ipv6) \ - $(use_with crypt gcrypt) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_with gnome-keyring secret) \ - $(use_with jpeg) \ - $(use_with ssl gnutls) \ - $(use_with telepathy) \ - $(use_with zeroconf avahi) \ - $(use_with zlib) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" -} diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest index 31c3f68029d3..190ca03c76bd 100644 --- a/net-misc/wakeonlan/Manifest +++ b/net-misc/wakeonlan/Manifest @@ -1,4 +1,6 @@ +AUX wakeonlan-0.41-ethers-lookup-r1.patch 2287 BLAKE2B 95bacd277caff21b056f3a8c159808594dce0fc60c735757148a315c87d02d110695b343eaffa28b067668b2f874ad1f88516fe9cee4f98621ecbb15396b1b4f SHA512 52a0b30aa8a2beee0056112b49cfe6ef6021f682f7ba1ba38173d227f5e103f34fdded8c61b7b399cc548ca5e182b47d320af6dffe617673aa873f08c20e1bc4 AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f EBUILD wakeonlan-0.41-r2.ebuild 656 BLAKE2B d54b3d423bdc9e563beb94b7ff7a8bd11e15c2db232125966ce2f3036efec681d521f230b71cb245503ad890a8b4c606c7e59357370009d04d5f335a8628e670 SHA512 f1d799b8372909276834149a272340471e8a97312d4c5821f53c2382159dc160f8d2b4ab8ae60f9764fddbb5ee88df0703452a532b76571a4b099241b62b93cb +EBUILD wakeonlan-0.41-r3.ebuild 649 BLAKE2B 85edf6292cab6564eeb3c799e263e81df5724d78e371763295aeccda87e688e11d9c834cac99f86be86d19a1bc8a25b08f16b1733d8fb35509c08bcef76330e4 SHA512 c698e9b4f308a9e2e9013232cd920baabf22698d562ef3b4ff7ed44b5277b338696652503b7821d0f1b74e256ea7e22f9badaf8f88d35550aed56f9ffab2120e MISC metadata.xml 252 BLAKE2B d5ae1c6434a18a4052d21b9d34d573fceda4a6a37f4f0f1001fcd8c5d7d179d6f6d7df0f611b7129eddeb894dbcbf573d9c22f25dfc12fcd989900efe48b3512 SHA512 84cb947f6732467eb3137a917ea484aed7b45f56115790f8fb6595b73d0a558e03f379e239db903e4741934744c8eb10237382be10788787c684fafc854527d3 diff --git a/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup-r1.patch b/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup-r1.patch new file mode 100644 index 000000000000..3e01c3e52c38 --- /dev/null +++ b/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup-r1.patch @@ -0,0 +1,90 @@ +--- wakeonlan-0.41.orig/wakeonlan ++++ wakeonlan-0.41/wakeonlan +@@ -5,6 +5,7 @@ + ######################################################################### + + use strict; ++use Net::hostent; + use Socket; + use Getopt::Std; + use vars qw($VERSION $opt_v $opt_h $opt_i $opt_p $opt_f); +@@ -44,19 +45,64 @@ + + sub wake + { +- my $hwaddr = shift; ++ my $host = shift; + my $ipaddr = shift || $DEFAULT_IP; + my $port = shift || $DEFAULT_PORT; + + my ($raddr, $them, $proto); +- my ($hwaddr_re, $pkt); ++ my ($hwaddr, $hwaddr_re, $pkt); + +- # Validate hardware address (ethernet address) ++ # get the hardware address (ethernet address) + + $hwaddr_re = join(':', ('[0-9A-Fa-f]{1,2}') x 6); +- if ($hwaddr !~ m/^$hwaddr_re$/) { +- warn "Invalid hardware address: $hwaddr\n"; +- return undef; ++ if ($host =~ m/^$hwaddr_re$/) { ++ $hwaddr = $host; ++ } else { ++ # $host is not a hardware address, try to resolve it ++ my $ip_re = join('\.', ('([0-9]|[1-9][0-9]|1[0-9]{2}|2([0-4][0-9]|5[0-5]))') x 4); ++ my $ip_addr; ++ if ($host =~ m/^$ip_re$/) { ++ $ip_addr = $host; ++ } else { ++ my $h; ++ unless ($h = gethost($host)) { ++ warn "$host is not a hardware address and I could not resolve it as to an IP address.\n"; ++ return undef; ++ } ++ $ip_addr = inet_ntoa($h->addr); ++ } ++ # look up ip in /etc/ethers ++ unless (open (ETHERS, '<', '/etc/ethers')) { ++ warn "$host is not a hardware address and I could not open /etc/ethers.\n"; ++ return undef; ++ } ++ while () { ++ if (($_ !~ m/^$/) && ($_ !~ m/^#/)) { # ignore comments ++ my ($mac, $ip); ++ ($mac, $ip) = split(' ', $_, 3); ++ if ($ip =~ m/^$ip_re$/) { ++ if ($ip eq $ip_addr) { ++ $hwaddr = $mac; ++ last; ++ } ++ next; ++ } else { ++ my $h2; ++ unless ($h2 = gethost($ip)) { ++ next; ++ } ++ if (inet_ntoa($h2->addr) eq $ip_addr) { ++ $hwaddr = $mac; ++ last; ++ } ++ } ++ } ++ } ++ close (ETHERS); ++ unless (defined($hwaddr)) { ++ warn "Could not find $host in /etc/ethers\n"; ++ return undef; ++ } + } + + # Generate magic sequence +@@ -68,7 +114,7 @@ + + # Allocate socket and send packet + +- $raddr = gethostbyname($ipaddr); ++ $raddr = gethostbyname($ipaddr)->addr; + $them = pack_sockaddr_in($port, $raddr); + $proto = getprotobyname('udp'); + diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild new file mode 100644 index 000000000000..c61e6f722759 --- /dev/null +++ b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GENTOO_DEPEND_ON_PERL=noslotop +inherit perl-module + +DESCRIPTION="Client for Wake-On-LAN" +HOMEPAGE="https://github.com/jpoliv/wakeonlan/" +SRC_URI="https://github.com/jpoliv/wakeonlan/archive/${P}.tar.gz" + +LICENSE="Artistic GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +DEPEND="virtual/perl-ExtUtils-MakeMaker" + +PATCHES="${FILESDIR}/${P}-ethers-lookup-r1.patch" + +src_install() { + perl-module_src_install + dodoc examples/lab001.wol + fperms u+w /usr/bin/wakeonlan /usr/share/man/man1/wakeonlan.1 +} diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 15b6a578f13b..8306d7ed6094 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,4 +1,4 @@ DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c -EBUILD wget-1.20.3-r1.ebuild 3218 BLAKE2B 661a8943a4fbd2c62b6c130d4c2046f903a139e8a17ed8208891aa83f93513bf943f7317e668117b80a9c0007d72a4332dd544b5deb63c30b0cec4e219e503a0 SHA512 cdb99a68f4f15d73e8f842b586130a99f8b2c7284921c61d957f2fda7273f96b339f8d69e693e299bcf8b44fa952e64dac60b50e0bc4a888f721e40fbb96d80b -EBUILD wget-1.20.3-r3.ebuild 3367 BLAKE2B 81111c074f50ae7c8e576a5c32f60cc5594c7fea06fd9c93ecee06ca5ea3e339ad8f5743df1912adc1b3407a909a116f7f0d2edc02ee3ddd52a254c832608bba SHA512 6d58d28d41396bd27efaa9288c91b944dcd150d67228a074eb0a1164f1a6bf2633127c7a934747f81bdd374bd669ef2993ab88e9437549f8cf1b35f92428bf2c +EBUILD wget-1.20.3-r1.ebuild 3215 BLAKE2B 046366c62070b9bfb055fc9b31f1e68817fd34d72f6e1ef60b5810b9d3a0154159a984100b85a7cda4f2dbf6c0d7f7d2e4c423a4742df9c88ca8d3bd396674bd SHA512 20f4632b350d918a04552e92ae61b742d8a99d4c2f5889a8eeb7cd6feb522707b997d5d433e8fcffb40f0851a7e259f704c5ae1aab4a7971c3b3adaa16bf7146 +EBUILD wget-1.20.3-r3.ebuild 3363 BLAKE2B 882c30312ff53b013c38cf4c9b3f2e9d4a5068dbc1c2454f7c0c90b2ff0d7e12ff6a9f88d576966129a62608828a4e608c7dab939497e9cdde366e6ec89d5a62 SHA512 84bb45efe21d6766c5a4c503103305318e3a16a6fb44f0e447cb8f9083cd6ae91f97828be547ff1d7dab095f678e65a12a313315483010ba8933d5b046ae2eb4 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4 diff --git a/net-misc/wget/wget-1.20.3-r1.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild index a3967da13316..21bffdc666e6 100644 --- a/net-misc/wget/wget-1.20.3-r1.ebuild +++ b/net-misc/wget/wget-1.20.3-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild index 00bf74f0865b..dc1e481def73 100644 --- a/net-misc/wget/wget-1.20.3-r3.ebuild +++ b/net-misc/wget/wget-1.20.3-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest new file mode 100644 index 000000000000..e8121cac1bc9 --- /dev/null +++ b/net-misc/wget2/Manifest @@ -0,0 +1,4 @@ +AUX wget2-1.99.2-remove_ldconfig_call.patch 768 BLAKE2B 203ad8814f1eba1f671ee4e612851c73bb764c125a4db392c3baf0a1eef05652f883f21d9bf0dc4528fa40cda79edc29f836a27782003bb78f336136fcee1e3a SHA512 75e90ad557cb231aafb5d28f8403c9bdeb2d61f64d10084df20ab077b3fc16cf7bd47d880d04ea6f1db0a09870e7161f5ac644d340ba4526354e62d238b477d3 +DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f +EBUILD wget2-1.99.2.ebuild 2021 BLAKE2B b4e1a611f429780746353792c876a1fefc082ad3684e111b2832ec9098fcd7985669eaf5200dc12939a947e636bea52b7c7a142b5036932250989fe177d0dd79 SHA512 98a75a65fff0dc92540b0143fe2765f02f1260d8f47634a62b1ad4cae9791529c36354630b5eedb07f4686c5023e06c0ea1ebcbb3b861e913a2d26d2e953258b +MISC metadata.xml 652 BLAKE2B 3404cf0ecbba0e6fbb3a1e1d232eb379fbcaf0e5f8d295c439a3d5613496c957daf40816f4bc5047df48e35fa4343f6fd874763e6681532412e9446e5860ee27 SHA512 8d98d6217536cd6a0ea07fdd588fd4f44f82e66c4dd6a8ecccbc58ddd5c4e4a0bef8e282fccc0064a442f5d6131b1475c7b1ef956f4841a990ddbcbf619c55b4 diff --git a/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch b/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch new file mode 100644 index 000000000000..6953b7314b63 --- /dev/null +++ b/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch @@ -0,0 +1,25 @@ +From eb2aefb01868e91f2e1252ddd1bcdb9c075e5b49 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Sun, 8 Mar 2020 21:46:15 +0100 +Subject: [PATCH] Don't run ldconfig by default + +Signed-off-by: Lars Wendler +--- + Makefile.am | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 979ad1b1..5bc6f6ce 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -75,7 +75,3 @@ fuzz-coverage: clean clean-lcov + check-local: + $(AM_V_at)$(MAKE) -s syntax-check >/dev/null + $(AM_V_at)$(srcdir)/contrib/check_options $(srcdir)/docs/wget2.md $(builddir)/src/wget2$(EXEEXT) +- +-# ppl often forget to run ldconfig after an install, so let's do it here +-install-exec-hook: +- $(AM_V_at)$(LDCONFIG) || : +-- +2.25.1 + diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml new file mode 100644 index 000000000000..c84bc2d35c97 --- /dev/null +++ b/net-misc/wget2/metadata.xml @@ -0,0 +1,16 @@ + + + + + polynomial-c@gentoo.org + Lars Wendler + + + Enable support for brotli compression + Build gpgme backend + Enable HTTP/2.0 support + Enable crypto support via dev-libs/openssl + Use public suffix list via media-libs/libnspsl + Depend on dev-util/vagrind for test suite + + diff --git a/net-misc/wget2/wget2-1.99.2.ebuild b/net-misc/wget2/wget2-1.99.2.ebuild new file mode 100644 index 000000000000..6e48cfdc1eea --- /dev/null +++ b/net-misc/wget2/wget2-1.99.2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="GNU Wget2 is a file and recursive website downloader" +HOMEPAGE="https://gitlab.com/gnuwget/wget2" +SRC_URI="mirror://gnu/wget/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/0" # subslot = libwget.so version +KEYWORDS="~amd64 ~x86" +IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn libressl lzma openssl pcre psl +ssl test valgrind xattr zlib" +REQUIRED_USE="valgrind? ( test )" + +RDEPEND=" + brotli? ( app-arch/brotli ) + bzip2? ( app-arch/bzip2 ) + !gnutls? ( dev-libs/libgcrypt:= ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) + ) + ) + gpgme? ( + app-crypt/gpgme + dev-libs/libassuan + dev-libs/libgpg-error + ) + http2? ( net-libs/nghttp2 ) + idn? ( net-dns/libidn2:= ) + lzma? ( app-arch/xz-utils ) + pcre? ( dev-libs/libpcre2 ) + psl? ( net-libs/libpsl ) + xattr? ( sys-apps/attr ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + valgrind? ( dev-util/valgrind ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + # Upstream attempts to be "smart" by calling ldconfig in + # install-exec-hook + "${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-static + --with-plugin-support + --with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)" + --without-libidn + --without-libmicrohttpd + $(use_enable doc) + $(use_enable valgrind valgrind-tests) + $(use_enable xattr) + $(use_with brotli brotlidec) + $(use_with bzip2) + $(use_with gpgme) + $(use_with http2 libnghttp2) + $(use_with idn libidn2) + $(use_with lzma) + $(use_with pcre libpcre2) + $(use_with psl libpsl) + $(use_with zlib) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + doman docs/man/man{1/*.1,3/*.3} + + find "${D}" -type f -name '*.la' -delete || die + rm "${ED}"/usr/bin/${PN}_noinstall || die +} diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index 4bbe2dc37c68..d8ec2985cc97 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -3,8 +3,8 @@ AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82 DIST whois-5.5.5.tar.gz 103424 BLAKE2B ef406985be6ca6fe1d73e5c23817c99aa1c111f9ec74707f96602e53e519b77585fc27feaf11baf0cfc4f1fa94fbd876fd6631ea0a4c2b3d7b4bcd99cfd2e786 SHA512 0fcdd5b7fbdf4123edda2af58a2fcf0a1a87c454dc6cb83c86c1d200f80659967a7d08d54d3b010c40465004aa219de2a8efcc4b41524a8aefc2e6050d868d1b DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9f6e6355f29a5b043ba5cbad19310058964120142d417e6a5df86bd68d03d7ac4358be488538584c2a56740f SHA512 97a139a8e24b9a92c5597bc31e1b8d5d5bcab1ec4cc53f80cbdb7f2e5b7e54f36b3a8a8d90fd7b86452aad36adc0ba2015aaf936643b290c8a777f5f6cb27ef3 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084 -EBUILD whois-5.4.3.ebuild 1574 BLAKE2B 95a98d315c975ca42f98f0ba09f39e5002f46f1c6bd6024fc78dd2bffe8cd422afb0f2d2e735ed10d69f77f5d575c946e273be69d59f8a78ee0503c86f41a2e7 SHA512 e1be4caba92dd2bcc92238a158d941adc733686bac889c2a5cc578c0e9d99faa4caee097ec2ba4f8b44f7374075312d400a7c3dad9179f0913690ffd022c51e7 -EBUILD whois-5.5.5.ebuild 1803 BLAKE2B 18abf8ebc9dc0b9e47d911344cd64876aae9bd0c88a22bc40489759824116c42510e65c1f698513ecdf048eef7bb58a841e949083aaae55b4adae1dfd9ddf268 SHA512 c8ea7771d38c1e138899fbf1859d33b8fa2d448306403ad2561c940b4dfefbb20dd2555ed38780187beec2ead11c6e118e87aee01aa667e5cada372610cee3bc -EBUILD whois-5.5.6.ebuild 1803 BLAKE2B 18abf8ebc9dc0b9e47d911344cd64876aae9bd0c88a22bc40489759824116c42510e65c1f698513ecdf048eef7bb58a841e949083aaae55b4adae1dfd9ddf268 SHA512 c8ea7771d38c1e138899fbf1859d33b8fa2d448306403ad2561c940b4dfefbb20dd2555ed38780187beec2ead11c6e118e87aee01aa667e5cada372610cee3bc -EBUILD whois-9999.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1 +EBUILD whois-5.4.3.ebuild 1572 BLAKE2B bf36dd139354f6615611de53a705c078ac7960c9bfbac8c75443c213774fe5b984fc25e07fdc00313a6cdacc81f4ecd5b4e9570c94653d6c4ef3abcf6ed82a79 SHA512 f8dc7ac8b2441df7721b192ba91b099f6d8a2bb9b38a62124bb80e409e0d686d9c0a918dae33ccd430f46b8c9080651455b1a29807ca3b4e6ec7b7d0208945be +EBUILD whois-5.5.5.ebuild 1799 BLAKE2B 88352b97b5f99ec654251f4e44fccc301c922ff3bff5ead97a793187728630d8c5d17a25fb008201407c6c2b35cc545772ed60ee73c7cb0676ca195bc8d9e57a SHA512 b5668faf787c2bf8f6786dab4a075e10a186c72e219f43cac4839bed67a88d192137091516495725fc30242e1a240d13f5dc93712e7c40c21846cd9b790dddda +EBUILD whois-5.5.6.ebuild 1799 BLAKE2B 88352b97b5f99ec654251f4e44fccc301c922ff3bff5ead97a793187728630d8c5d17a25fb008201407c6c2b35cc545772ed60ee73c7cb0676ca195bc8d9e57a SHA512 b5668faf787c2bf8f6786dab4a075e10a186c72e219f43cac4839bed67a88d192137091516495725fc30242e1a240d13f5dc93712e7c40c21846cd9b790dddda +EBUILD whois-9999.ebuild 1776 BLAKE2B 32d93beeb2591155f013cb39c98226b44444ce6c114ef1897a4ad7dd9ef26564cc99ab7695cc345507cf28cb34fbfcec7d311b45c330f39d2968b56a209d2f7e SHA512 a81d99f9ec0bcf777d7ff1f075ce8446c5166f0c4299f593395b7672fabdcc3efe7b36ad56fe0b14b9fe26408db7bdfc87b98f48000931b168875f8cd1e5f6cf MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d diff --git a/net-misc/whois/whois-5.4.3.ebuild b/net-misc/whois/whois-5.4.3.ebuild index 08d0eda40315..bcaf625576f2 100644 --- a/net-misc/whois/whois-5.4.3.ebuild +++ b/net-misc/whois/whois-5.4.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="iconv idn nls" RESTRICT="test" #59327 diff --git a/net-misc/whois/whois-5.5.5.ebuild b/net-misc/whois/whois-5.5.5.ebuild index 5c2065a97ce5..d99078f32be7 100644 --- a/net-misc/whois/whois-5.5.5.ebuild +++ b/net-misc/whois/whois-5.5.5.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then else #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/whois/whois-5.5.6.ebuild b/net-misc/whois/whois-5.5.6.ebuild index 5c2065a97ce5..d99078f32be7 100644 --- a/net-misc/whois/whois-5.5.6.ebuild +++ b/net-misc/whois/whois-5.5.6.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then else #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild index 8b649d81bce7..84b8abe1134b 100644 --- a/net-misc/whois/whois-9999.ebuild +++ b/net-misc/whois/whois-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then else #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest index f66a273e5faf..e1ee521df654 100644 --- a/net-misc/x11-ssh-askpass/Manifest +++ b/net-misc/x11-ssh-askpass/Manifest @@ -1,3 +1,3 @@ DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9 -EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 978 BLAKE2B 29d270060865c0a3fb95d214836e4b8eb338c8e3aed13edbc4e711ce07a72fc25ba1f6c9fd334d09e922969ec17ee94dc43d3db3e170ce0b549599df3533217b SHA512 e1550015d511e4b0c2b84850908452225eb44b7da0147f8bf69fcf0eaef8188f40df4d6c65cc91f4680344cc9e05d8ee83f7237d1f72cc8e3f12fa4f811a3ecc +EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 979 BLAKE2B a72347035985f24db73719a47f6fa0ddd82c582aa4a6d7f11f01072d312c11acef9ce515388ccaa68e2d9d92648fadca49834332c5efb6354afbb4ef946468f4 SHA512 97b4ab3684cc83d0b0850bc9adba6aa8176246ae87ae4f2e52d17e58f521c3aeda9f8b144e2407015a493172b8f2b9ff17d3d6fc4652325f3176d096ea6dc6ed MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4 diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild index 63844cfe043c..382f83d18b00 100644 --- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild +++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.liquidmeme.net/software/x11-ssh-askpass/${P}.tar.gz" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86" IUSE="" RDEPEND="virtual/ssh diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 660f7040f5e2..8609c57c7e5c 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,6 +1,4 @@ -DIST youtube-dl-2020.01.24.tar.gz 3159926 BLAKE2B 0b1be74f74eb0be6cb0a41faf0538110bfc5d1a213fa1c456a6a358096f16ac8768ebd3d4673e523251fd0721a4a0990f061713d32b13c11077e79f8f02989e1 SHA512 8f85a218395d2932b26c7b76d5b03cbdf9a7c541415c8d1b805239b6ab1ca74b94fc497f32052a1d93fe20ac760994975a13551dd8c5319f0549af20b70a1a78 -DIST youtube-dl-2020.02.16.tar.gz 3161956 BLAKE2B 36cd189b162d98f986d669c4439070efbf344aa05f821b9e35a58fcef8db839ad0e079836e7a84cd17b04afdb113559695ad500f4b0183c7dcefa1694bdccf62 SHA512 1164ad9f875d67844ddc7bf8214bcc06cb384d7f2a5661c1f419f2ce5950b1cfcbf90c558e143b76948d9d7cf57cf3843c8d6392fc6ef77f89319375610f01a2 -EBUILD youtube-dl-2020.01.24.ebuild 2260 BLAKE2B a48928c4a0252d63ca1298ada873980ddf65232bd3e701b967d897cc27164ac984db30d6751e993690c90b508f6578f0de616edb89a0bc86afea52b7222d770a SHA512 1a46d92d493004b2341d429c83d20b39815682e9163525132acbe5ca7ecce3b02555d0723695f83abd5443204083a5a23d0510a82340c441e67d360a24c4d300 -EBUILD youtube-dl-2020.02.16.ebuild 2266 BLAKE2B fe492271e4383198eb2654a2085c297120dc09f9ae6242cc65bacb2b98422ddb371e5ff68f3620370faedaab9566e786c46e740c93fa7538c742188c4959e329 SHA512 a3cfd6f92f2b66ed7ed90feaa3563402fbca898f1918d7b0804512da81fa47db69cbad7e8cef06178e4f5f7ac1db5889ab75d8b0abe501c6d5b94d521466f4cc -EBUILD youtube-dl-99999999.ebuild 2163 BLAKE2B 29e69318bbbb79c7e311867c0be98bff4f3958c8df7723c28b0917b8cb3c8f8a922dd1cd1f83853423a19b3f62e4e26255e8a26a5e6e0c55ec8b44fd5dd6157b SHA512 096da09988640a41943c7af34f52a4953e9e175452b390b5956c324f61a6161db5004cf8d70f8ff34d83b29513eee7709df8335aff82b5a3413ed48c4af6f76c +DIST youtube-dl-2020.03.24.tar.gz 3165706 BLAKE2B 817cd8762f496255e58f909ab04f5fec3627918b4d9b58a9ab12c8bd56a12f672067c1dfe0808d76a96bc97fc7bc9a9e661c4f176577c0257f45d5cf6d0c7b92 SHA512 421c0ae412977cdf94d079aa7982360ffdfc4271bb7af27a598adbdb8454c2044e5c44ff3a9f339e9b0989c1264223ca83bba6a9151d01052f8f72c076d9e369 +EBUILD youtube-dl-2020.03.24.ebuild 2210 BLAKE2B 323d2ab1445d2a1333f4c23e561b302b95a6731657092e1a5085bda7c6b0605f07026079a7af5bd15a8b1fe91baf16e0d43856768473539812d2167be6e9e20b SHA512 f6378774bcadcca2dbd9ea55aa4eb003f7417188fa496fdd056ad66bf5d1a1da90ed98e696d4238340bc0f2a2d080a8e94c3ba33822c9566981faa8c92077c8b +EBUILD youtube-dl-99999999.ebuild 2113 BLAKE2B b92cf80b267e39b08b11a488127b19cfb22387ee95c7a5ccd28de5aa15c81df32f6b55fcbbde65e64ec26018b2b0c105eb811620873963ca3494ba387df87596 SHA512 cfdcbb7a37cf355233fa191197ccd38a113b3bc7ab3391f42587614d129b8a310ec5896c4f069d2c3f6e9fc4e38b4141a721bc373b313961a93b72dd28458ae1 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 diff --git a/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild b/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild deleted file mode 100644 index b90fc3a70b10..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=(python3_{6,7,8}) -inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://github.com/ytdl-org/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -LICENSE="public-domain" - -KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - || ( - dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - ) -" -S=${WORKDIR}/${PN} - -src_compile() { - distutils-r1_src_compile -} - -python_test() { - emake offlinetest -} - -python_install_all() { - dodoc README.txt - doman ${PN}.1 - - newbashcomp ${PN}.bash-completion ${PN} - - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} - - insinto /usr/share/fish/vendor_completions.d - doins ${PN}.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "${PN}(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :" - elog - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need avconf (media-video/libav) or" - elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" - elog "videos can be retrieved in a higher quality format without sound." - elog "${PN} will detect whether avconv/ffmpeg is present and" - elog "automatically pick the best option." - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." - elog - elog "Downloading MMS and RTSP videos requires either mplayer" - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." - elog - elog "If you want ${PN} to embed thumbnails from the metadata into the" - elog "resulting MP4 files, consider installing media-video/atomicparsley" -} diff --git a/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild b/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild deleted file mode 100644 index cc4f38a726e5..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=(python3_{6,7,8}) -inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://github.com/ytdl-org/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -LICENSE="public-domain" - -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - || ( - dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - ) -" -S=${WORKDIR}/${PN} - -src_compile() { - distutils-r1_src_compile -} - -python_test() { - emake offlinetest -} - -python_install_all() { - dodoc README.txt - doman ${PN}.1 - - newbashcomp ${PN}.bash-completion ${PN} - - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} - - insinto /usr/share/fish/vendor_completions.d - doins ${PN}.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "${PN}(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :" - elog - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need avconf (media-video/libav) or" - elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" - elog "videos can be retrieved in a higher quality format without sound." - elog "${PN} will detect whether avconv/ffmpeg is present and" - elog "automatically pick the best option." - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." - elog - elog "Downloading MMS and RTSP videos requires either mplayer" - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." - elog - elog "If you want ${PN} to embed thumbnails from the metadata into the" - elog "resulting MP4 files, consider installing media-video/atomicparsley" -} diff --git a/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild b/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild new file mode 100644 index 000000000000..1f7d1a6c1729 --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=(python3_{6,7,8}) +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://github.com/ytdl-org/youtube-dl/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" +LICENSE="public-domain" + +KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] +" +DEPEND=" + ${RDEPEND} + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/flake8[${PYTHON_USEDEP}] + ) +" +S=${WORKDIR}/${PN} + +src_compile() { + distutils-r1_src_compile +} + +python_test() { + emake offlinetest +} + +python_install_all() { + dodoc README.txt + doman ${PN}.1 + + newbashcomp ${PN}.bash-completion ${PN} + + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} + + insinto /usr/share/fish/vendor_completions.d + doins ${PN}.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "${PN}(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :" + elog + elog "${PN} works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need avconf (media-video/libav) or" + elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" + elog "videos can be retrieved in a higher quality format without sound." + elog "${PN} will detect whether avconv/ffmpeg is present and" + elog "automatically pick the best option." + elog + elog "Videos or video formats streamed via RTMP protocol can only be" + elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." + elog + elog "Downloading MMS and RTSP videos requires either mplayer" + elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." + elog + elog "If you want ${PN} to embed thumbnails from the metadata into the" + elog "resulting MP4 files, consider installing media-video/atomicparsley" +} diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild index 3135d5cb48e0..e469e49163c2 100644 --- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild +++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild @@ -15,11 +15,8 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] - || ( - dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - ) " DEPEND=" ${RDEPEND} diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest index 16f0ada492f7..0dc987c9bd5f 100644 --- a/net-misc/youtube-viewer/Manifest +++ b/net-misc/youtube-viewer/Manifest @@ -1,8 +1,8 @@ DIST youtube-viewer-3.5.5.tar.gz 238922 BLAKE2B 8e5b57f5e83ce53b3249e948e141042a4dff019e201718c5a75d5577a349707add5f2d4a6e5a53ff4968394b0b54df43bdee4933e9d4fe9ef62b6ed489a54678 SHA512 6e73565e7b8ba415e0f056a402804510af2d2d3e833daf3254330f75b404a21042318441d52b9b7ecb6659a693189c43a9b9148be4d3e154d4a1d23b402e8a63 -DIST youtube-viewer-3.5.8.tar.gz 239590 BLAKE2B 7230518b87f77d153820ba8c60af8e017cbc7e5f65d96597673f5c9500f5116a63aac28f385eac92a0df9e7f36ea7c3af8c4efa5b1ad55ae66afdb03abad95d7 SHA512 1d657c08ccf4fc4d79408e2020fda1f9187ffc1b6faea5524b4190627b46d22336b8faff22330882507ac81e3717344fdef614ea57717c1face1807a835ef746 DIST youtube-viewer-3.5.9.tar.gz 236095 BLAKE2B b98cfbca26da99f148d3afe0a4f7a4478abaf7c9f9727b421b7718004950e8bee52f58fe08e30b7ccfcd44bdc3ba3f7f75a5a5450581c3f2a9badaeac0fcb5f4 SHA512 2fe06feacbb0240606197b982aa097272d1d615e83a15d686da96fe336a5e85c71dccc046faaa106d85b1012a6b169ff39434b72b2033b2c8d301616c085eae1 +DIST youtube-viewer-3.7.4.tar.gz 281921 BLAKE2B dac2cbf76f3d0939f79fa875652680e197f41bf09769585894147dfe433db72a94d59309237f5ce5398753a39e2cf2cf83ae3f4f6987f5a4b49d806de2598e2c SHA512 4584821fb0ae3ec7e5f9c3b2e887b1fa158fb74a82be07698277e12d3762fd3b8f0557baddb9e08fe485f322b44b91adc2feaaba46227e0c519a516b54bbc4e8 EBUILD youtube-viewer-3.5.5.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181 -EBUILD youtube-viewer-3.5.8-r1.ebuild 2126 BLAKE2B b4cdfcdf7e1ba4e9764c49d417b4109767254a3c848abe9580231b168a0232e72900d776178b90a487ecfe36aee7713e5f8c1ca5c5ca964aa2594335cacc34d8 SHA512 132f0f0cfb73393428e79a86b95a4109c1dec252ec2d6c67c7d58318d90595fdb08c86a105464f0d8ed9f620142840fda1090179ed05e83c6cb19a7b87e2abd8 EBUILD youtube-viewer-3.5.9.ebuild 2126 BLAKE2B b4cdfcdf7e1ba4e9764c49d417b4109767254a3c848abe9580231b168a0232e72900d776178b90a487ecfe36aee7713e5f8c1ca5c5ca964aa2594335cacc34d8 SHA512 132f0f0cfb73393428e79a86b95a4109c1dec252ec2d6c67c7d58318d90595fdb08c86a105464f0d8ed9f620142840fda1090179ed05e83c6cb19a7b87e2abd8 -EBUILD youtube-viewer-9999.ebuild 2066 BLAKE2B 2e4b124f1665cf74802d26c2846bada76df74c1ec3c924209b5337317f54eec6966e91938813d07dc3a19b1fe175da51744a10ea1647a879d332865bece9c325 SHA512 020de8cd2fe7a25980841da52c21deab563bebd1e40f5135b8cac247dff88f55d5ddb1736ed75d631c82b171f2bdc1482040b5b723e5c4ffdfe32f6a0ff70b4a -MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6 +EBUILD youtube-viewer-3.7.4-r1.ebuild 2496 BLAKE2B 9d5b79820a27b95a922b8d93a9586475c097d8c064c7e5cce9bb817de098d2401b9b9674c85d13f59a4625afe809de39f7f9219b6680bbb4f6a983472349d369 SHA512 d75a19b8022f7184cedf6b7cdd022c68f316623420203d646ba26b4b57a50aa1acb488f4d24cd66ecdebc65973b5d601a124656b96fa5377258c2df852e33b27 +EBUILD youtube-viewer-9999.ebuild 2363 BLAKE2B 00362cde6040f2920a56ebb920714da4e28b5ef1425ffc4b5bf8eb920bed98d46822c22e5e1ef37ed37d8cf83fb5b333d6adca9cd7d0a51368697523d56a477b SHA512 47ae6a92016a1d61780fcb5c6f6b638f9ba19ad26ac5939e940e6fa3d8fd0ec3a23ae13ff28c9d2b3f02748e063072a8f8053cd65fbbe2ae6f6050cb201663d5 +MISC metadata.xml 1231 BLAKE2B 691c72ae1d2c9a73fbdbd449718ae6f14ce65ef95b997923c2a14cca565c5f2e7f85094ef4a68806615239f7ac16b08bc24ecc857e1f05f86d0d7f3920e67e0f SHA512 65289c8a1802c76de4d360682bba3b8ecd6c541797bcb33d18f237aaaf86a1d715749fd7b2d668a108803fb9e33ad49e5a7691ea0e3a4f081a6b99a7cab32e4e diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml index 7f054f58d41f..8b79660b6222 100644 --- a/net-misc/youtube-viewer/metadata.xml +++ b/net-misc/youtube-viewer/metadata.xml @@ -18,7 +18,9 @@ trizen/youtube-viewer - Install the gtk GUI, called gtk-youtube-viewer + Install the gtk2 GUI + Install the gtk3 GUI + Use the old gtk2 GUI instead of the gtk3 one Youtube Viewer is a CLI application dedicated for searching and diff --git a/net-misc/youtube-viewer/youtube-viewer-3.5.8-r1.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.8-r1.ebuild deleted file mode 100644 index 676951a81313..000000000000 --- a/net-misc/youtube-viewer/youtube-viewer-3.5.8-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop eutils perl-module xdg-utils - -DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer" -HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html" -SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( Artistic GPL-1+ )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk" - -RDEPEND=" - dev-perl/Data-Dump - dev-perl/JSON - dev-perl/libwww-perl[ssl] - dev-perl/Term-ReadLine-Gnu - dev-perl/LWP-Protocol-https - virtual/perl-Encode - virtual/perl-File-Path - virtual/perl-File-Spec - virtual/perl-Getopt-Long - virtual/perl-Scalar-List-Utils - virtual/perl-Term-ANSIColor - virtual/perl-Term-ReadLine - virtual/perl-Text-ParseWords - virtual/perl-Text-Tabs+Wrap - gtk? ( - dev-perl/File-ShareDir - >=dev-perl/Gtk2-1.244.0 - virtual/freedesktop-icon-theme - x11-libs/gdk-pixbuf:2[X,jpeg] - ) - || ( media-video/ffmpeg[openssl,-libressl] media-video/ffmpeg[-openssl,libressl] media-video/ffmpeg[gnutls] ) - || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )" -DEPEND="dev-perl/Module-Build" - -src_configure() { - local myconf - if use gtk ; then - myconf="--gtk-youtube-viewer" - fi - perl-module_src_configure -} - -src_install() { - perl-module_src_install - - if use gtk ; then - domenu share/gtk-youtube-viewer.desktop - doicon share/icons/gtk-youtube-viewer.png - fi -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update - elog "Optional dependencies:" - optfeature "cache support" dev-perl/LWP-UserAgent-Cached - optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS - optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA - optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth - optfeature "live streams support" net-misc/youtube-dl - optfeature "threads support" virtual/perl-threads - elog - elog "Check the configuration file in ~/.config/youtube-viewer/" - elog "and configure your video player backend." -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} diff --git a/net-misc/youtube-viewer/youtube-viewer-3.7.4-r1.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r1.ebuild new file mode 100644 index 000000000000..90be18b8c75b --- /dev/null +++ b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop eutils perl-module xdg-utils + +DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer" +HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html" +SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk gtk2" + +REQUIRED_USE="gtk2? ( gtk )" + +RDEPEND=" + dev-perl/Data-Dump + dev-perl/JSON + dev-perl/libwww-perl[ssl] + dev-perl/Term-ReadLine-Gnu + dev-perl/LWP-Protocol-https + virtual/perl-Encode + virtual/perl-File-Path + virtual/perl-File-Spec + virtual/perl-Getopt-Long + virtual/perl-Scalar-List-Utils + virtual/perl-Term-ANSIColor + virtual/perl-Term-ReadLine + virtual/perl-Text-ParseWords + virtual/perl-Text-Tabs+Wrap + gtk? ( + gtk2? ( + >=dev-perl/Gtk2-1.244.0 + ) + !gtk2? ( + dev-perl/Gtk3 + ) + dev-perl/File-ShareDir + virtual/freedesktop-icon-theme + x11-libs/gdk-pixbuf:2[X,jpeg] + ) + || ( >=media-video/ffmpeg-4.1.3[openssl,-libressl] >=media-video/ffmpeg-4.1.3[-openssl,libressl] >=media-video/ffmpeg-4.1.3[gnutls] ) + || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )" +DEPEND="dev-perl/Module-Build" + +src_configure() { + local myconf + if use gtk; then + if use gtk2; then + myconf="--gtk2" + else + myconf="--gtk3" + fi + fi + + perl-module_src_configure +} + +src_install() { + perl-module_src_install + + if use gtk; then + domenu share/gtk-youtube-viewer.desktop + doicon share/icons/gtk-youtube-viewer.png + fi +} + +pkg_postinst() { + use gtk && xdg_icon_cache_update + elog "Optional dependencies:" + optfeature "cache support" dev-perl/LWP-UserAgent-Cached + optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS + optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA + optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth + optfeature "live streams support" net-misc/youtube-dl + optfeature "threads support" virtual/perl-threads + elog + elog "Check the configuration file in ~/.config/youtube-viewer/" + elog "and configure your video player backend." + elog + ewarn "Starting with version 3.7.4, youtube-viewer requires the user to" + ewarn "get their own API key to function. Please refer to README.md or" + ewarn "https://github.com/trizen/youtube-viewer#logging-in for details!" +} + +pkg_postrm() { + use gtk && xdg_icon_cache_update +} diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild index 42baf31b22b6..8ee6e65d0d11 100644 --- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild +++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit gnome2-utils eutils perl-module git-r3 +inherit desktop eutils perl-module git-r3 xdg-utils DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer" HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html" @@ -13,8 +13,15 @@ EGIT_REPO_URI="https://github.com/trizen/${PN}.git" LICENSE="|| ( Artistic GPL-1+ )" SLOT="0" KEYWORDS="" -IUSE="gtk" +IUSE="gtk gtk2" +REQUIRED_USE="gtk2? ( gtk )" + +GTK_COMMON_DEPS=" + dev-perl/File-ShareDir + virtual/freedesktop-icon-theme + x11-libs/gdk-pixbuf:2[X,jpeg] +" RDEPEND=" dev-perl/Data-Dump dev-perl/JSON @@ -31,12 +38,17 @@ RDEPEND=" virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( + gtk2? ( + >=dev-perl/Gtk2-1.244.0 + ) + !gtk2? ( + dev-perl/Gtk3 + ) dev-perl/File-ShareDir - >=dev-perl/Gtk2-1.244.0 virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[X,jpeg] ) - || ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] ) + || ( >=media-video/ffmpeg-4.1.3[openssl,-libressl] >=media-video/ffmpeg-4.1.3[-openssl,libressl] >=media-video/ffmpeg-4.1.3[gnutls] ) || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )" DEPEND="dev-perl/Module-Build" @@ -44,23 +56,28 @@ SRC_TEST="do" src_configure() { local myconf - if use gtk ; then - myconf="--gtk-youtube-viewer" + if use gtk; then + if use gtk2; then + myconf="--gtk2" + else + myconf="--gtk3" + fi fi + perl-module_src_configure } src_install() { perl-module_src_install - if use gtk ; then + if use gtk; then domenu share/gtk-youtube-viewer.desktop doicon share/icons/gtk-youtube-viewer.png fi } pkg_postinst() { - use gtk && gnome2_icon_cache_update + use gtk && xdg_icon_cache_update elog "Optional dependencies:" optfeature "cache support" dev-perl/LWP-UserAgent-Cached optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS @@ -74,5 +91,5 @@ pkg_postinst() { } pkg_postrm() { - use gtk && gnome2_icon_cache_update + use gtk && xdg_icon_cache_update } -- cgit v1.2.3