From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- net-misc/Manifest.gz | Bin 55368 -> 55284 bytes net-misc/adjtimex/Manifest | 2 +- net-misc/adjtimex/adjtimex-1.29-r2.ebuild | 16 +- net-misc/anydesk/Manifest | 8 +- net-misc/anydesk/anydesk-5.5.6-r1.ebuild | 7 +- net-misc/anydesk/anydesk-6.0.0-r1.ebuild | 7 +- net-misc/anydesk/anydesk-6.0.1.ebuild | 7 +- net-misc/anydesk/anydesk-6.1.0.ebuild | 5 +- net-misc/asterisk-g729/Manifest | 2 +- .../asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild | 4 +- net-misc/asterisk/Manifest | 6 +- net-misc/asterisk/asterisk-13.38.1-r2.ebuild | 313 ------------- net-misc/asterisk/asterisk-16.17.0.ebuild | 320 +++++++++++++ net-misc/asterisk/asterisk-18.3.0.ebuild | 363 +++++++++++++++ net-misc/axel/Manifest | 6 +- net-misc/axel/axel-2.17.10.ebuild | 2 - net-misc/axel/axel-2.17.8.ebuild | 4 +- net-misc/axel/axel-2.17.9.ebuild | 4 +- net-misc/bfgminer/Manifest | 2 +- net-misc/bfgminer/bfgminer-5.5.0.ebuild | 25 +- net-misc/bgpq3/Manifest | 4 +- net-misc/bgpq3/bgpq3-0.1.33.ebuild | 4 +- net-misc/bgpq3/bgpq3-0.1.35.ebuild | 4 +- net-misc/bird/Manifest | 7 +- net-misc/bird/bird-2.0.8.ebuild | 61 +++ net-misc/bird/files/confd-bird-2 | 9 + net-misc/bird/files/initd-bird-2 | 16 +- net-misc/bird/metadata.xml | 12 + net-misc/cadaver/Manifest | 2 +- net-misc/cadaver/cadaver-0.23.3.ebuild | 12 +- net-misc/capi4hylafax/Manifest | 6 - .../capi4hylafax-01.03.00.99.300.20-r2.ebuild | 156 ------- net-misc/capi4hylafax/files/capi4hylafax.confd | 19 - net-misc/capi4hylafax/files/capi4hylafax.initd | 63 --- net-misc/capi4hylafax/metadata.xml | 17 - net-misc/cbugzilla/Manifest | 2 +- net-misc/cbugzilla/cbugzilla-0.2.1.ebuild | 11 +- net-misc/cfengine/Manifest | 2 +- net-misc/cfengine/cfengine-3.6.2.ebuild | 9 +- net-misc/chrony/Manifest | 9 +- net-misc/chrony/chrony-4.0-r1.ebuild | 210 --------- net-misc/chrony/chrony-4.0-r2.ebuild | 217 +++++++++ net-misc/chrony/chrony-4.0.ebuild | 182 -------- net-misc/chrony/chrony-4.1_pre1.ebuild | 231 +++++++++ net-misc/chrony/chrony-9999.ebuild | 97 ++-- net-misc/clusterssh/Manifest | 4 +- net-misc/clusterssh/clusterssh-4.03.03.ebuild | 4 +- net-misc/clusterssh/clusterssh-4.30.600.ebuild | 4 +- net-misc/connect/Manifest | 4 +- net-misc/connect/connect-1.103.ebuild | 34 -- net-misc/connect/connect-1.105.ebuild | 2 +- net-misc/connman-gtk/Manifest | 1 - net-misc/connman-gtk/connman-gtk-1.1.1.ebuild | 54 --- net-misc/connman/Manifest | 3 +- net-misc/connman/connman-1.39.ebuild | 100 ---- net-misc/connman/connman-9999.ebuild | 3 +- net-misc/croc/Manifest | 48 +- net-misc/croc/croc-8.6.10.ebuild | 145 ------ net-misc/croc/croc-8.6.11.ebuild | 146 ------ net-misc/croc/croc-8.6.12.ebuild | 149 ++++++ net-misc/croc/croc-9.0.0.ebuild | 149 ++++++ net-misc/curl/Manifest | 6 +- net-misc/curl/curl-7.74.0-r2.ebuild | 4 +- net-misc/curl/curl-7.76.0.ebuild | 291 ++++++++++++ net-misc/curl/curl-7.76.1.ebuild | 295 ++++++++++++ net-misc/dhcpcd/Manifest | 5 +- net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild | 2 +- net-misc/dhcpcd/dhcpcd-9.3.4.ebuild | 3 +- .../files/dhcpcd-9.3.4-include_termios.patch | 22 + net-misc/dhcping/Manifest | 2 +- net-misc/dhcping/dhcping-1.2.ebuild | 6 +- net-misc/dibbler/Manifest | 4 +- net-misc/dibbler/dibbler-1.0.1-r2.ebuild | 56 --- net-misc/dibbler/dibbler-1.0.1-r3.ebuild | 4 +- net-misc/dibbler/dibbler-1.0.1.ebuild | 49 -- net-misc/dropbear/Manifest | 2 +- net-misc/dropbear/dropbear-2020.81-r2.ebuild | 2 +- net-misc/dropbox/Manifest | 9 +- net-misc/dropbox/dropbox-117.4.378.ebuild | 102 ---- net-misc/dropbox/dropbox-118.4.460.ebuild | 102 ---- net-misc/dropbox/dropbox-120.4.4598.ebuild | 102 ++++ net-misc/electrum/Manifest | 8 +- net-misc/electrum/electrum-4.0.9-r2.ebuild | 2 +- net-misc/electrum/electrum-4.1.0.ebuild | 97 ++++ net-misc/electrum/electrum-4.1.1.ebuild | 97 ++++ net-misc/electrum/electrum-4.1.2-r1.ebuild | 99 ++++ net-misc/ena-driver/Manifest | 4 +- net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild | 4 +- net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild | 4 +- net-misc/ethertypes/Manifest | 2 +- net-misc/ethertypes/ethertypes-0.ebuild | 2 +- net-misc/freerdp/Manifest | 2 + net-misc/freerdp/freerdp-2.3.2.ebuild | 119 +++++ net-misc/frr/Manifest | 6 +- net-misc/frr/frr-7.5.1-r1.ebuild | 140 ------ net-misc/frr/frr-7.5.1-r2.ebuild | 145 ++++++ net-misc/frr/frr-7.5.ebuild | 150 ------ net-misc/frr/metadata.xml | 28 +- net-misc/gallery-dl/Manifest | 8 +- net-misc/gallery-dl/gallery-dl-1.16.5.ebuild | 45 -- net-misc/gallery-dl/gallery-dl-1.17.1.ebuild | 3 - net-misc/gallery-dl/gallery-dl-1.17.2.ebuild | 42 ++ net-misc/gallery-dl/gallery-dl-9999.ebuild | 3 - net-misc/geoipupdate/Manifest | 2 +- net-misc/geoipupdate/geoipupdate-4.3.0.ebuild | 2 +- net-misc/gerbera/Manifest | 7 +- .../gerbera-1.5.0-incomplete-type-iohandler.patch | 25 - net-misc/gerbera/gerbera-1.7.0.ebuild | 94 ---- net-misc/gerbera/gerbera-1.8.0.ebuild | 89 ++++ net-misc/gerbera/gerbera-9999.ebuild | 7 +- net-misc/gnome-online-miners/Manifest | 2 +- .../gnome-online-miners-3.34.0-r1.ebuild | 39 ++ .../gnome-online-miners-3.34.0.ebuild | 39 -- net-misc/gnome-remote-desktop/Manifest | 10 +- .../gnome-remote-desktop-0.1.9-copy-pixels.patch | 71 --- ...nome-remote-desktop-0.1.9-drop-vnc-frames.patch | 80 ---- .../gnome-remote-desktop-0.1.7.ebuild | 50 -- .../gnome-remote-desktop-0.1.8.ebuild | 50 -- .../gnome-remote-desktop-0.1.9.ebuild | 54 --- .../gnome-remote-desktop-40.0.ebuild | 61 +++ net-misc/gns3-server/Manifest | 4 +- net-misc/gns3-server/gns3-server-2.2.17.ebuild | 5 +- net-misc/gns3-server/gns3-server-2.2.19.ebuild | 5 +- net-misc/gofish/Manifest | 7 +- net-misc/gofish/files/gofish-1.2-r1.confd | 1 + net-misc/gofish/files/gofish-1.2-r1.rc | 12 + net-misc/gofish/gofish-1.2-r1.ebuild | 35 ++ net-misc/gofish/gofish-1.2.ebuild | 18 +- net-misc/gofish/metadata.xml | 9 +- net-misc/grive/Manifest | 3 - net-misc/grive/grive-0.5.1.ebuild | 34 -- net-misc/grive/grive-0.5.1_pre20171005.ebuild | 35 -- net-misc/gsutil/Manifest | 4 +- net-misc/gsutil/gsutil-4.59-r1.ebuild | 98 ++++ net-misc/gsutil/gsutil-4.59.ebuild | 97 ---- net-misc/gsutil/gsutil-4.60-r1.ebuild | 98 ++++ net-misc/gsutil/gsutil-4.60.ebuild | 97 ---- net-misc/gvrpcd/Manifest | 2 +- net-misc/gvrpcd/gvrpcd-1.3.ebuild | 11 +- net-misc/htbinit/Manifest | 14 +- net-misc/htbinit/files/htb.init-v0.8.5_tos.patch | 4 +- net-misc/htbinit/files/htb.init_find_fix.patch | 4 +- net-misc/htbinit/files/htb_0.8.5_esfq.diff | 53 --- net-misc/htbinit/files/htb_0.8.5_esfq.patch | 53 +++ net-misc/htbinit/files/htb_0.8.5_ipv6.diff | 128 ----- net-misc/htbinit/files/htb_0.8.5_ipv6.patch | 128 +++++ net-misc/htbinit/files/prio_rule.patch | 4 +- net-misc/htbinit/files/timecheck_fix.patch | 4 +- net-misc/htbinit/htbinit-0.8.5-r7.ebuild | 40 +- net-misc/htpdate/Manifest | 12 +- net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch | 35 ++ net-misc/htpdate/htpdate-1.0.7.ebuild | 47 -- net-misc/htpdate/htpdate-1.2.0.ebuild | 42 -- net-misc/htpdate/htpdate-1.2.2.ebuild | 4 +- net-misc/htpdate/htpdate-1.2.6.ebuild | 57 +++ net-misc/htpdate/htpdate-9999.ebuild | 57 +++ net-misc/htpdate/metadata.xml | 3 + net-misc/httpie/Manifest | 4 +- net-misc/httpie/httpie-2.3.0.ebuild | 55 --- net-misc/httpie/httpie-2.4.0.ebuild | 2 +- net-misc/httptype/Manifest | 2 +- net-misc/httptype/httptype-1.3.9-r1.ebuild | 4 +- net-misc/hylafaxplus/Manifest | 5 +- .../files/hylafaxplus-CVE-2020-1539x.patch | 110 ----- net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild | 161 ------- net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild | 2 +- net-misc/iaxmodem/Manifest | 2 +- net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild | 7 +- net-misc/icaclient/Manifest | 4 +- net-misc/icaclient/icaclient-21.1.0.14.ebuild | 3 +- net-misc/icaclient/icaclient-21.3.0.38.ebuild | 3 +- net-misc/ices/Manifest | 2 +- net-misc/ices/ices-2.0.2.ebuild | 4 +- net-misc/ipcalc/Manifest | 2 +- net-misc/ipcalc/ipcalc-0.42_p2.ebuild | 2 +- net-misc/iperf/Manifest | 2 +- net-misc/iperf/iperf-3.99999.99999.ebuild | 2 +- net-misc/ipsorcery/Manifest | 2 +- net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild | 12 +- net-misc/iputils/Manifest | 4 +- net-misc/iputils/iputils-20190709-r1.ebuild | 2 +- net-misc/iputils/iputils-20200821-r2.ebuild | 2 +- net-misc/jwhois/Manifest | 2 +- net-misc/jwhois/jwhois-4.0-r1.ebuild | 4 +- net-misc/kafka-bin/Manifest | 22 +- net-misc/kafka-bin/kafka-bin-2.0.1.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.1.1.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.2.1.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.3.0.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.4.0.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.4.1.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.5.0.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.5.1.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.6.0.ebuild | 4 +- net-misc/kafka-bin/kafka-bin-2.6.1.ebuild | 2 - net-misc/kafka-bin/kafka-bin-2.7.0.ebuild | 2 - net-misc/keychain/Manifest | 2 +- net-misc/keychain/keychain-2.8.5.ebuild | 2 +- net-misc/knock/Manifest | 2 + net-misc/knock/knock-0.8.ebuild | 47 ++ net-misc/l7-protocols/Manifest | 2 +- .../l7-protocols/l7-protocols-2009.05.28-r1.ebuild | 10 +- net-misc/lanmap/Manifest | 2 +- net-misc/lanmap/lanmap-81-r2.ebuild | 5 +- net-misc/lksctp-tools/Manifest | 2 +- .../lksctp-tools/lksctp-tools-1.0.18-r1.ebuild | 2 +- net-misc/lldpd/Manifest | 22 +- .../files/lldpd-0.9.5-seccomp-add-socket-ops.patch | 13 - .../lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch | 11 - net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch | 12 + .../lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch | 12 - .../files/lldpd-1.0.3-fix-fdp-without-cdp.patch | 30 -- net-misc/lldpd/files/lldpd-1.0.5-cpp.patch | 13 - net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch | 31 -- net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch | 12 - net-misc/lldpd/lldpd-1.0.10.ebuild | 102 ++++ net-misc/lldpd/lldpd-1.0.3.ebuild | 106 ----- net-misc/lldpd/lldpd-1.0.4.ebuild | 105 ----- net-misc/lldpd/lldpd-1.0.5-r1.ebuild | 103 ---- net-misc/lldpd/lldpd-1.0.6.ebuild | 102 ---- net-misc/lldpd/lldpd-1.0.7.ebuild | 2 +- net-misc/lldpd/lldpd-1.0.9.ebuild | 98 ++++ net-misc/megatools/Manifest | 2 +- net-misc/megatools/megatools-1.10.3.ebuild | 19 +- net-misc/memcached/Manifest | 2 +- net-misc/memcached/memcached-1.6.9.ebuild | 19 +- net-misc/mico/Manifest | 8 +- net-misc/mico/metadata.xml | 5 +- net-misc/mico/mico-2.3.13-r13.ebuild | 6 +- net-misc/mico/mico-2.3.13-r14.ebuild | 6 +- net-misc/mico/mico-9999.ebuild | 6 +- net-misc/mikutter/Manifest | 4 +- net-misc/mikutter/mikutter-4.0.6.ebuild | 2 +- net-misc/mikutter/mikutter-9999.ebuild | 2 +- net-misc/mobile-broadband-provider-info/Manifest | 4 +- .../mobile-broadband-provider-info-20190618.ebuild | 22 - .../mobile-broadband-provider-info-20201225.ebuild | 2 +- net-misc/modemmanager/Manifest | 11 +- net-misc/modemmanager/modemmanager-1.10.0.ebuild | 130 ------ .../modemmanager/modemmanager-1.14.8-r1.ebuild | 2 +- net-misc/modemmanager/modemmanager-1.14.8.ebuild | 130 ------ net-misc/modemmanager/modemmanager-1.16.2.ebuild | 128 +++++ net-misc/modemmanager/modemmanager-1.16.4.ebuild | 128 +++++ net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild | 130 ------ net-misc/mosh/Manifest | 4 +- net-misc/mosh/mosh-1.3.2.ebuild | 4 +- net-misc/mosh/mosh-9999.ebuild | 5 +- net-misc/mstpd/Manifest | 2 +- net-misc/mstpd/mstpd-0.0.9.ebuild | 2 +- net-misc/ndisc6/Manifest | 2 +- net-misc/ndisc6/ndisc6-1.0.3.ebuild | 5 +- net-misc/ndppd/Manifest | 2 +- net-misc/ndppd/ndppd-0.2.5.ebuild | 5 +- net-misc/netdate/Manifest | 2 +- net-misc/netdate/netdate-1.2-r1.ebuild | 4 +- net-misc/netifrc/Manifest | 4 +- net-misc/netifrc/netifrc-0.7.1-r1.ebuild | 4 +- net-misc/netifrc/netifrc-0.7.3.ebuild | 2 +- net-misc/netkit-fingerd/Manifest | 2 +- .../netkit-fingerd/netkit-fingerd-0.17-r3.ebuild | 6 +- net-misc/netkit-routed/Manifest | 2 +- .../netkit-routed/netkit-routed-0.17-r5.ebuild | 4 +- net-misc/netkit-rsh/Manifest | 2 +- net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild | 2 +- net-misc/netkit-talk/Manifest | 2 +- net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild | 4 +- net-misc/netopeer2/Manifest | 2 + net-misc/netopeer2/netopeer2-1.1.70.ebuild | 46 ++ net-misc/netstat-nat/Manifest | 2 +- net-misc/netstat-nat/netstat-nat-1.4.10.ebuild | 16 +- net-misc/networkmanager/Manifest | 9 +- .../networkmanager-1.26.4-iwd-fixes-pr640.patch | 169 ------- .../networkmanager/networkmanager-1.26.4.ebuild | 348 -------------- .../networkmanager/networkmanager-1.26.6.ebuild | 348 -------------- .../networkmanager/networkmanager-1.28.0-r1.ebuild | 2 +- .../networkmanager/networkmanager-1.30.4.ebuild | 345 ++++++++++++++ net-misc/npapi-sdk/Manifest | 4 +- net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild | 5 +- net-misc/npapi-sdk/npapi-sdk-9999.ebuild | 6 +- net-misc/ntp/Manifest | 2 +- net-misc/ntp/ntp-4.2.8_p15.ebuild | 4 +- net-misc/ntpsec/Manifest | 7 +- .../files/ntpsec-1.2.0-move-newfstatat.patch | 20 + net-misc/ntpsec/ntpsec-1.1.9.ebuild | 6 +- net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild | 167 +++++++ net-misc/ntpsec/ntpsec-1.2.0.ebuild | 163 ------- net-misc/ntpsec/ntpsec-9999.ebuild | 6 +- net-misc/nx/Manifest | 3 +- net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch | 42 ++ net-misc/nx/nx-3.5.99.26.ebuild | 5 + net-misc/nxplayer/Manifest | 2 +- net-misc/nxplayer/nxplayer-5.1.24.1.ebuild | 28 +- net-misc/ofono/Manifest | 2 +- net-misc/ofono/ofono-1.31.ebuild | 8 +- net-misc/oidc-agent/Manifest | 7 +- .../files/oidc-agent-3.3.1_desktop-category.patch | 9 - .../files/oidc-agent-3.3.1_install-perms.patch | 58 --- .../oidc-agent-3.3.5_makefile-toolchain-vars.patch | 48 -- net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild | 63 --- net-misc/oidc-agent/oidc-agent-4.0.2.ebuild | 4 +- net-misc/olsrd/Manifest | 4 +- net-misc/olsrd/olsrd-0.9.6.1.ebuild | 13 +- net-misc/olsrd/olsrd-0.9.8.ebuild | 14 +- net-misc/openntpd/Manifest | 2 +- net-misc/openntpd/openntpd-6.2_p3-r2.ebuild | 4 +- net-misc/openssh/Manifest | 16 +- .../files/openssh-8.6_p1-X509-glue-13.1.patch | 72 +++ .../files/openssh-8.6_p1-hpn-15.2-X509-glue.patch | 357 ++++++++++++++ .../files/openssh-8.6_p1-hpn-15.2-glue.patch | 132 ++++++ .../openssh/files/openssh-8.6_p1-hpn-version.patch | 13 + net-misc/openssh/files/sshd.service | 1 + net-misc/openssh/openssh-8.4_p1-r3.ebuild | 4 +- net-misc/openssh/openssh-8.5_p1-r1.ebuild | 4 +- net-misc/openssh/openssh-8.5_p1.ebuild | 2 +- net-misc/openssh/openssh-8.6_p1-r1.ebuild | 518 +++++++++++++++++++++ net-misc/openvswitch/Manifest | 2 +- net-misc/openvswitch/openvswitch-2.14.1.ebuild | 14 +- net-misc/pedro/Manifest | 4 +- net-misc/pedro/files/pedro-1.6-portage.patch | 4 +- net-misc/pedro/pedro-1.6.ebuild | 20 +- net-misc/pipes/Manifest | 2 +- net-misc/pipes/pipes-1.16.1-r1.ebuild | 4 +- net-misc/portfwd/Manifest | 2 +- net-misc/portfwd/portfwd-0.29-r1.ebuild | 8 +- net-misc/proxychains/Manifest | 2 +- net-misc/proxychains/proxychains-4.12-r1.ebuild | 4 +- net-misc/ps3mediaserver/Manifest | 2 +- .../ps3mediaserver/ps3mediaserver-1.90.1.ebuild | 4 +- net-misc/putty/Manifest | 4 +- net-misc/putty/putty-0.74.ebuild | 4 +- net-misc/putty/putty-9999.ebuild | 4 +- net-misc/quagga/Manifest | 2 +- net-misc/quagga/quagga-1.2.4.ebuild | 4 +- net-misc/rabbitmq-server/Manifest | 4 +- .../rabbitmq-server/rabbitmq-server-3.8.14.ebuild | 2 +- .../rabbitmq-server/rabbitmq-server-3.8.7.ebuild | 80 ---- net-misc/radvd/Manifest | 10 +- net-misc/radvd/radvd-2.17-r1.ebuild | 4 +- net-misc/radvd/radvd-2.17-r2.ebuild | 4 +- net-misc/radvd/radvd-2.18-r1.ebuild | 4 +- net-misc/radvd/radvd-2.18.ebuild | 4 +- net-misc/radvd/radvd-2.19.ebuild | 4 +- net-misc/rdesktop/Manifest | 8 +- net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild | 6 +- net-misc/rdesktop/rdesktop-1.8.6.ebuild | 6 +- net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild | 6 +- net-misc/rdesktop/rdesktop-1.9.0.ebuild | 6 +- net-misc/remmina/Manifest | 6 +- net-misc/remmina/remmina-1.4.11.ebuild | 102 ---- net-misc/remmina/remmina-1.4.12.ebuild | 5 +- net-misc/remmina/remmina-1.4.13.ebuild | 101 ++++ net-misc/rsync/Manifest | 6 +- .../rsync/files/rsync-3.2.3-glibc-lchmod.patch | 58 +++ net-misc/rsync/rsync-3.2.3-r2.ebuild | 4 +- net-misc/rsync/rsync-3.2.3-r3.ebuild | 147 ++++++ net-misc/rsync/rsync-9999.ebuild | 11 +- net-misc/rwhoisd/Manifest | 2 +- net-misc/rwhoisd/rwhoisd-1.5.9.6-r1.ebuild | 46 ++ net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild | 46 -- net-misc/rygel/Manifest | 4 +- net-misc/rygel/rygel-0.38.4.ebuild | 2 +- net-misc/rygel/rygel-0.40.1.ebuild | 82 ++++ net-misc/s3cmd/Manifest | 2 +- net-misc/s3cmd/s3cmd-2.1.0.ebuild | 4 +- net-misc/scponly/Manifest | 4 +- net-misc/scponly/scponly-4.8-r6.ebuild | 4 +- net-misc/scponly/scponly-4.8-r7.ebuild | 4 +- net-misc/seafile-client/Manifest | 5 +- .../files/seafile-client-8.0.1-glib-2.68.0.patch | 12 + .../seafile-client/seafile-client-8.0.1-r1.ebuild | 56 --- .../seafile-client/seafile-client-8.0.1-r2.ebuild | 56 +++ .../seafile-client/seafile-client-8.0.2.ebuild | 60 +++ net-misc/seafile/Manifest | 2 + net-misc/seafile/seafile-8.0.2.ebuild | 54 +++ net-misc/shmux/Manifest | 3 +- net-misc/shmux/shmux-1.0.2-r1.ebuild | 4 +- net-misc/shmux/shmux-1.0.2.ebuild | 37 -- net-misc/sipcalc/Manifest | 2 +- net-misc/sipcalc/sipcalc-1.1.6.ebuild | 6 +- net-misc/sks/Manifest | 3 +- .../sks/files/sks-1.1.6_p20200624-r1-db-hang.patch | 32 ++ net-misc/sks/sks-1.1.6_p20200624-r1.ebuild | 133 ++++++ net-misc/sks/sks-1.1.6_p20200624.ebuild | 132 ------ net-misc/socket/Manifest | 4 +- net-misc/socket/files/socket-1.5-makefile.patch | 4 +- net-misc/socket/socket-1.5.ebuild | 12 +- net-misc/spice-gtk/Manifest | 10 +- net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild | 4 +- net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild | 4 +- net-misc/spice-gtk/spice-gtk-0.38.ebuild | 4 +- net-misc/spice-gtk/spice-gtk-0.39.ebuild | 2 +- net-misc/spice-gtk/spice-gtk-9999.ebuild | 4 +- net-misc/sshrc/Manifest | 4 +- net-misc/sshrc/sshrc-0.6.1.ebuild | 5 +- net-misc/sshrc/sshrc-0.6.2.ebuild | 5 +- net-misc/sstp-client/Manifest | 4 +- net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild | 55 --- net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild | 63 +++ net-misc/sstp-client/sstp-client-1.0.12.ebuild | 56 --- net-misc/streamlink/Manifest | 6 +- net-misc/streamlink/streamlink-1.3.1-r1.ebuild | 4 +- net-misc/streamlink/streamlink-2.0.0.ebuild | 6 +- net-misc/streamlink/streamlink-9999.ebuild | 6 +- net-misc/stunnel/Manifest | 11 +- net-misc/stunnel/files/stunnel | 42 -- net-misc/stunnel/files/stunnel-5.50-libressl.patch | 228 --------- net-misc/stunnel/files/stunnel-r1 | 51 -- net-misc/stunnel/stunnel-5.50-r1.ebuild | 95 ---- net-misc/stunnel/stunnel-5.55.ebuild | 91 ---- net-misc/stunnel/stunnel-5.56-r1.ebuild | 91 ---- net-misc/stunnel/stunnel-5.58.ebuild | 4 +- net-misc/suite3270/Manifest | 2 +- net-misc/suite3270/suite3270-4.0_p13.ebuild | 2 +- net-misc/sysrepo/Manifest | 2 + net-misc/sysrepo/sysrepo-1.4.122.ebuild | 39 ++ net-misc/teamviewer/Manifest | 5 +- net-misc/teamviewer/teamviewer-15.15.5.ebuild | 2 - net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild | 138 ++++++ net-misc/telnet-bsd/Manifest | 2 +- net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild | 7 +- net-misc/tipcutils/Manifest | 2 +- net-misc/tipcutils/tipcutils-2.0.3.ebuild | 10 +- net-misc/udpxy/Manifest | 2 +- net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild | 21 +- net-misc/unison/Manifest | 8 +- net-misc/unison/unison-2.48.15_p4-r2.ebuild | 109 ----- net-misc/unison/unison-2.51.3_p20201024.ebuild | 111 ----- net-misc/unison/unison-2.51.3_p20201127.ebuild | 2 +- net-misc/unix2tcp/Manifest | 2 +- net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild | 4 +- net-misc/vde/Manifest | 2 +- net-misc/vde/vde-2.3.2-r6.ebuild | 4 +- net-misc/vncrec/Manifest | 2 +- net-misc/vncrec/vncrec-0.2-r2.ebuild | 13 +- net-misc/vrrpd/Manifest | 2 +- net-misc/vrrpd/vrrpd-1.9.ebuild | 5 +- net-misc/wget/Manifest | 2 +- net-misc/wget/wget-1.20.3-r3.ebuild | 2 +- net-misc/whois/Manifest | 6 +- net-misc/whois/whois-5.5.6-r1.ebuild | 4 +- net-misc/whois/whois-5.5.7.ebuild | 77 --- net-misc/whois/whois-5.5.9.ebuild | 77 +++ net-misc/x11-ssh-askpass/Manifest | 2 +- .../x11-ssh-askpass-1.2.4.1-r2.ebuild | 7 +- net-misc/x2goserver/Manifest | 6 +- net-misc/x2goserver/x2goserver-4.1.0.2.ebuild | 6 +- net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild | 6 +- net-misc/x2goserver/x2goserver-4.1.0.3.ebuild | 6 +- net-misc/yandex-disk/Manifest | 2 +- .../yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild | 4 +- net-misc/you-get/Manifest | 8 +- net-misc/you-get/metadata.xml | 1 + net-misc/you-get/you-get-0.4.1432.ebuild | 10 +- net-misc/you-get/you-get-0.4.1500.ebuild | 8 +- net-misc/you-get/you-get-0.4.1520.ebuild | 23 + net-misc/youtube-dl/Manifest | 10 +- net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild | 71 --- net-misc/youtube-dl/youtube-dl-2021.03.25.ebuild | 71 --- net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild | 71 +++ net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild | 71 +++ net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild | 71 +++ net-misc/youtube-viewer/Manifest | 4 +- .../youtube-viewer/youtube-viewer-3.7.4-r2.ebuild | 3 +- net-misc/youtube-viewer/youtube-viewer-9999.ebuild | 3 +- net-misc/zerotier/Manifest | 6 +- net-misc/zerotier/metadata.xml | 1 - net-misc/zerotier/zerotier-1.6.3.ebuild | 4 +- net-misc/zerotier/zerotier-1.6.4.ebuild | 80 ++++ net-misc/zssh/Manifest | 2 +- net-misc/zssh/zssh-1.5c-r1.ebuild | 4 +- net-misc/zsync/Manifest | 2 +- net-misc/zsync/zsync-0.6.2-r1.ebuild | 4 +- 472 files changed, 8131 insertions(+), 8060 deletions(-) delete mode 100644 net-misc/asterisk/asterisk-13.38.1-r2.ebuild create mode 100644 net-misc/asterisk/asterisk-16.17.0.ebuild create mode 100644 net-misc/asterisk/asterisk-18.3.0.ebuild create mode 100644 net-misc/bird/bird-2.0.8.ebuild create mode 100644 net-misc/bird/files/confd-bird-2 delete mode 100644 net-misc/capi4hylafax/Manifest delete mode 100644 net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.20-r2.ebuild delete mode 100644 net-misc/capi4hylafax/files/capi4hylafax.confd delete mode 100644 net-misc/capi4hylafax/files/capi4hylafax.initd delete mode 100644 net-misc/capi4hylafax/metadata.xml delete mode 100644 net-misc/chrony/chrony-4.0-r1.ebuild create mode 100644 net-misc/chrony/chrony-4.0-r2.ebuild delete mode 100644 net-misc/chrony/chrony-4.0.ebuild create mode 100644 net-misc/chrony/chrony-4.1_pre1.ebuild delete mode 100644 net-misc/connect/connect-1.103.ebuild delete mode 100644 net-misc/connman-gtk/connman-gtk-1.1.1.ebuild delete mode 100644 net-misc/connman/connman-1.39.ebuild delete mode 100644 net-misc/croc/croc-8.6.10.ebuild delete mode 100644 net-misc/croc/croc-8.6.11.ebuild create mode 100644 net-misc/croc/croc-8.6.12.ebuild create mode 100644 net-misc/croc/croc-9.0.0.ebuild create mode 100644 net-misc/curl/curl-7.76.0.ebuild create mode 100644 net-misc/curl/curl-7.76.1.ebuild create mode 100644 net-misc/dhcpcd/files/dhcpcd-9.3.4-include_termios.patch delete mode 100644 net-misc/dibbler/dibbler-1.0.1-r2.ebuild delete mode 100644 net-misc/dibbler/dibbler-1.0.1.ebuild delete mode 100644 net-misc/dropbox/dropbox-117.4.378.ebuild delete mode 100644 net-misc/dropbox/dropbox-118.4.460.ebuild create mode 100644 net-misc/dropbox/dropbox-120.4.4598.ebuild create mode 100644 net-misc/electrum/electrum-4.1.0.ebuild create mode 100644 net-misc/electrum/electrum-4.1.1.ebuild create mode 100644 net-misc/electrum/electrum-4.1.2-r1.ebuild create mode 100644 net-misc/freerdp/freerdp-2.3.2.ebuild delete mode 100644 net-misc/frr/frr-7.5.1-r1.ebuild create mode 100644 net-misc/frr/frr-7.5.1-r2.ebuild delete mode 100644 net-misc/frr/frr-7.5.ebuild delete mode 100644 net-misc/gallery-dl/gallery-dl-1.16.5.ebuild create mode 100644 net-misc/gallery-dl/gallery-dl-1.17.2.ebuild delete mode 100644 net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch delete mode 100644 net-misc/gerbera/gerbera-1.7.0.ebuild create mode 100644 net-misc/gerbera/gerbera-1.8.0.ebuild create mode 100644 net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild delete mode 100644 net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild delete mode 100644 net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-copy-pixels.patch delete mode 100644 net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-drop-vnc-frames.patch delete mode 100644 net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.7.ebuild delete mode 100644 net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild delete mode 100644 net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.9.ebuild create mode 100644 net-misc/gnome-remote-desktop/gnome-remote-desktop-40.0.ebuild create mode 100644 net-misc/gofish/files/gofish-1.2-r1.confd create mode 100644 net-misc/gofish/files/gofish-1.2-r1.rc create mode 100644 net-misc/gofish/gofish-1.2-r1.ebuild delete mode 100644 net-misc/grive/grive-0.5.1.ebuild delete mode 100644 net-misc/grive/grive-0.5.1_pre20171005.ebuild create mode 100644 net-misc/gsutil/gsutil-4.59-r1.ebuild delete mode 100644 net-misc/gsutil/gsutil-4.59.ebuild create mode 100644 net-misc/gsutil/gsutil-4.60-r1.ebuild delete mode 100644 net-misc/gsutil/gsutil-4.60.ebuild delete mode 100644 net-misc/htbinit/files/htb_0.8.5_esfq.diff create mode 100644 net-misc/htbinit/files/htb_0.8.5_esfq.patch delete mode 100644 net-misc/htbinit/files/htb_0.8.5_ipv6.diff create mode 100644 net-misc/htbinit/files/htb_0.8.5_ipv6.patch create mode 100644 net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch delete mode 100644 net-misc/htpdate/htpdate-1.0.7.ebuild delete mode 100644 net-misc/htpdate/htpdate-1.2.0.ebuild create mode 100644 net-misc/htpdate/htpdate-1.2.6.ebuild create mode 100644 net-misc/htpdate/htpdate-9999.ebuild delete mode 100644 net-misc/httpie/httpie-2.3.0.ebuild delete mode 100644 net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch delete mode 100644 net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild create mode 100644 net-misc/knock/knock-0.8.ebuild delete mode 100644 net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch delete mode 100644 net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch create mode 100644 net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch delete mode 100644 net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch delete mode 100644 net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch delete mode 100644 net-misc/lldpd/files/lldpd-1.0.5-cpp.patch delete mode 100644 net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch delete mode 100644 net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch create mode 100644 net-misc/lldpd/lldpd-1.0.10.ebuild delete mode 100644 net-misc/lldpd/lldpd-1.0.3.ebuild delete mode 100644 net-misc/lldpd/lldpd-1.0.4.ebuild delete mode 100644 net-misc/lldpd/lldpd-1.0.5-r1.ebuild delete mode 100644 net-misc/lldpd/lldpd-1.0.6.ebuild create mode 100644 net-misc/lldpd/lldpd-1.0.9.ebuild delete mode 100644 net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild delete mode 100644 net-misc/modemmanager/modemmanager-1.10.0.ebuild delete mode 100644 net-misc/modemmanager/modemmanager-1.14.8.ebuild create mode 100644 net-misc/modemmanager/modemmanager-1.16.2.ebuild create mode 100644 net-misc/modemmanager/modemmanager-1.16.4.ebuild delete mode 100644 net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild create mode 100644 net-misc/netopeer2/netopeer2-1.1.70.ebuild delete mode 100644 net-misc/networkmanager/files/networkmanager-1.26.4-iwd-fixes-pr640.patch delete mode 100644 net-misc/networkmanager/networkmanager-1.26.4.ebuild delete mode 100644 net-misc/networkmanager/networkmanager-1.26.6.ebuild create mode 100644 net-misc/networkmanager/networkmanager-1.30.4.ebuild create mode 100644 net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch create mode 100644 net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild delete mode 100644 net-misc/ntpsec/ntpsec-1.2.0.ebuild create mode 100644 net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch delete mode 100644 net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch delete mode 100644 net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch delete mode 100644 net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch delete mode 100644 net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild create mode 100644 net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.1.patch create mode 100644 net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-X509-glue.patch create mode 100644 net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-glue.patch create mode 100644 net-misc/openssh/files/openssh-8.6_p1-hpn-version.patch create mode 100644 net-misc/openssh/openssh-8.6_p1-r1.ebuild delete mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild delete mode 100644 net-misc/remmina/remmina-1.4.11.ebuild create mode 100644 net-misc/remmina/remmina-1.4.13.ebuild create mode 100644 net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch create mode 100644 net-misc/rsync/rsync-3.2.3-r3.ebuild create mode 100644 net-misc/rwhoisd/rwhoisd-1.5.9.6-r1.ebuild delete mode 100644 net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild create mode 100644 net-misc/rygel/rygel-0.40.1.ebuild create mode 100644 net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch delete mode 100644 net-misc/seafile-client/seafile-client-8.0.1-r1.ebuild create mode 100644 net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild create mode 100644 net-misc/seafile-client/seafile-client-8.0.2.ebuild create mode 100644 net-misc/seafile/seafile-8.0.2.ebuild delete mode 100644 net-misc/shmux/shmux-1.0.2.ebuild create mode 100644 net-misc/sks/files/sks-1.1.6_p20200624-r1-db-hang.patch create mode 100644 net-misc/sks/sks-1.1.6_p20200624-r1.ebuild delete mode 100644 net-misc/sks/sks-1.1.6_p20200624.ebuild delete mode 100644 net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild create mode 100644 net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild delete mode 100644 net-misc/sstp-client/sstp-client-1.0.12.ebuild delete mode 100644 net-misc/stunnel/files/stunnel delete mode 100644 net-misc/stunnel/files/stunnel-5.50-libressl.patch delete mode 100644 net-misc/stunnel/files/stunnel-r1 delete mode 100644 net-misc/stunnel/stunnel-5.50-r1.ebuild delete mode 100644 net-misc/stunnel/stunnel-5.55.ebuild delete mode 100644 net-misc/stunnel/stunnel-5.56-r1.ebuild create mode 100644 net-misc/sysrepo/sysrepo-1.4.122.ebuild create mode 100644 net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild delete mode 100644 net-misc/unison/unison-2.48.15_p4-r2.ebuild delete mode 100644 net-misc/unison/unison-2.51.3_p20201024.ebuild delete mode 100644 net-misc/whois/whois-5.5.7.ebuild create mode 100644 net-misc/whois/whois-5.5.9.ebuild create mode 100644 net-misc/you-get/you-get-0.4.1520.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2021.03.25.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild create mode 100644 net-misc/zerotier/zerotier-1.6.4.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 94d856826e25..eda136861ccb 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest index f042183feded..c1f93d9fc584 100644 --- a/net-misc/adjtimex/Manifest +++ b/net-misc/adjtimex/Manifest @@ -2,5 +2,5 @@ AUX adjtimex-1.29-r2-gentoo-utc.patch 1011 BLAKE2B c4e7f951ef316917630cfa122058e AUX adjtimex.init 638 BLAKE2B 652bc1dd50a59bec204b669bb72ba3ca68ae65bc450d4ff662ba2af5f7d5f784f184a3cf7156439fdb72608ef46042d606fc4f1e9abb969ff3ce500f3db9cf6f SHA512 4d8caa72076ac8ba2c0f6cabb31a28254e609d2215cc8f830921e729013144fc10cb6a8796fff80ecc4bf1dc611652e81830e46e59c1726d3147cc1680017041 DIST adjtimex_1.29-10.debian.tar.xz 33008 BLAKE2B b1da53008ef2373d9b450228bdb7f3378516880bf5b0d9b6d2c8aaa25880eea05954923e18497c42bf4e0f541dfa6c119c558b2712c5ed096a9c3e32dd3407c0 SHA512 4be30bdc63446259fe246e4d7fc0cb78fa40f40e9eb1a0b3a9d523d19ba0664be5e04f1803235a268eaae41cf4d88adfdbc6ecec86f8bd03703aca6c25ba9b8b DIST adjtimex_1.29.orig.tar.gz 85551 BLAKE2B 4e7784c3d3efa1f6ea226a7822de675a27c5be5d048664f8ff215eebe65b493e6dc0d004cc955c2e3b4e314e6283eafd628e92b611504b6ea92f4e5fe7d1a8c7 SHA512 5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649 -EBUILD adjtimex-1.29-r2.ebuild 1698 BLAKE2B 7c797d15069fa7c505523c30dbdcec943f4cc54741aa29985a4a2a62b275cbf2d29d98a74abfb986ef5d1d0824522d6d169c541d52913a11ad9fefaa08c0ef10 SHA512 d2a18708d3d69449b2f78e8e51d2854ecb255db5605184327de2cd5c1064ba41ee49cdb5317d3dee0232f8835d570b4ea2aad4001a4a1c314831bf49a298f2fc +EBUILD adjtimex-1.29-r2.ebuild 1655 BLAKE2B cbbd2ea4d74d096767c6efdcc10385f71cd031e31c370a873d457ba07dec1165c337bfc70ee9e88ce5a5b796d4a4f6a6ec5fb620c365fbc153a00420561014ed SHA512 44cd2c491c99b057ca4a65703edd8c03efd09e5b128d9345d0746ffb284c923b87311430d51a9fe1933329c7208071a8ab53d3226c2ef09174b05793490f4e44 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild index b551ebc5c36c..5ac80ba347a5 100644 --- a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild +++ b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit eutils fixheadtails toolchain-funcs +inherit fixheadtails toolchain-funcs DEBIAN_PV="10" MY_P="${P/-/_}" DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}" DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.debian.tar.xz" DEBIAN_SRC="${MY_P}.orig.tar.gz" -DESCRIPTION="display or set the kernel time variables" +DESCRIPTION="Display or set the kernel time variables" HOMEPAGE="https://www.ibiblio.org/pub/Linux/system/admin/time/adjtimex.lsm https://github.com/rogers0/adjtimex" SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH} ${DEBIAN_URI}/${DEBIAN_SRC}" @@ -18,14 +18,10 @@ SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH} LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc x86" -IUSE="" - -DEPEND="sys-apps/sed" -RDEPEND="" src_unpack() { unpack "${DEBIAN_SRC}" - cd "${S}" || die "Failed to cd $S" + cd "${S}" || die "Failed to cd ${S}" unpack "${DEBIAN_PATCH}" } @@ -35,6 +31,7 @@ src_prepare() { for f in $(cat "$DEBPATCHDIR/series") ; do eapply "$DEBPATCHDIR"/$f done + # Then gentoo changes for i in debian/adjtimexconfig debian/adjtimexconfig.8 ; do sed -e 's|/etc/default/adjtimex|/etc/conf.d/adjtimex|' \ @@ -42,12 +39,15 @@ src_prepare() { sed -e 's|^/sbin/adjtimex |/usr/sbin/adjtimex |' \ -i.orig ${i} done + eapply "${FILESDIR}"/${PN}-1.29-r2-gentoo-utc.patch ht_fix_file debian/adjtimexconfig + sed -i \ -e '/CFLAGS = -Wall -t/,/endif/d' \ -e '/$(CC).* -o/s|$(CFLAGS)|& $(LDFLAGS)|g' \ Makefile.in || die "sed Makefile.in" + eapply_user } diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest index 568a54b3b1c4..860572a93409 100644 --- a/net-misc/anydesk/Manifest +++ b/net-misc/anydesk/Manifest @@ -8,8 +8,8 @@ DIST anydesk-6.0.0-i386.tar.gz 5116771 BLAKE2B 074907ac1976a3b9df7df0acf29663039 DIST anydesk-6.0.1-amd64.tar.gz 5209989 BLAKE2B 5588b40460af9033aca744440d5ce43db608b8dc188a33c6f317e5e36c32b5ee8b102761b2153365018dea3a3afad03b4b1a2720cafd98f62789de407deaaeeb SHA512 bdf585bdb6fe5738e253f631807965446f585a4ffed3747b2e147b3f39d474c3a9c6177c88e2cfa1c0ae0e46c0219f581171147393609f0ecd7fa4d6cccd369d DIST anydesk-6.0.1-i386.tar.gz 5130077 BLAKE2B 9d0467cb24493458efdac6d835b06ef22bb6db3aaeb7277386ae0749c215c3640e722e2e7d17964e32a668d63826a68f3429d3425fb7aabe59a2718648bd2b88 SHA512 58cf2ca8bb67f672ec2ac988216ab593479f09d32e8e6ace93b0d92640197f9d13a637480421be8b038f8840d91a89f97b937c9e3b3f115bc49a5fa852b2c064 DIST anydesk-6.1.0-amd64.tar.gz 5264850 BLAKE2B dd71ca67af11e84860f785a50bfb41a6fedae0f1cd28e9a9061d4f34a84a07add7900eb234ac77b0ffd6c2cb77b2e614e9b7d50b4f7045269c008070ab605064 SHA512 b58cd0bde8ef6bbf4878b276dc45297bdeb5c05c273d41b95465cbfec879b60c9295ae3a76e5cae4940ece5471c13856bb18b2785e0bea1866402afd95f5372a -EBUILD anydesk-5.5.6-r1.ebuild 2669 BLAKE2B e180bd3ceeec590b6fb302f4ea99ca8abe3a87151cbb6c07a67c460e05f0fc553661b8570caaba52843c4370840655b25f8441c7f220e6264e3a3055350da4a7 SHA512 0ddeb37637e097570c3bc8a3dbbc5fd523ba4c5ee1fa389ddc50c2c834a605c22b86d0d67c259301e04148bee83134457e11c5c6de61f6ded680df53f8a6975e -EBUILD anydesk-6.0.0-r1.ebuild 2669 BLAKE2B e180bd3ceeec590b6fb302f4ea99ca8abe3a87151cbb6c07a67c460e05f0fc553661b8570caaba52843c4370840655b25f8441c7f220e6264e3a3055350da4a7 SHA512 0ddeb37637e097570c3bc8a3dbbc5fd523ba4c5ee1fa389ddc50c2c834a605c22b86d0d67c259301e04148bee83134457e11c5c6de61f6ded680df53f8a6975e -EBUILD anydesk-6.0.1.ebuild 2675 BLAKE2B 0a7b6b11007f1418533cb5c601f5e5b190135864e58ac1df87861c8e2974050eb53705f61629f301fe83a18f229da6053e2a2ffbf5a88e612716fc7bc82f23bc SHA512 d1f13baff3bdf48ad72f47c29d3a756fc94a6537eccd3fe3a708275ef68147a88051350d1ac9e18946e6f04c0121eea4d123f42455e85402306b78e7d10dec8b -EBUILD anydesk-6.1.0.ebuild 2522 BLAKE2B aaf29b49fce8c4d87599bb3323c7a17bbf11e2dcbfa2b980c197f72ba9d37a0d2519ec5c5626a3753b06a24fe1e7ee14472cae6617612e6a50331761cda9c2b6 SHA512 5c90f3171110e77bf846e9774b63bdbba783fbae7a7a7401c516ede2b0fb5f99ed003c6c4e262b8cdfab22ab0ea341d78c0f03f84cc554abb3a037ab90a5c321 +EBUILD anydesk-5.5.6-r1.ebuild 2584 BLAKE2B 7917472494dafd9b8023329e803f517df74cdecb162e0281bb40174bf411fe9b7412cae45a7045c31eeebccbd3d63f7b6ff371c72a8ed94dcdffb432db832192 SHA512 3a6cc70c201cad2633506730804da0a221bca870f8214086c749794feb8291700f672939446a35c23928aadd4b854c60cdbed0319d3d48024e5ab25fbade7086 +EBUILD anydesk-6.0.0-r1.ebuild 2584 BLAKE2B 7917472494dafd9b8023329e803f517df74cdecb162e0281bb40174bf411fe9b7412cae45a7045c31eeebccbd3d63f7b6ff371c72a8ed94dcdffb432db832192 SHA512 3a6cc70c201cad2633506730804da0a221bca870f8214086c749794feb8291700f672939446a35c23928aadd4b854c60cdbed0319d3d48024e5ab25fbade7086 +EBUILD anydesk-6.0.1.ebuild 2590 BLAKE2B ca86304549b74307150bec314b1039cdcc52e02000bd6888c758f095f06f6df694f8fba2823f0d3b21e494a55667fbd68505371bed8e2028ad5d33996722db67 SHA512 625bb319aafea3cc7524641d07d7282651fd8fba216f117f8d6f642c00977072ecbea7c41af5320bb5ff38600d5a6de3b2cb6c7787acc5941ec7f123c4b32714 +EBUILD anydesk-6.1.0.ebuild 2437 BLAKE2B 77218d2eea87f14eb5db5da9ada5d8afc2413affc9a9f28f296774b56f7ebd677bf0e79cdf7dd9f2a7a1d0c68cd008e5da8dc5ffe4cf030ddbb5b48a35c6f970 SHA512 02856b52bc8f4dc4e514b00d510fe6fe213c0a66bffa6e87ff1bb418e2b3e0a6f4ca801167c6bce6a83fcab3f413f58aff21e8b639dfc68a96a3f7b36e0ad8f2 MISC metadata.xml 677 BLAKE2B f5b86851aaa83fc0f0a22739416e5d6fa06e4f8bdd14ed33660219774e1179a9df5e08440e99a3b75f156b72835a6a2c9742ba176828ac6caea9f7d564ebca87 SHA512 824b2ba8de1e03f3089a248226612505b2d0e172443fadc488a45d8f5a4eaa26e8acb8c67f27476dc0d7d8dd8de25950a87225f8495cd1b38c573308c3d1fc3c diff --git a/net-misc/anydesk/anydesk-5.5.6-r1.ebuild b/net-misc/anydesk/anydesk-5.5.6-r1.ebuild index 19f3fc159bd9..d498d8b7ae03 100644 --- a/net-misc/anydesk/anydesk-5.5.6-r1.ebuild +++ b/net-misc/anydesk/anydesk-5.5.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -103,10 +103,7 @@ pkg_postinst() { elog fi - elog "For querying information about the host PC AnyDesk calls" - elog "the following commands. Feel free to install them, but it" - elog "should run without as well." - elog + optfeature_header "AnyDesk uses additional tools to query information about the host:" optfeature "lsb_release" sys-apps/lsb-release optfeature "lspci" sys-apps/pciutils optfeature "lsusb" sys-apps/usbutils diff --git a/net-misc/anydesk/anydesk-6.0.0-r1.ebuild b/net-misc/anydesk/anydesk-6.0.0-r1.ebuild index 19f3fc159bd9..d498d8b7ae03 100644 --- a/net-misc/anydesk/anydesk-6.0.0-r1.ebuild +++ b/net-misc/anydesk/anydesk-6.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -103,10 +103,7 @@ pkg_postinst() { elog fi - elog "For querying information about the host PC AnyDesk calls" - elog "the following commands. Feel free to install them, but it" - elog "should run without as well." - elog + optfeature_header "AnyDesk uses additional tools to query information about the host:" optfeature "lsb_release" sys-apps/lsb-release optfeature "lspci" sys-apps/pciutils optfeature "lsusb" sys-apps/usbutils diff --git a/net-misc/anydesk/anydesk-6.0.1.ebuild b/net-misc/anydesk/anydesk-6.0.1.ebuild index 3d912fed07f2..3818d457efc3 100644 --- a/net-misc/anydesk/anydesk-6.0.1.ebuild +++ b/net-misc/anydesk/anydesk-6.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -103,10 +103,7 @@ pkg_postinst() { elog fi - elog "For querying information about the host PC AnyDesk calls" - elog "the following commands. Feel free to install them, but it" - elog "should run without as well." - elog + optfeature_header "AnyDesk uses additional tools to query information about the host:" optfeature "lsb_release" sys-apps/lsb-release optfeature "lspci" sys-apps/pciutils optfeature "lsusb" sys-apps/usbutils diff --git a/net-misc/anydesk/anydesk-6.1.0.ebuild b/net-misc/anydesk/anydesk-6.1.0.ebuild index 84f711fbaf94..258fe9e1b0d6 100644 --- a/net-misc/anydesk/anydesk-6.1.0.ebuild +++ b/net-misc/anydesk/anydesk-6.1.0.ebuild @@ -97,10 +97,7 @@ pkg_postinst() { elog fi - elog "For querying information about the host PC AnyDesk calls" - elog "the following commands. Feel free to install them, but it" - elog "should run without as well." - elog + optfeature_header "AnyDesk uses additional tools to query information about the host:" optfeature "lsb_release" sys-apps/lsb-release optfeature "lspci" sys-apps/pciutils optfeature "lsusb" sys-apps/usbutils diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest index 3a0b4279b26a..ee945b4f87d4 100644 --- a/net-misc/asterisk-g729/Manifest +++ b/net-misc/asterisk-g729/Manifest @@ -6,6 +6,6 @@ DIST codec_g729a-13.0_3.1.9-x86_32.tar.gz 411156 BLAKE2B 179c77d32d1f8ac3314813a DIST codec_g729a-13.0_3.1.9-x86_64.tar.gz 478364 BLAKE2B 49136479e1bd139fcb22130868575d5be7d6784081307679cfeee16951f6a303b5328a62c23a0ade506f2df0527b275bd198560dacd59ba5b9ba237095622778 SHA512 5fa2dca977ca1dcbf3019fc86c3edc91fd561c814bfa9a5202680b7a581f03faa1705a4392a70409f9cd30a4379691b609f0f572030972cbe432cad435314951 DIST codec_g729a-16.0_3.1.9-x86_32.tar.gz 476772 BLAKE2B e1a7b8baefc551f16618fded2663acfb825a7eabcccc7ca844792e6179bac5b9ac2e0f4c387e3b2861347c6deb5db13f41ecd265c2261dbb65756890d976f4f7 SHA512 cddf46f369b0922a5569961688fcd4fb840bcce3a5573549d8a3a3e6150e20cd7c18e32ea07edc10150dd409763504ab50fad5d884fb33a49d624e4ebe0afd10 DIST codec_g729a-16.0_3.1.9-x86_64.tar.gz 475819 BLAKE2B d738dccb1e94ae5458b72de7f52d3bb9964f3be993efe44f615bc06b0c17638ac743dd0465a68c172f339d888ceac35b54babadd217c13b028575c3b1e5aa94b SHA512 f6c60c66fce03ea5ce02301dc9c8b5a93fefbc60089980401cd1fee58357b2c03ab2b12eb50df82d2f3a25613e37c1bb370a319cf0a36c92983ef98aa137429d -EBUILD asterisk-g729-13.0.3.1.9.ebuild 1895 BLAKE2B 775ed24bbf5d00c880f29a545d835f8d796d0a2b5869648875545cfc8004aa388e5c71192eacfb88ddc79349ef774325871c8eb4f51308cb8878e4162d427f91 SHA512 facfeea9503997a4700f79a2eccd323a1b891d1eb4db642946170ed7811e2275758c3b91c756ff7a59fb67eec4a7efada14d1e299ed8c54efbdc5d3993e20291 +EBUILD asterisk-g729-13.0.3.1.9.ebuild 1877 BLAKE2B 8260fcfcf662c57229a95306689c8a243911df527f36e309500168bccb05d7cb86ed598cebd86ab9ec0687ff80c0dafd0bd39b7d37cd317dc9b59b2e8ee3b534 SHA512 0b6c3122741cff44b4d3494c6bbf09b25b2657ef74f1886ecd8cda34c63041d295a68be2f7631ac154ca3ffe5c06d949ff32803e7160b1546ff7e5086e0db9a4 EBUILD asterisk-g729-16.0.3.1.9.ebuild 1822 BLAKE2B 2b4b37e2bb698709c0584b4473e3b47426c6e84e92e5f76c33aadde4fd1545a7f37c167e9e393f9e9732d30608c7e6a6f711c31d3ec77b1f94057e943833a8c6 SHA512 47de616999a25657435abb2ac96fb438344903fba37f98c99ecbcb191c78675060574c56c5c0318e92ae1b8e0ca4ddec829c0cf65cb2b553a46354029cab7b69 MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6 diff --git a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild index 56e63d3355f5..1a226c0eb772 100644 --- a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild +++ b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit multilib - DESCRIPTION="G.729 codec and supporting files for asterisk" HOMEPAGE="https://www.sangoma.com/asterisk/software/g729-codec/" diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 54593fd6fd66..7e627b0e63f6 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -14,14 +14,16 @@ AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32a AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa353dcff2d8c239cb203da289a7af91c083f4b89350d64bc2e87b1d7422266207605997badfab00ea24fc SHA512 4b4402ce62527084d0f82c5ad975d6b85276bb9c1e97d6f405737c6eee3c15f45e1b48f149d508c4f5cd70dd23a5e9be3ebd673047f80f4dfcda4913c9b6b287 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7 -DIST asterisk-13.38.1.tar.gz 33705256 BLAKE2B c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242 SHA512 270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051 DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B dc05fe7c797f9b848c918121ffe7e7648bca75fccb70412fcd39f37beb3fd33e7d64cd198919cb6ae2867cd685651497ae15a30fb280988a9c7184e80de235ae SHA512 9e47ea2906a2c0d1a2f527d106ef6200a8d0cce76a31a6cfb3ca720a2ef7b5f723ae5c6266c74b0bdfd5718346e8d01a30fc346981463fa4ee7a4b7c99a67928 +DIST asterisk-16.17.0.tar.gz 27836573 BLAKE2B f01b499cdd9659403df2d422dc4140f3ade66384fc4bf72b220c4179ada5723e2ce07f0c76c473d9fb5bd14a83357c55145c7d5c840ef29c754b05d337f8709e SHA512 ea142028974beffc6e8e87a780eb3928c4542eb7886246eb689fc4f61191e4bf05477aabd24c98f14e69504e5afec29cea33aeab4fefcc8fbd48c72592b630c2 DIST asterisk-18.2.2.tar.gz 27888521 BLAKE2B 5837b6434568a8e9f7a8963098994ccb487cfe9b85d59b30e5866e4eb67d222c4ac2c77036f7d461de72acc6ffd07fcd2d56bcaa618f4aecdbdba60d609eeb93 SHA512 e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546 -EBUILD asterisk-13.38.1-r2.ebuild 9725 BLAKE2B a25d483b9242d2ca6223226d75f5da9f5b56ef0aafc865393e876a1178fec355867e98ed178bb4be7dd5ea805137ee809a6e3274a53a54a6d0628a2cb8c6b9e9 SHA512 9021cd20e0bf2d825cbd9855d975c3a562bbbd00d6c4c8e8c246d85c839f3198b19cb62819c9a1708b4aec5d2784bb05079a04ead3f937f7fc661ef072434dd6 +DIST asterisk-18.3.0.tar.gz 27917957 BLAKE2B df4589291a1b8c815acc63650c1a1c6febef4147b849114fad13c84754f23c8a960b1ebc865c4e4fa33e63a841c11f2d0a5474980a406df94a654622b4a4b6f0 SHA512 7625d6c2c1069acde8dcb94f54dc3016cbb63c70eab7e0a86768be79ffe2286691367cd32df372d695e63f58919246e5c2dca98bec9389d7a4b09dced5bf8ecb EBUILD asterisk-13.38.2-r1.ebuild 10793 BLAKE2B 9e0ba0d5db3f56b8726a557e8f80ac5833aceb1a023f5d107f5736a275eb3866f98eec6cc9234af73c8ecbdc44302207a0b595e89e7f2a4c578b8553037e8ea5 SHA512 d324345df46ae82b113b06746a9ee4020700de68619f1f82f7c2d41da46f8056c9479b4f9e2cea96bc964c89b72e7fc300d9d5f91162eb0e0a922170916f9b61 EBUILD asterisk-13.38.2.ebuild 9725 BLAKE2B a25d483b9242d2ca6223226d75f5da9f5b56ef0aafc865393e876a1178fec355867e98ed178bb4be7dd5ea805137ee809a6e3274a53a54a6d0628a2cb8c6b9e9 SHA512 9021cd20e0bf2d825cbd9855d975c3a562bbbd00d6c4c8e8c246d85c839f3198b19cb62819c9a1708b4aec5d2784bb05079a04ead3f937f7fc661ef072434dd6 EBUILD asterisk-16.16.2-r1.ebuild 11358 BLAKE2B 11dfe65926cad46998ccc2942e00d2a43343dee69c6a0ce2b32c070d1927a58cefba753463467d55e0c3133bb3b01941c5879ebd8881c227cbc94089947b2722 SHA512 ab299440f47d5dc2aa16af46f6859ab4317ec1d83aef853fadcc403a44d3cbc4043a9b6cfe7ce146e6b3bc5958123072e04705e80a3b964009177266a12570a5 EBUILD asterisk-16.16.2.ebuild 9916 BLAKE2B a02bc1d09394459ca9737f43dea546b16fe3230319585bf7a86a8bbccc123342054f63578382b17bf1c02cee94749c1516860aaea383aaec173990267ba41f35 SHA512 c06ebbc5202ddbda233747120b17b2cda0cb8db4465ea5f445f0d064c8efdb49ef7cf957c5da759bc392dcb5e5805e30b47268062c94b241d2cb27e0ec33c152 +EBUILD asterisk-16.17.0.ebuild 9920 BLAKE2B 42ebcf0214fb22a13448145e72484456e16416fa286578b7fafaa86418e90aefe70820272a4ed0fb600b371d58657c964363dbc162b61850141af3c394905de1 SHA512 a05fdb4ab9013e29030ea00b8817a7112dfb6a70df842cfc319aa1f1d919ab151604bf810ed9dc8cf0784096aa425de53de242709f715ada1535fb57b6d60974 EBUILD asterisk-18.2.2.ebuild 11331 BLAKE2B 89f1eb498c7e25872918ec01a865bb00c393f4b86e6199622f49259b9ceff341c71992d99adce75d8ef808edbf4d139106c3bd41f2ee46e69e013da1b0af03bb SHA512 f4568a1caf38249e2e62ee6a0033aeb023bb0c731820b42429f02afd3f7faffa64fa66f95d708f7f19a0032bdd0ab7c830dfe5a4f985f7ff40b0f7108ccdfb58 +EBUILD asterisk-18.3.0.ebuild 11279 BLAKE2B a038a0238a447946ead8f669f1d6f8b2515ec1d90901e0d2cdfeb67b037c3e54a21c75652edb8b245fd414d318b4d74b50004dbc0b5b568cf7d5aed7e98dbaf4 SHA512 ba616804b6cb83c28e8e2cd8b81be1b73f9b7ca255fa268e507712b4dfdc5e14b6dedb7b3ce9477e565baa2e8c882999373f6ced4f4ed01eaf89239d3aefcd07 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee diff --git a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild deleted file mode 100644 index 4afefac8480b..000000000000 --- a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild +++ /dev/null @@ -1,313 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="https://www.asterisk.org/" -SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -IUSE_VOICEMAIL_STORAGE=( - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/asterisk-historic-no-var-run-install.patch" - "${FILESDIR}/asterisk-13.38.1-r1-autoconf-lua-version.patch" - "${FILESDIR}/asterisk-13.38.1-r1-func_lock-fix-races.patch" - "${FILESDIR}/asterisk-13.18.1-r2-autoconf-2.70.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - dev-libs/jansson - dev-libs/libedit - 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 ) - blocks? ( sys-libs/blocksruntime ) - 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? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) - lua? ( ${LUA_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - pjproject? ( net-libs/pjproject ) - portaudio? ( media-libs/portaudio ) - postgres? ( dev-db/postgresql:* ) - radius? ( net-dialup/freeradius-client ) - snmp? ( net-analyzer/net-snmp:= ) - span? ( media-libs/spandsp ) - speex? ( - media-libs/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( virtual/imap-c-client ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="dev-libs/libxml2:2 - virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -pkg_pretend() { - CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users - have reported that this module dropped critical SIP packets in their deployments. You - may want to disable it if you see such problems." - check_extra_config - - [[ "${MERGE_TYPE}" == binary ]] && return - - if tc-is-clang; then - use blocks || die "CC=clang requires USE=blocks" - else - use blocks && die "USE=blocks can only be used with CC=clang" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf -} - -src_configure() { - local vmst - - econf \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - $(use_with caps cap) \ - $(use_with lua lua) \ - $(use_with http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(usex "$1" enable disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake 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 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 oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do - if use "${vmst#+}"; then - _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_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 - - dodir "/usr/$(get_libdir)/pkgconfig" - 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 - emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs - chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed" - chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed" - - # 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 - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - - # Reset diropts else dodoc uses it for doc installations. - diropts -m0755 - - # install the upgrade documentation - dodoc UPGRADE* BUGS CREDITS - - # install extra documentation - use doc && dodoc doc/*.{txt,pdf} - - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - - # Asterisk installs a few folders that's empty by design, - # but still required. This finds them, and marks them for - # portage. - while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do - keepdir "${d#${ED}}" - done -} - -pkg_postinst() { - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - fi -} diff --git a/net-misc/asterisk/asterisk-16.17.0.ebuild b/net-misc/asterisk/asterisk-16.17.0.ebuild new file mode 100644 index 000000000000..38bd3ceccba0 --- /dev/null +++ b/net-misc/asterisk/asterisk-16.17.0.ebuild @@ -0,0 +1,320 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11 + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/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 ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.9 ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( virtual/imap-c-client ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +src_configure() { + local vmst + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake NOISY_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 alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_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 + + dodir "/usr/$(get_libdir)/pkgconfig" + 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 + emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs + chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed." + chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed." + + # 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 + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + fi +} diff --git a/net-misc/asterisk/asterisk-18.3.0.ebuild b/net-misc/asterisk/asterisk-18.3.0.ebuild new file mode 100644 index 000000000000..bc3042b8c586 --- /dev/null +++ b/net-misc/asterisk/asterisk-18.3.0.ebuild @@ -0,0 +1,363 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11 + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.9:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( virtual/imap-c-client ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk + newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest index 7209a6df8f6f..b8026cdea636 100644 --- a/net-misc/axel/Manifest +++ b/net-misc/axel/Manifest @@ -1,7 +1,7 @@ DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437 DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01 -EBUILD axel-2.17.10.ebuild 1054 BLAKE2B 658b793448fb76f9e1dd5168980de9616db86b0fa3dac0807025b4896740d85bbfa63b2bd258b567fe1999364e9b689fcc4120c48cbb78dbb96e12ffe8c6edc2 SHA512 f0feaf93e68ccd8493f712fc4f3ffac76ec5dd4fc7803075bacb68c300fce48b609134a47b9823631b08a983dc6c8e057270da354d6e7515538378816a5a542d -EBUILD axel-2.17.8.ebuild 1054 BLAKE2B 4b125d7d707116374d3c66342a70d174eee139e5f5ba07ef3d9b7bd8d2da2a2c906aceea4b751977c8bedf626d5bdef54b11263140d663f5559cc92b67702b44 SHA512 982df8b1fe6e40cda200318ecb32058c9d31889a8473f7124651353e0897b79729f4d3cd4697957a1047dd3a12890ad492481f3118a2539c3577e95bc7d0dcf9 -EBUILD axel-2.17.9.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936 +EBUILD axel-2.17.10.ebuild 1035 BLAKE2B 178080a8fdafcc5cb149ff3017d1109f045bc413543b64087ef856a8f403f2ca41a12fe6aae7f70f3ead1adffeaed72aa213a89141a18303e6e416d2464ccccb SHA512 8bbaa2813d083d5832fc4cdbb919930800e29c2f6228c714fd0f71be177e061fb008943a2b86ff4196a52bd5c252f6effe073591e5b9727d42f8615cdf95d3dd +EBUILD axel-2.17.8.ebuild 1035 BLAKE2B 178080a8fdafcc5cb149ff3017d1109f045bc413543b64087ef856a8f403f2ca41a12fe6aae7f70f3ead1adffeaed72aa213a89141a18303e6e416d2464ccccb SHA512 8bbaa2813d083d5832fc4cdbb919930800e29c2f6228c714fd0f71be177e061fb008943a2b86ff4196a52bd5c252f6effe073591e5b9727d42f8615cdf95d3dd +EBUILD axel-2.17.9.ebuild 1040 BLAKE2B 76c7e01e25534cde69ab735d2060b6b589166efee7731233c066c9947c680546f27a1aec5dad3dd9f631563b75313b6f89fa3f6358025ff63bc2ad1c6df61795 SHA512 2d116746680408a19a3268e7691d6d2685d05c53ba80fc32543867b9853cc3e242eba90e77f1277f67df92952a66664452b99521edf6013ef6d133411e75b4fd MISC metadata.xml 334 BLAKE2B cdc0f78ca802b6c5268d4f3642637af74d419ba07fb07a2a0f0e21dfdc20de3301ee91d7b027b4fff5c1f2eca4dc5cd395dbf916ab7d2bb6cac9ed85b228f5eb SHA512 e23a07690d4d2f1b26e90fb151d1b7afb922649c4989b4f4b8e9dafe3024c9b7dafb6dbfa467731055d605e101cf44d3c17be3d6f6f99629063cc42f8b616449 diff --git a/net-misc/axel/axel-2.17.10.ebuild b/net-misc/axel/axel-2.17.10.ebuild index 36e4e204eda9..07ab4176a7e0 100644 --- a/net-misc/axel/axel-2.17.10.ebuild +++ b/net-misc/axel/axel-2.17.10.ebuild @@ -3,8 +3,6 @@ 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" diff --git a/net-misc/axel/axel-2.17.8.ebuild b/net-misc/axel/axel-2.17.8.ebuild index 6c2695bbd2a4..07ab4176a7e0 100644 --- a/net-misc/axel/axel-2.17.8.ebuild +++ b/net-misc/axel/axel-2.17.8.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 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" diff --git a/net-misc/axel/axel-2.17.9.ebuild b/net-misc/axel/axel-2.17.9.ebuild index dad9472d9679..94347826a82f 100644 --- a/net-misc/axel/axel-2.17.9.ebuild +++ b/net-misc/axel/axel-2.17.9.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 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" diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest index 2d58ae642aef..e94b92cef625 100644 --- a/net-misc/bfgminer/Manifest +++ b/net-misc/bfgminer/Manifest @@ -1,4 +1,4 @@ AUX bfgminer-5.5.0-fno-common.patch 2746 BLAKE2B 6954f9016289a6e0f4f5fb68e3c08013f3ad422f6d1710709df3103bb03551d40926d0e4469cf91fcdbe5c6064b9d66bf47309c014a662ef5778a2b5bb301bec SHA512 f59ff668c8deb63e6276129be6e88ad2a347994f3de2a6389e353f61ef677fb73be6f45b090d40cc3546f8456ae291a60bce8645e85f5e39d1d7eed531c5db82 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb -EBUILD bfgminer-5.5.0.ebuild 5168 BLAKE2B ab41b6d6c181cce98314d227ca389d3e3d05e65b93dee4704b8cd975aec4b8ab79990c418be2bda61912de22cc612833ce0d811e16817890e59144e292782b1e SHA512 420efee89dbc369305a111c28562180008096868c3e46a30618c27978f39d247dce3e253ef14c3a4c61259380df8f19f06e426926b473badef70bef0302b7915 +EBUILD bfgminer-5.5.0.ebuild 5159 BLAKE2B 4b4fd431fcb2eb561702b1489a5057b8c3d31c34d50defe990c6fd7fd33059ba1949398e09b918a21ee91ade3820d6aa2e5755df7f2fc2c7fad861a85bcb2c29 SHA512 3b05464321158422f46e84b0332e23b460dab13a856cbd2b71b5752de291144ebc8b5a37890928c8855bda3de88f624bb0cf11f67fac1224e562b1e9bb866fe1 MISC metadata.xml 3962 BLAKE2B 70c28b8c2c68996fb2d3bd7f134feb618776adf3a3e8b2e080dc00c813f072c80519909149bcd5bba17904d044fd49773dffca06880f07446d39240c87bf2574 SHA512 e4fa5e82269099a6d1681c22d3b9d31e8e73bef8b0555dee227c69008b40efc191819e61f4e61a3c7d516563627c910d5c473dd7413e94451d61c21aa64eba20 diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild index 1ecd48c23a11..b107ddd50512 100644 --- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild +++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild @@ -3,8 +3,6 @@ EAPI=6 -inherit eutils - DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C" HOMEPAGE="https://bitcointalk.org/?topic=168174" SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz" @@ -17,7 +15,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" # TODO: kncasic & titan (need systemwide knc-asic install) # TODO: minergate (needs actual miner_gate) IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex" -REQUIRED_USE=' +REQUIRED_USE=" || ( keccak scrypt sha256d ) || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) @@ -59,9 +57,9 @@ REQUIRED_USE=' x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb ) -' +" -DEPEND=' +DEPEND=" net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] @@ -97,7 +95,7 @@ DEPEND=' app-misc/realpath ) ) -' +" RDEPEND="${DEPEND} opencl? ( || ( @@ -131,12 +129,12 @@ src_configure() { if use ncurses; then if use unicode; then - with_curses='--with-curses=ncursesw' + with_curses="--with-curses=ncursesw" else - with_curses='--with-curses=ncurses' + with_curses="--with-curses=ncurses" fi else - with_curses='--without-curses' + with_curses="--without-curses" fi CFLAGS="${CFLAGS}" \ @@ -175,7 +173,7 @@ src_configure() { $(use_enable sha256d) \ $(use_enable twinfury) \ --with-system-libblkmaker \ - $with_curses \ + ${with_curses} \ $(use_with udev libudev) \ $(use_enable udev-broad-rules broad-udevrules) \ $(use_with lm-sensors sensors) \ @@ -187,11 +185,12 @@ src_configure() { } src_install() { - emake install DESTDIR="$D" + emake install DESTDIR="${D}" + if ! use examples; then - rm -r "${D}/usr/share/doc/${PF}/rpc-examples" + rm -r "${ED}/usr/share/doc/${PF}/rpc-examples" fi if ! use screen; then - rm "${D}/usr/bin/start-bfgminer.sh" + rm "${ED}/usr/bin/start-bfgminer.sh" fi } diff --git a/net-misc/bgpq3/Manifest b/net-misc/bgpq3/Manifest index 21f2eafb85a3..bed30b9bb7d3 100644 --- a/net-misc/bgpq3/Manifest +++ b/net-misc/bgpq3/Manifest @@ -1,5 +1,5 @@ DIST bgpq3-0.1.33.tar.gz 82696 BLAKE2B d6a8b950747ed0889d2e67873f4b029127d49b730bb0cf4047df7025415db2ee1870d4be632e9347cfe7930f3a453d34e87ba236314825eb994809a5c2b990e6 SHA512 f4faec46eaa5fe77a9118ed76e3d2dddce855cebfe6ead3dadffe0f72ea720502e378febd04829409039fd2bd6a693e518814408c628df1a9e5c7e7c5c170f49 DIST bgpq3-0.1.35.tar.gz 87066 BLAKE2B b217d490ed74e9174cbbd70ed5d1dd4bc72b136a23d583b6b9cede8fd38d8b579a463d8a146313f9eec1904e836ac4db0b75a2c1554c00c5df79a8d0d32f950f SHA512 a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01 -EBUILD bgpq3-0.1.33.ebuild 674 BLAKE2B 14f8d30ead4bbba32fb56baf8292aba0eeb03bbcc17e48c0fabc6ef00806beabb64acb5044a514a7510813829280719b8f3d39a200d98b9e0cccccc7aeca5117 SHA512 dcbb1c3312da4aec1455b74d2fa9a741c295e1053ae55651a6df2c86011a0f0dbf0799f1dbb4d30383539fff9a6c8f8931022bf6650d3795f76e3ccd6e377bb0 -EBUILD bgpq3-0.1.35.ebuild 770 BLAKE2B 7af3683fc58bf8a2fe675f1945a64456f16800c2746d876d862cf1d2dff758ec929e922ff472adc708be5677bf9d5d8bae25dae3dc35c1c173db1e056a7bd4f9 SHA512 c633a9af222adbf10a50b42ddf6cea73a325ede45e782b2296aad5a06ff4758eb83b3e82e43aad29095d2f8d3407ab33e4c09b02eba8c5515e5717ace197d2dc +EBUILD bgpq3-0.1.33.ebuild 664 BLAKE2B fa4f5ef98778f944f52763cb7332a2975166c94628e8c433e926f228930413ec1a2443c68a48425a98feaee39b5d91379680a4c690eebd136a0fc92f6b8eebab SHA512 88ebf2c7d1d5f7759ab110f4814bee2b3411608391757245ef137512451b80f1f25e708e932fe3c16c30fbc2f45728e822875524346fe101c9207839c0d21868 +EBUILD bgpq3-0.1.35.ebuild 763 BLAKE2B 356204c1be56f704623b2ef4ab34429cff34d4d77609a06a68a8fc0cbd7bc92c7319e414d32ffca9f8d5c15481c13dfdb5f9d0582dd17ba5bc318169d71265aa SHA512 a70368e3812e344fd12b186b07c543ef36277ee6c55e7d332fed6a99a795fb2a7af303d039917d8ebbbbed3647e7d0ccefcd0ff7ed224f90c772856ffff97f4c MISC metadata.xml 1265 BLAKE2B 08a5d75cc81e3edee274fe845a5d0495bc6c2dafc127f41350dfae62a0ad7425cfb34817ede9fafec65c510f34d9728ecab15e621ba7310093f2d41d9ce32141 SHA512 9364ecadb0b1fd98841b69d59e5bf000be9cd92997c4203506ee4ebfba9513b33141526153defc23bbeb3e5ae6542648e5ba7d2583893fb06420e831b2cd41a1 diff --git a/net-misc/bgpq3/bgpq3-0.1.33.ebuild b/net-misc/bgpq3/bgpq3-0.1.33.ebuild index 3c1cd11d960a..4f14be4d6393 100644 --- a/net-misc/bgpq3/bgpq3-0.1.33.ebuild +++ b/net-misc/bgpq3/bgpq3-0.1.33.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils +inherit autotools DESCRIPTION="Generate access-lists for Cisco/Juniper routers, successor of bgpq" HOMEPAGE="https://github.com/snar/bgpq3/" diff --git a/net-misc/bgpq3/bgpq3-0.1.35.ebuild b/net-misc/bgpq3/bgpq3-0.1.35.ebuild index ad300b09c414..39a1880953ef 100644 --- a/net-misc/bgpq3/bgpq3-0.1.35.ebuild +++ b/net-misc/bgpq3/bgpq3-0.1.35.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils +inherit autotools DESCRIPTION="Generate access-lists for Cisco/Juniper routers, successor of bgpq" HOMEPAGE="https://github.com/snar/bgpq3/" diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest index 38e40d3e410b..50bcfcd49aee 100644 --- a/net-misc/bird/Manifest +++ b/net-misc/bird/Manifest @@ -1,5 +1,8 @@ AUX bird-2.0.7-gcc10.patch 460 BLAKE2B fda9c1ce155d1d4842fec83ede52847fe895ea406cf3d6b715ea2bea01843604cfd6c2957f6d64847d8d73f21a9d952f8af07d78e7261c585643b7c33727f107 SHA512 84a187e4dc0c48efb9b8e0248dae90669c93abbc2d26b58a1f197420100a69806f80650ac90e064947984d7b1a2f9c5598ffd021a97bee10420b4c61d9cf75c0 -AUX initd-bird-2 1169 BLAKE2B 399481b20099d54f4a4f0cbffa2d9d080f090e15fa1bb9e0613469d94a895fcff3708983defe6d9be181f11ad18598e7e36d411cfc8e07b59c78a74890b5c1c3 SHA512 42224f1ac8ac53be1e0f2d30ecba0fa9ac491494bb6b6147940455538623082f4111731463daec15cbc7c10a90c440d36e27eaab1193f9385488ab6683e15f55 +AUX confd-bird-2 231 BLAKE2B 9be6c9b94ede8233e6b249d6543b236f3bba2f065bd3bd811c4db37d1bbe66b4d196a11d5c85742d45cb800c895d9517c10b33217811b9499c191a4a03aa2359 SHA512 5531e581f1535d8e0db316c1f151282ca7dcab68cf49c91264105a9f1751e7bfbe5eef6c52c6a3a76c74cf5810e2ecd912cb2845f55b7dd960823b05f086def8 +AUX initd-bird-2 1433 BLAKE2B d89a6d48e36736f8dc8d21df7213f5edc0702f2a4e64f5321a8a4b0b3e1501755553f35e4f6270be707a50538defb806658dee00453835bcac86a633c60fb8c7 SHA512 bd3eec06701c86eaa7c89e75a963656be6081415f93f7844bba272e3f1feccbd90081ea0b711ac51c6d7c1e337e8325a27879b336f20204ad225d0c7dafa3b68 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35 +DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2 EBUILD bird-2.0.7.ebuild 809 BLAKE2B e5fe5d1bc763c46d9249d87460112134f108fa92aa05b7b4c7e6715fe4695beaf0d00de044432e79534647ef9340b5a95326b5b837c2332b55cf4071bc0577e5 SHA512 31c7e720b065945f46a1d9ffd704bb31164d1f886e03d518abad23bc15deed66a923b5ceac1f3da21f9d7e806182783306b71dc27244bf4f0a2fa639948c05bc -MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330 +EBUILD bird-2.0.8.ebuild 1257 BLAKE2B 3b9fe5cd1fbdd48497fbd5df6660a8fd212e5e3f7ab2ed54b20a4b564a879e63c2eae6a52bfe59c1d6e710d49c801af7a5184b4dd64b316b8f54e52c4beb8def SHA512 2988f25efd01b765bb9b4c12527da4b6e8c182499cd5ccdd562c481d73e3ed280e3365eac1c73aae652e5f3908508585d8659ca8a099759d4b59657834ae0891 +MISC metadata.xml 687 BLAKE2B 5b457a6eaa7607e1d423dd10c07d117aace1a918b77b66612c4e9963e0675fc6edf85b0eedefd164af8a328344f3f2675818cc4d5b00675d3450217f171deb51 SHA512 f7b45bbbb8ad221ebf83d1c87f587ebaeca5127335069a6d36949eaa8789a2c1a7a1db550742617f47b5aed78223e37e1fb3db771f89f950f750029f908daff0 diff --git a/net-misc/bird/bird-2.0.8.ebuild b/net-misc/bird/bird-2.0.8.ebuild new file mode 100644 index 000000000000..5b842e0b42ed --- /dev/null +++ b/net-misc/bird/bird-2.0.8.ebuild @@ -0,0 +1,61 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit fcaps + +DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6" +HOMEPAGE="https://bird.network.cz" +SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos" +IUSE="+client debug libssh" + +RDEPEND=" + client? ( sys-libs/ncurses:= ) + client? ( sys-libs/readline:= ) + filecaps? ( + acct-group/bird + acct-user/bird + ) + libssh? ( net-libs/libssh:= )" +BDEPEND=" + sys-devel/bison + sys-devel/flex + sys-devel/m4 +" + +FILECAPS=( + CAP_NET_ADMIN usr/sbin/bird + CAP_NET_BIND_SERVICE usr/sbin/bird + CAP_NET_RAW usr/sbin/bird +) + +src_configure() { + econf \ + --localstatedir="${EPREFIX}/var" \ + $(use_enable client) \ + $(use_enable debug) \ + $(use_enable libssh) +} + +src_install() { + if use client; then + dobin birdc + fi + dobin birdcl + dosbin bird + newinitd "${FILESDIR}/initd-${PN}-2" ${PN} + newconfd "${FILESDIR}/confd-${PN}-2" ${PN} + dodoc doc/bird.conf.example +} + +pkg_postinst() { + use filecaps && \ + einfo "If you want to run bird as non-root, edit" + einfo "'${EROOT}/etc/conf.d/bird' and set BIRD_GROUP and BIRD_USER with" + einfo "the wanted username." +} diff --git a/net-misc/bird/files/confd-bird-2 b/net-misc/bird/files/confd-bird-2 new file mode 100644 index 000000000000..a2dc3ed89db8 --- /dev/null +++ b/net-misc/bird/files/confd-bird-2 @@ -0,0 +1,9 @@ +# /etc/init.d/bird + +# Options to pass to the bird process +# See https://bird.network.cz/?get_doc&v=20&f=bird-1.html#ss1.3 +# BIRD_GROUP and BIRD_USER will be appended to BIRD_OPTS + +#BIRD_GROUP="bird" +#BIRD_USER="bird" +#BIRD_OPTS="" diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2 index 06030d4b3016..3b759df883d8 100644 --- a/net-misc/bird/files/initd-bird-2 +++ b/net-misc/bird/files/initd-bird-2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Copyright 2019 Alarig Le Lay # Distributed under the terms of the GNU General Public License v2 @@ -8,12 +8,20 @@ extra_started_commands="reload" pidfile="/run/${RC_SVCNAME}.pid" command="/usr/sbin/${RC_SVCNAME}" retry=15 +start_stop_daemon_args="--make-pidfile" CONF_FILE="/etc/${RC_SVCNAME}.conf" SOCK="/run/${RC_SVCNAME}.ctl" +if [ ${BIRD_GROUP} ]; then + BIRD_OPTS="${BIRD_OPTS} -g ${BIRD_GROUP}" +fi +if [ ${BIRD_USER} ]; then + BIRD_OPTS="${BIRD_OPTS} -u ${BIRD_USER}" +fi + client_args="-s ${SOCK}" -command_args="${client_args} -c ${CONF_FILE} -P ${pidfile}" +command_args="${client_args} -c ${CONF_FILE} -P ${pidfile} ${BIRD_OPTS}" client_args="${client_args} -r" depend() { @@ -44,6 +52,10 @@ reload() { eend $? } +start_post() { + checkpath -f -m 0655 -o bird:bird "${pidfile}" +} + stop_pre() { if [ "${RC_CMD}" = "restart" ] ; then check_run || return 1 diff --git a/net-misc/bird/metadata.xml b/net-misc/bird/metadata.xml index 3be54ec47f3c..3d132613ac58 100644 --- a/net-misc/bird/metadata.xml +++ b/net-misc/bird/metadata.xml @@ -5,7 +5,19 @@ chainsaw@gentoo.org Tony Vroon + + proxy-maint@gentoo.org + Proxy Maintainers + + + Alarig Le Lay + alarig@swordarmor.fr + Build the ncurses/readline full featured CLI + + Enables net-libs/libssh binding, mendatory for RPKI + support + diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest index ed1ab1132b5a..d410aa125320 100644 --- a/net-misc/cadaver/Manifest +++ b/net-misc/cadaver/Manifest @@ -1,4 +1,4 @@ AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41 -EBUILD cadaver-0.23.3.ebuild 1078 BLAKE2B ce8ac416a39a65d3c543503c7b079b56220c143430cba5263202aa9883f6992a6f0dcc7fc2a998f387bb96e8af6d5460656e99694c0ff8ee11d716679084c162 SHA512 8b664a3c3a11a2a1ad5edeb217ce46c14ea691a3499613e0de6b825b76e1f8c2b78dc185515024ad0eb016eab1b1a0def7d6a575e4b7c891f019c305f3eeed29 +EBUILD cadaver-0.23.3.ebuild 1118 BLAKE2B 9accef5f15f857d137c41cc43f0c54c385396eb1e50c16db5340b7cd77ad01af6fe1d7ef9350ab1f6bea5a3c61afc0cff806803fb1ccf44e8154fb386c173d2a SHA512 b44254ea3d5d5e5f37854fe899ba4abbb7cee51009f5e2b1e063417a0f891611f3b0c338a5e823c885370956993b81216789ad09da764917f8d4910a0bc9440f MISC metadata.xml 359 BLAKE2B 2e0d3e108f50e8f7e36f5c49b73ed3618a6848be9cbc73eb213545a40ac2e959f63e215b1b23f13665ece13cf7c548d5126112efd5df8c8ec6b05bdc5893ac3a SHA512 89556255a93ee1ed2bb71c9f1404de6547db145371a062e7be6daff4e8ea8a418f0fad2223caada5d3b75d8d625d6cbf9be3440aad7bb9c69c11d6e09c96e139 diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild index a9288a4027bc..3b5240b2e504 100644 --- a/net-misc/cadaver/cadaver-0.23.3.ebuild +++ b/net-misc/cadaver/cadaver-0.23.3.ebuild @@ -1,12 +1,12 @@ # Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" inherit autotools DESCRIPTION="Command-line WebDAV client" -HOMEPAGE="http://webdav.org/cadaver/" +HOMEPAGE="http://webdav.org/cadaver/ https://github.com/notroj/cadaver" SRC_URI="http://webdav.org/cadaver/${P}.tar.gz" LICENSE="GPL-2" @@ -14,9 +14,9 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86" IUSE="nls" -RDEPEND=">=net-libs/neon-0.27.0" -DEPEND="${RDEPEND} - sys-devel/gettext" +BDEPEND="sys-devel/gettext" +DEPEND=">=net-libs/neon-0.27.0" +RDEPEND="${DEPEND}" DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO) @@ -31,7 +31,7 @@ src_prepare() { -e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \ -i configure.ac || die "sed configure.ac failed" sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed" - cp "${EPREFIX}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed" + cp "${BROOT}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed" config_rpath_update . AT_M4DIR="m4 m4/neon" eautoreconf diff --git a/net-misc/capi4hylafax/Manifest b/net-misc/capi4hylafax/Manifest deleted file mode 100644 index 7848fa8ee25f..000000000000 --- a/net-misc/capi4hylafax/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX capi4hylafax.confd 555 BLAKE2B 1660a0ac02e1762e589cc04e8683ca660ad7c9cc21509f4064226000ab8d364a0596e18eca5ac0e55497a14dc0c29e1db23716d565f5f75778e8730bcc25b096 SHA512 357504c887bb12a3b93e0ab8a4e7a7789e2848b831f27fba653e3fd9bf62b694edfb758d82693b61b992de834e9d5a0d1e4a8aa1e50dbd6e2d0649c9581e9821 -AUX capi4hylafax.initd 1821 BLAKE2B 4b21a9a97f84df8f6b028c95012e987d79cf1493b45a6a6fc1193621490aaab0a870ac991fe6bffc6cb1c8726095c03548b13b92b74fc94b3def0912476645bd SHA512 bd5d427631b825b886f1e56ff118c795bd04868df459cc8dc0a66d87004a36748eb8f55978bda64af19db3706f7be96b55739da43f28c762a6cd69ed91fd70c5 -DIST capi4hylafax_01.03.00.99.svn.300-20.debian.tar.gz 546271 BLAKE2B 5318d9c1d69edfc7d5157975ecbb0311fb756e9dcb36741dd927096f882a1f2fa3b0a994f6553c8166dd5c20d62d1f1d5a916c5b69c6d416f9f521b62915997e SHA512 a0c1e64d783150abf80feecca07a3eebead95a982133ac9601b204b73933468c61fa39863be8c93ea2bf52c5262b9944b4d5c4a8795475d3a5ca17e481401b8e -DIST capi4hylafax_01.03.00.99.svn.300.orig.tar.gz 533410 BLAKE2B 22a8c5f40f0bf61518ad7a7d901f56fc296aa07114e1a0d8279a2dfd2ed364a1b375f1b3c9da799a122b913543719bfe2253eab696ef6c6bbb19d7b5eca75099 SHA512 c01063bcdf7d5dfbeef0eadd94a0714b5f34f442c19e5287a0fa40ce3ecbbad53afaddeb093435952367fb7b503dd9c637002d954a58175df3920d9d2966c468 -EBUILD capi4hylafax-01.03.00.99.300.20-r2.ebuild 4266 BLAKE2B ecf56cd0f640aa705e8ce87f54eb90314b95e04879f6c51cab76fec95476f048931c56f27439ebd927966d005347c9f6770b4e8befce1401d1ea4848686d9bcd SHA512 ee69069923cacad3e21a23e6d4ce3fe10dc7d1510534f5560d65950b3d293de3fd11ec1a08519be20fbcfeb6db950cf85f03701244f736dc2d230b3c0c140cd3 -MISC metadata.xml 680 BLAKE2B aeb003ea54883d6778dffd9cec6916e618bf6e5bd4d3f624004c64ffbbac9ca250f4f0d63a3c7cb845553c22e83c1e7ccda7a8a0d52f3add8d3125233aa5b941 SHA512 c27851901f9af6dc6d30cf3fe0c9133b9a2f9fa97b488a763d7eb2208a1829bd4bd16c7c8581257b9367142ca458d330b0ec8507b0e0160760506e3a180e31aa diff --git a/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.20-r2.ebuild b/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.20-r2.ebuild deleted file mode 100644 index 50cce3b04057..000000000000 --- a/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.20-r2.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools epatch optfeature versionator - -FAX_SPOOL_DIR="${ROOT}/var/spool/fax" - -MY_PV1="$(get_version_component_range 1-4)" -MY_PV2="$(get_version_component_range 5)" -MY_PV3="$(get_version_component_range 6)" -MY_P="${PN}_${MY_PV1}.svn.${MY_PV2}" - -DESCRIPTION="capi4hylafax adds a faxcapi modem to the hylafax enviroment" -HOMEPAGE="https://packages.qa.debian.org/c/capi4hylafax.html" -SRC_URI="mirror://debian/pool/main/c/capi4hylafax/${MY_P}.orig.tar.gz - mirror://debian/pool/main/c/capi4hylafax/${MY_P}-${MY_PV3}.debian.tar.gz" - -S="${WORKDIR}/${PN}-svn" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" - -DEPEND=" - app-shells/bash:0 - media-libs/tiff:0 - net-libs/libcapi - sys-libs/zlib - virtual/jpeg:0 -" -RDEPEND=" - ${DEPEND} - dev-util/dialog -" - -DOCS=( AUTHORS ChangeLog Readme_src ) -HTML_DOCS=( README.html LIESMICH.html ) - -src_prepare() { - EPATCH_SOURCE="${WORKDIR}/debian/patches" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" epatch - - eapply_user - - eautoreconf - - mv ../debian . || die - - # fix location of fax spool - sed -e "s:/var/spool/hylafax:${FAX_SPOOL_DIR}:g" \ - -i config.faxCAPI \ - -i Readme_src \ - -i src/defaults.h.in \ - -i debian/*.1 || die - - # fix location of fax config - sed -i -e "s:/etc/hylafax:${FAX_SPOOL_DIR}/etc:g" setupconffile || die - - # fix name and location of logfile - sed -e "s:/var/spool/fax/log/capi4hylafax:/var/log/${PN}.log:" \ - -i config.faxCAPI || die - - sed -e "s:/tmp/capifax.log:/var/log/${PN}.log:" \ - -i src/defaults.h.in config.faxCAPI || die - - # patch man pages - sed -e "s:/usr/share/doc/capi4hylafax/:/usr/share/doc/${PF}/html/:g" \ - -e "s:c2send:c2faxsend:g" \ - -e "s:c2recv:c2faxrecv:g" \ - -e "s:CAPI4HYLAFAXCONFIG \"1\":C2FAXADDMODEM \"8\":g" \ - -e "s:capi4hylafaxconfig:c2faxaddmodem:g" \ - -i debian/*.1 || die - - cp -f debian/capi4hylafaxconfig.1 debian/c2faxaddmodem.8 || die -} - -src_configure() { - econf --with-hylafax-spooldir="${FAX_SPOOL_DIR}" -} - -src_install() { - keepdir "${FAX_SPOOL_DIR}"/{etc,recvq,pollq,log,status} - fowners uucp:uucp "${FAX_SPOOL_DIR}" "${FAX_SPOOL_DIR}"/{etc,recvq,pollq,log,status} - fperms 0700 "${FAX_SPOOL_DIR}" - - default - - # install setup script - newsbin setupconffile c2faxaddmodem - - # install sample config - insinto "${FAX_SPOOL_DIR}/etc" - newins config.faxCAPI config.faxCAPI.default - - # install docs - newdoc debian/changelog ChangeLog.debian - - # install man pages - doman debian/c2fax*.[18] - - # install examples - insinto /usr/share/doc/${PF}/examples - doins sample_faxrcvd config.faxCAPI fritz_pic.tif GenerateFileMail.pl - newins sample_AVMC4_config.faxCAPI config.faxCAPI_AVMC4 - newins debian/faxsend sample_faxsend - - # finally install init-script + config - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} -} - -pkg_postinst() { - einfo - elog "To use capi4hylafax:" - elog "Make sure that your isdn/capi devices are owned by" - elog "the \"uucp\" user (see udev or devfsd config)." - elog "Modify ${FAX_SPOOL_DIR}/etc/config.faxCAPI" - elog "to suit your system." - - if [ -n "${REPLACING_VERSIONS}" ]; then - elog - elog "If you're upgrading from a previous version" - elog "please check for new or changed options." - elog "A sample default config is installed as:" - elog "${FAX_SPOOL_DIR}/etc/config.faxCAPI.default" - else - elog - elog "Please run package config to install a default configuration." - fi - - elog - elog "You should also check special options in:" - elog "/etc/conf.d/${PN}" - elog - elog "The following optional dependency is also available:" - optfeature "hylafax integration" net-misc/hylafax - elog - elog "Then append the following line to your hylafax" - elog "config file (${FAX_SPOOL_DIR}/etc/config):" - elog "SendFaxCmd: /usr/bin/c2faxsend" - einfo -} - -pkg_config() { - local config_file="${FAX_SPOOL_DIR}/etc/config.faxCAPI" - if [ -e "${config_file}" ]; then - eerror "The configuration file already exists. Please either update" - eerror "or remove this file and re-run package configuration." - eerror "Configuration file location: ${config_file}" - else - elog "Installing template configuration file to ${config_file}" - cp -f "${FAX_SPOOL_DIR}/etc/config.faxCAPI.default" \ - "${config_file}" || die - fi -} diff --git a/net-misc/capi4hylafax/files/capi4hylafax.confd b/net-misc/capi4hylafax/files/capi4hylafax.confd deleted file mode 100644 index 40aa8cfe603d..000000000000 --- a/net-misc/capi4hylafax/files/capi4hylafax.confd +++ /dev/null @@ -1,19 +0,0 @@ -# configuraton file for /etc/init.d/capi4hylafax - -# Activate Logging (Filename have to be specified in the config file). -#ACTIVATE_LOGGING="yes" - -# Specify the output format. Allowed types are: -# HYLAFAX (default), TIFF, SFF, G3 -#OUTPUT_FORMAT="HYLAFAX" - -# Virtual device name only needed for Hylafax. -#VIRTUAL_DEVICE="faxCAPI" - -# Name and path of the config file -#CONFIG_FILE="/var/spool/fax/etc/config.faxCAPI" - -# Directory where received faxes are to be stored. -# Do not set it in Hylafax mode (see OUTPUT_FORMAT)! -#RECEIVE_DIR="/var/spool/fax/recvq" - diff --git a/net-misc/capi4hylafax/files/capi4hylafax.initd b/net-misc/capi4hylafax/files/capi4hylafax.initd deleted file mode 100644 index 08c3917f6f8f..000000000000 --- a/net-misc/capi4hylafax/files/capi4hylafax.initd +++ /dev/null @@ -1,63 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need capi -} - -checkconfig() { - local DEFAULT_OUTPUT_FORMAT="HYLAFAX" - local DEFAULT_VIRTUAL_DEVICE="faxCAPI" - local DEFAULT_RECEIVE_DIR="/var/spool/fax" - local DEFAULT_CONFIG_FILE="/var/spool/fax/etc/config.faxCAPI" - - [ -n "${CONFIG_FILE}" ] || CONFIG_FILE="${DEFAULT_CONFIG_FILE}" - [ -n "${OUTPUT_FORMAT}" ] || OUTPUT_FORMAT="${DEFAULT_OUTPUT_FORMAT}" - [ -n "${VIRTUAL_DEVICE}" ] || VIRTUAL_DEVICE="${DEFAULT_VIRTUAL_DEVICE}" - [ "${OUTPUT_FORMAT}" = "HYLAFAX" ] || DEFAULT_RECEIVE_DIR="/var/spool/fax/recvq" - [ -n "${RECEIVE_DIR}" ] || RECEIVE_DIR="${DEFAULT_RECEIVE_DIR}" - - if [ ! -f "${CONFIG_FILE}" ]; then - eerror "You're missing ${CONFIG_FILE}" - return 1 - fi - - OPTIONS="" - PIDFILE="/var/run/c2faxrecv.pid" - - [ "${ACTIVATE_LOGGING}" = "yes" ] && OPTIONS="${OPTIONS} -L" - - [ "${OUTPUT_FORMAT}" = "${DEFAULT_OUTPUT_FORMAT}" ] || \ - OPTIONS="${OPTIONS} -f ${OUTPUT_FORMAT}" - - [ "${CONFIG_FILE}" = "${DEFAULT_CONFIG_FILE}" ] || \ - OPTIONS="${OPTIONS} -C ${CONFIG_FILE}" - - [ "${OUTPUT_FORMAT}" = "HYLAFAX" -a "${RECEIVE_DIR}" = "${DEFAULT_RECEIVE_DIR}" ] || \ - OPTIONS="${OPTIONS} -q ${RECEIVE_DIR}" - - if [ "${VIRTUAL_DEVICE}" != "${DEFAULT_VIRTUAL_DEVICE}" ]; then - PIDFILE="/var/run/c2faxrecv.${VIRTUAL_DEVICE}.pid" - OPTIONS="${OPTIONS} ${VIRTUAL_DEVICE}" - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting CAPI4HylaFAX for ${VIRTUAL_DEVICE}" - start-stop-daemon -b -m --quiet --start --pidfile ${PIDFILE} \ - --exec /usr/bin/c2faxrecv -- ${OPTIONS} - eend $? -} - -stop() { - checkconfig || return 1 - - ebegin "Stopping CAPI4HylaFAX for ${VIRTUAL_DEVICE}" - start-stop-daemon >/dev/null --quiet --stop --pidfile ${PIDFILE} --retry 10 && \ - /bin/rm -f ${PIDFILE} - eend $? -} - diff --git a/net-misc/capi4hylafax/metadata.xml b/net-misc/capi4hylafax/metadata.xml deleted file mode 100644 index b5d05033d344..000000000000 --- a/net-misc/capi4hylafax/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - capi4hylafax adds a faxcapi modem to the hylafax enviroment. So you can - send and receive FAX documents with CAPI 2.0 fax controllers via a - hylafax server. - - - capi4hylafax は hylafax 環境に faxcopi - モデムを加えます。つまり hylafax - サーバに対して CAPI 2.0 fax コントローラ経由で FAX - ドキュメントを送信したり - 受信したりできるようになります。 - - diff --git a/net-misc/cbugzilla/Manifest b/net-misc/cbugzilla/Manifest index a950e1c6fc3f..538295839614 100644 --- a/net-misc/cbugzilla/Manifest +++ b/net-misc/cbugzilla/Manifest @@ -1,3 +1,3 @@ DIST cbugzilla-0.2.1.tar.xz 240824 BLAKE2B ff3332d954d0c3be92b5104e1a13668be66952ee20caaa65ad302a299c87b893f77179415b5a90d0873550f2ddf5646eadd18040851c7bc3ba913e130930db32 SHA512 4a5671bfb222d17841082d123e68250526f6504aee3ba816b454b5d37174391eb464a7e3eaa9fdcfbbb5619b443b4af28ae520dc4bfd49faab1e523d59e2392f -EBUILD cbugzilla-0.2.1.ebuild 503 BLAKE2B 1e47e7d9607e6abc3c00242c0f5d600284dd8b8ae359b9ef27723570439827103758f59b91df0f42a0109e82f60a9ee5364a8d21afae084f891747a6bc666ef9 SHA512 191078acc3f87c586801b2ec50f9517a1c66f68414275364caf60e2d26014fbf061348db5bebf7e3289c507af9dd8b29452d5a082eec35388cc11176cad11625 +EBUILD cbugzilla-0.2.1.ebuild 495 BLAKE2B 669a52b92014d727187afd4283f97948694b94fa0f7e4961accc113ddd8565fbfd446ad55cba72a8e77a17062ad86bbb55904d5403dbd1ff7956d7d9e0eacab6 SHA512 e15e6e54e4831721da4d4128a989dce4e5c25765501e8df1b1ffb9da6412dfe0a66bb454836040d8fce4979a3bf421c0fac92ba95f8af3edbb14ab18a22c1066 MISC metadata.xml 245 BLAKE2B e88caa06a239232c934e30a1256673bba436fe7ae970a140b68721315fd41bfab31fc6bab9c5fb006c8ca934b3a77c8d2c19a18d58f3d4553d819e3149601121 SHA512 b3fc951a81d8cb12e1d4be68f5ac51b67f1d7bcfab18c504c010b059e80ea890e7e363a0e077f3aafdac38b950afbc49157f6b4a38d4c060a596bd88608ec40e diff --git a/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild b/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild index ca0c621bce54..72f69a411921 100644 --- a/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild +++ b/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="CLI and C api to get data from Bugzilla" HOMEPAGE="https://github.com/yaccz/cbugzilla" @@ -10,11 +10,12 @@ SRC_URI="https://dev.gentoo.org/~yac/distfiles/${P}.tar.xz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="net-misc/curl +DEPEND=" + app-text/htmltidy dev-libs/libxdg-basedir - app-text/htmltidy" + net-misc/curl +" RDEPEND="${DEPEND}" DOCS=( "README.rst" "ChangeLog.rst" ) diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest index e2f434ba8306..cfdb260ce668 100644 --- a/net-misc/cfengine/Manifest +++ b/net-misc/cfengine/Manifest @@ -5,5 +5,5 @@ AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B c8ccad409a64f1a0232fc800fe3787ece5 AUX cfengine-3.6.2-sysmacros.patch 555 BLAKE2B e1111a7cd5dd1b28787c0db6af1f55fed2b95ac3f1267eb5ad516584f6bf4c070a5243185808ce772c2a70171bcf3e5eb331bc0cfc5b82a04e8dccd99fdce761 SHA512 404468a5e10b535c8f10c2cff9c8928730a4323145cd29cfc080cd3af9effef1b890fb038f3dad8d84ba67d1af72b402d35cc1f382ff34fb0cdd07b8af23732c DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9 -EBUILD cfengine-3.6.2.ebuild 4233 BLAKE2B 5122f44c2f29211090bdaacaf69ea5494ee5c17318dd3c3726a9291d5c7489f50b9d36f27a5cfbb197b890ee9a974f52ae74e012ce5263722e186cc191f30f04 SHA512 64cc74d3cb5ad93b5898d78928be0d81438bca150302ef236e71d6ee6acab3d370f3dfdcd2919685ebe6f98faec119dd3e8872d0f094bdd8d862740d9260e650 +EBUILD cfengine-3.6.2.ebuild 4202 BLAKE2B c7b6395c2bb97edac2cd8c94e1ce76e12d938a3472aa68b6f8d5b7115ce26ee2b6bd3dbe4aeff28eb54db2cfed756a03353150012bdecaee8610c1bfcfaa7da9 SHA512 a5ba90edf4524cf18f862465af2e699eebd1e339755a0f171463b405da285a0d88a305a86c7f06144418129fde06016d021bb3116382d07a01624eb59db1badb MISC metadata.xml 2058 BLAKE2B 55eb2fc9f281e651d45e677bd8dedd4294009ae8975fdf94d15abb295abd92e9a1a2cfbdc97789e14f9a6789c0d6d59678637e947a6d778d10262e01d6936369 SHA512 212daea407c091ede8db7b3444d3e39e354e97a1ddb29ced2c448bbda7eb9dfbfd93dcea5aeeb35198181eee0b9c5ebda454b9d864f9b20c94134ed4fcee41a0 diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild index d0d55340c25f..2bdad3a9ba84 100644 --- a/net-misc/cfengine/cfengine-3.6.2.ebuild +++ b/net-misc/cfengine/cfengine-3.6.2.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" -inherit eutils autotools flag-o-matic +inherit autotools epatch MY_PV="${PV//_beta/b}" MY_PV="${MY_PV/_p/p}" MY_P="${PN}-${MY_PV}" -DESCRIPTION="An automated suite of programs for configuring and maintaining -Unix-like computers" +DESCRIPTION="An automated suite of programs for configuring and maintaining Unix-like computers" HOMEPAGE="http://www.cfengine.org/" -SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz -> ${MY_P}.tar.gz +SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )" LICENSE="GPL-3" diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index d3924e3c7a54..8ff3bef91a3d 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -4,7 +4,10 @@ AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50 AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 -EBUILD chrony-4.0-r1.ebuild 5215 BLAKE2B 42b24a96d932a28a481dfeb8c27425e100b7b305cf55c65ba81359ff5dd301b7cc541dc0f999bb8e7fce3836788b00adb7c44840deab5541b570d4dd3610ae63 SHA512 d1befbff09f1d8a588997f85bfdd1ad726f27ccd64cc0821a9b3b1cb97355e068af8a291e05a969ad47de792101466cab2f8af9f6bb5fcc6a98caeae804b6efa -EBUILD chrony-4.0.ebuild 4324 BLAKE2B c6e4eef917c334681564f974323f503d088fe0aeac43e5c88f302f5e6f29fdb0d45fd2862d768621a23110deb53e907597efb44d361a794b2e37181ae3c19208 SHA512 be89d10a76643ad8c46d005f3ddc49dc60485a7b5954445a7ddc4468c142d31100465c0222231da43f338f621fc11de2bd20ecc42bde43424b85b48f01b84d1f -EBUILD chrony-9999.ebuild 5222 BLAKE2B c688ee6af7aaf0a68488510a5f4d739b67bcbf7f6fd013dd5128fbc69cfe0316cb7cd29140c43ef13bea0a6700ba2a724f5229a0a0163e047fe1d8631c6a6149 SHA512 cb668189ca505659c3ef75f6a9838eaca432302075967d6b80cf91e01f87774d60aaa94e99ade646fb8c94db6ed8afcd938c20eb249a8ea9608bafeaee702bee +DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b808e360eb0c3724351c54ac4f187a2aa4450830130da718c6a0c488baa170ca87e7e6eac781d85c67b3773f SHA512 c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c +DIST chrony-4.1-pre1.tar.gz 563277 BLAKE2B 474d27d0e402d83bda52125940b8205119519b93571e6b8df3fea5eeb5f1f3babbcc40bc81db77bc345830d5e9528ad087ff539026a1a585ce220feeb851e978 SHA512 03e28e6651d6aa3c99333b94ee503843c3a69b8c8366bf647c41a3a9e34e987c440e289ec16e5c62c2a7405271bddc533efbd59d6c6ab43712c8908dfb86322e +DIST chrony-4.1-pre1.tar.gz.asc 195 BLAKE2B 4a06b35be3257a52cc824e2acfdff32b6598d1744bc23418e89291d71d6d9a86c35559eab26034ce2e05c4152ffb691b5ec4104dc339821e93523c33c8cbdd72 SHA512 8eb695c3f85f90d02b22b1202c8766347289a6da1d0658a3d89eed90202799bcfc647b96e5f931fb862011e85feed5f4914b39e45a3e20f01827509fe271a2d7 +EBUILD chrony-4.0-r2.ebuild 5467 BLAKE2B 3ce0ad6ccb8e6477b4b7e615e7c19fa8f492253730f185ddf127fffccdf18b9f23b55b2a5acbc06ca19e1deb328d01b477a50a70984f8f4ac968d48f8ab57e08 SHA512 6d7c2c61527da60511bf62a3133fd717faad3a4a970f898687bd14806427229012defc36713fb70b8ae4fedde3b4c9b48eea0c8124003f5866299a3e0717b12d +EBUILD chrony-4.1_pre1.ebuild 5947 BLAKE2B fabbdc7c71fefc3ecbf125b39300b282087759077174e6b789b5644cdc37909cc86e469db67241d8b9012344b06e69f971a22e7f9bae428485ce3d654e526c45 SHA512 7d6f66c7737bb0639e3b08afaf2018b0c2fc165df2d69ccb4b6abc5ae689a6954c2253817072876ec4a7bd057b5e4b78d4c88b01c4df9984463f594bfd50aa31 +EBUILD chrony-9999.ebuild 5947 BLAKE2B fabbdc7c71fefc3ecbf125b39300b282087759077174e6b789b5644cdc37909cc86e469db67241d8b9012344b06e69f971a22e7f9bae428485ce3d654e526c45 SHA512 7d6f66c7737bb0639e3b08afaf2018b0c2fc165df2d69ccb4b6abc5ae689a6954c2253817072876ec4a7bd057b5e4b78d4c88b01c4df9984463f594bfd50aa31 MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r1.ebuild deleted file mode 100644 index 1f2f0ba26279..000000000000 --- a/net-misc/chrony/chrony-4.0-r1.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2021 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/ https://git.tuxfamily.org/chrony/chrony.git" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" -else - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86" -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt" -# nettle > nss > libtomcrypt in configure -REQUIRED_USE=" - sechash? ( || ( nettle nss libtomcrypt ) ) - nettle? ( !nss ) - nss? ( !nettle ) - libtomcrypt? ( !nettle !nss ) - !sechash? ( !nss ) - !sechash? ( !nts? ( !nettle ) ) - nts? ( nettle ) -" -RESTRICT="test" - -BDEPEND="nettle? ( virtual/pkgconfig )" - -if [[ ${PV} == "9999" ]]; then - # Needed for doc generation in 9999 - BDEPEND+=" virtual/w3m" - REQUIRED_USE+=" html" -fi - -DEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - sys-libs/libcap - ) - nts? ( net-libs/gnutls:= ) - libedit? ( dev-libs/libedit ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss:= ) - seccomp? ( sys-libs/libseccomp ) - html? ( dev-ruby/asciidoctor ) - pps? ( net-misc/pps-tools ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -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 - - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die -} - -src_configure() { - if ! use caps; then - sed -i \ - -e 's/ -u ntp//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - if ! use seccomp; then - sed -i \ - -e 's/ -F 0//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - tc-export CC PKG_CONFIG - - # Update from time to time with output from "date +%s" - # on a system that is time-synced. - export SOURCE_DATE_EPOCH=1607976314 - - # not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - $(usex caps '' --disable-linuxcaps) - $(usex cmdmon '' --disable-cmdmon) - $(usex debug '--enable-debug' '') - $(usex ipv6 '' --disable-ipv6) - $(usex libedit '' --without-editline) - $(usex nettle '' --without-nettle) - $(usex nss '' --without-nss) - $(usex ntp '' --disable-ntp) - $(usex nts '' --disable-nts) - $(usex nts '' --without-gnutls) - $(usex phc '' --disable-phc) - $(usex pps '' --disable-pps) - $(usex refclock '' --disable-refclock) - $(usex rtc '' --disable-rtc) - $(usex samba --enable-ntp-signd '') - $(usex sechash '' --disable-sechash) - $(usex libtomcrypt '' --disable-tomcrypt) - --chronysockdir="${EPREFIX}/run/chrony" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --mandir="${EPREFIX}/usr/share/man" - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc/chrony" - --with-hwclockfile="${EPREFIX}/etc/adjtime" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - ${EXTRA_ECONF} - ) - - # print the ./configure call - echo sh ./configure "${myconf[@]}" >&2 - sh ./configure "${myconf[@]}" || die -} - -src_compile() { - if [[ ${PV} == "9999" ]]; then - # uses w3m - emake -C doc man txt - fi - - emake all docs $(usex html '' 'ADOC=true') -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${T}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - - if use html; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - if use caps; then - # Prepare a directory for the chrony.drift file (a la ntpsec) - # Ensures the environment is sane on new installs - fowners ntp:ntp /var/{lib,log}/chrony - fperms 770 /var/lib/chrony - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit examples/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_preinst() { - HAD_CAPS=false - HAD_SECCOMP=false - - if has_version 'net-misc/chrony[caps]' ; then - HAD_CAPS=true - fi - - if has_version 'net-misc/chrony[seccomp]' ; then - HAD_SECCOMP=true - fi - -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - if use caps && ! ${HAD_CAPS} ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" - ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" - ewarn "This is necessary for chrony to drop privileges" - elif ! use caps && ! ${HAD_CAPS} ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" - fi - fi - - if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then - elog "To enable seccomp in enforcing mode, please modify:" - elog "- /etc/conf.d/chronyd for OpenRC" - elog "- systemctl edit chronyd for systemd" - elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)" - fi -} diff --git a/net-misc/chrony/chrony-4.0-r2.ebuild b/net-misc/chrony/chrony-4.0-r2.ebuild new file mode 100644 index 000000000000..2c76d583d7c4 --- /dev/null +++ b/net-misc/chrony/chrony-4.0-r2.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2021 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/ https://git.tuxfamily.org/chrony/chrony.git" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" + SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P}-tar-gz-asc.txt -> ${P}.tar.gz.asc )" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" +fi + +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt" +# nettle > nss > libtomcrypt in configure +REQUIRED_USE=" + sechash? ( || ( nettle nss libtomcrypt ) ) + nettle? ( !nss ) + nss? ( !nettle ) + libtomcrypt? ( !nettle !nss ) + !sechash? ( !nss ) + !sechash? ( !nts? ( !nettle ) ) + nts? ( nettle ) +" + +BDEPEND=" + nettle? ( virtual/pkgconfig ) +" + +if [[ ${PV} == "9999" ]]; then + # Needed for doc generation in 9999 + REQUIRED_USE+=" html" + BDEPEND+=" virtual/w3m" +else + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )" +fi + +DEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) + nts? ( net-libs/gnutls:= ) + libedit? ( dev-libs/libedit ) + nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) + seccomp? ( sys-libs/libseccomp ) + html? ( dev-ruby/asciidoctor ) + pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" + +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 + + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die +} + +src_configure() { + if ! use caps; then + sed -i \ + -e 's/ -u ntp//' \ + "${T}"/chronyd.conf examples/chronyd.service || die + fi + + if ! use seccomp; then + sed -i \ + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die + fi + + tc-export CC PKG_CONFIG + + # Update from time to time with output from "date +%s" + # on a system that is time-synced. + export SOURCE_DATE_EPOCH=1607976314 + + # not an autotools generated script + local myconf=( + $(use_enable seccomp scfilter) + $(usex caps '' --disable-linuxcaps) + $(usex cmdmon '' --disable-cmdmon) + $(usex debug '--enable-debug' '') + $(usex ipv6 '' --disable-ipv6) + $(usex libedit '' --without-editline) + $(usex nettle '' --without-nettle) + $(usex nss '' --without-nss) + $(usex ntp '' --disable-ntp) + $(usex nts '' --disable-nts) + $(usex nts '' --without-gnutls) + $(usex phc '' --disable-phc) + $(usex pps '' --disable-pps) + $(usex refclock '' --disable-refclock) + $(usex rtc '' --disable-rtc) + $(usex samba --enable-ntp-signd '') + $(usex sechash '' --disable-sechash) + $(usex libtomcrypt '' --without-tomcrypt) + --chronysockdir="${EPREFIX}/run/chrony" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc/chrony" + --with-hwclockfile="${EPREFIX}/etc/adjtime" + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + ${EXTRA_ECONF} + ) + + # print the ./configure call + echo sh ./configure "${myconf[@]}" >&2 + sh ./configure "${myconf[@]}" || die +} + +src_compile() { + if [[ ${PV} == "9999" ]]; then + # uses w3m + emake -C doc man txt + fi + + emake all docs $(usex html '' 'ADOC=true') +} + +src_install() { + default + + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd + newconfd "${T}"/chronyd.conf chronyd + + insinto /etc/${PN} + newins examples/chrony.conf.example1 chrony.conf + + docinto examples + dodoc examples/*.example* + + newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" + + if use html; then + docinto html + dodoc doc/*.html + fi + + keepdir /var/{lib,log}/chrony + + if use caps; then + # Prepare a directory for the chrony.drift file (a la ntpsec) + # Ensures the environment is sane on new installs + fowners ntp:ntp /var/{lib,log}/chrony + fperms 770 /var/lib/chrony + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony + + systemd_dounit examples/chronyd.service + systemd_dounit examples/chrony-wait.service + systemd_enable_ntpunit 50-chrony chronyd.service +} + +pkg_preinst() { + HAD_CAPS=false + HAD_SECCOMP=false + + if has_version 'net-misc/chrony[caps]' ; then + HAD_CAPS=true + fi + + if has_version 'net-misc/chrony[seccomp]' ; then + HAD_SECCOMP=true + fi + +} + +pkg_postinst() { + tmpfiles_process chronyd.conf + + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + if use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" + ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" + ewarn "This is necessary for chrony to drop privileges" + elif ! use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" + fi + fi + + if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then + elog "To enable seccomp in enforcing mode, please modify:" + elog "- /etc/conf.d/chronyd for OpenRC" + elog "- systemctl edit chronyd for systemd" + elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)" + fi +} diff --git a/net-misc/chrony/chrony-4.0.ebuild b/net-misc/chrony/chrony-4.0.ebuild deleted file mode 100644 index 3926d6b0f383..000000000000 --- a/net-misc/chrony/chrony-4.0.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2021 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/ https://git.tuxfamily.org/chrony/chrony.git" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" -else - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86" -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux" -REQUIRED_USE="sechash? ( nettle )" -RESTRICT="test" - -BDEPEND="nettle? ( virtual/pkgconfig )" - -if [[ ${PV} == "9999" ]]; then - # Needed for doc generation in 9999 - BDEPEND+=" virtual/w3m" - REQUIRED_USE+=" html" -fi - -DEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - sys-libs/libcap - ) - libedit? ( dev-libs/libedit ) - nettle? ( dev-libs/nettle:= ) - seccomp? ( sys-libs/libseccomp ) - html? ( dev-ruby/asciidoctor ) - pps? ( net-misc/pps-tools ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -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 - - sed -i \ - -e 's|RELOADDNS||g' \ - -e 's|pkg-config|${PKG_CONFIG}|g' \ - configure || die - - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die -} - -src_configure() { - if ! use caps; then - sed -i \ - -e 's/ -u ntp//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - if ! use seccomp; then - sed -i \ - -e 's/ -F 0//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - tc-export CC PKG_CONFIG - - # Note: ncurses and nss switches are mentioned in the configure script but - # do nothing - # not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - $(usex caps '' --disable-linuxcaps) - $(usex cmdmon '' --disable-cmdmon) - $(usex ipv6 '' --disable-ipv6) - $(usex libedit '' --without-editline) - $(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 samba --enable-ntp-signd '') - $(usex sechash '' --disable-sechash) - ${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-hwclockfile="${EPREFIX}/etc/adjtime" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - --without-nss - --without-tomcrypt - ) - - # print the ./configure call - echo sh ./configure "${myconf[@]}" >&2 - sh ./configure "${myconf[@]}" || die -} - -src_compile() { - if [[ ${PV} == "9999" ]]; then - # uses w3m - emake -C doc man txt - fi - - emake all docs $(usex html '' 'ADOC=true') -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${T}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - - if use html; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - if use caps; then - # Prepare a directory for the chrony.drift file (a la ntpsec) - # Ensures the environment is sane on new installs - fowners ntp:ntp /var/{lib,log}/chrony - fperms 770 /var/lib/chrony - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit examples/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_preinst() { - HAD_CAPS=false - - if has_version 'net-misc/chrony[caps]'; then - HAD_CAPS=true - fi -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" - ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" - ewarn "This is necessary for chrony to drop privileges" - fi -} diff --git a/net-misc/chrony/chrony-4.1_pre1.ebuild b/net-misc/chrony/chrony-4.1_pre1.ebuild new file mode 100644 index 000000000000..eb58830becb9 --- /dev/null +++ b/net-misc/chrony/chrony-4.1_pre1.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2021 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/ https://git.tuxfamily.org/chrony/chrony.git" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" + SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + fi +fi + +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" +# nettle > nss > libtomcrypt in configure +REQUIRED_USE=" + sechash? ( || ( nettle nss libtomcrypt ) ) + nettle? ( !nss ) + nss? ( !nettle ) + libtomcrypt? ( !nettle !nss ) + !sechash? ( !nss ) + !sechash? ( !nts? ( !nettle ) ) +" + +if [[ ${PV} == "9999" ]] ; then + # Needed for doc generation in 9999 + REQUIRED_USE+=" html" + BDEPEND+=" virtual/w3m" +else + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )" +fi + +DEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) + libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) + nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) + nts? ( net-libs/gnutls:= ) + pps? ( net-misc/pps-tools ) + seccomp? ( sys-libs/libseccomp ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" +BDEPEND=" + html? ( dev-ruby/asciidoctor ) + nts? ( virtual/pkgconfig ) + sechash? ( + nettle? ( virtual/pkgconfig ) + nss? ( virtual/pkgconfig ) + ) +" + +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 + + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die +} + +src_configure() { + if ! use caps ; then + sed -i \ + -e 's/ -u ntp//' \ + "${T}"/chronyd.conf examples/chronyd.service || die + fi + + if ! use seccomp ; then + sed -i \ + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die + fi + + tc-export CC PKG_CONFIG + + # Update from time to time with output from "date +%s" + # on a system that is time-synced. + export SOURCE_DATE_EPOCH=1607976314 + + # Not an autotools generated script + local myconf=( + $(use_enable seccomp scfilter) + + $(usex caps '' '--disable-linuxcaps') + $(usex cmdmon '' '--disable-cmdmon') + $(usex debug '--enable-debug' '') + $(usex ipv6 '' '--disable-ipv6') + $(usex libedit '' '--without-editline') + $(usex libtomcrypt '' '--without-tomcrypt') + $(usex nettle '' '--without-nettle') + $(usex nss '' '--without-nss') + $(usex ntp '' '--disable-ntp') + $(usex nts '' '--disable-nts') + $(usex nts '' '--without-gnutls') + $(usex phc '' '--disable-phc') + $(usex pps '' '--disable-pps') + $(usex refclock '' '--disable-refclock') + $(usex rtc '' '--disable-rtc') + $(usex samba '--enable-ntp-signd' '') + $(usex sechash '' '--disable-sechash') + + --chronysockdir="${EPREFIX}/run/chrony" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc/chrony" + --with-hwclockfile="${EPREFIX}/etc/adjtime" + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + + ${EXTRA_ECONF} + ) + + # Print the ./configure call + echo sh ./configure "${myconf[@]}" >&2 + sh ./configure "${myconf[@]}" || die +} + +src_compile() { + if [[ ${PV} == "9999" ]] ; then + # Uses w3m + emake -C doc man txt + fi + + emake all docs $(usex html '' 'ADOC=true') +} + +src_install() { + default + + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd + newconfd "${T}"/chronyd.conf chronyd + + insinto /etc/${PN} + newins examples/chrony.conf.example1 chrony.conf + + docinto examples + dodoc examples/*.example* + + newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" + + if use html ; then + docinto html + dodoc doc/*.html + fi + + keepdir /var/{lib,log}/chrony + + if use caps ; then + # Prepare a directory for the chrony.drift file (a la ntpsec) + # Ensures the environment is sane on new installs + # bug #711058 + fowners ntp:ntp /var/{lib,log}/chrony + fperms 770 /var/lib/chrony + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony + + systemd_dounit examples/chronyd.service + systemd_dounit examples/chrony-wait.service + systemd_enable_ntpunit 50-chrony chronyd.service +} + +pkg_preinst() { + HAD_CAPS=false + HAD_SECCOMP=false + + # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 + # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand + if has_version 'net-misc/chrony[caps]' ; then + HAD_CAPS=true + fi + + if has_version 'net-misc/chrony[seccomp]' ; then + HAD_SECCOMP=true + fi +} + +pkg_postinst() { + tmpfiles_process chronyd.conf + + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + if use caps && ! ${HAD_CAPS} ; then + # bug #719876 + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" + ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" + ewarn "This is necessary for chrony to drop privileges" + elif ! use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" + fi + fi + + # TODO: Will try to re-enable before final release ideally? + # bug #783915 + if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then + elog "To enable seccomp in enforcing mode, please modify:" + elog "- /etc/conf.d/chronyd for OpenRC" + elog "- systemctl edit chronyd for systemd" + elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)" + fi +} diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 7e6fadddffaa..eb58830becb9 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -8,19 +8,26 @@ inherit systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" -if [[ ${PV} == "9999" ]]; then - inherit git-r3 +if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + inherit git-r3 else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + fi fi S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2" SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt" +IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" # nettle > nss > libtomcrypt in configure REQUIRED_USE=" sechash? ( || ( nettle nss libtomcrypt ) ) @@ -29,16 +36,14 @@ REQUIRED_USE=" libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) ) - nts? ( nettle ) " -RESTRICT="test" - -BDEPEND="nettle? ( virtual/pkgconfig )" -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == "9999" ]] ; then # Needed for doc generation in 9999 - BDEPEND+=" virtual/w3m" REQUIRED_USE+=" html" + BDEPEND+=" virtual/w3m" +else + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )" fi DEPEND=" @@ -47,18 +52,26 @@ DEPEND=" acct-user/ntp sys-libs/libcap ) - nts? ( net-libs/gnutls:= ) libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) - seccomp? ( sys-libs/libseccomp ) - html? ( dev-ruby/asciidoctor ) + nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) + seccomp? ( sys-libs/libseccomp ) " RDEPEND=" ${DEPEND} selinux? ( sec-policy/selinux-chronyd ) " +BDEPEND=" + html? ( dev-ruby/asciidoctor ) + nts? ( virtual/pkgconfig ) + sechash? ( + nettle? ( virtual/pkgconfig ) + nss? ( virtual/pkgconfig ) + ) +" PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch @@ -76,13 +89,13 @@ src_prepare() { } src_configure() { - if ! use caps; then + if ! use caps ; then sed -i \ -e 's/ -u ntp//' \ "${T}"/chronyd.conf examples/chronyd.service || die fi - if ! use seccomp; then + if ! use seccomp ; then sed -i \ -e 's/ -F 0//' \ "${T}"/chronyd.conf examples/chronyd.service || die @@ -94,26 +107,28 @@ src_configure() { # on a system that is time-synced. export SOURCE_DATE_EPOCH=1607976314 - # not an autotools generated script + # Not an autotools generated script local myconf=( $(use_enable seccomp scfilter) - $(usex caps '' --disable-linuxcaps) - $(usex cmdmon '' --disable-cmdmon) + + $(usex caps '' '--disable-linuxcaps') + $(usex cmdmon '' '--disable-cmdmon') $(usex debug '--enable-debug' '') - $(usex ipv6 '' --disable-ipv6) - $(usex libedit '' --without-editline) - $(usex nettle '' --without-nettle) - $(usex nss '' --without-nss) - $(usex ntp '' --disable-ntp) - $(usex nts '' --disable-nts) - $(usex nts '' --without-gnutls) - $(usex phc '' --disable-phc) - $(usex pps '' --disable-pps) - $(usex refclock '' --disable-refclock) - $(usex rtc '' --disable-rtc) - $(usex samba --enable-ntp-signd '') - $(usex sechash '' --disable-sechash) - $(usex libtomcrypt '' --disable-tomcrypt) + $(usex ipv6 '' '--disable-ipv6') + $(usex libedit '' '--without-editline') + $(usex libtomcrypt '' '--without-tomcrypt') + $(usex nettle '' '--without-nettle') + $(usex nss '' '--without-nss') + $(usex ntp '' '--disable-ntp') + $(usex nts '' '--disable-nts') + $(usex nts '' '--without-gnutls') + $(usex phc '' '--disable-phc') + $(usex pps '' '--disable-pps') + $(usex refclock '' '--disable-refclock') + $(usex rtc '' '--disable-rtc') + $(usex samba '--enable-ntp-signd' '') + $(usex sechash '' '--disable-sechash') + --chronysockdir="${EPREFIX}/run/chrony" --docdir="${EPREFIX}/usr/share/doc/${PF}" --mandir="${EPREFIX}/usr/share/man" @@ -121,17 +136,18 @@ src_configure() { --sysconfdir="${EPREFIX}/etc/chrony" --with-hwclockfile="${EPREFIX}/etc/adjtime" --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + ${EXTRA_ECONF} ) - # print the ./configure call + # Print the ./configure call echo sh ./configure "${myconf[@]}" >&2 sh ./configure "${myconf[@]}" || die } src_compile() { - if [[ ${PV} == "9999" ]]; then - # uses w3m + if [[ ${PV} == "9999" ]] ; then + # Uses w3m emake -C doc man txt fi @@ -152,16 +168,17 @@ src_install() { newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - if use html; then + if use html ; then docinto html dodoc doc/*.html fi keepdir /var/{lib,log}/chrony - if use caps; then + if use caps ; then # Prepare a directory for the chrony.drift file (a la ntpsec) # Ensures the environment is sane on new installs + # bug #711058 fowners ntp:ntp /var/{lib,log}/chrony fperms 770 /var/lib/chrony fi @@ -178,6 +195,8 @@ pkg_preinst() { HAD_CAPS=false HAD_SECCOMP=false + # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 + # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand if has_version 'net-misc/chrony[caps]' ; then HAD_CAPS=true fi @@ -185,7 +204,6 @@ pkg_preinst() { if has_version 'net-misc/chrony[seccomp]' ; then HAD_SECCOMP=true fi - } pkg_postinst() { @@ -193,6 +211,7 @@ pkg_postinst() { if [[ -n "${REPLACING_VERSIONS}" ]] ; then if use caps && ! ${HAD_CAPS} ; then + # bug #719876 ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" ewarn "This is necessary for chrony to drop privileges" @@ -201,6 +220,8 @@ pkg_postinst() { fi fi + # TODO: Will try to re-enable before final release ideally? + # bug #783915 if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then elog "To enable seccomp in enforcing mode, please modify:" elog "- /etc/conf.d/chronyd for OpenRC" diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest index efb9f5d2794e..7b44f13a0735 100644 --- a/net-misc/clusterssh/Manifest +++ b/net-misc/clusterssh/Manifest @@ -1,6 +1,6 @@ DIST App-ClusterSSH-4.01_05.tar.gz 71502 BLAKE2B f9e1f9de36173c766a382660e34adee3005a64550a90cafe59101fd3f4b66307990e254334fb270398c9e36a9d27657a27e7348b1223a7ccef04181f8c88809b SHA512 4b63b91684c981a28871e5264502c66435b531ae3c4bad2eab2571f8b237d43e5f45ed93d036e7497c713f2982a110d93a3055ae0004d4f33e7786df9aa56ff8 DIST App-ClusterSSH-4.03_06.tar.gz 81476 BLAKE2B 6b513cb86fd4827eb510dd26ded9aa2d45ac1fe484dc10b8cb841c8b1fb50c7f279cbc6a63e817acbbf66e4aea5faa4f32cc612c387d018bf09abb18919fd7d6 SHA512 87dff4c0445436c10929bcf30a9295deb6ddacca16939091fdab0cf67765c77706745ce8e738145ea6c67ec06093567b7668e4387a72b48018f8e173da5709b4 -EBUILD clusterssh-4.03.03.ebuild 1089 BLAKE2B ac9a5be053d65396bb35109f0120f85a2eead683f71122c4d68ae5fa3c5ea288fbfb27ac1961630a728d6e4b3895388d05ca31d272119d2a5b579d5b5ea4d2cc SHA512 aaebdc4ea6796fd7e83d60bcb4f5cdbe5c6875dd7069c1feb3cc588ef8027cba580d14a9b36a6d024e3c29a302565a1d82e0e5156e5c7ca4d61f086f7c44c86a -EBUILD clusterssh-4.30.600.ebuild 987 BLAKE2B 1baf04eeabf7b2446f5b4b054ac8ef1d442c7b72bc8b9e6f8e26801834e069fdf78d46de3fd34f7e13d15bc0b9b5298180d80cf4f3e4c1d066b8cbe160b14703 SHA512 4e0640394d26a3fb3e8748d325293ef5cd22e1f231848f03da4349ea6b7d98a1f498bfaa67d195c6629d16b4cf9dd0122841a1efe06b94620cc2da3a358789e3 +EBUILD clusterssh-4.03.03.ebuild 1070 BLAKE2B 71b09ec83e69facd4308df30c15ab9cce9cf1009a007a70de5503d44b6c94be228f0ff94845a581b740ccb243286bbb9da21d8b47c803a6db6f9cef317627b2e SHA512 277e9a1cca280261584c40ed1af97d09270b54c9a89b931dcbbcae911fae58b1c5da0d52815e17c37ff1fc2c135a6d08be38b3115e4477a8ccca02846d298843 +EBUILD clusterssh-4.30.600.ebuild 980 BLAKE2B 503f0717e4630bb4752bab6cc0d1ad300e35a6a164be52e1f0482bc1f4837613f5304815bc362da191002cd4e155f3a3767e81528980af2a14338923ec3d1eba SHA512 fde939b6f4b910dfaa8559926f0e3164895e3c7508e7152b005325a5c468c65d58c6cf95d615129967f0d9e0637300781663f9fafb1163b340bff46a0ae0a289 EBUILD clusterssh-9999.ebuild 871 BLAKE2B 6d559b7a1a350b462004fde3fe56a697efd60c06b8f786405b3c96f331a51e4ed1e5f171429060b02727d16b8aeed7d5406bb05df755bd866a8fa7ba86d6b973 SHA512 ed797c1eb3ef11aa8732d81508d58d393d4f8ae09c863f4661d49d14974b23ed67abab564772b92600211dd7e58de62c3bc6074885270afba900cbe60542868c MISC metadata.xml 708 BLAKE2B 7b8f81297e6627f6d072cb45a58319f12879277a5b2f414b6f3b7d0c0bdbb0358cd278b6d35e1bd4b01a4185a4f227706a43f21874c0bd36e6ba124eb9cb05b0 SHA512 f4033f8bfeb926bfb4a3ad935988068ed53eff91e35cb3683df27c8d56f095b7873a66fcd2e56c79df434a51fa1796c265d9d89334d3538b4f6a9f42755089f2 diff --git a/net-misc/clusterssh/clusterssh-4.03.03.ebuild b/net-misc/clusterssh/clusterssh-4.03.03.ebuild index c121d86103db..cb2f2702720f 100644 --- a/net-misc/clusterssh/clusterssh-4.03.03.ebuild +++ b/net-misc/clusterssh/clusterssh-4.03.03.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -7,7 +7,7 @@ MY_PN="App-ClusterSSH" MODULE_AUTHOR="DUNCS" MODULE_VERSION="4.01_05" -inherit eutils perl-module versionator +inherit perl-module DESCRIPTION="Concurrent Multi-Server Terminal Access" HOMEPAGE="https://github.com/duncs/clusterssh" diff --git a/net-misc/clusterssh/clusterssh-4.30.600.ebuild b/net-misc/clusterssh/clusterssh-4.30.600.ebuild index bb6b7e86a265..e2aa81d7cfa3 100644 --- a/net-misc/clusterssh/clusterssh-4.30.600.ebuild +++ b/net-misc/clusterssh/clusterssh-4.30.600.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,7 +11,7 @@ MODULE_AUTHOR="DUNCS" # CHANGE ME AT EVERY VERSION BUMP MODULE_VERSION="4.03_06" -inherit eutils perl-module +inherit perl-module DESCRIPTION="Concurrent Multi-Server Terminal Access" HOMEPAGE="https://github.com/duncs/clusterssh" diff --git a/net-misc/connect/Manifest b/net-misc/connect/Manifest index 78eca85ae99c..a255e2958763 100644 --- a/net-misc/connect/Manifest +++ b/net-misc/connect/Manifest @@ -1,5 +1,3 @@ -DIST connect-1.103.tar.bz2 37980 BLAKE2B 5f7639c06bf1486e541003ced967c486debfacacde9701ae079fba4c41fd9c77e25c3140e6b0d52782f22912cfdbcfe59e882959b30910de55d0752ed5abb365 SHA512 6de32aa48171b1528abe12c1044e1d498cd10c3ef7b4652318402b7bc12bbb50ce0f9eab10408dc3cc26c1c0d56804bd088fbedae688f921c84c40d1aa0ae4d9 DIST connect-1.105.tar.gz 40778 BLAKE2B a54fdb5bc808311fb6b4c61e05fdc135db55b714c11ce64565e7e315988bc70b1b6b1c4f6857dc621b05f0434b9bed6e5507d5966e516d2ab444d5435eec05a1 SHA512 f49001043a8ffbda3823d0ea3640cc85536ce3d23302fd4d704d8a520f99271a2ed66fda11a5402382edc1dcf874988339ebcaf1d6335249a8dd2a8b4ae965a3 -EBUILD connect-1.103.ebuild 871 BLAKE2B ceeb5875db5cb34ca4c22e6cf3855f74bda7e4befd5af0e5215375d1e565ef83f86abec9e7dc2585bee7b34adfce5723c419e35bc07ee83096bfb7a0dd7eb830 SHA512 ced575df5881d3bf018fe8d46dfebd44cc7c26fc7292befe2f3d4946bf53cf1b1bcadf9ee86d1659eabf2c006bf5ef3edfc87349c4875da90a65dbfdb1b89ef0 -EBUILD connect-1.105.ebuild 516 BLAKE2B e8be9ff6081e16d98aa1de140adef8cff02d30f016962be9a342b5c1a614614bb6affc4fe2cee1e177baf9862ca205224d3a0e4cf600123cdf96c814c6090daf SHA512 b6d9e52b58006c6ff412b353b4000c19adf385f703588a5e1aa40e9f8eb11f91df9c3a0080f91fdf1417330b5638cbe5df5450cecc33b28ef5eae16e7fb50507 +EBUILD connect-1.105.ebuild 514 BLAKE2B b6a1f947bb509bdeb0a8db9b8d0e9095440cfab3ecd80cee1fb2885d6aba0c3220be39611164dcfd3e6ae22858739c9e9d5e58ba97fb23ba6132952ade259e77 SHA512 69d80217dec36456826f8aacc1d8dda9f35ea43d24086adbb4d9e02a066117430a63c810b0031632c28d2ae992f3fd4425aaf0c38159ca14faa07acecd8f8df4 MISC metadata.xml 718 BLAKE2B b8061c57dcf69174394046128800dd1a6b90a92d759064efa069d41979b8ff546d722a7fd5a98b623d5c5377204fa8e2067720add25588b0ab4a2bccc4912364 SHA512 f547257db8b2f63faadd14c7c87db691340859ea54d11385cc685d662e10f69644d997921635044b24470aee0b3ee74dafbd6df409499e4470808ad39dcda7b2 diff --git a/net-misc/connect/connect-1.103.ebuild b/net-misc/connect/connect-1.103.ebuild deleted file mode 100644 index 9db0c05615c1..000000000000 --- a/net-misc/connect/connect-1.103.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -IUSE="" -DESCRIPTION="network connection relaying command (proxy)" -HOMEPAGE="https://bitbucket.org/gotoh/connect" -HG_COMMIT_ID="ee1fbc21da4b" # bitbucket commit id -#SRC_URI="https://www.bitbucket.org/gotoh/connect/get/${PV}.tar.bz2 -> ${P}.tar.bz2" -SRC_URI="https://bitbucket.org/gotoh/connect/get/${HG_COMMIT_ID}.tar.bz2 -> ${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -DEPEND="" -RDEPEND="" -S="${WORKDIR}/gotoh-connect-${HG_COMMIT_ID}" - -src_compile() { - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c || die "compilation failed" -} - -src_install() { - dobin ${PN} -} - -pkg_postinst() { - einfo - einfo "There is no manpage." - einfo "Please see https://bitbucket.org/gotoh/connect/wiki/Home for details." - einfo -} diff --git a/net-misc/connect/connect-1.105.ebuild b/net-misc/connect/connect-1.105.ebuild index b1c4c97f5b62..60d98f7def78 100644 --- a/net-misc/connect/connect-1.105.ebuild +++ b/net-misc/connect/connect-1.105.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/gotoh/ssh-connect" SRC_URI="https://github.com/gotoh/ssh-connect/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" S="${WORKDIR}/ssh-connect-${PV}" diff --git a/net-misc/connman-gtk/Manifest b/net-misc/connman-gtk/Manifest index a231012916f4..c6fdea4f4ff1 100644 --- a/net-misc/connman-gtk/Manifest +++ b/net-misc/connman-gtk/Manifest @@ -1,4 +1,3 @@ DIST connman-gtk-1.1.1.tar.gz 61789 BLAKE2B d04d508b5bb03abe78c9b6734df919b6589cea9e7f38c41059210e62795ce79a17b6ba8b3ab1b0c403a43fa2712893bc0d00b1e5f15d9910ca45108b9e760e12 SHA512 78fd41a37370c76f118e3fb8a707b96fd6bf1234a8832d047302d4b0fa350f87316f6e2e749860b2cdf0ff6e6eb76e4d7d398dc7fc084403ca2f8682d2907553 EBUILD connman-gtk-1.1.1-r1.ebuild 927 BLAKE2B fc25ac4b73cfa12a5d15aad10e12beb342e915bb1fbc24e7416cd8624ab7edbb7438a80fcd246b77db1b8f2a2fe24a75164ebcde712ece59e754a634566f0a38 SHA512 fe7ec89bc2bd316defdab51bd58bbab03828c5442287ccb578531784a6231811fc38ca1aef7d480790b9deb75d0d62c37e34a2103f28fa6f7256a5387f102c0e -EBUILD connman-gtk-1.1.1.ebuild 939 BLAKE2B fbf8d281f22cbddfcac61b734121df5479d89e3c4c8027751d49d5bec9cb835a9afa81143cea2986db16ca44e0567ba618898d85be6be070ea66f5e462211aa6 SHA512 628b59ca685ec0d8007fa244cf893f7b05ba44e89ad1d10f5cedb7ae9b02a58ebf3151f0dd2e2f532bf8d3f429f75f5d31651dea086257450756bb40270f5296 MISC metadata.xml 488 BLAKE2B d55fe987103c9440307fc9db557cbb4c6add9b960e642b0d6f5735aafec2a29156a0a4ca6d51bb71c4e238bd897430e4e4065383b88ffde803bf53aae99d1314 SHA512 f84f35958b032afd49633c59fac3474148d01becdf968d62747c8a2d99aeec4f90cae7242b7f7fc00cee2903a9188bdc206308a7d692e136317959ebf9019867 diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild deleted file mode 100644 index 0d2c795e54fe..000000000000 --- a/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome2-utils - -DESCRIPTION="GTK GUI for Connman" -HOMEPAGE="https://github.com/jgke/connman-gtk" -SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="openconnect" - -CDEPEND=" - >=dev-libs/glib-2.0:2 - >=x11-libs/gtk+-3.10:3 - openconnect? ( >=net-vpn/openconnect-5.99 ) -" -RDEPEND="${CDEPEND} - net-misc/connman -" -DEPEND="${CDEOEND} - >=dev-util/intltool-0.35.0 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - default - sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die - eautoreconf -} - -src_configure() { - default - econf \ - --disable-schemas-compile \ - $(use_with openconnect) -} - -pkg_preinst() { - gnome2_schemas_savelist -} - -pkg_postinst() { - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index 3a9b45e3ca8d..b4705d8c1b0b 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -2,6 +2,5 @@ AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d94863 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40 DIST connman-1.39.tar.xz 755688 BLAKE2B f18018a0c2b58a89e613dba70672c27631ecbb0c0e44c84fe4c9097753aaeb7b278cd3ab0bef9b5e1928c34ee90b287754356e525cc318ecb6347370ee3043b4 SHA512 5bec2830971e34966a7a3a40c505b8a14cf6fa639262d4f1eaeb38f5e602d7a234f7d4f2c4919517b0832664382389e20a59fdb027753cd20059a23589de1764 EBUILD connman-1.39-r1.ebuild 2745 BLAKE2B 78a55fff293c38a70f061c9b4af3dfc268a7c88e02cfd07d606ea4761716754f7b7aeb222e447bba125309c2ee11d6c340b69d4aef502d6a1b03a4c8be3d801b SHA512 f20d2d9062f30a56005815604a8435240a4d6202b7468121ac79750db0d554a42244f9a7793908e79419c0bef09910013fe6f318e4588c520910ad24d274179a -EBUILD connman-1.39.ebuild 2722 BLAKE2B 6c6022f6646f3bacb03f3465d7eed3cddbd383a6039186eee7640248b9b191097f8ecef126214ae0ed94bec9b4b154d0d2961c7e8c2b0b123e0fa3e04144a017 SHA512 6d6e451329ad138849252c257dc9b82bb92a23e90e700d43b2a6e48be72f05dd9e26191b32c6387bb780db0881d620b9a7cb745cfa36de2a418a994d80d6992d -EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da +EBUILD connman-9999.ebuild 2751 BLAKE2B 49d7e875a9ae05a837c328296539b0e22453d795609c257ef6783fc98e8319cfec57fa0837e1ee4373a74c81391f8fa1f7a573a776ba126ac7c073391a25001a SHA512 5a6f306112ec1d1110c78ee7abc12e8638b38e770a593672486175ab881f1c89e8f6d4c43e6e26c417971e2c212b4fe526d82d59811fa1b4b2ccb2fb567a9c50 MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f diff --git a/net-misc/connman/connman-1.39.ebuild b/net-misc/connman/connman-1.39.ebuild deleted file mode 100644 index d37b4b33e953..000000000000 --- a/net-misc/connman/connman-1.39.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -inherit autotools systemd tmpfiles - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" -else - SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ppc ppc64 x86" -fi - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://01.org/connman" - -LICENSE="GPL-2" -SLOT="0" - -IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager -+nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard -wispr" - -REQUIRED_USE="^^ ( iptables nftables )" -BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.16 - >=sys-apps/dbus-1.2.24 - sys-libs/readline:0= - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - iwd? ( net-wireless/iwd ) - l2tp? ( net-dialup/xl2tpd ) - nftables? ( - >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= ) - ofono? ( net-misc/ofono ) - openconnect? ( net-vpn/openconnect ) - openvpn? ( net-vpn/openvpn ) - policykit? ( sys-auth/polkit ) - pptp? ( net-dialup/pptpclient ) - vpnc? ( net-vpn/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.39" - -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 bluetooth bluetooth builtin) \ - $(use_enable debug) \ - $(use_enable ethernet ethernet builtin) \ - $(use_enable examples test) \ - $(use_enable iwd) \ - $(use_enable l2tp l2tp builtin) \ - $(use_enable networkmanager nmcompat) \ - $(use_enable ofono ofono builtin) \ - $(use_enable openconnect openconnect builtin) \ - $(use_enable openvpn openvpn builtin) \ - $(use_enable policykit polkit builtin) \ - $(use_enable pptp pptp builtin) \ - $(use_enable tools) \ - $(use_enable vpnc vpnc builtin) \ - $(use_enable wifi wifi builtin) \ - $(use_enable wireguard) \ - $(use_enable wispr wispr builtin) \ - --with-firewall=$(usex iptables "iptables" "nftables" ) \ - --disable-iospm \ - --disable-hh2serial-gps -} - -src_install() { - default - dobin client/connmanctl - - if use doc; then - dodoc doc/*.txt - fi - keepdir /usr/lib/${PN}/scripts - keepdir /var/lib/${PN} - newinitd "${FILESDIR}"/${PN}.initd2 ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} - -pkg_postinst() { - tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf -} diff --git a/net-misc/connman/connman-9999.ebuild b/net-misc/connman/connman-9999.ebuild index 937b54ecf834..9f5662b9ab43 100644 --- a/net-misc/connman/connman-9999.ebuild +++ b/net-misc/connman/connman-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -55,6 +55,7 @@ src_prepare() { src_configure() { econf \ --localstatedir=/var \ + --runstatedir=/run \ --with-systemdunitdir=$(systemd_get_systemunitdir) \ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ --enable-client \ diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest index d6ac785b8d32..b2f1d1137ef9 100644 --- a/net-misc/croc/Manifest +++ b/net-misc/croc/Manifest @@ -1,6 +1,6 @@ AUX croc-disable-network-tests.patch 813 BLAKE2B 305ccd0cbfde01e44bc89cc9bd5545134b02df4f91e217f4eca71cbc4b4c0f2fc908912f16b47fd4867c4472cfb861bc17263cf378106d7542a7ec78287a69f3 SHA512 f31578ac1530e20715a4be305a18245f201ea16514bb265c0b676d72190e3ac90d89d1e846e5bfb8199fc0e532ed56b890b7e2b1389834564686c7bb36fc2e46 -DIST croc-8.6.10.tar.gz 2756887 BLAKE2B 8c18ce57c470611d265ec3aa122380a24238c2f5cfe55837c4aec45577e882e888ee6595d4641acbde69c6bfb80d52f33f3d8471c262ef6dca143b3554ba879d SHA512 abcd71377c9f22376e901ceb08441c6b7ae1ae4aa444b1f52086ca06a78f3f33e8718a94829b12a49c34c17ee5fc4afa60370f02e423de37366eb7b713caded1 -DIST croc-8.6.11.tar.gz 2757822 BLAKE2B 3599c4a6bde17f7b7816c935a5de0d05269e64ecca27617b8f5b0d7510a53d0fbfec834f076f6cb68649e252abc91de1baa1c7127125937e7c2ffb59b0076cb3 SHA512 5ff0d84564f0979df850941dc6815841b18842e97b1ba448f8e2ada67ecb7e4a928a67a193b5d7b9b2cc0212cf7f9b48998a62d89df2635c526f2410257e3bef +DIST croc-8.6.12.tar.gz 2754360 BLAKE2B e8c9c3c724c542b051a49eddaac71242527dbaaf7efe3e18aa4097aca4be26195d4b1d8a8e688d87173791874026d5f183cb5f3b66a95f495745deacb821ef91 SHA512 36f69bb4b2a33d774141d082f06f702890add252f9ba2b1baf34c745fdca0832a9d1bd40684ed84a50c06b74dd363f71b06b86c7052540a346e603bf42deb1b8 +DIST croc-9.0.0.tar.gz 2744585 BLAKE2B 87b9cd6455cae18e422652f3633d1047f873ca86504b715af90740015fccb0f060fc2af94a5600b902f25dfd45ba1a285502ffc36065dc5f626925d02f4e14a3 SHA512 978085df85e813a9502ce15d9ece7f06718061ce3cc9a2274c5af0ac8a2db78b28c2bfeb3210361bb8c6011b91528bfcede6185a897c5a1a548356a434876f36 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765 @@ -26,6 +26,8 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3d DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip 20348 BLAKE2B 74a4be12412897c2b8a361023107469ba1ed86109b0c216d010621bfe5700fbaaf4622ad5ab4b2fc13fc0c6ce9c2e2f9d47cdcad2c3efa95c47baa879bf3f816 SHA512 4cad5f43527cfdac732d5a71f083ded5080cbb01cb16245616408bcd41c99dd89002813a83a69d2c2e8a3aa46434495b855d592046108713739b3e29ee0ca8fd +DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe +DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.zip 20977 BLAKE2B e9a9da9c1383fd4011c9d934467ce94b00b04cdfb58faa0a531fa4b71d956b45cc1e6b9afc9011a2dad60fadd3a0c1fce7eda5de1e6eeabd53cc9f541ed48029 SHA512 05a554dc62146f8251376ec07e521594941e6f7c0173fb0c0ca48e6d9e512a92a29e059acdce83a5a0af503c0391fee4bbab57d2e256efb44b1ac137bfae59c2 DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip 5985 BLAKE2B db4ca25a009754faf835ed02201c87cc04f82c3d3e9d4698d030984e2ba6eb557dd629d4b48005a44a87d6f333c573cc4b9465cd10456ba5af958a37dbeddc70 SHA512 9ad6acec3cd1b12d46279f0f7fd12d2216f53658eea4181d0331a9c2de4d8e5c7ae5f095c4eb7c1c97a1d14b0f231f23c36ee52d92708eb3dcdfdd4cfefe17c8 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 @@ -42,14 +44,12 @@ DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod 42 BLAKE2B 28d1441e2d219c81 DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip 4494 BLAKE2B e17a498a1c54d88a2e98483c52efbd8e0150a728c299e0bb0319ea820cc50276e5f2727c549a126d3094efe9a889adcdc2862286f19fcb870abe8a9157fac4ee SHA512 25f1fde274a499c5ade50061cbb5727f2798158b1547092b298d36b89ed0efcfe84b727e20a3dc980b1f9fcaa1a0dc07f8e0369155df11bd5f76b8fffbb32a64 DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod 72 BLAKE2B 5f5815449eb44d202f99b7e2168a08000eba8b70f3b669190d8ebd8d485adada71049cacc71b6e72931d45284565b816597f995e16858b2fd0a2eef2cd815c7d SHA512 eaedd08e8235f2a61d8e3c8e342b1773d2d687351e715adc8ea13d1e49511d16c6f8d5510bba5ffcb9d295a64813d21214e6d55dadcd1c8686f9c3320a9d2511 DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip 21717 BLAKE2B 611144d8f187db3a63bf6c8dce9b2b4752551c412a5228c4d52c7f24cc65336b95e6d2ffb8f20baf50d0ebf90ae77998c6ec6c5618c0fbebf5b312a7b26be892 SHA512 bac0d4ffb2e4bb0dcdcebdd5d651984dc9b1be639a7de249b1ba47bd66d7d4f0aad3ae7b9ba9ea6ba032204e543feb3b83b77e86e7a5de295f2fd06a0f8876b9 -DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.mod 256 BLAKE2B 70fa2325354dbce5bffc6b0b1a3f29e49177ce84dd79d6a3aca03178b0d79cf4630c856d127e43e66409a25db33b432a33bdc956e1da9de0d53b1c4e3d369b50 SHA512 ff7c7c934293393d8d60cdc02f35f015b5967483458417087771cff837798d44d0e1b7b79829dd97473169c042597cfda2d72865a8ed38a9181e2ae5f4fb5175 -DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.zip 7866 BLAKE2B f464e721e0e0d5858947c7fed35937490bc07107c7f4da81685450507cced82dc839c6c34a94da20ba1293c6c28c0d126d5383be30b73bf3fa05f767cfba29bc SHA512 ec238972ad1f967423a43e58b5758c0b064a73d7642fb2dec084540f9fb13d321e03144ab88ca0a0ed6f70ea35bf8a0448b0e838dd66bcb6d15e63e86f9c4b4b DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.7.mod 256 BLAKE2B 1073924c937ba65c2f09f8245fe8563c2a4d420c47c5e2e960cc73c4a9c4c8071075f057da4546423928b421f790d29ade8dccc461290a7a798fae5ffcd3f2e1 SHA512 49638a21af6b9b81810d117e6b2a35c411dfcd38cecb164cf8abba0ab22c19b2cf2bdd975c617625dc03892d12a13697462368345a2d3acd40427946e79d8168 DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.7.zip 7821 BLAKE2B 689b5064287a3a4f1e91f53cc68c8dd02b7bff9c834bc60d93ccef9d4accd4e7c1a75550c9bf0f71c5d22888c6d8e85b2ff890c030ad8a051eaf8e160e94066c SHA512 4c82e3e8a8a88d879b8f4a30b7875ba6570b66c9bdd0804635b3ef151f3313fa9ae9bb98a52be07a1795b3295564b66330e1ee28ac64c6d8b8407fafae426675 +DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.1.mod 200 BLAKE2B ac3886b13c5b45725a8b53e9f8c03b577cc1ade1d81947bc441e28d107b0cb402621def301c3507ffbae3ad822af7f04307794e6b215209ab12ccc30b0d35b39 SHA512 01d5e9bb9869ab766d61ab82cd383eeabef10b7f93a708271824958ce4f2cd6fa1140b21065809b0141c795c025c22f04501cf8874804a1fa3445ad722e42a13 +DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.1.zip 11583 BLAKE2B f1e557e34acd31eda481a39b053211bd581dd64019afe305c236886970cdff4489825e5823e28f83fbe7c0bbaa4229bc14714fb28d00d3023acfa8f9247bc804 SHA512 3fa8341a5e534baa4b4cde61df068e67db65fdbadc3bfb48bed3fabea3d6acadfa04dea950286d8a1778a18afa2b09564948f53b8da65e8b58481d2baeebbb60 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod 216 BLAKE2B cab544fefb07749635d4f00451aececdb02ee3f24a08762f5ce2af7ca356693b2dbadd1190fae5aa0b67564d34faa5afef9882ceffec4389c2ab26b6e5da70c2 SHA512 4ebaa50c73558c972222a6c44f768442542ceef31a1b4372df732b6c634443cdda8dc6ab8e468a53380a4323e05464b995364109ae9f17e215ca2eb55f0b5665 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip 9036 BLAKE2B ee36c5c39df2e10c28c6caae3b40c876ab88fd314dfe65809f92914429156cf87eafb0f9709df8a6b9ca45427a69dc62d03591c4d3da00376c4065617f44799c SHA512 a1686577f23bdc2121197742103a4c35685e3aaf4251ee26e2352f830a1244eaaeceb859cba23410a1a12d6d59e9f62b03cd8aeaf287d10c59db6c784d51ac68 -DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.mod 595 BLAKE2B 4ceea6efaabfafc1a238f78594f360363d397d4beb9c80d449846c86955c1c40285c96fe25d6f0366fdc87ac7eb68b298271942f77c5c52ee89e192953c2f3f6 SHA512 8abe6f306b6c74794742ff4047bd70e18f3f14d5361ea91f1abbd398afda445703a5d35ea190893d7499646190bf1ce7345fab4c824b6c73a968d341b8a2af08 -DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.zip 606537 BLAKE2B c3f9914f228fc1aaefe3e3ec2a004b1284609a07b7a9099817d9bf3a2636a727c79f4acba55f2e2b33a649765b169af27940a6b821e34aea5a9f6339d2ace052 SHA512 e836b9b16a809843b69d5944088163a53520eef0edf6dc2156165e92ff5bb12bd46e7b30f54570d0e119a99fde22793c0a2d4b87bee59a566b7f07bfacca12e9 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.mod 595 BLAKE2B c96dbd7220e3f018eff0feacd44ae0330edab515a8f5d8b8be1e2e65f429e6b9927a38425f0629ceac2a812773dbf9feeae5c37302e120b4d4bd6ed698d09e16 SHA512 29ec96afa5026e9b5238db5fe506979ae88689e25bec6e76a6acb7d9ef79e6126a642c0ccc11594ac5746654dcfa0104470b99a60068efea44eb01c247265f55 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.zip 606458 BLAKE2B e22a5c544a46b42aff8cdcd1fee43531d63ecd13a25b2b876004ac754c117ade1599ba14b180732361f045a13c31056db84451e98d68cacde7e285e3c86ffc99 SHA512 4548ec4cc5645c7ffbf0eba82a31512711b57368c408aebf884a314a6dfd49035f3e6391fbe526194357ce11c0ac717fd7f1d45a308832dad47e6862b1bcc8f7 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3 @@ -63,36 +63,44 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b0 DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod 32 BLAKE2B 714a7fdeaaa7ea25dedf0279e7edc1939ae954f9214851f3b8ca0baf2be779b323f79dcf86c34026dc48a9c12f448d5b70f0088292a0f5d7e77706eccd7167df SHA512 dbf23e08092d028c7f03935ddf3e1f63b2ab16781d713f1339a0dfd1199217e80e01a4183f1b18c25db99077b9f059baee8016ec069cac6252839f79008ad09f DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip 72830 BLAKE2B 5ce514604ab22c4d54b49be8b79448ccd2218c7d189acf746b74b2bf6869ff3dc74a99306b89bc7ee198cb78f717f05640ba6ca365c5f54b999730283354e4eb SHA512 72c9fdf871d60349e2dddc1dc70ba27b22632b0f0f992e7fa53ac89fdb7daf952fe5ac2c2a93a3875ca036cb7f14dff7c555267468fe9f533901d3766ee674bb DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip 1864871 BLAKE2B c621f8aecb2a2732dab3954a1c74d8d657ce336ae195a1c81f2e4521069a8afa0e60e1e204460b922474dc17ea02ea5f5a7cc08902bb2da49ee7a4cb0e4e9d48 SHA512 3a80bda483d8e3b8297b09d97c2a199b132d4f932485fd30020ee3c9fe9ad08c1d2793a3cdd749f3d2731815713bdfa40c6a50234ff991392db7475d2c45abe2 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210314154223-e6e6c4f2bb5b.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210314154223-e6e6c4f2bb5b.zip 1864817 BLAKE2B f7eab8f9a16d94b5b316e1fa7ffe9c08bff170cebec2180e437100ebd0e8b3ea13c968a10c26ca8767f06c0a7025253d5883ca5394d6cb88888ca4e4eaae43b5 SHA512 34329ca71445a969301f1b1642db533ae0cad01d00c4071fb7a2dafda152c398e39faeb4f3e1f684d9e087024cc6155705990e38e6fb5a5c4dc87987e1bdd859 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip 1864784 BLAKE2B 6e21ae64d3917f37cc233bb3d63c25149182930d022ff1e70bfc50ead953f49d6fd434405b9c1a4ad5b31ea39471b0a9ae6a0093b53d8b7e6cc1e88a34a45544 SHA512 f7077f2cb6f051911f8d97449b22ca79679c5f8e0a29c3c438a4f4bad25fdc58dbfdb9baa32b008663059bf9054cb9ec029215262559fc655f05a413b7214bd3 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.zip 1865333 BLAKE2B 58893c3623e8ae23e9dbb28cfbb4faa45b949b640489e5e8e677b52292afd272da6075d5a9f532fe6089412ea0324b87db31c7bbb5831c35fc817a11892a2aba SHA512 ee1b82519e67b583b967d7426c0a4bab55253039259dcb1ac9bd053a16623a9fe9e9a491e5c540499e69bd20b1f05c2ff4a31e3dd5f8da175ead4b784bb8dc90 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210315170653-34ac3e1c2000.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210315170653-34ac3e1c2000.zip 1586988 BLAKE2B 0a73047c15bec39e2b1f2cd899f47507d28a26690e960089e77653409f31896536fd292e5c08e385351ec2425d4beb81b4beda3353432c49df4a66cfe8396c4b SHA512 0b8b1868ec897be3ce309249bf8b0c8152f2d8d8a3be6cc53fb25f8b432aaee85cf3b2cff984129fcfc73f61fb15a6eb67b3da3e1eb8696d17d17f02c9bd56ba +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210326220855-61e056675ecf.mod 179 BLAKE2B 3cd215496f02ebe2d6fcafc76ccb7e3438b1d87b9744991c1361967a18a972d32cdd6158391a4542e0d5ba6e943f4c381ba3a2c7e2cd3361eecb319401a49538 SHA512 6cd10dbbcb568d08e073e868c64c6e7ffff044907e4d239335ad90843c060fcf1311174ed2afb27c106072a030783f11b9df666e61d476e650a38254067cd0c5 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210326220855-61e056675ecf.zip 1577897 BLAKE2B dab942bf967f8c0e2f43069678dbcb18a98b52192ddf453cb013b9800a8f9abc141f216f2c889423136a145df64aae73a5c3ff328b22924706535f45c5c68c06 SHA512 bfd7ac85148191551e5113c91a87f623c07504b2363a8240b245abeffb86e41f04b0e869990573d545c0aa1ba0f106942f7c70f2f3259b5012a1089454442dc6 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.mod 179 BLAKE2B 1d41797e9cd238f294cd4d01f3115a496d72952d4aa92116e99de7fef6d5881b8e532e4c419c36dbd58a04e4cfd27c814936e5b51ca99f47c9bee8578eb9d71e SHA512 ea5604f4e47cf196e4ab474016327b04c27aab3ef394d19f15a0a34d763f659c1764dea0554de8afbc9ec28168681f1ea1e03a6ef64fc1355f0e0d7c4ef709a1 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.zip 1565776 BLAKE2B eb0064f562896b0e6ae48369150c663f66ed93ced8d05f355e8c6ad7d53b9e6b7f4b1ff5d4c0dfb6a7e5b23e6344a90e9e02304ece8d669578d56bfa9517d27f SHA512 dae90ddd392edd9d13a21e183c1cd1e8ab37c595172612f499dd264a599cd9ea191e5a84a7ae4f26baca2615c6bd18671a63b9844dd4b84a5af13585582b3fc9 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.zip 1672831 BLAKE2B 52abdc9448149a1def99bce77eaddb2481897636fe2181488ada584d15e4a6703f8f27447ae1cc2e8fa345f7f4e78d7d918032c3fbd40a83b2b66d65c9b95143 SHA512 6efa521056d306ce6ff9b135942b1b36515bd69d0481a729dfd78a1c0a7136ca65972d38a4d0df7962a6f1ec950186bb8ce58f5032567cf98c600803ff8ac5f9 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.zip 1673533 BLAKE2B 5dd8dd215ba0b2a410212363626a6e3c2d5a738cdd1c46563bdecb222487e412ff7faea05688f5b3670adafab867148bdb64ceef59ee4150b9be94f26836892e SHA512 e9880a3401a20f4e8e0304af6fb1f23aea07a06c32673a5ad8c41107bce3d5ef019614d3acf475484e27c5b60f07c6f951b6638adf7edd7adfc1c95b6337bf46 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210326220804-49726bf1d181.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210326220804-49726bf1d181.zip 1668182 BLAKE2B 440c37f0ab39f135383144e47e8d8ff90a2fc0e3e954d4dc0a12901150dded88e7351463e7c18ab03c08d9109e423408512cebe23d73cc2ed059bb02ef90b35a SHA512 a36f0fa5c69c3d85c569a620afac989fdb293d24235d5536b4095dc8eb44c1a89cd5a1f666d42bfe490c14c8a1d89168f4cd98e91c0b8a2d9d49055e41a371e5 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210415045647-66c3f260301c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210415045647-66c3f260301c.zip 1668770 BLAKE2B e071f99a42996d0a84bf57f5f7c3d081d85dc97f64fc952c796323c76745b55bf9d7edbea2ffd7fe8598c8e69eba540c6fbe6df56fc1c21bc6db3fde2b0df17d SHA512 fd719c0cadd011e001a94453e97d496b5daea4afcc95a7747dd090bbb4cc38ceb5262f7183800adda7791aaf75206831cbe60553faf4f950706dcf8336136967 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 -DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 -DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip 23402 BLAKE2B 03ef6b566c4f9539fe7310adff76e37bac4e3aaf32559f1a228690195207530ff68ad1179b22594cb7a62f9dcceb41631452052eb8bdab852848ffa1e19c0fbb SHA512 3aaf366b00d38d9dfe1ab23a0c6df05e2fb586f44470ec9b7cc59fc113cc68567a4102352b4a416da137df619b44c61e28042124cebcc525e3c6ebf10f8fbff2 +DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 +DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip 23415 BLAKE2B 7b67ba682ce566564d78910a6854418708f329ee424c922ad8c8082df64a4ac3f643647fe235e64340f91364005d361c398c19c546faba0db070ab4da7b52a05 SHA512 390acf2a26428b88b213f16d28860c00f2255ee49a1d516e044c5ce51cbcb01545d10dd5868dba88c7aee5381ec07c68fb62a9e391eacf1a26ea4c318356175d +DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 +DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.zip 22672 BLAKE2B e36e6cfa566c936219702eb086d6fe20936dfd57b58f7643331b116b63dfbfd40e679794d453b9a4c5952d5523a52dc6538ea05466e6a291f9d1240d3a2381c6 SHA512 9dca218e749d2a405b7d7bdc29ce1a3219e5f965103a7cccd5468c861262539c0c13212b28059d27937a9b39ce0e16dff386f92a31b62cb23f3dbb52bf992660 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip 8609319 BLAKE2B a4459cdb830dd5de499cab9b0a37afa88f0cee1b3733a9d765a6693eea89fa5f7b2aafd9f5b27405c9bd38f27f715ef311845e52d3dedbcbf2ba020a04334898 SHA512 f40c677e92a896b7158f0b3ddb786e670a954fff7d981be3e0d3bc6d789d4f069174273050a0cedb8e2438d780e6950e027d84a2e2d64b7936e61edc613acd36 +DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b +DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 @@ -102,6 +110,6 @@ DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b5250 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8 -EBUILD croc-8.6.10.ebuild 5551 BLAKE2B a0d53a25e9d01b975942147fb64f80415b348d0b776f9ac36769efce4cf27594f954a3fea262a8251b8130db932dc259a1ca960a23eb6153137401d1793a5122 SHA512 95036477bad3589ad50af5571d0ff0cd6cd9b6eb94d3bb982267b89f80f6e972c09f16ff86d51fe572bb254da70f55ce8c396170bf7a542c8d790d3c832d640f -EBUILD croc-8.6.11.ebuild 5612 BLAKE2B 18ce07b68186649de78c5cf8b805d8aecbb63584b9ece77c49826779d581736234b6ebd2083f7d8df98fae1f3d2a597901b1b80ed53ca80f64b08f7c88852463 SHA512 2aa66e12e684fcdd81a5b3e3777a33191a0b9718a56a72dbdbcb8e7551ed29f62e789d6b2b2ca1b7338254152d8eec1b1e55e61484dfcc8033abc9e8cfa46318 +EBUILD croc-8.6.12.ebuild 5802 BLAKE2B cc8125c39f431fa4f4bd8c79324ac029b7f23f8fe43a881f7f11aaf2fbca4957ba54c758c2066b572118e474299e1fae389bfb9cf67f4e9ec0dbf4fbf12a3d4a SHA512 050dd004f3283bc904872fc498908757eceea3344e4d6860771931c2fb0b4da9c4ef07760322ba93d872de045fa1c46140586986a84cc8fa09ea9fd92c28f75c +EBUILD croc-9.0.0.ebuild 5785 BLAKE2B b781c40d169c8c0d1471c69f328b377d4f7ead9be8ea40e13d9d989efc12a2cc4f8ef0410020003fc858f4dad4da5f4e5b227ebc172356dbe5bae13f50609d05 SHA512 afa0e4a59a7084b058a3849f6c299977fe75d7615a94597628113f2453648ae2139877f9edc337642ba50d60c4123aa5cb677457bd121d1d324503d10e930755 MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91 diff --git a/net-misc/croc/croc-8.6.10.ebuild b/net-misc/croc/croc-8.6.10.ebuild deleted file mode 100644 index c2779660e2bc..000000000000 --- a/net-misc/croc/croc-8.6.10.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 go-module systemd - -DESCRIPTION="Easily and securely send things from one computer to another" -HOMEPAGE="https://github.com/schollz/croc" - -EGO_SUM=( - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/OneOfOne/xxhash v1.2.2/go.mod" - "github.com/OneOfOne/xxhash v1.2.5" - "github.com/OneOfOne/xxhash v1.2.5/go.mod" - "github.com/cespare/xxhash v1.1.0" - "github.com/cespare/xxhash v1.1.0/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0" - "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/denisbrodbeck/machineid v1.0.1" - "github.com/denisbrodbeck/machineid v1.0.1/go.mod" - "github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod" - "github.com/kalafut/imohash v1.0.0" - "github.com/kalafut/imohash v1.0.0/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/mattn/go-isatty v0.0.12/go.mod" - "github.com/mattn/go-runewidth v0.0.10" - "github.com/mattn/go-runewidth v0.0.10/go.mod" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/rivo/uniseg v0.1.0/go.mod" - "github.com/rivo/uniseg v0.2.0" - "github.com/rivo/uniseg v0.2.0/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/russross/blackfriday/v2 v2.1.0" - "github.com/russross/blackfriday/v2 v2.1.0/go.mod" - "github.com/schollz/cli/v2 v2.2.1" - "github.com/schollz/cli/v2 v2.2.1/go.mod" - "github.com/schollz/logger v1.2.0" - "github.com/schollz/logger v1.2.0/go.mod" - "github.com/schollz/mnemonicode v1.0.1" - "github.com/schollz/mnemonicode v1.0.1/go.mod" - "github.com/schollz/pake/v2 v2.0.6" - "github.com/schollz/pake/v2 v2.0.6/go.mod" - "github.com/schollz/peerdiscovery v1.6.3" - "github.com/schollz/peerdiscovery v1.6.3/go.mod" - "github.com/schollz/progressbar/v3 v3.7.4" - "github.com/schollz/progressbar/v3 v3.7.4/go.mod" - "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" - "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" - "github.com/spaolacci/murmur3 v1.1.0" - "github.com/spaolacci/murmur3 v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094" - "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod" - "golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83" - "golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod" - "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110" - "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" - "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" - "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" - "golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod" - "golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b" - "golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod" - "golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod" - "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" - "golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod" - "golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d" - "golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.3/go.mod" - "golang.org/x/text v0.3.5" - "golang.org/x/text v0.3.5/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/tylerb/is.v1 v1.1.2" - "gopkg.in/tylerb/is.v1 v1.1.2/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" - ) -go-module_set_globals - -SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=" - acct-group/croc - acct-user/croc -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-network-tests.patch" -) - -DOCS=( README.md ) - -src_prepare() { - default - # Replace User=nobody with User=croc - sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die - # Rename bash completion function - sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ - src/install/bash_autocomplete || die -} - -src_compile() { - go build || die -} - -src_install() { - dobin croc - systemd_dounit croc.service - newbashcomp src/install/bash_autocomplete croc - einstalldocs -} - -src_test() { - go test -work ./... || die -} diff --git a/net-misc/croc/croc-8.6.11.ebuild b/net-misc/croc/croc-8.6.11.ebuild deleted file mode 100644 index 1a1cfe1b063c..000000000000 --- a/net-misc/croc/croc-8.6.11.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 go-module systemd - -DESCRIPTION="Easily and securely send things from one computer to another" -HOMEPAGE="https://github.com/schollz/croc" - -EGO_SUM=( - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/OneOfOne/xxhash v1.2.2/go.mod" - "github.com/OneOfOne/xxhash v1.2.5" - "github.com/OneOfOne/xxhash v1.2.5/go.mod" - "github.com/cespare/xxhash v1.1.0" - "github.com/cespare/xxhash v1.1.0/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0" - "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/denisbrodbeck/machineid v1.0.1" - "github.com/denisbrodbeck/machineid v1.0.1/go.mod" - "github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod" - "github.com/kalafut/imohash v1.0.0" - "github.com/kalafut/imohash v1.0.0/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/mattn/go-isatty v0.0.12/go.mod" - "github.com/mattn/go-runewidth v0.0.10" - "github.com/mattn/go-runewidth v0.0.10/go.mod" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/rivo/uniseg v0.1.0/go.mod" - "github.com/rivo/uniseg v0.2.0" - "github.com/rivo/uniseg v0.2.0/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/russross/blackfriday/v2 v2.1.0" - "github.com/russross/blackfriday/v2 v2.1.0/go.mod" - "github.com/schollz/cli/v2 v2.2.1" - "github.com/schollz/cli/v2 v2.2.1/go.mod" - "github.com/schollz/logger v1.2.0" - "github.com/schollz/logger v1.2.0/go.mod" - "github.com/schollz/mnemonicode v1.0.1" - "github.com/schollz/mnemonicode v1.0.1/go.mod" - "github.com/schollz/pake/v2 v2.0.7" - "github.com/schollz/pake/v2 v2.0.7/go.mod" - "github.com/schollz/peerdiscovery v1.6.3" - "github.com/schollz/peerdiscovery v1.6.3/go.mod" - "github.com/schollz/progressbar/v3 v3.7.6" - "github.com/schollz/progressbar/v3 v3.7.6/go.mod" - "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" - "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" - "github.com/spaolacci/murmur3 v1.1.0" - "github.com/spaolacci/murmur3 v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094" - "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod" - "golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b" - "golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod" - "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" - "golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000" - "golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" - "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" - "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" - "golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod" - "golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod" - "golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005" - "golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod" - "golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod" - "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" - "golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d" - "golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.3/go.mod" - "golang.org/x/text v0.3.5" - "golang.org/x/text v0.3.5/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/tylerb/is.v1 v1.1.2" - "gopkg.in/tylerb/is.v1 v1.1.2/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" - ) -go-module_set_globals - -SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=" - acct-group/croc - acct-user/croc -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-network-tests.patch" -) - -DOCS=( README.md ) - -src_prepare() { - default - # Replace User=nobody with User=croc - sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die - # Rename bash completion function - sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ - src/install/bash_autocomplete || die -} - -src_compile() { - go build || die -} - -src_install() { - dobin croc - systemd_dounit croc.service - newbashcomp src/install/bash_autocomplete croc - einstalldocs -} - -src_test() { - go test -work ./... || die -} diff --git a/net-misc/croc/croc-8.6.12.ebuild b/net-misc/croc/croc-8.6.12.ebuild new file mode 100644 index 000000000000..4820f7d818b7 --- /dev/null +++ b/net-misc/croc/croc-8.6.12.ebuild @@ -0,0 +1,149 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 go-module systemd + +DESCRIPTION="Easily and securely send things from one computer to another" +HOMEPAGE="https://github.com/schollz/croc" + +EGO_SUM=( + "github.com/BurntSushi/toml v0.3.1/go.mod" + "github.com/OneOfOne/xxhash v1.2.2/go.mod" + "github.com/OneOfOne/xxhash v1.2.5" + "github.com/OneOfOne/xxhash v1.2.5/go.mod" + "github.com/cespare/xxhash v1.1.0" + "github.com/cespare/xxhash v1.1.0/go.mod" + "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" + "github.com/cpuguy83/go-md2man/v2 v2.0.0" + "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod" + "github.com/davecgh/go-spew v1.1.0/go.mod" + "github.com/davecgh/go-spew v1.1.1" + "github.com/davecgh/go-spew v1.1.1/go.mod" + "github.com/denisbrodbeck/machineid v1.0.1" + "github.com/denisbrodbeck/machineid v1.0.1/go.mod" + "github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod" + "github.com/kalafut/imohash v1.0.0" + "github.com/kalafut/imohash v1.0.0/go.mod" + "github.com/kr/pretty v0.1.0" + "github.com/kr/pretty v0.1.0/go.mod" + "github.com/kr/pty v1.1.1/go.mod" + "github.com/kr/text v0.1.0" + "github.com/kr/text v0.1.0/go.mod" + "github.com/mattn/go-isatty v0.0.12/go.mod" + "github.com/mattn/go-runewidth v0.0.10" + "github.com/mattn/go-runewidth v0.0.10/go.mod" + "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db" + "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/rivo/uniseg v0.1.0/go.mod" + "github.com/rivo/uniseg v0.2.0" + "github.com/rivo/uniseg v0.2.0/go.mod" + "github.com/russross/blackfriday/v2 v2.0.1/go.mod" + "github.com/russross/blackfriday/v2 v2.1.0" + "github.com/russross/blackfriday/v2 v2.1.0/go.mod" + "github.com/schollz/cli/v2 v2.2.1" + "github.com/schollz/cli/v2 v2.2.1/go.mod" + "github.com/schollz/logger v1.2.0" + "github.com/schollz/logger v1.2.0/go.mod" + "github.com/schollz/mnemonicode v1.0.1" + "github.com/schollz/mnemonicode v1.0.1/go.mod" + "github.com/schollz/pake/v2 v2.0.7" + "github.com/schollz/pake/v2 v2.0.7/go.mod" + "github.com/schollz/peerdiscovery v1.6.3" + "github.com/schollz/peerdiscovery v1.6.3/go.mod" + "github.com/schollz/progressbar/v3 v3.7.6" + "github.com/schollz/progressbar/v3 v3.7.6/go.mod" + "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" + "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" + "github.com/spaolacci/murmur3 v1.1.0" + "github.com/spaolacci/murmur3 v1.1.0/go.mod" + "github.com/stretchr/objx v0.1.0/go.mod" + "github.com/stretchr/testify v1.3.0/go.mod" + "github.com/stretchr/testify v1.6.1" + "github.com/stretchr/testify v1.6.1/go.mod" + "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094" + "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" + "golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod" + "golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod" + "golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2" + "golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" + "golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod" + "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" + "golang.org/x/net v0.0.0-20210326220855-61e056675ecf" + "golang.org/x/net v0.0.0-20210326220855-61e056675ecf/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" + "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" + "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" + "golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod" + "golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod" + "golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod" + "golang.org/x/sys v0.0.0-20210326220804-49726bf1d181" + "golang.org/x/sys v0.0.0-20210326220804-49726bf1d181/go.mod" + "golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod" + "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" + "golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod" + "golang.org/x/term v0.0.0-20210317153231-de623e64d2a6" + "golang.org/x/term v0.0.0-20210317153231-de623e64d2a6/go.mod" + "golang.org/x/text v0.3.0/go.mod" + "golang.org/x/text v0.3.3/go.mod" + "golang.org/x/text v0.3.5" + "golang.org/x/text v0.3.5/go.mod" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" + "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" + "gopkg.in/tylerb/is.v1 v1.1.2" + "gopkg.in/tylerb/is.v1 v1.1.2/go.mod" + "gopkg.in/yaml.v2 v2.2.2/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" + ) +go-module_set_globals + +SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + acct-group/croc + acct-user/croc +" + +PATCHES=( + "${FILESDIR}/${PN}-disable-network-tests.patch" +) + +DOCS=( README.md ) + +src_prepare() { + default + # Replace User=nobody with User=croc + sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die + # Rename bash completion function + sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ + src/install/bash_autocomplete || die +} + +src_compile() { + go build || die +} + +src_install() { + dobin croc + systemd_dounit croc.service + newbashcomp src/install/bash_autocomplete croc + einstalldocs +} + +src_test() { + go test -work ./... || die +} diff --git a/net-misc/croc/croc-9.0.0.ebuild b/net-misc/croc/croc-9.0.0.ebuild new file mode 100644 index 000000000000..346132b16e5d --- /dev/null +++ b/net-misc/croc/croc-9.0.0.ebuild @@ -0,0 +1,149 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 go-module systemd + +DESCRIPTION="Easily and securely send things from one computer to another" +HOMEPAGE="https://github.com/schollz/croc" + +EGO_SUM=( + "github.com/BurntSushi/toml v0.3.1/go.mod" + "github.com/OneOfOne/xxhash v1.2.2/go.mod" + "github.com/OneOfOne/xxhash v1.2.5" + "github.com/OneOfOne/xxhash v1.2.5/go.mod" + "github.com/cespare/xxhash v1.1.0" + "github.com/cespare/xxhash v1.1.0/go.mod" + "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" + "github.com/cpuguy83/go-md2man/v2 v2.0.0" + "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod" + "github.com/davecgh/go-spew v1.1.0/go.mod" + "github.com/davecgh/go-spew v1.1.1" + "github.com/davecgh/go-spew v1.1.1/go.mod" + "github.com/denisbrodbeck/machineid v1.0.1" + "github.com/denisbrodbeck/machineid v1.0.1/go.mod" + "github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod" + "github.com/kalafut/imohash v1.0.0" + "github.com/kalafut/imohash v1.0.0/go.mod" + "github.com/kr/pretty v0.1.0" + "github.com/kr/pretty v0.1.0/go.mod" + "github.com/kr/pty v1.1.1/go.mod" + "github.com/kr/text v0.1.0" + "github.com/kr/text v0.1.0/go.mod" + "github.com/mattn/go-isatty v0.0.12/go.mod" + "github.com/mattn/go-runewidth v0.0.10/go.mod" + "github.com/mattn/go-runewidth v0.0.12" + "github.com/mattn/go-runewidth v0.0.12/go.mod" + "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db" + "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/rivo/uniseg v0.1.0/go.mod" + "github.com/rivo/uniseg v0.2.0" + "github.com/rivo/uniseg v0.2.0/go.mod" + "github.com/russross/blackfriday/v2 v2.0.1/go.mod" + "github.com/russross/blackfriday/v2 v2.1.0" + "github.com/russross/blackfriday/v2 v2.1.0/go.mod" + "github.com/schollz/cli/v2 v2.2.1" + "github.com/schollz/cli/v2 v2.2.1/go.mod" + "github.com/schollz/logger v1.2.0" + "github.com/schollz/logger v1.2.0/go.mod" + "github.com/schollz/mnemonicode v1.0.1" + "github.com/schollz/mnemonicode v1.0.1/go.mod" + "github.com/schollz/pake/v3 v3.0.1" + "github.com/schollz/pake/v3 v3.0.1/go.mod" + "github.com/schollz/peerdiscovery v1.6.3" + "github.com/schollz/peerdiscovery v1.6.3/go.mod" + "github.com/schollz/progressbar/v3 v3.7.6" + "github.com/schollz/progressbar/v3 v3.7.6/go.mod" + "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" + "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" + "github.com/spaolacci/murmur3 v1.1.0" + "github.com/spaolacci/murmur3 v1.1.0/go.mod" + "github.com/stretchr/objx v0.1.0/go.mod" + "github.com/stretchr/testify v1.3.0/go.mod" + "github.com/stretchr/testify v1.6.1" + "github.com/stretchr/testify v1.6.1/go.mod" + "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094" + "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" + "golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod" + "golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc" + "golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" + "golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod" + "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" + "golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d" + "golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" + "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" + "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" + "golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod" + "golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod" + "golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod" + "golang.org/x/sys v0.0.0-20210415045647-66c3f260301c" + "golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod" + "golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod" + "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" + "golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod" + "golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72" + "golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72/go.mod" + "golang.org/x/text v0.3.0/go.mod" + "golang.org/x/text v0.3.3/go.mod" + "golang.org/x/text v0.3.6" + "golang.org/x/text v0.3.6/go.mod" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" + "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" + "gopkg.in/tylerb/is.v1 v1.1.2" + "gopkg.in/tylerb/is.v1 v1.1.2/go.mod" + "gopkg.in/yaml.v2 v2.2.2/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" + ) +go-module_set_globals + +SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + acct-group/croc + acct-user/croc +" + +PATCHES=( + "${FILESDIR}/${PN}-disable-network-tests.patch" +) + +DOCS=( README.md ) + +src_prepare() { + default + # Replace User=nobody with User=croc + sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die + # Rename bash completion function + sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ + src/install/bash_autocomplete || die +} + +src_compile() { + go build || die +} + +src_install() { + dobin croc + systemd_dounit croc.service + newbashcomp src/install/bash_autocomplete croc + einstalldocs +} + +src_test() { + go test -work ./... || die +} diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 9992dc7e3a79..a344fc9d0d3a 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -3,7 +3,11 @@ AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 DIST curl-7.74.0.tar.xz 2400972 BLAKE2B bef9e01493994afc933549a78b41065708aeaa9f6f5cdd1dbf2f43bbb03bbc97b17308b8bda5f11599c3cc0c6c77903e6fa6f1310ff874fad902a59566b51e8a SHA512 5d987f0b4d051c9e254f14d4e2a05f7cda9fb0f0ac7b3ca3664a25a51ee5ffe092ee072c0d9a613fcd3f34727d75bba14b70f5500cb110ca818591e071c3e6f4 DIST curl-7.75.0.tar.xz 2418816 BLAKE2B 74889ede1b57a6685eef0f504d4c261c0b271b36ab3290bfc895efe9a6fffe4bfd433eaae438cd2b54a920671a2ebc2ca5e73bd88f6be40b4f46ef281028f1d8 SHA512 4c2fc6658379b8b93dd50665b70f3000b63d3bcafd2df60b7e651a8edf4735b3decb06c338b84cb22058191aa9f8f4dc85760a42f9987210b59300758304b746 -EBUILD curl-7.74.0-r2.ebuild 8757 BLAKE2B 04230b4f348706178adc7d63a63c0b082eb46d1c5a9a7889af69d74fe32fed0308f736f7b87049470e41e2194d9c5277cd1ec7fa7aa21b6e1ba781a43df6f1de SHA512 8b57ee13c05d23b39e30c71383aaa2041f8603e5d46d78719dad303658573596bddd0a4fe9461d5d95fa9b8e90c6fba26d3e3874636dfa410eba8708d9c41d03 +DIST curl-7.76.0.tar.xz 2428552 BLAKE2B 7c02bbd3c86a5de38990f7ef63e92804fc02977bf34eb4372e7ac95aa091689094193bcf58e30d76114341f930777787cbfbbf83f02c5037f7ac7599296a6735 SHA512 a67e5078b48150c6f5331e76b25a6b197f1e916be1db900bf9455b032b3af5a71610b47e607546ecbae510d196a0cfcb75a14dac549288797af1701b7b587ece +DIST curl-7.76.1.tar.xz 2427636 BLAKE2B 56452871fbd998f0c9a5af86b3853ed1dfc956c39380e5da472b4f382db45926ac3aa9e395ae7d2812aac0f0f29bee28343218810a169beb592c5224e0a4f018 SHA512 5fe85d2e776789aa8117c57fe7648e375b7fa92d5ead5d69855f19ca9a2624d77a1f9ab91766ecb72bbc17e82862248cd07e48917884d6fd856b93fb00d83e28 +EBUILD curl-7.74.0-r2.ebuild 8751 BLAKE2B fe6c5cb4ed83d798928d6f8a32a4cf54a8e3ba05d9145519c347f86690d0334e741fc7b497468fcc569a4a848a27ae408a5c1cfb6f4cfcc1bad3d71b03f8c28e SHA512 35a6e766cd708a97b191e68566941a86253d180824ca29502d5f6c7438ddf849966a9aeb4682b03f1980d342670f82e33af70917115330423d55c36ed31af91a EBUILD curl-7.74.0-r4.ebuild 8113 BLAKE2B fbe25717bdfc5f72378663c6ca5d789ed804f9f781b681021fe673ecbc8b6610529f04e9a85651fef8b06c82a705c90733cd0b0f87f8a230ee542d0476127271 SHA512 80c82de586872712446702ddf9a69971f378ce253ea2511a07a6d0daad756254cc543a64e47034ed4e08099210b06fd2bb432e1269bfbdf62c53c55a9d526a5a EBUILD curl-7.75.0.ebuild 8131 BLAKE2B 2eea96c28eb050bbce674de4922484b0ee269e7a2da55d964596dead5efafdc9638e102abd7bbb1b59a26ece7f78aa77cbec2feca05ea5d08d6172c3367b62b8 SHA512 a87d56e727c0bf9d9cd819ca9c8290581cd4eda32c1e3f20804845122e7be0a49492aec395048604fc16f9110b0be0c7464528069f7c0a78882e124cbf5c24d3 +EBUILD curl-7.76.0.ebuild 8126 BLAKE2B 7c13dd8eebeb6f4faa739491cb472f2f51072fce44afc3f1bdcab4b89299ab0fc2db136d02f9fb8857da561174710271f15c37002c477ba356f1a6e669a8cc05 SHA512 c4691af18330e43d8526784e0e796bae9b8acd33acf72ea491d32ea08efabfb6e97f049563cd1516d1af9378a395963390f16964a2cd104ba6a186e353cb45b6 +EBUILD curl-7.76.1.ebuild 8190 BLAKE2B bd6a4893802cb9e87f6c09d59435d21c9775be528e29189fc7af812e7d94aa45533d7805e2f549e4690b9c262873b93cd59fb2b399f5ad0d298ab48c7d4828a1 SHA512 664dbb8eee706323ad8626777a71de2ca4004f7cc84c8c3574efac1def88dd96318a47147a3a028345d4759d3bba310bede25b85e1c27fc6f41305237184d5e9 MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052 diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild index 66fabfa2438e..8b9f7cd25988 100644 --- a/net-misc/curl/curl-7.74.0-r2.ebuild +++ b/net-misc/curl/curl-7.74.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit autotools eutils prefix multilib-minimal +inherit autotools prefix multilib-minimal DESCRIPTION="A Client that groks URLs" HOMEPAGE="https://curl.haxx.se/" @@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd" 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.76.0.ebuild b/net-misc/curl/curl-7.76.0.ebuild new file mode 100644 index 000000000000..dbfb4e71fdf4 --- /dev/null +++ b/net-misc/curl/curl-7.76.0.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools 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="curl" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" +IUSE+=" nghttp3 quiche" +IUSE+=" elibc_Winnt" + +# c-ares must be disabled for threads +# only one default ssl provider can be enabled +REQUIRED_USE=" + winssl? ( elibc_Winnt ) + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_winssl + ) + )" + +# lead to lots of false negatives, bug #285669 +RESTRICT="!test? ( test )" + +RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + mbedtls? ( + net-libs/mbedtls:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + openssl? ( + dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}] + ) + nss? ( + dev-libs/nss:0[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + ) + http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) + adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + 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}] + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" + +# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 +# rtmp? ( +# media-video/rtmpdump +# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) +# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) +# ) + +# ssl providers to be added: +# fbopenssl $(use_with spnego) + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + test? ( + sys-apps/diffutils + dev-lang/perl + )" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch +) + +src_prepare() { + default + + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 + sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 + + 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 ) + #myconf+=( --without-default-ssl-backend ) + if use ssl ; then + if use gnutls || use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls --with-nettle ) + fi + if use mbedtls || use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss || use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss ) + fi + if use openssl || use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use winssl || use curl_ssl_winssl; then + einfo "SSL provided by Windows" + myconf+=( --with-winssl ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_winssl; then + einfo "Default SSL provided by Windows" + myconf+=( --with-default-ssl-backend=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 + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-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 + $(use_with brotli) + --without-cyassl + --without-darwinssl + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + $(use_with metalink libmetalink) + --without-libgsasl + --without-libpsl + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + $(use_with quiche) + $(use_with rtmp librtmp) + --without-rustls + --without-schannel + --without-secure-transport + --without-spnego + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + ECONF_SOURCE="${S}" \ + econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # avoid building the client + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use quiche; then + libs+=( "-lquiche" ) + priv+=( "quiche" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "-libtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/curl-7.76.1.ebuild b/net-misc/curl/curl-7.76.1.ebuild new file mode 100644 index 000000000000..75fede552e18 --- /dev/null +++ b/net-misc/curl/curl-7.76.1.ebuild @@ -0,0 +1,295 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools 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="curl" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" +IUSE+=" nghttp3 quiche" +IUSE+=" elibc_Winnt" + +# c-ares must be disabled for threads +# only one default ssl provider can be enabled +REQUIRED_USE=" + winssl? ( elibc_Winnt ) + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_winssl + ) + )" + +# lead to lots of false negatives, bug #285669 +RESTRICT="!test? ( test )" + +RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + mbedtls? ( + net-libs/mbedtls:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + openssl? ( + dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}] + ) + nss? ( + dev-libs/nss:0[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + ) + http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) + adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + 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}] + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" + +# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 +# rtmp? ( +# media-video/rtmpdump +# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) +# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) +# ) + +# ssl providers to be added: +# fbopenssl $(use_with spnego) + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + test? ( + sys-apps/diffutils + dev-lang/perl + )" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch +) + +src_prepare() { + default + + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 + sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 + + 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 ) + #myconf+=( --without-default-ssl-backend ) + if use ssl ; then + if use gnutls || use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls --with-nettle ) + fi + if use mbedtls || use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss || use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss ) + fi + if use openssl || use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use winssl || use curl_ssl_winssl; then + einfo "SSL provided by Windows" + myconf+=( --with-winssl ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_winssl; then + einfo "Default SSL provided by Windows" + myconf+=( --with-default-ssl-backend=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 + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-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 + $(use_with brotli) + --without-cyassl + --without-darwinssl + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + $(use_with metalink libmetalink) + --without-libgsasl + --without-libpsl + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + $(use_with quiche) + $(use_with rtmp librtmp) + --without-rustls + --without-schannel + --without-secure-transport + --without-spnego + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + ECONF_SOURCE="${S}" \ + econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # avoid building the client + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use quiche; then + libs+=( "-lquiche" ) + priv+=( "quiche" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "-libtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc +} + +multilib_src_test() { + multilib_is_native_abi && default_src_test +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 57e01f355dd3..53e76979d496 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,3 +1,4 @@ +AUX dhcpcd-9.3.4-include_termios.patch 631 BLAKE2B a5f7bb637d5c365dd4d6c6cc296d1f9d263f88073bac0ca930a947e5fe5ba186929cf3d201b64bca9d26ffd8d8ffaa02513061a4459ab90ba157e63a4be897a2 SHA512 2124070c834e23efafcdeda34b9ec71b4b6a1af79c786c8d291cf3d0d739c32f6167e34d6efce2627a99d8b00e4237599563c25f470b503a97377fe663e31096 AUX dhcpcd-9.4.0-memleak_fix.patch 730 BLAKE2B 705d0d6a203560315702af8ccd491cd3529cc7abe5038cb3a8881acb88e5c14d3bb75af267e2ba338e4ef4a6a9b85c0b47ca004f30b2018d978214f260e46fb3 SHA512 3a2111468bb8def0353b153c6d234ee70e7de9606ec4463ecf3276afe82dcbd772138ac7b429c6723112d61f0b22e27760deaf43a2838b7406d8886a29f6393a AUX dhcpcd-9.4.0-sparc_privsep.patch 1657 BLAKE2B 58564b77f97fa469ae64747915ac27f733e03d833d73edaac64293f1552c3be9128091683b061a05095244a3c59729f3aacd69ca3220bfb3f66bcf09112dedbc SHA512 d9dff010beb3eccd8f6f3adfa9ab2162d16b504f17f6f66363930be693760b16e1f226591e7486e893e99511480cba29d5baaeac1d23e5387e6e5d0e8f4dd1a0 AUX dhcpcd-9.4.0-unlink_socket.patch 1657 BLAKE2B 6c66e78fb0be1ed60176bee31240b9185b9bf71e80d9b0d6a03d77c1cd5ca7b7a4dab468d5299887443e8e1ef17556d89d569eebdb8eecfbe0e0bf91b381d116 SHA512 17325af7fd51dd9a6eb7edf8e952eb096c054414a7ad7fdf242d19500222832e994815ed9eb3aafb7a68a62dbaa7c9b9e77dc7b632919127662c805e4117f11e @@ -9,8 +10,8 @@ DIST dhcpcd-8.1.9-patches-01.tar.xz 3208 BLAKE2B 38f59096c7fbe7beb3df11e492d3ef1 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517 DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f -EBUILD dhcpcd-8.1.9-r1.ebuild 4505 BLAKE2B a1646a494c20d4d7038ec42941e4afaeac4cf1b2246f89eca4614ef060ad31813575218a3fdd121566001a0c41cf316ca50d91dde3ecd11603cd48c6d4bb47d0 SHA512 3ee0e788ceb7534702147458c192c57aed9e091a94cf0958f28f2a108890f1e07079aa024e964e9f529c62d2c1ce89cf3c54023d9f90ba34f41c9e24e3132ea4 -EBUILD dhcpcd-9.3.4.ebuild 4676 BLAKE2B d7015dcb29660199edc472049b8dbd7eff7f7bf1d8d2ff91a28125056dab73cb5292ca8d5e106381a6e1a3c0baae5f537b0d64822a10da331d0404100babe245 SHA512 2260f54aaed43a4eeba216b1dd930bfa63692336c6ee93f5db2f1c46e23d8ab0d0bb1b3910f4feb240ca833ba8039b6b1d3cff9c1f3eb03e6957192c7bb9e181 +EBUILD dhcpcd-8.1.9-r1.ebuild 4506 BLAKE2B 0d12744d514c7648a102cb7039ded63670fda8c573393bf48039547b15adc82840f6f9146f29ff143aa154f3d459f55a3a7300d97b9f1e70b5d3ed790f9f6565 SHA512 3f4123bc7c6dccc99adc70d90d2e8f5965fb4bb6d8d9f59562ddab4d06332dbc4cd1d88a3e1ccab936ed10cb2bac25138ded8761d540934a128879343d4186de +EBUILD dhcpcd-9.3.4.ebuild 4730 BLAKE2B 4c63d9e20ae7c3e0d4265ba9294daa15ad29ee9a4375181eecc9d09e8868da304312df9e15560723919dfa705621db198039f80c961e314ddd12a63aedb750b4 SHA512 6d8d899536afd2124f32aeb04b250eb8e8535c46c7e4538fdb86fe8270d1862823284e0a77a793267d04c9775287d62c04eeef4af0654c30acfb3fc9ba2f08a6 EBUILD dhcpcd-9.4.0-r1.ebuild 4752 BLAKE2B 5b8044625fd6cfcceced8c61ec58d821854e730e5563acade906f66039e1414f3414b8e454e39120d638eaab64840c6de20a135085e1b745f014d5edebceba4e SHA512 bc1ac38efdf606c7da4d12573741d9b6bbd626c056cfa4f4cb4e702448766540e5969cdcdaee354948667255694c015f13b4d0ed2abab456df69062506a4b02b EBUILD dhcpcd-9.4.0.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf diff --git a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild index 87278eab090f..77c0de3e8f74 100644 --- a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild @@ -14,7 +14,7 @@ else MY_P="${MY_P/_rc/-rc}" SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild index 90ee346ea29a..c8db117d1acc 100644 --- a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild @@ -13,7 +13,7 @@ else MY_P="${MY_P/_beta/-beta}" MY_P="${MY_P/_rc/-rc}" SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi @@ -35,6 +35,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-9.4.0-sparc_privsep.patch" #776178 + "${FILESDIR}/${PN}-9.3.4-include_termios.patch" #777600 ) src_configure() { diff --git a/net-misc/dhcpcd/files/dhcpcd-9.3.4-include_termios.patch b/net-misc/dhcpcd/files/dhcpcd-9.3.4-include_termios.patch new file mode 100644 index 000000000000..58a6a0216b8a --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-9.3.4-include_termios.patch @@ -0,0 +1,22 @@ +From 7c08f3777a69c69e87a149bb35681ce2ed2f0490 Mon Sep 17 00:00:00 2001 +From: Mikhail Efremov +Date: Tue, 8 Dec 2020 16:15:28 +0000 +Subject: [PATCH] Linux: Fix privsep build by including sys/termios.h for all + platforms + +--- + src/privsep-linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index e588ecd7..1fbe97fa 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include /* For TCGETS */ + + #include + #include diff --git a/net-misc/dhcping/Manifest b/net-misc/dhcping/Manifest index 429a9c325512..824a7665f040 100644 --- a/net-misc/dhcping/Manifest +++ b/net-misc/dhcping/Manifest @@ -1,3 +1,3 @@ DIST dhcping-1.2.tar.gz 75485 BLAKE2B f8447e38c22964410b08c93a847e1638b055f64461e6d39d0cde54b56222313222055ec922c911f7b86bdd37a8844e723a96753f31eaaf787c8c4194390e13e0 SHA512 84ead27ba07f7ecc1e8cf6d95b40c98ee20a39ce54386249f403120beac70c45d765d5268b4968dbfbbb92790adcc1eb648c3a87071d215ad64bcd23aec818d3 -EBUILD dhcping-1.2.ebuild 366 BLAKE2B 2ea689bb0a1f9fefdbdaf38c52f6fad896c1df9fad076dcd515de991eff7ffe5272a708d9cd7555b725b836f6be3557e94f717dba74f4ca995b557c745fe2885 SHA512 1efd74a63a7018f9295d3eace271b23b27881254a5aa76d7ef49e1b19dcaa00cc896bbc19dea854da7965a4a07749ccba4515b0c218d22bfb068d1bbf032d74b +EBUILD dhcping-1.2.ebuild 354 BLAKE2B 95c2be9b0dae99df0660c176e6ba1d441b297de150017c634531599cc781465f5b945a5b4ed21c090f2e155278cc40dcc5cd8aa46d39de5112ae9d7c26d5bd20 SHA512 d780e0a0d10d7f53d7d6b338813399107e9bbc627e6d20bd7b65b4b41c0ab24f6fa4373f294546f49d9f025e672cd657131421b258efb7c18ce8c1ad5c828102 MISC metadata.xml 218 BLAKE2B 4894dca53f3c39ffc7e477e6bad052c8fc183a42712c04a24d87da384cc71f790b1dd7d14bc8c6cfe8144c1ecf93a39b18fdbd3a7c78877f9778a5b49d7dc985 SHA512 603ad05330f07596dedb6477c2c36ce6d982fe1415f64d82593c913343fc6227e1e741104a520b1d130ec846ee6083f1dedace7e9b4aa109cc4aae6b3863c6c5 diff --git a/net-misc/dhcping/dhcping-1.2.ebuild b/net-misc/dhcping/dhcping-1.2.ebuild index 83adc5fd6eb9..b288cce6699a 100644 --- a/net-misc/dhcping/dhcping-1.2.ebuild +++ b/net-misc/dhcping/dhcping-1.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -DESCRIPTION="Utility for sending a dhcp request to a dhcp server to see if it is responding" +DESCRIPTION="Utility to send DHCP requests to DHCP servers to see if responding" HOMEPAGE="http://www.mavetju.org/unix/general.php" SRC_URI="http://www.mavetju.org/download/${P}.tar.gz" diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest index 007ce7b4ecc4..bc804c0228a0 100644 --- a/net-misc/dibbler/Manifest +++ b/net-misc/dibbler/Manifest @@ -5,7 +5,5 @@ AUX dibbler-client.service 134 BLAKE2B f425f3460ae1188b2a391e240dd8f64e3ed9b8114 AUX dibbler-relay 348 BLAKE2B c9a8d1f2b130e00e9d0f4ad517fc5256ec1d09cde6b66c8641cdf6b171b170944866842d76a4619f2294dd30de9670dc45775d16253e96a1ee4a668ece576285 SHA512 5eb62c4c7e9a4c5b558d0fed79a41b5a2db996349ab5ebfdff2f50d2bf0ba0e4293aab1a9bb089014aacaa3a502a7a13c14b3f3fe9510d1c0d91fca2b0674745 AUX dibbler-server 354 BLAKE2B 08b1177bbe9f3f1f1be809dd9f3617368257072e22ad6fe1e1a671429a2e488ac47d2902defd34b60b0adf9b6aaf0db119c8edb4c4ce8d510df8e0f0a8b260dd SHA512 3d2f1df6263e3373988d5ba75479a7bed16c3a363809fdde582afeebab0cda746c91d02f8a9535e15ed1095c098f4ab3721322092bc692e0403f8c46f16adcd5 DIST dibbler-1.0.1.tar.gz 4375118 BLAKE2B 1418a20ecf96f0793b25165d2790bb12aec0dc9ffbdf248f996f736e375f466a5853f698bc3da753dae57db4493a662cc8962e5d1fb6d9dd7c0c9d893128773e SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0 -EBUILD dibbler-1.0.1-r2.ebuild 1342 BLAKE2B aaa10aa5fb467c1b65ecc559250cc5fd633ed915d1e4b2cd8526ac9b5f1774b02370f25b25b2c9ff958c388134d1b0ea3656481ef3d21c92d242d63e27efbea8 SHA512 4e9d53563f94dc14fa9cdce3fa1fa93a0ac931568aa118e535edb073446d48ea83cc19bde4fe1c8aff09a65b58c8de4581f1c598cb64f7c80f954d55a91803a3 -EBUILD dibbler-1.0.1-r3.ebuild 1377 BLAKE2B 1ef90dcbeb577d64045077879e9987339685d5c58d3d85d698a255284ba69424085b855377ec9cfc78a62d0454c5979a2241a247b2e03e7474cf9b7cdcdd7bb3 SHA512 ceba9d31bd4b2a3edbb6e2ccf50751448c74246c5a612318686e3509d97a2582c530aeaceb797df5ac0f09cf114687cd8260bdfcbc39461ad169e29708924a2e -EBUILD dibbler-1.0.1.ebuild 1204 BLAKE2B 09a671ebfaa7cd2281884d3a8207ff154b21dbad83b74d4bb24b28631ab4c468247853051c131366a7f918626751099d006cdd7e19588c10a4c1fdbb25c116f9 SHA512 26ebe42082faacbfe6bbe138f972638910c556cc282c9771d520f776adc66ec09d7768c00509e72934df48532d60c31a8fedfe288b6a2ad770fe13cfc1ecd64f +EBUILD dibbler-1.0.1-r3.ebuild 1375 BLAKE2B 9cdbbfd5c677c843be51e1995678e517beba4a9fcb9a4ca8eb1b56a486eae44a0d905c6807884dac3486e204a8d876a6de3d8081aaac2f7f6754871910057315 SHA512 dc5f6e83562f2172000a60e210b9b0d28371a5555097c6b3f7e6abc98009f16600e2b78040c22f54d3e25fbe21c48a115e21f9bcf93d705b4e2de0141ec2dc17 MISC metadata.xml 350 BLAKE2B 88539009202645f314ed13bd5d4ebca86b45658a3d9de79596c337b262f6a37911efdb52defb0ea6e6a07ef8977cf1f3410a5d19359197df1d2c769f279856a7 SHA512 41de174499d1f04980b349af4c88d4fa396dee28edde06eeda3a144bed48f2a20d333f4b6ea7f0137e9ebbd3f47cc2019960084bec1bb8525daa6c06da90c0e9 diff --git a/net-misc/dibbler/dibbler-1.0.1-r2.ebuild b/net-misc/dibbler/dibbler-1.0.1-r2.ebuild deleted file mode 100644 index 64f7775868c1..000000000000 --- a/net-misc/dibbler/dibbler-1.0.1-r2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit readme.gentoo-r1 systemd - -DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)" -HOMEPAGE="http://klub.com.pl/dhcpv6/" -SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86" -IUSE="doc resolvconf" - -RDEPEND="resolvconf? ( virtual/resolvconf )" -DEPEND="${RDEPEND} - doc? ( dev-texlive/texlive-latexextra )" - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf -to suit your needs. They are stored in /etc/dibbler" - -src_configure() { - econf $(use_enable resolvconf) -} - -src_compile() { - default - # devel documentation is broken and users should consult the online version - # http://klub.com.pl/dhcpv6/doxygen/ - use doc && emake -C doc/ user -} - -src_install() { - default - readme.gentoo_create_doc - - dosbin dibbler-{client,relay,server} - doman doc/man/*.8 - - insinto /etc/dibbler - doins doc/examples/*.conf - keepdir /var/lib/dibbler - - dodoc AUTHORS CHANGELOG RELNOTES TODO - use doc && dodoc doc/dibbler-user.pdf - - doinitd "${FILESDIR}"/dibbler-{client,relay,server} - systemd_dounit "${FILESDIR}"/dibbler-client.service -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild index 3bc3e0296bbb..be80b56206bd 100644 --- a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild +++ b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86" +KEYWORDS="amd64 ~arm64 ~hppa ~mips x86" IUSE="doc resolvconf" RDEPEND="resolvconf? ( virtual/resolvconf )" diff --git a/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild deleted file mode 100644 index 610fb4e2bfae..000000000000 --- a/net-misc/dibbler/dibbler-1.0.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit eutils readme.gentoo systemd - -DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)" -HOMEPAGE="http://klub.com.pl/dhcpv6/" -SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~hppa ~mips x86" -IUSE="doc" - -DEPEND="doc? ( dev-texlive/texlive-latexextra )" -RDEPEND="" - -DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf -to suit your needs. They are stored in /etc/dibbler" - -src_prepare() { - epatch "${FILESDIR}"/${P}-fno-common.patch - epatch_user -} - -src_compile() { - emake - # devel documentation is broken and users should consult the online version - # http://klub.com.pl/dhcpv6/doxygen/ - use doc && emake -C doc/ user -} - -src_install() { - readme.gentoo_create_doc - - dosbin dibbler-{client,relay,server} - doman doc/man/*.8 - - insinto /etc/dibbler - doins doc/examples/*.conf - dodir /var/lib/dibbler - - dodoc AUTHORS CHANGELOG RELNOTES TODO - use doc && dodoc doc/dibbler-user.pdf - - doinitd "${FILESDIR}"/dibbler-{client,relay,server} - systemd_dounit "${FILESDIR}"/dibbler-client.service -} diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index c8f1f7371036..754c4e645e1e 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -2,5 +2,5 @@ AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da -EBUILD dropbear-2020.81-r2.ebuild 2963 BLAKE2B 471b9c68b23258721d15e6a1f02dc326d347839303b449355b8f9f0de3d36f28a75c3c9a01300166fdb36d568ba30c5321b5e37cbf647d8f4f406d5aef8058f7 SHA512 7b2770f6dd8eb3c4589913e1285cba21c893c1fba5a8d9ab7486cb606d13bfc9e75c3f53513f77c1b4ecae78906cebebacd39abe02c68188f992760b4e3e05f0 +EBUILD dropbear-2020.81-r2.ebuild 2964 BLAKE2B a84ee1a23beb4798760f306d2d5f083f8603822fce6d7b0b37559f7f390d120b939c82f35054bcc29e246c8509dc316fd9ada81b720f3c75e238ee469598a50d SHA512 ad4563e6e32ea22918c7f0d74564c665c14ef3f7a4aad966f79f5bc0008eefac12b52b36a78ba9fcde10ac84b316191f6d656a056f1102a4bfdd9d1baa5abbda MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314 diff --git a/net-misc/dropbear/dropbear-2020.81-r2.ebuild b/net-misc/dropbear/dropbear-2020.81-r2.ebuild index 54c40455d06c..06a278f6bece 100644 --- a/net-misc/dropbear/dropbear-2020.81-r2.ebuild +++ b/net-misc/dropbear/dropbear-2020.81-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056) SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib" LIB_DEPEND=" diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index ed6a4e436e68..7d6b3b902400 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,10 +1,7 @@ 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-117.4.378.tar.gz 98240407 BLAKE2B 2a4a1f2967cc3b4fb59461d3ab94a8cb120db5ec3283d4ef0b1b13ad69e903bb87e11dbc72b1d1e2969aded63f03390af0087026864699c679276d195ec6e54f SHA512 261aad190643e02a102b70ce5418cf61f8affcf3607e6b35d91ec5713fb7ee058d2e20390fd6e8c434ae69d6f888ff390b12d2f544aa2b08a7ac98a9c545811d -DIST dropbox-lnx.x86-118.4.460.tar.gz 98620060 BLAKE2B 3b2aa51cd93d2ccfc78efe434ba2fd2a7bf270c54e64d009ce7d82927b85805d1616525aa8433afe3c59c8b7d15b3cfd129b8f85a504210e05fd2d95024e9589 SHA512 1858c1bafcb87cf5db44549ac3b12f56402ac2ef63e959d9d22a42952ca4a620115f92021736560e350730a5f5f0da52abf2d5b5c7765f82e39fb4f9b76098e4 -DIST dropbox-lnx.x86_64-117.4.378.tar.gz 101675442 BLAKE2B 42dbb52a4cb1998b1e114e5486acc0a89191c1856f1391c3f19186937faeae12ceec39e5496744f3237e457656f50d4c6af6b4f9ad5b02541e946c96f325ba92 SHA512 876314d7d56692c34c714c7aa8d03d5e9250a5a5bb72c74a16eaee68cf1cf28d4585e4b3ac457dc42d0230d222d62eeeab66672765c182d999f7200a1335a4b7 -DIST dropbox-lnx.x86_64-118.4.460.tar.gz 102012647 BLAKE2B 87ee9e246e5e4c7cd4b5fe7aacbbe028ebec3f02abf650b1d8d8f867aea0900d05ae697ec02916b59b19ad3049606bfa1c63a286f7d21a335650a4322978c345 SHA512 206bb2bc4932d0784438df8de4dfecbbc6deda4ca71f8cd5dced17066293f41f8a722d7e05516e24fcc163cdb9e475733d75d19b369a7f63b3a7f1a966f0d5f4 -EBUILD dropbox-117.4.378.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425 -EBUILD dropbox-118.4.460.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425 +DIST dropbox-lnx.x86-120.4.4598.tar.gz 99345343 BLAKE2B 9845f94832ffe7929a7e94a9e5b978390cb40611a054ba8ed7f1c880e13364f019d58a86d6083fc8e2b45d618870a4ac2d9643262bab8d600ebdad45bbaf8a6e SHA512 9ce9403695c88c1abf6413a1b06ad4d350b9603f20d4c1358b337123fc9ab02775d1a0e13c441e8185840705499eab4e59813210abe6e54274b39399b0ca309a +DIST dropbox-lnx.x86_64-120.4.4598.tar.gz 102693511 BLAKE2B 0d25e6d35ad1e1a9de541d3cbe19d5a63741616dac8ec70ab54ab6a78871d3f9008ce17518caa44c1722bf87de9cac924b65bdc16bd5a456a17d140b8c85fd09 SHA512 9ddafeff9b640f315f5bca4a9ee8af8da7d767f19a0aa4dc75df9cd6e02b822994d621331de929ab62a5d32c5c7fcd757b50ccb6f15be81c1c5d1dcc634291d8 +EBUILD dropbox-120.4.4598.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a diff --git a/net-misc/dropbox/dropbox-117.4.378.ebuild b/net-misc/dropbox/dropbox-117.4.378.ebuild deleted file mode 100644 index 17ace6762e14..000000000000 --- a/net-misc/dropbox/dropbox-117.4.378.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 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="selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -BDEPEND="dev-util/patchelf" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - x11-themes/hicolor-icon-theme - ) - selinux? ( sec-policy/selinux-dropbox ) - app-arch/bzip2 - dev-libs/glib:2 - dev-libs/libffi-compat:6 - media-libs/fontconfig - media-libs/freetype - net-misc/wget - sys-libs/zlib - sys-libs/ncurses-compat:5 - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 -" - -src_unpack() { - unpack ${A} - mkdir -p "${S}" || die - mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die - mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die - rmdir "${S}"/dropbox-lnx.*-${PV}/ || die - rmdir .dropbox-dist || die -} - -src_prepare() { - default - # we supply all of these in RDEPEND - rm -vf libGL.so.1 libX11* libffi.so.6 || die - # some of these do not appear to be used - rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ - PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ - wmctrl libdrm.so.2 libpopt.so.0 || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf images || die - fi - patchelf --set-rpath '$ORIGIN' \ - apex._apex.*.so \ - nucleus_python.*.so \ - tprt.*.so \ - || die - pax-mark cm dropbox - mv README ACKNOWLEDGEMENTS "${T}" || die -} - -src_install() { - local targetdir="/opt/dropbox" - - insinto "${targetdir}" - doins -r * - fperms a+x "${targetdir}"/{dropbox,dropboxd} - dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - - 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} -} - -pkg_postinst() { - einfo "Warning: while running, dropbox may attempt to autoupdate itself in" - einfo " your user's home directory. To prevent this, run the following as" - einfo " each user who will run dropbox:" - einfo "" - einfo "install -dm0 ~/.dropbox-dist" -} diff --git a/net-misc/dropbox/dropbox-118.4.460.ebuild b/net-misc/dropbox/dropbox-118.4.460.ebuild deleted file mode 100644 index 17ace6762e14..000000000000 --- a/net-misc/dropbox/dropbox-118.4.460.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 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="selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -BDEPEND="dev-util/patchelf" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - x11-themes/hicolor-icon-theme - ) - selinux? ( sec-policy/selinux-dropbox ) - app-arch/bzip2 - dev-libs/glib:2 - dev-libs/libffi-compat:6 - media-libs/fontconfig - media-libs/freetype - net-misc/wget - sys-libs/zlib - sys-libs/ncurses-compat:5 - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 -" - -src_unpack() { - unpack ${A} - mkdir -p "${S}" || die - mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die - mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die - rmdir "${S}"/dropbox-lnx.*-${PV}/ || die - rmdir .dropbox-dist || die -} - -src_prepare() { - default - # we supply all of these in RDEPEND - rm -vf libGL.so.1 libX11* libffi.so.6 || die - # some of these do not appear to be used - rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ - PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ - wmctrl libdrm.so.2 libpopt.so.0 || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf images || die - fi - patchelf --set-rpath '$ORIGIN' \ - apex._apex.*.so \ - nucleus_python.*.so \ - tprt.*.so \ - || die - pax-mark cm dropbox - mv README ACKNOWLEDGEMENTS "${T}" || die -} - -src_install() { - local targetdir="/opt/dropbox" - - insinto "${targetdir}" - doins -r * - fperms a+x "${targetdir}"/{dropbox,dropboxd} - dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - - 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} -} - -pkg_postinst() { - einfo "Warning: while running, dropbox may attempt to autoupdate itself in" - einfo " your user's home directory. To prevent this, run the following as" - einfo " each user who will run dropbox:" - einfo "" - einfo "install -dm0 ~/.dropbox-dist" -} diff --git a/net-misc/dropbox/dropbox-120.4.4598.ebuild b/net-misc/dropbox/dropbox-120.4.4598.ebuild new file mode 100644 index 000000000000..17ace6762e14 --- /dev/null +++ b/net-misc/dropbox/dropbox-120.4.4598.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 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="selinux X" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/.*" +QA_EXECSTACK="opt/dropbox/dropbox" + +BDEPEND="dev-util/patchelf" + +# Be sure to have GLIBCXX_3.4.9, #393125 +RDEPEND=" + X? ( + x11-themes/hicolor-icon-theme + ) + selinux? ( sec-policy/selinux-dropbox ) + app-arch/bzip2 + dev-libs/glib:2 + dev-libs/libffi-compat:6 + media-libs/fontconfig + media-libs/freetype + net-misc/wget + sys-libs/zlib + sys-libs/ncurses-compat:5 + virtual/opengl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 +" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" || die + mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die + mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die + rmdir "${S}"/dropbox-lnx.*-${PV}/ || die + rmdir .dropbox-dist || die +} + +src_prepare() { + default + # we supply all of these in RDEPEND + rm -vf libGL.so.1 libX11* libffi.so.6 || die + # some of these do not appear to be used + rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ + PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ + wmctrl libdrm.so.2 libpopt.so.0 || die + if use X ; then + mv images/hicolor/16x16/status "${T}" || die + else + rm -vrf images || die + fi + patchelf --set-rpath '$ORIGIN' \ + apex._apex.*.so \ + nucleus_python.*.so \ + tprt.*.so \ + || die + pax-mark cm dropbox + mv README ACKNOWLEDGEMENTS "${T}" || die +} + +src_install() { + local targetdir="/opt/dropbox" + + insinto "${targetdir}" + doins -r * + fperms a+x "${targetdir}"/{dropbox,dropboxd} + dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" + + 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} +} + +pkg_postinst() { + einfo "Warning: while running, dropbox may attempt to autoupdate itself in" + einfo " your user's home directory. To prevent this, run the following as" + einfo " each user who will run dropbox:" + einfo "" + einfo "install -dm0 ~/.dropbox-dist" +} diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 04c2a970b8e9..34c4a00d3204 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1,6 +1,12 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff DIST electrum-4.0.9.gh.tar.gz 4435268 BLAKE2B e1dfe319f7b4beffd039164c97d247f5d267d9d99313480bf06f9b748d095b33859cd8ea5dd5a135b38a1a206858e08ce500af8982ef7a6e3b3f7ff0233b9637 SHA512 a9a04163c8d76006ca18e1c50f38cabd7c3d7d75b16c8504627b9eb49bf9dca91800e18a585e7afd0b98fafeeeb821b967bea29928a46d10f65f0abc3fb90887 +DIST electrum-4.1.0.gh.tar.gz 4539032 BLAKE2B 72ef52a000799e496e6ccca152dc8bec827aef23d4e3290fd2e86ace0f96e9267f68b56c390b873658dc8f6e6998080bd0283494ee74603c360dfe250b64c282 SHA512 7dd94bfc23f78e915f42f1043f6b7e9d0d6d5de7303418da8d2f3bd53ece794c74c3cd0dd9d77b370a6c6f049261273b170ddcb67f6c3dc7189869b200e8d437 +DIST electrum-4.1.1.gh.tar.gz 4539619 BLAKE2B abcb0713b8b82fb7b13b432146ee63746690cf3a80d3951de41a13435eba7217010c92653d5263ea155072e5bb911e38f6c3d6a83f72bda9fb07a26f705e2621 SHA512 f3066171bc8cef1402356f01254acdce3e4f4d6fb99a1feb52d76f3a7c21f5b082148b7b598b19ae8a4817b221b8d80f27f9ab67d3d09e465856d51f8b28f0e4 +DIST electrum-4.1.2.gh.tar.gz 4926068 BLAKE2B e5d543c963cfec523e80e2de8b6a44c1845bdee23524c182e86efb7ff41caeaccebbefab2b8dda9c1e027410809d42be30db6dbc20fd877f3c749619478a6977 SHA512 4db8f8061ae149a5d9770b8c30676aa85ee66eb71052763e29d551317484b597628aad702370486b466c981688488f5a4592ae30a426e5fcd9250bc1a69a890a EBUILD electrum-4.0.9-r1.ebuild 2260 BLAKE2B e3e444bedf6174076d32d72e79328500045d0ae51a1d4b4beb939a4260e876eaec449d7a5ac4eda90ffb339530130e9ecf9932f166b0e7b91bc4de58ffae9f41 SHA512 eff401fec30e5ffa40659fef0e15665211bc09324ff4d3ff0677a3c019d19871b49a54fbe72f4c05d449660e27fcdf9bdc51ec745451d429b72cc644dad65216 -EBUILD electrum-4.0.9-r2.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84 +EBUILD electrum-4.0.9-r2.ebuild 2361 BLAKE2B 3dda3366438c3192f0578d40b32f3036d5c7b2a13dd239e757628210b7e7d01989cb1a88894e2c08d084335924bf6d0c7e706899aca6df1645cbf80cbfd86be5 SHA512 9cc89c2e87adb47178af80e50e3af504b4c8412b000ed03807d19301f9cce28ab3e5f1b8d1baea5c2b7f1371ccaf685e760bc1aa2f4f7affe24c24b2c0eb21c9 +EBUILD electrum-4.1.0.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84 +EBUILD electrum-4.1.1.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84 +EBUILD electrum-4.1.2-r1.ebuild 2424 BLAKE2B f35f538b95491c45d7b6bdb5d58d5181bb714eb117d091fdbe95aa3b9a8e06eab69d0b58f0ae8fafc200a337a5ee746145125aa259176a14c0b2e2c99bdbfc67 SHA512 664f9f74a51ec3879d5b5df878d195d932402398ca767fd9f7f8f8f315fc123784c256a35ca9eb8a55756df1d3c652f686a9ad561697c6b1c533d7b6568908a6 MISC metadata.xml 667 BLAKE2B 4532c27bf060a5d6708cd7cbd350a30765778cf197221c6c0a4ce3d6db04f22b57f2c2836010fffb26f2b165b4df4e07652bb64addda4c9c982b80810c064d71 SHA512 ac74b8fab1cc0ca770d0f07b422cdf46af8a845ce49e00bb7b8eb5135b68408482689210025f6be087c997e9154e0d7366b1361d31e22653b872f5638abcea56 diff --git a/net-misc/electrum/electrum-4.0.9-r2.ebuild b/net-misc/electrum/electrum-4.0.9-r2.ebuild index 434ffec4d5b6..2a512c321f6f 100644 --- a/net-misc/electrum/electrum-4.0.9-r2.ebuild +++ b/net-misc/electrum/electrum-4.0.9-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="cli ncurses qrcode +qt5" REQUIRED_USE="|| ( cli ncurses qt5 )" diff --git a/net-misc/electrum/electrum-4.1.0.ebuild b/net-misc/electrum/electrum-4.1.0.ebuild new file mode 100644 index 000000000000..434ffec4d5b6 --- /dev/null +++ b/net-misc/electrum/electrum-4.1.0.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_8 ) +PYTHON_REQ_USE="ncurses?" + +inherit desktop distutils-r1 xdg-utils + +DESCRIPTION="User friendly Bitcoin client" +HOMEPAGE="https://electrum.org/" +SRC_URI=" + https://github.com/spesmilo/electrum/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli ncurses qrcode +qt5" +REQUIRED_USE="|| ( cli ncurses qt5 )" + +RDEPEND="${PYTHON_DEPS} + dev-libs/libsecp256k1 + >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] + =dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}] + >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] + dev-python/bitstring[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + >=dev-python/dnspython-2[${PYTHON_USEDEP}] + dev-python/pbkdf2[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] + qrcode? ( media-gfx/zbar[v4l] ) + qt5? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + ) + ncurses? ( $(python_gen_impl_dep 'ncurses') ) +" +BDEPEND=" + test? ( + dev-python/pyaes[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + eapply "${FILESDIR}/3.1.2-no-user-root.patch" + eapply "${FILESDIR}/3.3.2-desktop.patch" + + # unbind aiorpcX dep + sed -e '/aiorpcX/s:,<0.19::' \ + -i contrib/requirements/requirements.txt || die + + # Prevent icon from being installed in the wrong location + sed -i '/icons_dirname/d' setup.py || die + + # use backwards-compatible cryptodome API + sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die + + local bestgui + if use qt5; then + bestgui=qt + elif use ncurses; then + bestgui=text + else + bestgui=stdio + fi + sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die + + eapply_user + + xdg_environment_reset + distutils-r1_src_prepare +} + +src_install() { + doicon -s 128 electrum/gui/icons/${PN}.png + dodoc RELEASE-NOTES + distutils-r1_src_install +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-misc/electrum/electrum-4.1.1.ebuild b/net-misc/electrum/electrum-4.1.1.ebuild new file mode 100644 index 000000000000..434ffec4d5b6 --- /dev/null +++ b/net-misc/electrum/electrum-4.1.1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_8 ) +PYTHON_REQ_USE="ncurses?" + +inherit desktop distutils-r1 xdg-utils + +DESCRIPTION="User friendly Bitcoin client" +HOMEPAGE="https://electrum.org/" +SRC_URI=" + https://github.com/spesmilo/electrum/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli ncurses qrcode +qt5" +REQUIRED_USE="|| ( cli ncurses qt5 )" + +RDEPEND="${PYTHON_DEPS} + dev-libs/libsecp256k1 + >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] + =dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}] + >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] + dev-python/bitstring[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + >=dev-python/dnspython-2[${PYTHON_USEDEP}] + dev-python/pbkdf2[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] + qrcode? ( media-gfx/zbar[v4l] ) + qt5? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + ) + ncurses? ( $(python_gen_impl_dep 'ncurses') ) +" +BDEPEND=" + test? ( + dev-python/pyaes[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + eapply "${FILESDIR}/3.1.2-no-user-root.patch" + eapply "${FILESDIR}/3.3.2-desktop.patch" + + # unbind aiorpcX dep + sed -e '/aiorpcX/s:,<0.19::' \ + -i contrib/requirements/requirements.txt || die + + # Prevent icon from being installed in the wrong location + sed -i '/icons_dirname/d' setup.py || die + + # use backwards-compatible cryptodome API + sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die + + local bestgui + if use qt5; then + bestgui=qt + elif use ncurses; then + bestgui=text + else + bestgui=stdio + fi + sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die + + eapply_user + + xdg_environment_reset + distutils-r1_src_prepare +} + +src_install() { + doicon -s 128 electrum/gui/icons/${PN}.png + dodoc RELEASE-NOTES + distutils-r1_src_install +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-misc/electrum/electrum-4.1.2-r1.ebuild b/net-misc/electrum/electrum-4.1.2-r1.ebuild new file mode 100644 index 000000000000..8299571facec --- /dev/null +++ b/net-misc/electrum/electrum-4.1.2-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_8 ) +PYTHON_REQ_USE="ncurses?" + +inherit desktop distutils-r1 xdg-utils + +DESCRIPTION="User friendly Bitcoin client" +HOMEPAGE="https://electrum.org/" +SRC_URI=" + https://github.com/spesmilo/electrum/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli ncurses qrcode +qt5" +REQUIRED_USE="|| ( cli ncurses qt5 )" + +RDEPEND="${PYTHON_DEPS} + dev-libs/libsecp256k1 + >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] + =dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}] + >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] + dev-python/bitstring[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + >=dev-python/dnspython-2[${PYTHON_USEDEP}] + dev-python/pbkdf2[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] + qrcode? ( media-gfx/zbar[v4l] ) + qt5? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + ) + ncurses? ( $(python_gen_impl_dep 'ncurses') ) +" +BDEPEND=" + test? ( + dev-python/pyaes[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + eapply "${FILESDIR}/3.1.2-no-user-root.patch" + eapply "${FILESDIR}/3.3.2-desktop.patch" + + # unbind aiorpcX dep + sed -e '/aiorpcx/s:,<0.19::' \ + -i contrib/requirements/requirements.txt || die + sed -e '/aiorpcx/s:raise.*:pass:' \ + -i run_electrum || die + + # Prevent icon from being installed in the wrong location + sed -i '/icons_dirname/d' setup.py || die + + # use backwards-compatible cryptodome API + sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die + + local bestgui + if use qt5; then + bestgui=qt + elif use ncurses; then + bestgui=text + else + bestgui=stdio + fi + sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die + + eapply_user + + xdg_environment_reset + distutils-r1_src_prepare +} + +src_install() { + doicon -s 128 electrum/gui/icons/${PN}.png + dodoc RELEASE-NOTES + distutils-r1_src_install +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest index c6d1341e5a7d..1ac5bc8e0f25 100644 --- a/net-misc/ena-driver/Manifest +++ b/net-misc/ena-driver/Manifest @@ -1,5 +1,5 @@ DIST ena-driver-2.0.3-linux.zip 446695 BLAKE2B 43d4dc947f53c42c6ccda7a0fd3e32cda2c49aadee67ac7d719739f49c91b704aff04fa47f943667c7dd29f6ee0a573ceb43001a9dcdc6492cdbeb85091dd957 SHA512 08e8c1caecff3d7e19fd847e102506e501aafbefec1867fcc88d535fa728abfa7f0d292bdc9c4dff6c3d4d303002ab8b9a62bfc855cfda5130880fb237eb57c2 DIST ena-driver-2.2.3-linux.tar.gz 406557 BLAKE2B 3e77bcb8e5bd00e0a643c17ad780e3abb5ff71859cdcb1257f9c73c7d5a14b0922cf97132ed40195a69e233b2850cb62f1854b49c8ab5c92b6b83dadb32bd7bd SHA512 257c959a6727213df6600cfb09741f5036d4efb950c1460be85bab3026d7f0fa5af252550bf395665dcf0de5dbee75f751516ac80ecf3d470aee996d12796770 -EBUILD ena-driver-2.0.3-r1.ebuild 893 BLAKE2B d888bafc4744911c91759f85013008dacf2aca3fe5f6fe5d504412a451dd32d65b8fc4ffdb8b44435826fcfbdb021e52b668ef2ac05741beda8da22d0a5deec0 SHA512 39658ba6890efdfde3ddfc43aa81072e20f52ec1da992434544fef65173fecf0a69f6e087aff77fa2b5a90fa2372c88a0077c7b6f708e976fdb13eae9b30e2d7 -EBUILD ena-driver-2.2.3-r1.ebuild 946 BLAKE2B b1952dc511209d94c71ac948c737d39931b2ecf7bdc7b868adbda31fc8e907a448b9a36172f9e15b368ff1c4c2d152a3d28792533a4e3a02833bf2c15f4bafea SHA512 1808fb697249bbbce14f426a5a41103632a56cf9d3e6dc90e1ea0e35631b1f31e421bd8a5791abffa936bace814bf9d91b9b907ee5c828db36be77d8ab95452d +EBUILD ena-driver-2.0.3-r1.ebuild 894 BLAKE2B 8791009c7487ea5ff910fb6ab24afa0c15c970ac8623db12bbb95ea8be9bd4735e5ec68b111be312707df56e70a9b52571c9d92b782df5aaa3c70cfe73200722 SHA512 c132e2e916cd922ecb602faf5821c56c0c90aac1ffc8d3ab2b49cc3b6edc5971b20f4b93d37db69875bd690abdb0549c367991adc2c8282815012d913f760837 +EBUILD ena-driver-2.2.3-r1.ebuild 947 BLAKE2B 598eec22ab8ccd9fbe9d9fe01f8c71d849acb6611d2b485cd3556707763157a8a06196ed715f94f9b780d7290359f5e4f018eeb24d592bcc0af3a8d66c8817a4 SHA512 2fb0cb0bc78d7c3e314d1adeafb95161d285875643a0174a7bb8f74ef68c0382e447566dc053e0d20fb66ca54d370bab23993cfb2f1550f2d9cf965b68d12d4c MISC metadata.xml 346 BLAKE2B e9e6ee8a307a333bc5ba90542031ff5ace4d4f66aa9bd6340cb3c6fb246c3a0889be2f956db9f8647caa646eea89ad5fb8272179635f328731a826caea99f4b3 SHA512 29838725724233d10c1b07c4611957836315a439267257ab075b21b7ef459fe10f1b667abfa2ef64e6756de40c499aae06e87f64330df93a4f936e15757b4894 diff --git a/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild b/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild index 303afdb0d7e5..37619f91213a 100644 --- a/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild +++ b/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" diff --git a/net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild b/net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild index 2a4bc1e592ab..cb3d20bddedc 100644 --- a/net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild +++ b/net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" diff --git a/net-misc/ethertypes/Manifest b/net-misc/ethertypes/Manifest index 83cd2c2ad2d8..dab1c7c987c1 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 587 BLAKE2B 632f5fa2cef51732a36f612a12770e06222a2028e969969356b639bb5ab735860f554fb780b35e88d6790a8b76ef07c4aac7a5d2cfa1ea31863c2dde331e4162 SHA512 09f97f07e38a68968ff0b7623fe12937c90eacaecc1c86a2bc645ab04dafc5a4df2c16bfd7b83ceca286af22e42e6cd1d99e54c4e7a5db99d20331877e5defa8 +EBUILD ethertypes-0.ebuild 588 BLAKE2B 4a8ca60dd603e39f7c1bfba5b5e6ade918cce49be4fca91f2f8e50e7bda8f935419328c2f55e61658181ed950d4ec5c73e10eff325735f360daedde21fd903b4 SHA512 826e1ac25b01c07f682cdaa1a45fdfe93597d06d48a66a82a19f82af01ba1f6113fd9b5e95e916f58a2f5c3b39aa3538973029be7d8878958981c7e9766aa40a 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 49477fe2b1b6..7990052a3340 100644 --- a/net-misc/ethertypes/ethertypes-0.ebuild +++ b/net-misc/ethertypes/ethertypes-0.ebuild @@ -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 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" !pinkbyte@gentoo.org Sergey Popov + + jakov.smolic@sartura.hr + Jakov Smolic + - - Enable gRPC plugin - - - Build Next Hop Resolution Protocol daemon - - - Enable Forwarding Plane Manager support - - - Enable RPKI - - - Add support for PAM (via sys-libs/pam) to the Virtual Terminal Interface Shell (vtysh); - - - Build OSPFAPI support - + Enable gRPC plugin + Build Next Hop Resolution Protocol daemon + Enable Forwarding Plane Manager support + Enable RPKI + Add support for PAM (via sys-libs/pam) to the Virtual Terminal Interface Shell (vtysh) + Build OSPFAPI support diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index a76188d5dd34..9e9d6dc69e10 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,6 +1,6 @@ -DIST gallery-dl-1.16.5.tar.gz 340821 BLAKE2B 06820e1755ccbc64382b084a54420368c9e9c7578c53f690d26ee552c6303580ccdd6ae8bec3a6462af9c204c1017cd2ff766bbbac317908b2951455793a10a9 SHA512 fe4535310adb900c4e6094928d8184d2981e2bb90c972a04c068badb0ec1dbad252053da466f7ad74e0662d1db1dc58703262fc627b823d8e90b18247bdca3ac DIST gallery-dl-1.17.1.tar.gz 344091 BLAKE2B e5a108d088083e3aa1881919e74f6631321312a225c0dd6d9c6cbee87ecc957d19a6c3812d3f0c80c5937089d1402ca2e0a779c23537f28ab78ad9654c06852d SHA512 015346cec09ab85fa408b3faa6b63d61fa1f2004b39b45d36741cb63e2809c62c48b544c57b0a02b797db6f36cc66172e9c120ff6cf1bf1a2c3d6f05f7ceb627 -EBUILD gallery-dl-1.16.5.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7 -EBUILD gallery-dl-1.17.1.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7 -EBUILD gallery-dl-9999.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7 +DIST gallery-dl-1.17.2.tar.gz 347680 BLAKE2B 443d859a6cf45cc36eb03dfd591f5f512f4ac7128aeb6da7530c3758c813023a08c324c6ecf0d8cd6a7db597c1b147dc6dad744af38374a3a9f80e9d9a556746 SHA512 1b62f0607f2a153909029672ecf91ec25a0e5473e8ec2c9974ff3a1a03e99a94616565c5092035cbd34865606f4ee9bbb8cf1949f5792f6edb07b7eeaa5dab51 +EBUILD gallery-dl-1.17.1.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c +EBUILD gallery-dl-1.17.2.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c +EBUILD gallery-dl-9999.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c MISC metadata.xml 793 BLAKE2B 0c014ab324d1fce9d2242f124aaea8273cb6de0553b5c0c6a65479d853ade3f1a9b8a7f482da9bd4ed6ff72ffd6138c35cde4cb373e92b5019e94405e29ba69f SHA512 2e7b177f458f13b084e28e0a59613ee58dce7ac0ad9483b04a2bb79df48583043924f13b5e3899d5f76a44b76ce2e4a04c63e71bea1916031c378831ea613fad diff --git a/net-misc/gallery-dl/gallery-dl-1.16.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.16.5.ebuild deleted file mode 100644 index b1acc9d0aa4b..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.16.5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{7..9}) -PYTHON_REQ_USE="sqlite,ssl,xml" -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 optfeature - -DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mikf/${PN}.git" -else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -# tests require network access -RESTRICT="test" -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" - -distutils_enable_tests setup.py - -src_compile() { - emake data/completion/gallery-dl - emake data/completion/_gallery-dl - emake man - distutils-r1_src_compile -} - -pkg_postinst() { - elog "To get additional features, some optional runtime dependencies" - elog "may be installed:" - elog "" - optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg - optfeature "video downloads" net-misc/youtube-dl -} diff --git a/net-misc/gallery-dl/gallery-dl-1.17.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.17.1.ebuild index b1acc9d0aa4b..c0680f91535c 100644 --- a/net-misc/gallery-dl/gallery-dl-1.17.1.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.17.1.ebuild @@ -37,9 +37,6 @@ src_compile() { } pkg_postinst() { - elog "To get additional features, some optional runtime dependencies" - elog "may be installed:" - elog "" optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg optfeature "video downloads" net-misc/youtube-dl } diff --git a/net-misc/gallery-dl/gallery-dl-1.17.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.17.2.ebuild new file mode 100644 index 000000000000..c0680f91535c --- /dev/null +++ b/net-misc/gallery-dl/gallery-dl-1.17.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) +PYTHON_REQ_USE="sqlite,ssl,xml" +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 optfeature + +DESCRIPTION="Download image galleries and collections from several image hosting sites" +HOMEPAGE="https://github.com/mikf/gallery-dl" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mikf/${PN}.git" +else + SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +# tests require network access +RESTRICT="test" +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" + +distutils_enable_tests setup.py + +src_compile() { + emake data/completion/gallery-dl + emake data/completion/_gallery-dl + emake man + distutils-r1_src_compile +} + +pkg_postinst() { + optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg + optfeature "video downloads" net-misc/youtube-dl +} diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild index b1acc9d0aa4b..c0680f91535c 100644 --- a/net-misc/gallery-dl/gallery-dl-9999.ebuild +++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild @@ -37,9 +37,6 @@ src_compile() { } pkg_postinst() { - elog "To get additional features, some optional runtime dependencies" - elog "may be installed:" - elog "" optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg optfeature "video downloads" net-misc/youtube-dl } diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index 621414c54f69..e798a085f643 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -37,5 +37,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920 EBUILD geoipupdate-2.3.1.ebuild 557 BLAKE2B d10ba07cf135898b205407d4a4a1212a09315dd0ab046b227295c13c15ad0df296f4f1310543e9b082b5899ee2e3eef484ff9a1965b4ad9a2841bd097f2255ba SHA512 75a4de845ad1923a0ad678de9db19213696beba4995b37ff7cab8c887396dff9b5005bd247e72c3ee2d140617718e1fbc3795a1fb70acb9028bd063fbcb48959 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7 -EBUILD geoipupdate-4.3.0.ebuild 2787 BLAKE2B 748a78c6fad95c490c683203f7a2b8dbf193c5dfc6e2e46829f5a0fa17b6b38b6d889f73ceb428f84fd083d17a61a715e6e12031771dc80b7e6ede417be04dc4 SHA512 951ed051f904adc8ac3d6626135b25668540927f06ff6e4d09a15e5b1c5fac6152702e7556a5753801e98e496079202addb4ebf0aa095f5528fe914644627c52 +EBUILD geoipupdate-4.3.0.ebuild 2780 BLAKE2B 8cdd7ec3ee334c87e4944198db1e39d57469a0cf9cfce07bbad7b03aa9b790b40c85f057d93bbd9c92ba20423d52cb0d9386295ef5575e4590a6d257fae06472 SHA512 a80f829eac8e7e22205ce9625ce1948866ffb4c290f728e53d2a0f73000b65914c3b915c0c46d9fbe9951373d2b9141dc4acaf43135d4a9d8c1c7ce8c053dd7a MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild index 083d40f6db79..9e77ca2c2a40 100644 --- a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild +++ b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 EGO_PN="github.com/maxmind/${PN}" -inherit eutils go-module +inherit go-module DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" HOMEPAGE="https://github.com/maxmind/geoipupdate" diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index 78b6c78625c7..7a7eab0f069e 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1,8 +1,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417 -AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c3b98600c491775d7c9d9c84f601f85319c53d665bad2ee7d41bfa6a933b96eb9cf6204a920ddf836447b52bbcccb4e8b857a66ac7d4481 SHA512 fdc77063b98fd0adda2d93891fa58fe54c2f96a3e8c3904ec64f6daf387169d765fb499e6cf21141b715d8597b66384cd475456876f0fa4a196f9d007f05009d -DIST gerbera-1.7.0.tar.gz 3574471 BLAKE2B 32aca4576236f852f7d0c85b86817e88e8539c074c6a3967266920750f89ef7fede6ccfa4e9534534dcf753fc030910500d5bf3dd3282d96c9f64b6492fe4a15 SHA512 32998ce281bdacfd11a0d4f7cfb1edcbea40cc6c5bb1dba4bbebed667ac47eea5049a49333ea15698e50a9954450873b4739f4ce9fcf4c56e1b548f19dee7533 -EBUILD gerbera-1.7.0.ebuild 2370 BLAKE2B e1e66fe87d5179311ca7368bfc889404ff863c7bf586b8846d08de8ca7f4c5074abe19019cfc639bba070fbc9f76d3804c6f24a44688fbb8ed0f652103e71dac SHA512 388b39d0303a72bea85b195447ccf65975cada83bb82f762cba491d4a60bff2bb67e0f24ba46d32e8e5b499411490503e23cb0263a57306b92609713109ce55d -EBUILD gerbera-9999.ebuild 2299 BLAKE2B ac17a4ae8a371d35f4ddb6107405559285630f9b989cdec156edb7383a733930b5d78a68646092890a5c7ed068d43aa1962b050e77da275d0a8345906f0db569 SHA512 ddac3d08441b5a3e4797fa69785da72f87175f90a6fccaea23029b6f544af9b0d0d5ecd98375949d4e00354e444445dd33520bd47a92687e0a76b4f9f3c07bb0 +DIST gerbera-1.8.0.tar.gz 3579194 BLAKE2B 322eac129481a62e733949bf373fa551a1abfb44bf3ab98693664165ef24b8bcd9e2487ac36f5280206573e929f8c81736cf421a5f4d5719927900314aceca6c SHA512 04c61da4c29256e5b25c0709d7538de6674fb93c74fe8f45d8a441916cb49062734a41117c1aa5924b30315be34b27efc927ef88ce4f68ae44f92e693ad67745 +EBUILD gerbera-1.8.0.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68 +EBUILD gerbera-9999.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09 diff --git a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch deleted file mode 100644 index 93fd9e198dfb..000000000000 --- a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5ebc80d64bc651a3cd5de0e92f1e607b8f8ea407 Mon Sep 17 00:00:00 2001 -From: Ian Whyman -Date: Sat, 9 May 2020 11:22:47 +0100 -Subject: [PATCH] Fix incomplete type iohandler with Ninja generator -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -error: invalid application of ‘sizeof’ to incomplete type ‘IOHandler’ ---- - src/metadata/ffmpeg_handler.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/metadata/ffmpeg_handler.h b/src/metadata/ffmpeg_handler.h -index 7c134430..565ff773 100644 ---- a/src/metadata/ffmpeg_handler.h -+++ b/src/metadata/ffmpeg_handler.h -@@ -42,6 +42,7 @@ - namespace fs = std::filesystem; - - #include "metadata_handler.h" -+#include "iohandler/io_handler.h" - - // forward declaration - class AVFormatContext; diff --git a/net-misc/gerbera/gerbera-1.7.0.ebuild b/net-misc/gerbera/gerbera-1.7.0.ebuild deleted file mode 100644 index 5c8a5e6ac2fb..000000000000 --- a/net-misc/gerbera/gerbera-1.7.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake eutils linux-info systemd tmpfiles - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" - SRC_URI="" - inherit git-r3 -else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${P}" -fi - -DESCRIPTION="UPnP Media Server" -HOMEPAGE="https://gerbera.io" - -LICENSE="GPL-2" -SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" - -DEPEND=" - acct-user/gerbera - >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] - >=dev-db/sqlite-3 - dev-libs/spdlog:= - dev-libs/pugixml - dev-libs/libfmt:0= - mysql? ( dev-db/mysql-connector-c ) - javascript? ( dev-lang/duktape:= ) - taglib? ( >=media-libs/taglib-1.11 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) - exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl ) - magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska ) - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -PATCHES=( - "${FILESDIR}/${PN}-1.5.0-incomplete-type-iohandler.patch" -) - -src_configure() { - local mycmakeargs=( - -DWITH_CURL="$(usex curl)" \ - -DWITH_DEBUG="$(usex debug)" \ - -DWITH_EXIF="$(usex exif)" \ - -DWITH_EXIV2="$(usex exiv2)" \ - -DWITH_AVCODEC="$(usex ffmpeg)" \ - -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ - -DWITH_JS="$(usex javascript)" \ - -DWITH_LASTFM="$(usex lastfm)" \ - -DWITH_MAGIC="$(usex magic)" \ - -DWITH_MATROSKA="$(usex matroska)" \ - -DWITH_MYSQL="$(usex mysql)" - -DWITH_SYSTEMD="$(usex systemd)" \ - -DWITH_TAGLIB="$(usex taglib)" \ - -DWITH_INOTIFY=1 - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" - newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" - - insinto /etc/${PN} - newins "${FILESDIR}/${PN}-1.3.0.config" config.xml - fperms 0640 /etc/${PN}/config.xml - fowners root:gerbera /etc/${PN}/config.xml -} - -pkg_postinst() { - if use mysql ; then - elog "Gerbera has been built with MySQL support and needs" - elog "to be configured before being started. By default" - elog "SQLite will be used." - fi -} diff --git a/net-misc/gerbera/gerbera-1.8.0.ebuild b/net-misc/gerbera/gerbera-1.8.0.ebuild new file mode 100644 index 000000000000..d68414c66ed6 --- /dev/null +++ b/net-misc/gerbera/gerbera-1.8.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake linux-info + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${P}" +fi + +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + +LICENSE="GPL-2" +SLOT="0" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" + +DEPEND=" + acct-user/gerbera + >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] + >=dev-db/sqlite-3 + dev-libs/spdlog:= + dev-libs/pugixml + dev-libs/libfmt:0= + mysql? ( dev-db/mysql-connector-c ) + javascript? ( dev-lang/duktape:= ) + taglib? ( >=media-libs/taglib-1.11 ) + lastfm? ( >=media-libs/lastfmlib-0.4 ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2 ) + ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + curl? ( net-misc/curl ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska ) + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv +" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="~INOTIFY_USER" + +src_configure() { + local mycmakeargs=( + -DWITH_CURL="$(usex curl)" \ + -DWITH_DEBUG="$(usex debug)" \ + -DWITH_EXIF="$(usex exif)" \ + -DWITH_EXIV2="$(usex exiv2)" \ + -DWITH_AVCODEC="$(usex ffmpeg)" \ + -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ + -DWITH_JS="$(usex javascript)" \ + -DWITH_LASTFM="$(usex lastfm)" \ + -DWITH_MAGIC="$(usex magic)" \ + -DWITH_MATROSKA="$(usex matroska)" \ + -DWITH_MYSQL="$(usex mysql)" + -DWITH_SYSTEMD="$(usex systemd)" \ + -DWITH_TAGLIB="$(usex taglib)" \ + -DWITH_INOTIFY=1 + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" + newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" + + insinto /etc/${PN} + newins "${FILESDIR}/${PN}-1.3.0.config" config.xml + fperms 0640 /etc/${PN}/config.xml + fowners root:gerbera /etc/${PN}/config.xml +} + +pkg_postinst() { + if use mysql ; then + elog "Gerbera has been built with MySQL support and needs" + elog "to be configured before being started. By default" + elog "SQLite will be used." + fi +} diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 5757a960069a..d68414c66ed6 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -3,15 +3,14 @@ EAPI=7 -inherit cmake eutils linux-info systemd tmpfiles +inherit cmake linux-info if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" - SRC_URI="" inherit git-r3 else SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" fi @@ -24,7 +23,7 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic DEPEND=" acct-user/gerbera - >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] + >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest index b5fa900144d9..d30ec5ee9f73 100644 --- a/net-misc/gnome-online-miners/Manifest +++ b/net-misc/gnome-online-miners/Manifest @@ -1,3 +1,3 @@ DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464 -EBUILD gnome-online-miners-3.34.0.ebuild 897 BLAKE2B 2189a23b07210b50b5b3979dc36c58b5146c82254705276df0b0e458751ccaccfa124fde137834d16074a19e405df73fe38204f18ef2cc84869568e035d00fe9 SHA512 5bca8617485b11535b8f9185aa800cd8afe84b4cdcf7ec1aeb9cec5fccb2b5af723a70cac0a99b83de5861311a8b2aa03bfc593cdb8d3ef740897f87ef62f0ff +EBUILD gnome-online-miners-3.34.0-r1.ebuild 898 BLAKE2B 912862579bd2cfe953cd35f8702a3768e433651a8a93c647c970e66fac2cc07c378214d380bb43d12e8864a00ca6f92f9273007185780b65986c29138b3c4351 SHA512 3ec1ba0cb89bdd4f0e59e89482212d9bf30a429c092980b117d195d87a865fe078fc9aaaf5facaa7de61e18b27893b92fbc0f7787d9734bc83d7d1c0058810e5 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild new file mode 100644 index 000000000000..2b595426beb3 --- /dev/null +++ b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.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:0= + >=dev-libs/glib-2.35.1:2 + >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] + media-libs/grilo:0.3 + >=net-libs/gnome-online-accounts-3.13.3:= + >=net-libs/libgfbgraph-0.2.2:0.2 + >=net-libs/libzapojit-0.0.2 + flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + $(use_enable flickr) \ + --disable-static \ + --enable-facebook \ + --enable-google \ + --enable-media-server \ + --enable-owncloud \ + --enable-windows-live +} diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild deleted file mode 100644 index ce5e8ea97968..000000000000 --- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest index d32013c2f972..8762e1799704 100644 --- a/net-misc/gnome-remote-desktop/Manifest +++ b/net-misc/gnome-remote-desktop/Manifest @@ -1,9 +1,3 @@ -AUX gnome-remote-desktop-0.1.9-copy-pixels.patch 2770 BLAKE2B 6415c88173a375282a816a5d2b2c7e947dd53d4cd3b2bd4d49bf2365e6f4854f562dd0dff99cd3fc8eb0a3fa7b962cf9d38fc3e72218cf37dc1d350195147a67 SHA512 feb4c600b9225a8ffe82faa221c78aa199fb1e49cfad0b7031deff0188165e6244af64e233349786f9da414efd296074aed8749eeb0f15e1d9a43aeb564be88d -AUX gnome-remote-desktop-0.1.9-drop-vnc-frames.patch 2637 BLAKE2B bf16767583e80fb0af8a0702e412f73c1cd9b1868446268a9e584db520fb22305d89f62bc165964116d39972d6946970da7c135120a18ad21e90a82cdc39b13e SHA512 e5634f7445d8933a010c1302363191873f55612e8ab272ed6b86b9a8043ce738e08ce3f23c98d32dacd2cc8c948340685843690f5d680d0eee410cb83d504ec3 -DIST gnome-remote-desktop-0.1.7.tar.xz 25636 BLAKE2B 00e389bc8887c3d43f9221a45c6c7154e4140fab560c5c568fe92f06794b736efcf2265c763d0d9d57d5343dd2f71b7a3a2c45b0466cdae608f0a609af53175d SHA512 dd20e5e6fd724ff03d8a32319c7145f1fef4331439e52921b812f087e6b83185bf318bb2fb9758fe083ec3cfea30448b601da4ed1aba85fa892ef7fbb794b9ed -DIST gnome-remote-desktop-0.1.8.tar.bz2 28565 BLAKE2B 8c14200eb17503eb92c7a7db51d487f17bca7616848aa8f555d2c31a5b758b500d6bbcb78a4a75cebbe0220281079848517c58813783497b463b0a771f07229b SHA512 1e433a95c303ce82782c27412c4f4456f0ecf33eb1e63b61b11f1cde68b6113a765a0f7d7871f73af8a253f1d7b3d3d4dafd36c3e5e9fa6d6c97279747f584ab -DIST gnome-remote-desktop-0.1.9.tar.xz 38040 BLAKE2B aac99424d9c11614f1fd3c9ce1ebe913212489b4c8f3cc22fe5d44b00483cba9cebae8974d221d81a1cbe3e53e85a24f2c5053714fb8b753ada1c034d031752c SHA512 6ac2962c824634cd5322785b6d251e899ea38668010b18b1b50124497895d9c00752904abf01490e27b74e1661aeae39d83fbbd77b841329b1e0fd381c3ea440 -EBUILD gnome-remote-desktop-0.1.7.ebuild 957 BLAKE2B ec9d93ae7954028f8a9ae96ea530418845e4a8ad8b9c8357bd70ae47ce092d18cb35ee7af6dcf3ac45bf90e3c70540b8780fd2219e71257baa59650ef1c8bf57 SHA512 04bd0aab7298411081b13fe1ee96cc3b27543472776cacee50a65d94e90acbbbe5198478ad023062a6733f2fc00437dec1bc17c3512fdcfd3559ce8a8df3f27c -EBUILD gnome-remote-desktop-0.1.8.ebuild 917 BLAKE2B 36c0cf9e37dc9442fd00876254e93ea27ea5866df69ef4c67238945c2b556de6157e1b33f306c3c21f5b436428f324b0a44554520baa98cb9f239d8a3b34c9ec SHA512 97d1c72cdc13ecf6dcdacfa2fec232449e075b3ef5d0b0d9f9e4102955194df3cfc2cd621532efd1f6c0a7de851180031945f7201b1971ddec3f15c1321733f6 -EBUILD gnome-remote-desktop-0.1.9.ebuild 936 BLAKE2B ffa02d3616f1656654687a0d1f7bf1548dd0acff02ab4592367a757433c69aed4a109c94222b8c772da055fd8b25f3053350c37443e4bec532f28d835e0dcd1b SHA512 297bfd0e93505a60880acf28cac5d53f91bb44f2905d815e602233f09ffba30b81bd3350bd86945d5be942a474a2b4b1c56093bccfffc3838ce573b05100e132 +DIST gnome-remote-desktop-40.0.tar.xz 59748 BLAKE2B 73c81a8d6a565cbba1475d122c1a16f02a676a572ac29b69bd5a31de5482b985a0bae7c3b8fda8f4ec1895db87ba2b9ca408347166c7e43c9a0456f5b4fdf7b7 SHA512 557d5425a92cc50dfac60d9e5e39fba88bd3a653ece6490aae663913bc1df490b7d864ae0d6e8cc2c305e7c0fa5f77d7b1e63488bc51f38a0f897232b69edc89 +EBUILD gnome-remote-desktop-40.0.ebuild 1163 BLAKE2B f9068166a79734b1efd85716fdb658ceee12ef46f09bbf5625858d230af24954b9c1f27f09a0a388e19545dc2649a3f2eec342b47c1d3105ab072bcac04a8795 SHA512 e510ccd0bfa6274a4745a2f838f268b6221af280611247797a6eea45981dc89dbdea86f6142182a0e2f68907f11f8dc52fcfbf8c3f6e9ff80afa867d66029cb7 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-copy-pixels.patch b/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-copy-pixels.patch deleted file mode 100644 index 44cecbf6ad60..000000000000 --- a/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-copy-pixels.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4d358762948dccdcac6d01f4dd7b8635e53de979 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Mon, 12 Oct 2020 17:34:30 +0200 -Subject: [PATCH] vnc: Copy pixels using the right destination stride - -We're copying the pixels in a separate thread managed by PipeWire, and -in this thread, accessing the VNC framebuffer dimension and stride is -racy. Instead of fetching the dimension directly, pass the expected -width and get the stride it will eventually have. - -Already before this patch, when the copied pixel end up on the main -thread and the dimension still doesn't match up, the frame will be -dropped. ---- - src/grd-session-vnc.c | 5 +++-- - src/grd-session-vnc.h | 3 ++- - src/grd-vnc-pipewire-stream.c | 5 +++-- - 3 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c -index a06d34d..ba3e5ce 100644 ---- a/src/grd-session-vnc.c -+++ b/src/grd-session-vnc.c -@@ -519,9 +519,10 @@ check_rfb_password (rfbClientPtr rfb_client, - } - - int --grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc) -+grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc, -+ int width) - { -- return session_vnc->rfb_screen->paddedWidthInBytes; -+ return width * BGRX_BYTES_PER_PIXEL; - } - - static void -diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h -index 07678c8..ee1f986 100644 ---- a/src/grd-session-vnc.h -+++ b/src/grd-session-vnc.h -@@ -55,7 +55,8 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc, - int x, - int y); - --int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc); -+int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc, -+ int width); - - gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc); - -diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c -index 96dd7c9..82ceb9b 100644 ---- a/src/grd-vnc-pipewire-stream.c -+++ b/src/grd-vnc-pipewire-stream.c -@@ -326,10 +326,11 @@ process_buffer (GrdVncPipeWireStream *stream, - int height; - int y; - -- src_stride = buffer->datas[0].chunk->stride; -- dst_stride = grd_session_vnc_get_framebuffer_stride (stream->session); - height = stream->spa_format.size.height; - width = stream->spa_format.size.width; -+ src_stride = buffer->datas[0].chunk->stride; -+ dst_stride = grd_session_vnc_get_stride_for_width (stream->session, -+ width); - - frame->data = g_malloc (height * dst_stride); - for (y = 0; y < height; y++) --- -GitLab - diff --git a/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-drop-vnc-frames.patch b/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-drop-vnc-frames.patch deleted file mode 100644 index 56ea75ff466d..000000000000 --- a/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-drop-vnc-frames.patch +++ /dev/null @@ -1,80 +0,0 @@ -From ab97841629f5f3f4fab9993b6255b6ae04828b9c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Wed, 9 Sep 2020 10:14:20 +0200 -Subject: [PATCH] vnc: Drop frames if client is gone - -Frames from PipeWire are posted asynchronously from a I/O thread to the -main thread where they are turned into VNC frame updates and cursor -movements. On the other hand, sessions are closed asynchronously when -the VNC client disappears. If a frame ended up on the main thread after -a client disappeared but before the session and stream was closed, we'd -try to turn the new frames into VNC updates without a client being -available, causing use after free. - -Fix this by dropping frames that happens during this time frame. - -Closes: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/issues/43 ---- - src/grd-session-vnc.c | 7 +++++++ - src/grd-session-vnc.h | 2 ++ - src/grd-vnc-pipewire-stream.c | 8 ++++++++ - 3 files changed, 17 insertions(+) - -diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c -index 813838a..a06d34d 100644 ---- a/src/grd-session-vnc.c -+++ b/src/grd-session-vnc.c -@@ -209,6 +209,12 @@ maybe_queue_close_session_idle (GrdSessionVnc *session_vnc) - g_idle_add (close_session_idle, session_vnc); - } - -+gboolean -+grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc) -+{ -+ return !session_vnc->rfb_client; -+} -+ - static void - handle_client_gone (rfbClientPtr rfb_client) - { -@@ -218,6 +224,7 @@ handle_client_gone (rfbClientPtr rfb_client) - - grd_session_vnc_detach_source (session_vnc); - maybe_queue_close_session_idle (session_vnc); -+ session_vnc->rfb_client = NULL; - } - - static void -diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h -index 579a12a..07678c8 100644 ---- a/src/grd-session-vnc.h -+++ b/src/grd-session-vnc.h -@@ -57,4 +57,6 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc, - - int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc); - -+gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc); -+ - #endif /* GRD_SESSION_VNC_H */ -diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c -index 78793c4..96dd7c9 100644 ---- a/src/grd-vnc-pipewire-stream.c -+++ b/src/grd-vnc-pipewire-stream.c -@@ -234,6 +234,14 @@ do_render (struct spa_loop *loop, - if (!frame) - return 0; - -+ if (grd_session_vnc_is_client_gone (stream->session)) -+ { -+ g_free (frame->data); -+ g_clear_pointer (&frame->rfb_cursor, rfbFreeCursor); -+ g_free (frame); -+ return 0; -+ } -+ - if (frame->rfb_cursor) - grd_session_vnc_set_cursor (stream->session, frame->rfb_cursor); - --- -GitLab - diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.7.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.7.ebuild deleted file mode 100644 index 5bd5fbadeeeb..000000000000 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.7.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome2-utils meson systemd xdg - -DESCRIPTION="Remote desktop daemon for GNOME using pipewire" -HOMEPAGE="https://gitlab.gnome.org/jadahl/gnome-remote-desktop" -SRC_URI="https://gitlab.gnome.org/jadahl/gnome-remote-desktop/uploads/ed3e8b8ebc1a74b6f4ed7260a2739f40/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="" - -DEPEND=" - dev-libs/glib:2 - >=media-video/pipewire-0.2.5:0/0.2 - sys-apps/systemd - net-libs/libvncserver - app-crypt/libsecret - x11-libs/libnotify -" -RDEPEND="${DEPEND} - x11-wm/mutter[screencast] -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild deleted file mode 100644 index dcbc76e70e20..000000000000 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome2-utils meson systemd xdg - -DESCRIPTION="Remote desktop daemon for GNOME using pipewire" -HOMEPAGE="https://gitlab.gnome.org/jadahl/gnome-remote-desktop" -SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="" - -DEPEND=" - dev-libs/glib:2 - >=media-video/pipewire-0.3.0:0/0.3 - sys-apps/systemd - net-libs/libvncserver - app-crypt/libsecret - x11-libs/libnotify -" -RDEPEND="${DEPEND} - x11-wm/mutter[screencast] -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.9.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.9.ebuild deleted file mode 100644 index 622bb9d2a09c..000000000000 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.9.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 gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Remote desktop daemon for GNOME using pipewire" -HOMEPAGE="https://gitlab.gnome.org/jadahl/gnome-remote-desktop" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="" - -DEPEND=" - dev-libs/glib:2 - media-video/pipewire:0/0.3 - sys-apps/systemd - net-libs/libvncserver - app-crypt/libsecret - x11-libs/libnotify -" -RDEPEND="${DEPEND} - x11-wm/mutter[screencast] -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-drop-vnc-frames.patch" - "${FILESDIR}/${P}-copy-pixels.patch" -) - -src_configure() { - local emesonargs=( - -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.0.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.0.ebuild new file mode 100644 index 000000000000..a74b7201bd2d --- /dev/null +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg + +DESCRIPTION="Remote desktop daemon for GNOME using pipewire" +HOMEPAGE="https://gitlab.gnome.org/jadahl/gnome-remote-desktop" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+rdp +vnc" +REQUIRED_USE="|| ( rdp vnc )" +RESTRICT="test" # Tests run xvfb-run directly + +DEPEND=" + x11-libs/cairo + dev-libs/glib:2 + >=media-video/pipewire-0.3.0:0/0.3 + sys-apps/systemd + app-crypt/libsecret + x11-libs/libnotify + rdp? ( + >=net-misc/freerdp-2.3:=[server] + >=sys-fs/fuse-3.9.1 + >=x11-libs/libxkbcommon-1.0.0 + ) + vnc? ( + net-libs/libvncserver + ) +" +RDEPEND="${DEPEND} + x11-wm/mutter[screencast] +" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/gdbus-codegen + dev-util/glib-utils + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_use rdp) + $(meson_use vnc) + -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index 5ee23da0445b..f63e3a346839 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,5 +1,5 @@ DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B 0f3698adeb7cf9daede05c0281a2c324bad0952a9e5774e11ebb9af342da020bac8b7acb05a938cd8df5a8934bed6bd2b56ee0187ea28b8356376e1f1396e944 SHA512 233db2e3bb3d6a071ce3ce24b8c86049f2707863f92ca67c4fdfb763bbdc98d3b78a1c2156d2d05548ee10f84394ab333f1c3404723091dc4e7edeb3df5a4a57 DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B 213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e634934431111c82b0d91b5afb61f SHA512 f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039 -EBUILD gns3-server-2.2.17.ebuild 2141 BLAKE2B bdf09970f3219a647417c16be639efc24db650957ecc8d1d33b0a782aa428f1499faa34e9e3147fd1ee0359937da6d0cd8714e849eb29246678e8dd4f306bc43 SHA512 9adc66b53022286421d46f591ef79eefb1b186376a5cee802c41b1a89e770e0ac7972c1b748e570da4dedb42473f6d89d032e698c080ff8f96e7fa3b29775507 -EBUILD gns3-server-2.2.19.ebuild 2113 BLAKE2B 7350a2d2acce98ebf3e5d468b51eb21a05982c42c4afc75398940632b3ddd27c720f9d917d2385a1556ac4e0e2ac75fe6f084e78a884225f32c614ab072313ac SHA512 235e8acfee7f30f7ba7e6de65b36bfa710a06cf2154630ad34b87d59846e5431837865557b3cfae7668a613f9151e34cca0f371f39bd1e24e988b17e90c7cc64 +EBUILD gns3-server-2.2.17.ebuild 1948 BLAKE2B 0db413789015cb528b82884639bd02abe1fa8e5fed63e1c8c5a0f534ed512613491ccac2ed1764aa5bc69e61b9c6000575541a9f20ceec51b08fd83d76542e22 SHA512 74004f45d53a3bcc1cf00b7abd171ab539c3320d34f22c0273aa6bf37e19b7457515f46f47b7dc1e0b25d4a305869d58dfdf8961699fbd9e3650b8b49f499ce2 +EBUILD gns3-server-2.2.19.ebuild 1920 BLAKE2B 97df3dc66e92ef74325c411945666fdd2be613ff9f43bc3cad09e7fb891c8a914612c398968b8158848775eeb7fbea32c4dc9499b15ad1a1386acc44404ba561 SHA512 a3ea580135874ec73009f732b72fda4b9b3b785937c9347b13434ed613cfa223607e2d0813c11d895f46195d84170b2569ec085399a6328aa1a307fa75a28c2a MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583 diff --git a/net-misc/gns3-server/gns3-server-2.2.17.ebuild b/net-misc/gns3-server/gns3-server-2.2.17.ebuild index b014c21ebf68..36b02014f945 100644 --- a/net-misc/gns3-server/gns3-server-2.2.17.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.17.ebuild @@ -54,14 +54,11 @@ python_install() { } pkg_postinst() { - elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality." - elog "" - elog "The following is a list of packages that can be added:" optfeature "QEMU Support" "app-emulation/qemu" optfeature "Virtualbox Support" "app-emulation/virtualbox" optfeature "Docker Support" "app-emulation/docker" optfeature "Wireshark Support" "net-analyzer/wireshark" - elog "" + elog elog "The following packages are currently unsupported:" elog "iouyap and vpcs" } diff --git a/net-misc/gns3-server/gns3-server-2.2.19.ebuild b/net-misc/gns3-server/gns3-server-2.2.19.ebuild index 74edb61d0a62..c02bcf1c7998 100644 --- a/net-misc/gns3-server/gns3-server-2.2.19.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.19.ebuild @@ -54,14 +54,11 @@ python_install() { } pkg_postinst() { - elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality." - elog "" - elog "The following is a list of packages that can be added:" optfeature "QEMU Support" "app-emulation/qemu" optfeature "Virtualbox Support" "app-emulation/virtualbox" optfeature "Docker Support" "app-emulation/docker" optfeature "Wireshark Support" "net-analyzer/wireshark" - elog "" + elog elog "The following packages are currently unsupported:" elog "iouyap and vpcs" } diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest index 414b55d492ae..61f19c0531e8 100644 --- a/net-misc/gofish/Manifest +++ b/net-misc/gofish/Manifest @@ -1,5 +1,8 @@ +AUX gofish-1.2-r1.confd 21 BLAKE2B 3a7fb9d9e622954e7bf2cabc4c3dcfa3b948303810e091f4f8d1a8fc73ba1d7bbe778714b4fb5cb3138c7913b5e74dc45cd964794b602d94149480d70fd8cfed SHA512 869e3a142459145c162cbcb9ae147169bff1158db0027c79c1374bf2f5160827e249ee7a59f3b0721d6392b585ce5a6ca65bdc0950092d8663d3dc9ffb65a2d7 +AUX gofish-1.2-r1.rc 276 BLAKE2B 0a0441c2357a0089aced9143de03c628d0b7b2e8fb1544ac7a3a7b7f0364745866977519654d9ebdc9037307424c981f6bb1627605f581a17cc58bd402d2c835 SHA512 0d8ccd935ce7a4d25be0f67d6095fdbcbd5e11b49aabdbd64cfba5f297cdcbc3db70b3759da4158cca00bf50faa6874c6cc3b2cc51dfebfa3c0b1c65c252db3f AUX gofish.confd 429 BLAKE2B 508d6970cf449da1b1b9cf3940d3df024f66ace3ec1f64415eccfab8d3a8c27be54c3b00fbbbc058fc17d583dd863323aad0a88291ffaee2015a6352202a004d SHA512 3a3fc8a701149195d6a18aa38cf22030415fcaf1e72bb9603175345d639a055e7b13130d4a2ef3308eaf946ed4d0c8d21378f8793e344d2baf6dc4c9ad0b7db6 AUX gofish.rc 607 BLAKE2B 85733d62a2b59a0feb900169cac3ce58f49a40664c7a536b23e4efde8db0888957773ace3cd0f317b821be4532cfd8b9ff7f6641f66cfcac15af6e62bee959fb SHA512 dbae20d8b5bd17e05612bf85acea2a6d0433a7c59670e6d7c2807274da8d8a81a82cdb15eac7dda572be062ef2aa87b62dabc0dfc208013eaeb682f7bc49f9e1 DIST gofish-1.2.tar.gz 212596 BLAKE2B ca202a55463fbc0b09ed902556d038101b4963ef24920ccd527c2b0c99a2905431c3bdffb2777605010b62db48dd80362ecc68e6ddcfecc7f5f4245bece4d749 SHA512 f7999a5e2b4f80d6402f26d9434f844b26b47b43a6b00055e72ba399426672ed299ca759252d8eb732b23a4c2c369a92c11c0d496f16f4bf3a999398cf6c5bee -EBUILD gofish-1.2.ebuild 639 BLAKE2B 84057e4158b72cf573c684aa61eea6c60961922ac457ce1a261340b333dad8624330e8334caca52865c2ca543beba75f12bf591a521a58d273466dd94e3fee9a SHA512 4788c07ebd7a8b82a04cea280b80e149ba559d3703b376428478bc3cebc0101ad4627cc829678eb30b087c2ae64b4e9f9b7300582f0787b8b760489f6471ecf9 -MISC metadata.xml 243 BLAKE2B abe6d8663d75c0714d442564a532697432403497680faea1e7aaac85ead3e43040f41b87aeff96392efe92cbeb4e8795d5fa89975098673d89b6b116e24e8b98 SHA512 20e0e5969c25ae20a3e0fd1a48aab24ea25d41f80ea16d1b5075a097ce1de9f1652c571a9b2673d6ff009e03eeb9bf5a11f61ed305486784df5ae0924ef9ef24 +EBUILD gofish-1.2-r1.ebuild 638 BLAKE2B 6eea9492afa5815f033e3a15331980c733c4725faeb907261c22caaef6936ac3269e4d970c6e3e45a37140b2ff65855c8a9cb5af0cfe26f03e09e8ecd9851f71 SHA512 3022adbcf217df44bad004f97a97ea3c965e61babdf47d3fc4715f4d9f9ae7da3325458a234f0bab6a19f5eb77112e6660e3854945eff386164f2c5419473424 +EBUILD gofish-1.2.ebuild 652 BLAKE2B c75e3dd069dc503b10b0eac2a817607a272587062562a0b0cf5cfe3abd2fc2f770bfb1968c341d5da1f54322959f4e02c4087f76a7ccb80fda78eab6d81efdc3 SHA512 0e85d33f0c2fb1aafb733d8f4aaac19329865f0c66e4224c686caea4aa27e790e3a1e7420f1912315323ed8664354d93da2b2bc044347a7ab6a73bb42dc72d37 +MISC metadata.xml 466 BLAKE2B 5cfa732e72370b818e728f16af957fcd57c4a10d03dca70bd83014074d659e2a695752a4f3bb536b30eca784b812004638fae7d7fb25cb1381b18c7881220aaf SHA512 957563aed285486e3453274fcb2a50f3492aee99f537f6028f8cedc95a88d033e7c0639dca64e34048fd6889c3148483a886e8f0e10063e85445febdea41ddc0 diff --git a/net-misc/gofish/files/gofish-1.2-r1.confd b/net-misc/gofish/files/gofish-1.2-r1.confd new file mode 100644 index 000000000000..5ecb2816c2aa --- /dev/null +++ b/net-misc/gofish/files/gofish-1.2-r1.confd @@ -0,0 +1 @@ +GOFISH_START_OPTS="" diff --git a/net-misc/gofish/files/gofish-1.2-r1.rc b/net-misc/gofish/files/gofish-1.2-r1.rc new file mode 100644 index 000000000000..2566bbca99c3 --- /dev/null +++ b/net-misc/gofish/files/gofish-1.2-r1.rc @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/gofish" +command_args="${GOFISH_START_OPTS}" +command_args_background="-d" +pidfile="/var/run/gofish.pid" + +depend() { + need net +} diff --git a/net-misc/gofish/gofish-1.2-r1.ebuild b/net-misc/gofish/gofish-1.2-r1.ebuild new file mode 100644 index 000000000000..fa82bccbe174 --- /dev/null +++ b/net-misc/gofish/gofish-1.2-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Gofish gopher server" +HOMEPAGE="http://gofish.sourceforge.net" +SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=" + acct-group/gopher + acct-user/gopher +" + +DOCS=( Configure_GoFish ) + +src_configure() { + local myeconfargs=( + --localstatedir=/var + --disable-mmap-cache + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + newinitd "${FILESDIR}"/gofish-1.2-r1.rc gofish + newconfd "${FILESDIR}"/gofish-1.2-r1.confd gofish +} diff --git a/net-misc/gofish/gofish-1.2.ebuild b/net-misc/gofish/gofish-1.2.ebuild index 6f64429d30ae..6ab8823d84a2 100644 --- a/net-misc/gofish/gofish-1.2.ebuild +++ b/net-misc/gofish/gofish-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,16 +8,11 @@ inherit user DESCRIPTION="Gofish gopher server" HOMEPAGE="http://gofish.sourceforge.net" SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz" +S="${WORKDIR}/${PN}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -S=${WORKDIR}/${PN} pkg_setup() { enewgroup gopher @@ -25,9 +20,12 @@ pkg_setup() { } src_configure() { - econf \ - --localstatedir=/var \ + local myeconfargs=( + --localstatedir=/var --disable-mmap-cache + ) + + econf "${myeconfargs[@]}" } src_install() { diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml index b939f35668cd..ab50e898b2e8 100644 --- a/net-misc/gofish/metadata.xml +++ b/net-misc/gofish/metadata.xml @@ -1,7 +1,14 @@ - + + matt@offtopica.uk + Matt Smith + + + proxy-maint@gentoo.org + Proxy Maintainers + gofish diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest index 626f5c5977da..c3c43024cb98 100644 --- a/net-misc/grive/Manifest +++ b/net-misc/grive/Manifest @@ -1,9 +1,6 @@ AUX 299.patch 3435 BLAKE2B 04b4c27800ee95e185aff83e1fd2453c30559fce7034a42821482cac9b4d409d3945813fef736e7adb744b9d865e31afab60c6ac457af968d7dbc319872ad5ea SHA512 b425c524b28a3e245a4de6090b052a2b1e08a06b5b8227450f91a127d4ea67cc8b1f3a74ac802f1525126d236fa1ad2de0a171ef0fa241ad27b1164606ec0501 DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888 -DIST grive-0.5.1_pre20171005.tar.gz 164450 BLAKE2B e8fde261ec419c1284575032ce326de4953ecf7b4824a70aec07b41f6013b4d26532ba0eae3897c910bd5bb51949dcc13fcb699013557f24c38c75fb251e868c SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c DIST grive-0.5.2_pre20200205.tar.gz 170384 BLAKE2B dac8d75bdefe0c206f443010093e73b34ae8257a5ced87917cca240fb7134a6aac8e5f018eeb7bf7dec46d5043e144efb2c9586ca2b5ff55a1d0fe022f72675a SHA512 d1058649d2a3dce773eab53b1704c5dd8bb1998089099ed9c3bacdaa5d3f995fa08c1b2c2b723bbce0efa2c9c04729d97aade6df6130da32f975e2bb45f339e6 EBUILD grive-0.5.1-r1.ebuild 787 BLAKE2B 7737e8622f3779d8a121b18bd09fd3717b019576fa1ada046dc104e3f23445b297d749bf6a3557b58a212839c6611c916e872455890be7aae01be1cf1ffdf574 SHA512 41bfbcd2dc7038d879db312b4701b4bd37cbbb8fa065a720dd5de71903aac8745c9ff679e96df1accd9e316badb1e02fd4562ff734fe52e79c53f2133f054dfd -EBUILD grive-0.5.1.ebuild 756 BLAKE2B e2d3f071ea93435ba19516baa1a138d6312f794133a8ce4edb811dd601daf7e129e73c13345c843d9a5c0af9346351d5c70df775a16d572f42c02913b8f82a77 SHA512 9e9c1fd7d8c34de9615f6a93af74caad6dbb5fe632ad4417aa7571a683099a3c3b8cb40dd984d6e57e2ca29473780e9bd0c3080c6c9cf6a569af68c1e179de08 -EBUILD grive-0.5.1_pre20171005.ebuild 810 BLAKE2B 75622d38abc90cb36ac0625bc113a4ae3e1841768d0392e24d45ffacd06c593ad96d4b366fad8f22d725eafa2bbb7324c9851f507c7af30660ec06202c1694f9 SHA512 d29f8d4cb9b1775b600469592378b0785de1dcc8a6afba3e142d95e47a8b3064576d1c2cd070f13b7fd9d14e0c668d2ebd67b9c153df91ba23036ba25379cd66 EBUILD grive-0.5.2_pre20200205.ebuild 804 BLAKE2B 52c46fe6396ab3d8cbefd8591f6b02ca5dfaa0815812ddc5cdb284fb0faca5a160755a99ab94ed87582911baa1e920f1902ed3abb6fc41fffcf9c73e45cfcc74 SHA512 cc872fbc59c008773dc275eadf339db3f4d4b6ff92d974f1af55fd7f6f681ac238bc67c32db900d467d224ae294623dd5875ceb799bffc7bce06a7648eca5d26 MISC metadata.xml 329 BLAKE2B 29317b0c9304da834a9876bf09262b2e6d8664978ec04973bfcb6b196efa71d3405f758176662a2af32b780f5819cf4980a4ed21f079609ed8b50109a176a438 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997 diff --git a/net-misc/grive/grive-0.5.1.ebuild b/net-misc/grive/grive-0.5.1.ebuild deleted file mode 100644 index 04bfdf1b8e05..000000000000 --- a/net-misc/grive/grive-0.5.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git" -else - inherit vcs-snapshot - SRC_URI="https://github.com/vitalif/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="An open source Linux client for Google Drive" -HOMEPAGE="https://github.com/vitalif/grive2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/boost:= - dev-libs/expat - >=dev-libs/json-c-0.11-r1:= - dev-libs/libgcrypt:0= - dev-libs/yajl - || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) - sys-libs/binutils-libs:0= - sys-libs/glibc -" -DEPEND="${RDEPEND}" diff --git a/net-misc/grive/grive-0.5.1_pre20171005.ebuild b/net-misc/grive/grive-0.5.1_pre20171005.ebuild deleted file mode 100644 index 75e5b3f315c4..000000000000 --- a/net-misc/grive/grive-0.5.1_pre20171005.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 cmake-utils - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git" -else - inherit vcs-snapshot - COMMIT="3c90425b8f46b62365ec3d84de628163865dbb1e" - SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="An open source Linux client for Google Drive" -HOMEPAGE="https://github.com/vitalif/grive2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/boost:= - dev-libs/expat - >=dev-libs/json-c-0.11-r1:= - dev-libs/libgcrypt:0= - dev-libs/yajl - || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) - sys-libs/binutils-libs:0= - sys-libs/glibc -" -DEPEND="${RDEPEND}" diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest index 58191ccdd8bc..fa2b0b30366d 100644 --- a/net-misc/gsutil/Manifest +++ b/net-misc/gsutil/Manifest @@ -4,6 +4,6 @@ AUX gsutil-4.50-boto-tests.patch 1483 BLAKE2B 9d40250f7a836535297da411bda76430dc AUX gsutil-4.50-tests.patch 2451 BLAKE2B d84d1cd31eeabb3c0ecbb4b4850ec30d5f96e641b135b6c7fe6e7442edcfc4d2d076858b6fe1365f9424d32c81d9b818885df03f66405dfb8ca4d2149ee33ab5 SHA512 007e07b54a5f4182586f3defbc070f5883356214cb0e28861df66509c414d8bbde5718fd8598bcf023e9971331a34b2f1aefd89350e6d3c97e93ae80176b2d5a DIST gsutil_4.59.tar.gz 4024669 BLAKE2B 4317cd3787adae2d7d066d7c8d5c62cfe77749d4efc8b5451e87ac6294de0e6f13c085795de30a891f2d7b58cd7e0724234cf14b4308542c8d050856a868c5cf SHA512 c86b957a2630f3a80869e3105c0baa7bf1297b84698e756fed28b28adf36345cf1dd28d4216ec395de6bfee5b118dd70040ff964a2938f22d8af15a5c3485c48 DIST gsutil_4.60.tar.gz 4012900 BLAKE2B d3d1b57d5b0d42b1b454944efe8d62855b665d3772817c636568ef49c79ae2c566ef08c4c6e1bd3c9829471561865b64b3beec8d3911d6766748337aa1b1fc3e SHA512 18ab701cbb60513d66e8b96ced28cfe65dc0f210435fb5ffbcbfab3541ec7ed051db726e52239796d9579d0928953f610064279a3ee1e5b5c06cec963493804c -EBUILD gsutil-4.59.ebuild 3026 BLAKE2B 579c56d597e1aedb12a872763947c3d1e4eb29edd6768cefea0ba0e1bc435f79a1a2ef495682407ed545fce53cbd71ce4fa5fd166c926ab1c9d9370018d1351a SHA512 82e63ab4bbb1e2b965079fa3268b2c340d909822c9e9b6286239a36a6b10745a45c7dc7ac93706907adc8e2a3a1e1210f19932b6534aa6bd453a65bfba9dca08 -EBUILD gsutil-4.60.ebuild 3026 BLAKE2B 579c56d597e1aedb12a872763947c3d1e4eb29edd6768cefea0ba0e1bc435f79a1a2ef495682407ed545fce53cbd71ce4fa5fd166c926ab1c9d9370018d1351a SHA512 82e63ab4bbb1e2b965079fa3268b2c340d909822c9e9b6286239a36a6b10745a45c7dc7ac93706907adc8e2a3a1e1210f19932b6534aa6bd453a65bfba9dca08 +EBUILD gsutil-4.59-r1.ebuild 3072 BLAKE2B 267dbbd52f525a90532b151eac417b5ad3abc88705b698c84ba765a4f71494ba39e858c0912dbba1f33fb56ed83f7e055d710d2330563c3d74838c134de01aa3 SHA512 c4c536f87b66a699b8b28da4b26245f923b9132e2f69369cc53dbe0baa051e15089a92b03031428b742b1f7ec035a2b09148746aff80822c508191f07fdbe93b +EBUILD gsutil-4.60-r1.ebuild 3072 BLAKE2B 267dbbd52f525a90532b151eac417b5ad3abc88705b698c84ba765a4f71494ba39e858c0912dbba1f33fb56ed83f7e055d710d2330563c3d74838c134de01aa3 SHA512 c4c536f87b66a699b8b28da4b26245f923b9132e2f69369cc53dbe0baa051e15089a92b03031428b742b1f7ec035a2b09148746aff80822c508191f07fdbe93b MISC metadata.xml 514 BLAKE2B b37a6acae57aa619dd2adc4722283fbf1f5076ed9b3fa18558fdbe0d9ea39eb9fd1e0a678ce2df59c2c37f444558f9e4d1e913be7c7fdf1b2a16f31e809b7588 SHA512 d97ecaa80d5996fb0bb424681861e552c4f3ee206ec0b5d7a4f703247ea495e0a201757ebe4a5288389cab58208ead2718288107cad173684f37ecb9357bf06e diff --git a/net-misc/gsutil/gsutil-4.59-r1.ebuild b/net-misc/gsutil/gsutil-4.59-r1.ebuild new file mode 100644 index 000000000000..7cd73f33bffb --- /dev/null +++ b/net-misc/gsutil/gsutil-4.59-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="command line tool for interacting with cloud storage services" +HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil" +SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}] + >=dev-python/boto-2.49.0[${PYTHON_USEDEP}] + >=dev-python/crcmod-1.7[${PYTHON_USEDEP}] + >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] + >=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}] + >=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}] + >=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.18[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] + >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] + >=dev-python/six-1.12.0[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/gsutil-4.41-tests.patch" + "${FILESDIR}/gsutil-4.50-boto-tests.patch" + "${FILESDIR}/gsutil-4.50-tests.patch" +) + +S="${WORKDIR}/${PN}" + +DOCS=( README.md CHANGES.md ) + +# needs to talk to Google to run tests +RESTRICT+=" test" + +python_prepare_all() { + distutils-r1_python_prepare_all + + # NB: We don't delete all of boto/ because the tests are imported by the + # production code. The same reason we can't delete gslib/tests/. We can + # delete the main boto library and use the system version though. + rm -r gslib/vendored/boto/boto || die + + # failes to compile with py3 + rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die + + # monotonic is only used by bundled fasteners that we do not install + sed -i \ + -e 's/mock==/mock>=/' \ + -e '/monotonic/d' \ + setup.py || die + # Sanity check we didn't miss any updates. + grep '==' setup.py && die "Need to update version requirements" + + # For debugging purposes, temporarily uncomment this in order to + # show hidden tracebacks. + #sed -e 's/^ except OSError as e:$/&\n raise/' \ + # -e 's/def _HandleUnknownFailure(e):/&\n raise/' \ + # -i gslib/__main__.py || die + + # create_bucket raised ResponseNotReady + sed -i \ + -e 's/test_cp_unwritable_tracker_file/_&/' \ + -e 's/test_cp_unwritable_tracker_file_download/_&/' \ + gslib/tests/test_cp.py || die + + sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \ + gslib/commands/test.py || die + + # IOError: close() called during concurrent operation on the same file object. + sed -i -e 's/sys.stderr.close()/#&/' \ + gslib/tests/testcase/unit_testcase.py || die +} + +python_compile() { + 2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \ + gslib/vendored/boto/tests || die "2to3 on boto tests failed" + + distutils-r1_python_compile +} + +python_test() { + BOTO_CONFIG="${FILESDIR}/dummy.boto" \ + "${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}" +} diff --git a/net-misc/gsutil/gsutil-4.59.ebuild b/net-misc/gsutil/gsutil-4.59.ebuild deleted file mode 100644 index 48e12ee22074..000000000000 --- a/net-misc/gsutil/gsutil-4.59.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="command line tool for interacting with cloud storage services" -HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil" -SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}] - >=dev-python/boto-2.49.0[${PYTHON_USEDEP}] - >=dev-python/crcmod-1.7[${PYTHON_USEDEP}] - >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] - >=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}] - >=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}] - >=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.18[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/monotonic-1.4[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] - >=dev-python/six-1.12.0[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/gsutil-4.41-tests.patch" - "${FILESDIR}/gsutil-4.50-boto-tests.patch" - "${FILESDIR}/gsutil-4.50-tests.patch" -) - -S="${WORKDIR}/${PN}" - -DOCS=( README.md CHANGES.md ) - -# needs to talk to Google to run tests -RESTRICT+=" test" - -python_prepare_all() { - distutils-r1_python_prepare_all - - # NB: We don't delete all of boto/ because the tests are imported by the - # production code. The same reason we can't delete gslib/tests/. We can - # delete the main boto library and use the system version though. - rm -r gslib/vendored/boto/boto || die - - # failes to compile with py3 - rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die - - sed -i \ - -e 's/mock==/mock>=/' \ - setup.py || die - # Sanity check we didn't miss any updates. - grep '==' setup.py && die "Need to update version requirements" - - # For debugging purposes, temporarily uncomment this in order to - # show hidden tracebacks. - #sed -e 's/^ except OSError as e:$/&\n raise/' \ - # -e 's/def _HandleUnknownFailure(e):/&\n raise/' \ - # -i gslib/__main__.py || die - - # create_bucket raised ResponseNotReady - sed -i \ - -e 's/test_cp_unwritable_tracker_file/_&/' \ - -e 's/test_cp_unwritable_tracker_file_download/_&/' \ - gslib/tests/test_cp.py || die - - sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \ - gslib/commands/test.py || die - - # IOError: close() called during concurrent operation on the same file object. - sed -i -e 's/sys.stderr.close()/#&/' \ - gslib/tests/testcase/unit_testcase.py || die -} - -python_compile() { - 2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \ - gslib/vendored/boto/tests || die "2to3 on boto tests failed" - - distutils-r1_python_compile -} - -python_test() { - BOTO_CONFIG="${FILESDIR}/dummy.boto" \ - "${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}" -} diff --git a/net-misc/gsutil/gsutil-4.60-r1.ebuild b/net-misc/gsutil/gsutil-4.60-r1.ebuild new file mode 100644 index 000000000000..7cd73f33bffb --- /dev/null +++ b/net-misc/gsutil/gsutil-4.60-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="command line tool for interacting with cloud storage services" +HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil" +SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}] + >=dev-python/boto-2.49.0[${PYTHON_USEDEP}] + >=dev-python/crcmod-1.7[${PYTHON_USEDEP}] + >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] + >=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}] + >=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}] + >=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.18[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] + >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] + >=dev-python/six-1.12.0[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/gsutil-4.41-tests.patch" + "${FILESDIR}/gsutil-4.50-boto-tests.patch" + "${FILESDIR}/gsutil-4.50-tests.patch" +) + +S="${WORKDIR}/${PN}" + +DOCS=( README.md CHANGES.md ) + +# needs to talk to Google to run tests +RESTRICT+=" test" + +python_prepare_all() { + distutils-r1_python_prepare_all + + # NB: We don't delete all of boto/ because the tests are imported by the + # production code. The same reason we can't delete gslib/tests/. We can + # delete the main boto library and use the system version though. + rm -r gslib/vendored/boto/boto || die + + # failes to compile with py3 + rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die + + # monotonic is only used by bundled fasteners that we do not install + sed -i \ + -e 's/mock==/mock>=/' \ + -e '/monotonic/d' \ + setup.py || die + # Sanity check we didn't miss any updates. + grep '==' setup.py && die "Need to update version requirements" + + # For debugging purposes, temporarily uncomment this in order to + # show hidden tracebacks. + #sed -e 's/^ except OSError as e:$/&\n raise/' \ + # -e 's/def _HandleUnknownFailure(e):/&\n raise/' \ + # -i gslib/__main__.py || die + + # create_bucket raised ResponseNotReady + sed -i \ + -e 's/test_cp_unwritable_tracker_file/_&/' \ + -e 's/test_cp_unwritable_tracker_file_download/_&/' \ + gslib/tests/test_cp.py || die + + sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \ + gslib/commands/test.py || die + + # IOError: close() called during concurrent operation on the same file object. + sed -i -e 's/sys.stderr.close()/#&/' \ + gslib/tests/testcase/unit_testcase.py || die +} + +python_compile() { + 2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \ + gslib/vendored/boto/tests || die "2to3 on boto tests failed" + + distutils-r1_python_compile +} + +python_test() { + BOTO_CONFIG="${FILESDIR}/dummy.boto" \ + "${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}" +} diff --git a/net-misc/gsutil/gsutil-4.60.ebuild b/net-misc/gsutil/gsutil-4.60.ebuild deleted file mode 100644 index 48e12ee22074..000000000000 --- a/net-misc/gsutil/gsutil-4.60.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="command line tool for interacting with cloud storage services" -HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil" -SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}] - >=dev-python/boto-2.49.0[${PYTHON_USEDEP}] - >=dev-python/crcmod-1.7[${PYTHON_USEDEP}] - >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] - >=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}] - >=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}] - >=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.18[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/monotonic-1.4[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] - >=dev-python/six-1.12.0[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/gsutil-4.41-tests.patch" - "${FILESDIR}/gsutil-4.50-boto-tests.patch" - "${FILESDIR}/gsutil-4.50-tests.patch" -) - -S="${WORKDIR}/${PN}" - -DOCS=( README.md CHANGES.md ) - -# needs to talk to Google to run tests -RESTRICT+=" test" - -python_prepare_all() { - distutils-r1_python_prepare_all - - # NB: We don't delete all of boto/ because the tests are imported by the - # production code. The same reason we can't delete gslib/tests/. We can - # delete the main boto library and use the system version though. - rm -r gslib/vendored/boto/boto || die - - # failes to compile with py3 - rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die - - sed -i \ - -e 's/mock==/mock>=/' \ - setup.py || die - # Sanity check we didn't miss any updates. - grep '==' setup.py && die "Need to update version requirements" - - # For debugging purposes, temporarily uncomment this in order to - # show hidden tracebacks. - #sed -e 's/^ except OSError as e:$/&\n raise/' \ - # -e 's/def _HandleUnknownFailure(e):/&\n raise/' \ - # -i gslib/__main__.py || die - - # create_bucket raised ResponseNotReady - sed -i \ - -e 's/test_cp_unwritable_tracker_file/_&/' \ - -e 's/test_cp_unwritable_tracker_file_download/_&/' \ - gslib/tests/test_cp.py || die - - sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \ - gslib/commands/test.py || die - - # IOError: close() called during concurrent operation on the same file object. - sed -i -e 's/sys.stderr.close()/#&/' \ - gslib/tests/testcase/unit_testcase.py || die -} - -python_compile() { - 2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \ - gslib/vendored/boto/tests || die "2to3 on boto tests failed" - - distutils-r1_python_compile -} - -python_test() { - BOTO_CONFIG="${FILESDIR}/dummy.boto" \ - "${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}" -} diff --git a/net-misc/gvrpcd/Manifest b/net-misc/gvrpcd/Manifest index fae15746673c..670fd7d4c74f 100644 --- a/net-misc/gvrpcd/Manifest +++ b/net-misc/gvrpcd/Manifest @@ -2,5 +2,5 @@ AUX conf.gvrpcd 132 BLAKE2B c1101658ffc59f5e45cb388b5595b3f48f89d037517e1d890c02 AUX gvrpcd-respect-ldflags.patch 465 BLAKE2B 1dc62e0caf54d120bdeaa3ad621f624ef00e8c16512b92ab4079881e9892e416d58c78023cb57c5de9c380c54b426aa590d174c131138b6b2103fc214adf1e6f SHA512 c0d0230ed35ca4fb421e4b65333bdef6cb4e5dde954d95b1f56d9bea0b33f6353969294bb30e4c231580d946c65632c49f06eda98fa41064fef6ff12349f2507 AUX init.gvrpcd 1055 BLAKE2B 6de4641a5c383769a8da604dc37a915a165a3164d4430a4ab70d8cd2a001e77dfb06ff60f22c830efec84a71e4155e7896c9de5c858e5279ebdb5a330d95212c SHA512 57fcd87fa6e209907352bd85984120ce2cdcd73cf008f41dab34d0b739d014229d10976416d0c6d4b154b81e36c6ac2e9cc961b79cf3e507a4b9d70d039ecaa7 DIST gvrpcd-1.3.tar.gz 12066 BLAKE2B dbe28e45b9efdeca7f4d21fdd3e4cf0470b3cbe90866ee024ad0b681b6a6825ca9844cb06e58eaae95fe38561caece1607c0c0473dbc85affcc72b6be966eb86 SHA512 53f2ad4c9ce5ee2bbf72c691ca0ea1d3d2e22dba98c18cdcbecc09c9082427f8ebc83277b4ffc40fd693652c932a4c093512f99157e82d5a3b97bb6f3d8ff444 -EBUILD gvrpcd-1.3.ebuild 737 BLAKE2B 85699f26af1e8bc2d9956b3fb0e1ae1ebaea5e6508c0d847ed15b4760ab7321a7b51c7564ab79ff3428ae923b2d33c4ff4002ce28444bb7f981abf0a362fbe49 SHA512 ee9de9b7741ec07bedcabe3d800f33de9feadefcc208087020f4baa670805c2927c738e0b08dad0824c4f7afd5ea8768d8f0cbd64f0c0d51e9d201e3cfec02a6 +EBUILD gvrpcd-1.3.ebuild 701 BLAKE2B 6d897d71543968b4d91a899465ef7609024eb95c245da2fb608862a676085503f3799214267750eb488ffae1d85780b9a8fc8f21684ccbdf7544f9a0f4b59561 SHA512 8d616d3a51c070a1b0476f28af2f4aae78520e20c96e3c079e7b72d94f8d028ecd125dde74788d5d4529092011a4572065d93fe583fc9f5621e5a012964f0fa1 MISC metadata.xml 513 BLAKE2B 969f21c45edd61752599bfb833e53a4e9e24658bd9e927a121dc15d1aebbaf7b60ef406de62d30770be779a8241ce288dbc765734d272f98dc21e491916b9fe0 SHA512 f5cd1e6f716565568ea62daf112681aa7a51c851a8288b66e798501dc52b974254739309612f82492ed379f59061f9fd1dca5b0ac141101751398e5d7c188935 diff --git a/net-misc/gvrpcd/gvrpcd-1.3.ebuild b/net-misc/gvrpcd/gvrpcd-1.3.ebuild index f3f5ec854595..ddadebc283c0 100644 --- a/net-misc/gvrpcd/gvrpcd-1.3.ebuild +++ b/net-misc/gvrpcd/gvrpcd-1.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils linux-info toolchain-funcs +inherit linux-info toolchain-funcs DESCRIPTION="A program for announcing VLANs using GVRP" HOMEPAGE="http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/" @@ -18,10 +18,9 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~VLAN_8021Q ~VLAN_8021Q_GVRP" -src_prepare() { - eapply "${FILESDIR}/${PN}-respect-ldflags.patch" - eapply_user -} +PATCHES=( + "${FILESDIR}/${PN}-respect-ldflags.patch" +) src_compile() { emake CC="$(tc-getCC)" diff --git a/net-misc/htbinit/Manifest b/net-misc/htbinit/Manifest index 9bd8abf0de29..4447d3748645 100644 --- a/net-misc/htbinit/Manifest +++ b/net-misc/htbinit/Manifest @@ -1,10 +1,10 @@ -AUX htb.init-v0.8.5_tos.patch 1656 BLAKE2B 28b8096b5d3fe07864932678a8969210dd492ca9b13717f1c09510b8ef1ea73a21a608af3d91854a95d8a8cc21062eb17d0354b23543726f0aa2b04963fd0675 SHA512 6b8c78cd75207d23b1786ddeff01ba96e45fdba575b51dcd9e96880518a3edc97604f2fb2ccf44243e697dbe86233d38a26be54db3981e93ca98e3bf95e9dd87 -AUX htb.init_find_fix.patch 1165 BLAKE2B 0fd10a7c714717cfe8029ee817e624772b9008b2a98b02fb5c75cb1d2362d73a5cea16a7db4a021ce3fcc223883f0eef485bb0968f52515e984e371c416a754e SHA512 dbca235aa92ac5b2486fe7a89a215c4e621965f72ce04336d2c04cc02f61f40ec5a92347c1515b6e1114d176ea29cf61d457d504bfcaccfbe149d20231145d07 -AUX htb_0.8.5_esfq.diff 1844 BLAKE2B 9d8d8461d954a9e38cd646f965b7d8853f1a6d176e8233d2eea42e15168d97917613fcdb4ca062eac58981edd3db76a1c9f6073831316f9b0c8b0cd09a1b1607 SHA512 ffef80a68b7e84b7c3758322bc58120fa67cd813c4a688f4f4483fdb0d8c1efb180e373b2b510d72c8f13945a0c6137fea005a70ffbb7ace12f4865b69db1bdd -AUX htb_0.8.5_ipv6.diff 4663 BLAKE2B 3df3659b0dc6975fec3e8e9506965797924da602b6a2e8e747776ebf810a7bc5c8a221756b4eb2eda6ea6a6338829fbc2e05bfc075d9b666e5cd06cb76e05f7b SHA512 3e1265d912e055fb2188945a46bd23a0798d04b8d3faf62344b11bd5e434cb7119098f095dc9b954dfae9b1e315e841df4dc0f47620500a884f7cbdf4d8c79c6 +AUX htb.init-v0.8.5_tos.patch 1583 BLAKE2B 794c51472cfe08c8d56023f0dcf1a75fbcd2f215a8dee56add23e19fd7e9861946eeb757110cde22ec7204a3566e82f1ea00f738e04fac4626b3588c5e7e6f3b SHA512 902bb6d157deb4161d67e6ca2317410ccb1f2c771debe5c631fc76c9dc20a6920554b2776104247050191a03ec18e7d57fa79e4df79b5c6e6d98061013cf0b61 +AUX htb.init_find_fix.patch 1092 BLAKE2B f94b0f133ccfbdd03902ed5629965670f7947cb6d75acb6879e25d037094b98d7b859f53e16ffcea2edfe8448f40726861e57c83c66fef1fe759d38d2af86c46 SHA512 babb5092fb52447067c7d9246dec4e3605bb4ef14a908ffcd69dc03161a8451b5e9e35621748780f03604c8406e218ea84c066f4aff3552586daa5d7ac28ee61 +AUX htb_0.8.5_esfq.patch 1771 BLAKE2B 8b82f373273cbcb4547cdec198134873c484dee373ad78b6e09bc802422fa20583c9dc69793ae17f81500f299fca9131a5755da52daaf191e33c024afc02aeb2 SHA512 193724a11662df0ee306936f98034e6537c76147bbbdeae3074c77a9abcd8fa42ef06ebc169b8abdae1fcb62295839e7d70d52216d0ca037b5b27bfe37411f78 +AUX htb_0.8.5_ipv6.patch 4590 BLAKE2B 04fbcf0bde55ce921a938bf70adcaebcec1fcb580f9171e711f244fae01a00f9ecca4c917106f3243762844ae8e2aaf226c484f04e4276dbd7e27e84f1bd9adc SHA512 e35e3d1cd5c79ff456dffd880339a37a963a631b5a42f1e9663f0331c7b01a44ba1ae4d0633abc6bed13419502b0afb15d6c601ca61aac51119864ab0a6f9adf AUX htbinit.rc 706 BLAKE2B af87c49783feaea896d91b84284a21d902ea1f6180a231815094c378a7d4c8db76ccef8e412134ad72c1affe44b3234313c40cade2fc16f414d86c14f745d391 SHA512 17ddfb3dcc2c0b069c3af3548b385cbb894364f7a0c1a37f612c45368d1241dda03fadd544663fe09e2b2c7f2a4c2286f10848fb0230eb520e204b63fb7a3b52 -AUX prio_rule.patch 636 BLAKE2B f936b559ddbc9833484985470c91aa106624222b5be1453bfd9d8ad1ddcc6441904e4cd80647e2fdcf0db66a4b8fad3a2c63c0ab9b089d2e76aeba9c3d32eabf SHA512 f56f054a3ae3770ad9f8de5d43a2f73c211f92db98bce067195b950c182443efee653205e1f86b18e17ba6096d1e574ea7c0a7cc0326a141f84a0cc6f80c8edf -AUX timecheck_fix.patch 1221 BLAKE2B e10986774c5de48081c70ffe92889e69923ee2f5d2ba9ab6be89fe3f21dfef958c698611462060fad5fba082a10bf0a2bca55dde52b8f64c4cc497b3d44164a7 SHA512 ece43ece3ef84865311f14e783434048604b6c9c55b174a95cdaa89dbbccd091044ab387aef887d5c67c14b448260ba6fbd849ea6e454c245ba2c7918cec650e +AUX prio_rule.patch 563 BLAKE2B 17fe3c20556baf52b70885d9ea1c889e420b2f78b0178b1e1b0a19a227754e89ad2940e30f4df069e7568473d79e5338dd017d8dbbd5bfe2d26e7274cd1e3182 SHA512 0b2b20a699bad9062890172e4289b28b1d9e17494bab11211f801791e71134c4001406ee491a30f8d8ebbdd34486e4317929c21d2e16588101c8b2eeadeb9745 +AUX timecheck_fix.patch 1148 BLAKE2B d24d45dd565cdd578d2f17f3b1e1c171472b8eea053fff199e9dac9486472ad5be55fb9c89dd1fb6cfecad4d171184997406a04f4e077d28829e7a221e034f4c SHA512 5e8583d004e15f6dde4ac37771e91683e46d2bb132b776002924508e3e6ca32b2e32bda471c20d0237f448cb443e6d6d1bf023a8b6f7e14a478ea7a699c89bbe DIST htb.init-v0.8.5 32038 BLAKE2B a21cc92b3a5d7badc3b3c7813549d25668152e3dd9c7c0f54ca14227b9d6e194a727d5ff97380c2795dbaada71d3b54894c8755f9bf80ba684552de14dc8dfaf SHA512 5f54f662e8b30c4efa6c8cac50eeddfec8650aa6f651065c0962c32067ca7ba17266d20860c296bac44d1f78caa50f6c948f3c55d468a76f9ce2069a43d3c6dd -EBUILD htbinit-0.8.5-r7.ebuild 1567 BLAKE2B 199243f13bcc1ed8ccfc311af3542f2c1d523982c1f769f9a74153c7ceb182883d08fb33f5089c5756b9d436d55b8286f477837793278c0b90385e9141e31083 SHA512 49421c7c1386140c57e5867b291a1c3d10f649ee124bb4097bc774bdf53a1bca046b3b920776f250d02811edcebbeff1c7b6cdf7cced6b8dc8ee8bd2e56cf4aa +EBUILD htbinit-0.8.5-r7.ebuild 1587 BLAKE2B 96737cbb4b66904c0b6a8fece086b632d90a128fb090b6bc2c11f8f03d317913596810d2bb90e5c9137044cfa9167cc8b39743b6994fd7ce557bc36a1751974c SHA512 f1f12a91cfeb7801586323a763789427a3422dd12f3a4872c911f28711228a737f1b5f56b9dfca11288ebf54ce991de63004d638ef15574167ef436b43e02689 MISC metadata.xml 1010 BLAKE2B 72e9cefd1de3576c7388bc98ec7e6a1a12b2668d9749e83240b3822c617ea899fab2ea4f069d2abd19b6aa942023e1b382b1ec3c616622390a881bc3ef53ba1c SHA512 9de719a9c9a15cbac8cfcd43effee95eac182647a0f695c4ff6d791caa4aa19f76d32dea34fbcdaea089ffdd454e2da2d7bd497c070a4b79308d68328a2d0d41 diff --git a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch index a798508631d3..f45b5c073493 100644 --- a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch +++ b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch @@ -1,5 +1,5 @@ ---- htb.init.old 2005-03-15 14:56:08.328305288 +0200 -+++ htb.init 2005-03-15 15:05:16.612953352 +0200 +--- a/htb.init ++++ b/htb.init @@ -240,6 +240,10 @@ # Maximum packet size HTB creates rate maps for. The default should # be sufficient for most cases, it certainly is for Ethernet. diff --git a/net-misc/htbinit/files/htb.init_find_fix.patch b/net-misc/htbinit/files/htb.init_find_fix.patch index 12222b3e32a5..27fce89ef2da 100644 --- a/net-misc/htbinit/files/htb.init_find_fix.patch +++ b/net-misc/htbinit/files/htb.init_find_fix.patch @@ -1,5 +1,5 @@ ---- htb.init.old 2004-01-29 22:41:23.000000000 +0100 -+++ htb.init 2006-09-08 00:22:11.000000000 +0200 +--- a/htb.init ++++ b/htb.init @@ -468,8 +468,8 @@ ### List of classes in $HTB_PATH htb_class_list () { diff --git a/net-misc/htbinit/files/htb_0.8.5_esfq.diff b/net-misc/htbinit/files/htb_0.8.5_esfq.diff deleted file mode 100644 index 3130f6868a4f..000000000000 --- a/net-misc/htbinit/files/htb_0.8.5_esfq.diff +++ /dev/null @@ -1,53 +0,0 @@ ---- htb.init.old 2004-01-29 22:41:23.000000000 +0100 -+++ htb.init 2006-09-07 23:32:58.000000000 +0200 -@@ -226,7 +226,7 @@ - # priority. Also, classes with higher priority are offered excess - # bandwidth first. - # --# LEAF=none|sfq|pfifo|bfifo optional, default "none" -+# LEAF=none|sfq|esfq|pfifo|bfifo optional, default "none" - # - # Tells the script to attach specified leaf queueing discipline to HTB - # class. By default, no leaf qdisc is used. -@@ -261,6 +261,15 @@ - # will never take place which is what you probably don't want. The - # default value of 10 seconds is probably a good value. - # -+### ESFQ qdisc parameters -+# -+# Same as SFQ and ... -+# -+# HASH=classic|src|dst -+# -+# src mean is fair per source IP -+# dsr mean is fair per destination IP -+# - ### PFIFO/BFIFO qdisc parameters - # - # Those are simple FIFO queueing disciplines. They only have one parameter -@@ -427,14 +445,14 @@ - - ### Modules to probe for. Uncomment the last HTB_PROBE - ### line if you have QoS support compiled into kernel --HTB_PROBE="sch_htb sch_sfq cls_fw cls_u32 cls_route" -+HTB_PROBE="sch_htb sch_sfq sch_esfq cls_fw cls_u32 cls_route" - #HTB_PROBE="" - - ### Config keywords - HTB_QDISC="DEFAULT\|DCACHE\|R2Q" - HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU" - HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM" --HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB" -+HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB\|HASH" - HTB_CLASS="$HTB_CLASS\|TOS" - - -@@ -801,6 +819,8 @@ - LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM}" - elif [ "$LEAF" = "pfifo" -o "$LEAF" = "bfifo" ]; then - LEAFPARM="${LIMIT:+limit $LIMIT}" -+ elif [ "$LEAF" = "esfq" ]; then -+ LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM} ${HASH:+hash $HASH}" - else - htb_fail_off "unknown leaf qdisc ($LEAF) in $classfile!" - fi diff --git a/net-misc/htbinit/files/htb_0.8.5_esfq.patch b/net-misc/htbinit/files/htb_0.8.5_esfq.patch new file mode 100644 index 000000000000..506c505f8e47 --- /dev/null +++ b/net-misc/htbinit/files/htb_0.8.5_esfq.patch @@ -0,0 +1,53 @@ +--- a/htb.init ++++ b/htb.init +@@ -226,7 +226,7 @@ + # priority. Also, classes with higher priority are offered excess + # bandwidth first. + # +-# LEAF=none|sfq|pfifo|bfifo optional, default "none" ++# LEAF=none|sfq|esfq|pfifo|bfifo optional, default "none" + # + # Tells the script to attach specified leaf queueing discipline to HTB + # class. By default, no leaf qdisc is used. +@@ -261,6 +261,15 @@ + # will never take place which is what you probably don't want. The + # default value of 10 seconds is probably a good value. + # ++### ESFQ qdisc parameters ++# ++# Same as SFQ and ... ++# ++# HASH=classic|src|dst ++# ++# src mean is fair per source IP ++# dsr mean is fair per destination IP ++# + ### PFIFO/BFIFO qdisc parameters + # + # Those are simple FIFO queueing disciplines. They only have one parameter +@@ -427,14 +445,14 @@ + + ### Modules to probe for. Uncomment the last HTB_PROBE + ### line if you have QoS support compiled into kernel +-HTB_PROBE="sch_htb sch_sfq cls_fw cls_u32 cls_route" ++HTB_PROBE="sch_htb sch_sfq sch_esfq cls_fw cls_u32 cls_route" + #HTB_PROBE="" + + ### Config keywords + HTB_QDISC="DEFAULT\|DCACHE\|R2Q" + HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU" + HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM" +-HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB" ++HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB\|HASH" + HTB_CLASS="$HTB_CLASS\|TOS" + + +@@ -801,6 +819,8 @@ + LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM}" + elif [ "$LEAF" = "pfifo" -o "$LEAF" = "bfifo" ]; then + LEAFPARM="${LIMIT:+limit $LIMIT}" ++ elif [ "$LEAF" = "esfq" ]; then ++ LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM} ${HASH:+hash $HASH}" + else + htb_fail_off "unknown leaf qdisc ($LEAF) in $classfile!" + fi diff --git a/net-misc/htbinit/files/htb_0.8.5_ipv6.diff b/net-misc/htbinit/files/htb_0.8.5_ipv6.diff deleted file mode 100644 index 815f99545a61..000000000000 --- a/net-misc/htbinit/files/htb_0.8.5_ipv6.diff +++ /dev/null @@ -1,128 +0,0 @@ ---- htb.init.old 2004-01-29 22:41:23.000000000 +0100 -+++ htb.init 2006-09-07 23:32:58.000000000 +0200 -@@ -275,6 +284,7 @@ - ### Filtering parameters - # - # RULE=[[saddr[/prefix]][:port[/mask]],][daddr[/prefix]][:port[/mask]] -+# RULEIPv6=[[saddr[/prefix]][_port[/mask]],][daddr[/prefix]][_port[/mask]] - # - # These parameters make up "u32" filter rules that select traffic for - # each of the classes. You can use multiple RULE fields per config. -@@ -300,9 +310,13 @@ - # RULE=10.5.5.5:80, - # selects traffic going from port 80 of single host 10.5.5.5 - # -+# RULEIPv6=3ffe:80fe:c28:1:45d1:3a1:5e2b:e6c8 -+# selects traffic going to IPv6 host 3ffe:80fe:c28:1:45d1:3a1:5e2b:e6c8 -+# - # - # - # REALM=[srealm,][drealm] -+# REALMIPv6=[srealm,][drealm] - # - # These parameters make up "route" filter rules that classify traffic - # according to packet source/destination realms. For information about -@@ -327,6 +341,7 @@ - # - # - # MARK= -+# MARKIPv6= - # - # These parameters make up "fw" filter rules that select traffic for - # each of the classes accoring to firewall "mark". Mark is a decimal -@@ -414,6 +429,9 @@ - PRIO_RULE_DEFAULT=${PRIO_RULE:-100} - PRIO_MARK_DEFAULT=${PRIO_MARK:-200} - PRIO_REALM_DEFAULT=${PRIO_REALM:-300} -+PRIO_RULEIPv6=${PRIO_RULEIPv6:-150} -+PRIO_MARKIPv6=${PRIO_MARKIPv6:-250} -+PRIO_REALMIPv6=${PRIO_REALMIPv6:-350} - - ### Default HTB_PATH & HTB_CACHE settings - HTB_PATH=${HTB_PATH:-/etc/sysconfig/htb} -@@ -818,6 +838,13 @@ - prio $PRIO_MARK handle $mark fw classid 1:$CLASS - done ### mark - -+ ### Create fw filter for MARKIPv6 fields -+ for mark in `htb_cfile_rules MARKIPv6`; do -+ ### Attach fw filter to root class -+ tc filter add dev $DEVICE parent 1:0 protocol ipv6 \ -+ prio $PRIO_MARKIPv6 handle $mark fw classid 1:$CLASS -+ done ### markipv6 -+ - ### Create route filter for REALM fields - for realm in `htb_cfile_rules REALM`; do - ### Split realm into source & destination realms -@@ -833,6 +860,21 @@ - ${DREALM:+to $DREALM} classid 1:$CLASS - done ### realm - -+ ### Create route filter for REALMIPv6 fields -+ for realm in `htb_cfile_rules REALMIPv6`; do -+ ### Split realm into source & destination realms -+ SREALM=${realm%%,*}; DREALM=${realm##*,} -+ [ "$SREALM" = "$DREALM" ] && SREALM="" -+ -+ ### Convert asterisks to empty strings -+ SREALM=${SREALM#\*}; DREALM=${DREALM#\*} -+ -+ ### Attach route filter to the root class -+ tc filter add dev $DEVICE parent 1:0 protocol ipv6 \ -+ prio $PRIO_REALM route ${SREALM:+from $SREALM} \ -+ ${DREALM:+to $DREALM} classid 1:$CLASS -+ done ### realmipv6 -+ - ### Create u32 filter for RULE fields - for rule in `htb_cfile_rules RULE`; do - ### Split rule into source & destination -@@ -876,6 +918,49 @@ - prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS - done ### rule - -+ ### Create u32 filter for RULEIPv6 fields -+ for rule in `htb_cfile_rules RULEIPv6`; do -+ ### Split rule into source & destination -+ SRC=${rule%%,*}; DST=${rule##*,} -+ [ "$SRC" = "$rule" ] && SRC="" -+ -+ -+ ### Split destination into address, port & mask fields -+ DADDR=${DST%%_*}; DTEMP=${DST##*_} -+ [ "$DADDR" = "$DST" ] && DTEMP="" -+ -+ DPORT=${DTEMP%%/*}; DMASK=${DTEMP##*/} -+ [ "$DPORT" = "$DTEMP" ] && DMASK="0xffff" -+ -+ -+ ### Split up source (if specified) -+ SADDR=""; SPORT="" -+ if [ -n "$SRC" ]; then -+ SADDR=${SRC%%_*}; STEMP=${SRC##*_} -+ [ "$SADDR" = "$SRC" ] && STEMP="" -+ -+ SPORT=${STEMP%%/*}; SMASK=${STEMP##*/} -+ [ "$SPORT" = "$STEMP" ] && SMASK="0xffff" -+ fi -+ -+ -+ ### Convert asterisks to empty strings -+ SADDR=${SADDR#\*}; DADDR=${DADDR#\*} -+ -+ ### Compose u32 filter rules -+ u32_s="${SPORT:+match ip6 sport $SPORT $SMASK}" -+ u32_s="${SADDR:+match ip6 src $SADDR} $u32_s" -+ u32_d="${DPORT:+match ip6 dport $DPORT $DMASK}" -+ u32_d="${DADDR:+match ip6 dst $DADDR} $u32_d" -+ -+ ### Uncomment the following if you want to see parsed rules -+ #echo "$rule: $u32_s $u32_d" -+ -+ ### Attach u32 filter to the appropriate class -+ tc filter add dev $DEVICE parent 1:0 protocol ipv6 \ -+ prio $PRIO_RULEIPv6 u32 $u32_s $u32_d classid 1:$CLASS -+ done ### ruleipv6 -+ - [ "$1" = "compile" ] && echo - done ### classfile - ;; diff --git a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch new file mode 100644 index 000000000000..6e99319f2c62 --- /dev/null +++ b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch @@ -0,0 +1,128 @@ +--- a/htb.init ++++ b/htb.init +@@ -275,6 +284,7 @@ + ### Filtering parameters + # + # RULE=[[saddr[/prefix]][:port[/mask]],][daddr[/prefix]][:port[/mask]] ++# RULEIPv6=[[saddr[/prefix]][_port[/mask]],][daddr[/prefix]][_port[/mask]] + # + # These parameters make up "u32" filter rules that select traffic for + # each of the classes. You can use multiple RULE fields per config. +@@ -300,9 +310,13 @@ + # RULE=10.5.5.5:80, + # selects traffic going from port 80 of single host 10.5.5.5 + # ++# RULEIPv6=3ffe:80fe:c28:1:45d1:3a1:5e2b:e6c8 ++# selects traffic going to IPv6 host 3ffe:80fe:c28:1:45d1:3a1:5e2b:e6c8 ++# + # + # + # REALM=[srealm,][drealm] ++# REALMIPv6=[srealm,][drealm] + # + # These parameters make up "route" filter rules that classify traffic + # according to packet source/destination realms. For information about +@@ -327,6 +341,7 @@ + # + # + # MARK= ++# MARKIPv6= + # + # These parameters make up "fw" filter rules that select traffic for + # each of the classes accoring to firewall "mark". Mark is a decimal +@@ -414,6 +429,9 @@ + PRIO_RULE_DEFAULT=${PRIO_RULE:-100} + PRIO_MARK_DEFAULT=${PRIO_MARK:-200} + PRIO_REALM_DEFAULT=${PRIO_REALM:-300} ++PRIO_RULEIPv6=${PRIO_RULEIPv6:-150} ++PRIO_MARKIPv6=${PRIO_MARKIPv6:-250} ++PRIO_REALMIPv6=${PRIO_REALMIPv6:-350} + + ### Default HTB_PATH & HTB_CACHE settings + HTB_PATH=${HTB_PATH:-/etc/sysconfig/htb} +@@ -818,6 +838,13 @@ + prio $PRIO_MARK handle $mark fw classid 1:$CLASS + done ### mark + ++ ### Create fw filter for MARKIPv6 fields ++ for mark in `htb_cfile_rules MARKIPv6`; do ++ ### Attach fw filter to root class ++ tc filter add dev $DEVICE parent 1:0 protocol ipv6 \ ++ prio $PRIO_MARKIPv6 handle $mark fw classid 1:$CLASS ++ done ### markipv6 ++ + ### Create route filter for REALM fields + for realm in `htb_cfile_rules REALM`; do + ### Split realm into source & destination realms +@@ -833,6 +860,21 @@ + ${DREALM:+to $DREALM} classid 1:$CLASS + done ### realm + ++ ### Create route filter for REALMIPv6 fields ++ for realm in `htb_cfile_rules REALMIPv6`; do ++ ### Split realm into source & destination realms ++ SREALM=${realm%%,*}; DREALM=${realm##*,} ++ [ "$SREALM" = "$DREALM" ] && SREALM="" ++ ++ ### Convert asterisks to empty strings ++ SREALM=${SREALM#\*}; DREALM=${DREALM#\*} ++ ++ ### Attach route filter to the root class ++ tc filter add dev $DEVICE parent 1:0 protocol ipv6 \ ++ prio $PRIO_REALM route ${SREALM:+from $SREALM} \ ++ ${DREALM:+to $DREALM} classid 1:$CLASS ++ done ### realmipv6 ++ + ### Create u32 filter for RULE fields + for rule in `htb_cfile_rules RULE`; do + ### Split rule into source & destination +@@ -876,6 +918,49 @@ + prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS + done ### rule + ++ ### Create u32 filter for RULEIPv6 fields ++ for rule in `htb_cfile_rules RULEIPv6`; do ++ ### Split rule into source & destination ++ SRC=${rule%%,*}; DST=${rule##*,} ++ [ "$SRC" = "$rule" ] && SRC="" ++ ++ ++ ### Split destination into address, port & mask fields ++ DADDR=${DST%%_*}; DTEMP=${DST##*_} ++ [ "$DADDR" = "$DST" ] && DTEMP="" ++ ++ DPORT=${DTEMP%%/*}; DMASK=${DTEMP##*/} ++ [ "$DPORT" = "$DTEMP" ] && DMASK="0xffff" ++ ++ ++ ### Split up source (if specified) ++ SADDR=""; SPORT="" ++ if [ -n "$SRC" ]; then ++ SADDR=${SRC%%_*}; STEMP=${SRC##*_} ++ [ "$SADDR" = "$SRC" ] && STEMP="" ++ ++ SPORT=${STEMP%%/*}; SMASK=${STEMP##*/} ++ [ "$SPORT" = "$STEMP" ] && SMASK="0xffff" ++ fi ++ ++ ++ ### Convert asterisks to empty strings ++ SADDR=${SADDR#\*}; DADDR=${DADDR#\*} ++ ++ ### Compose u32 filter rules ++ u32_s="${SPORT:+match ip6 sport $SPORT $SMASK}" ++ u32_s="${SADDR:+match ip6 src $SADDR} $u32_s" ++ u32_d="${DPORT:+match ip6 dport $DPORT $DMASK}" ++ u32_d="${DADDR:+match ip6 dst $DADDR} $u32_d" ++ ++ ### Uncomment the following if you want to see parsed rules ++ #echo "$rule: $u32_s $u32_d" ++ ++ ### Attach u32 filter to the appropriate class ++ tc filter add dev $DEVICE parent 1:0 protocol ipv6 \ ++ prio $PRIO_RULEIPv6 u32 $u32_s $u32_d classid 1:$CLASS ++ done ### ruleipv6 ++ + [ "$1" = "compile" ] && echo + done ### classfile + ;; diff --git a/net-misc/htbinit/files/prio_rule.patch b/net-misc/htbinit/files/prio_rule.patch index 28471aabb84e..429a1bed0ad1 100644 --- a/net-misc/htbinit/files/prio_rule.patch +++ b/net-misc/htbinit/files/prio_rule.patch @@ -1,5 +1,5 @@ ---- htb.init.old 2004-01-29 22:41:23.000000000 +0100 -+++ htb.init 2006-09-08 00:03:32.000000000 +0200 +--- a/htb.init ++++ b/htb.init @@ -453,7 +457,7 @@ ### Load & filter file $HTB_PATH/$1 htb_filter_file () { diff --git a/net-misc/htbinit/files/timecheck_fix.patch b/net-misc/htbinit/files/timecheck_fix.patch index de3791af997d..4797ea6fd0ab 100644 --- a/net-misc/htbinit/files/timecheck_fix.patch +++ b/net-misc/htbinit/files/timecheck_fix.patch @@ -1,5 +1,5 @@ ---- htb.init.old 2004-01-29 22:41:23.000000000 +0100 -+++ htb.init 2006-09-08 00:11:36.000000000 +0200 +--- a/htb.init ++++ b/htb.init @@ -891,7 +895,6 @@ TIME_TMP=`date +%w/%k:%M` TIME_DOW=${TIME_TMP%%/*} diff --git a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild index 2fab64e9f103..1ae14a2d6a5b 100644 --- a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild +++ b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild @@ -1,27 +1,36 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils linux-info +EAPI=7 + +inherit linux-info DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2" HOMEPAGE="https://www.sourceforge.net/projects/htbinit/" SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="ipv6 esfq" +IUSE="esfq ipv6" DEPEND="sys-apps/iproute2" RDEPEND="${DEPEND}" -S=${WORKDIR} +PATCHES=( + "${FILESDIR}"/htb.init-v0.8.5_tos.patch + "${FILESDIR}"/prio_rule.patch + "${FILESDIR}"/timecheck_fix.patch + "${FILESDIR}"/htb.init_find_fix.patch +) pkg_setup() { + local i for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE4 ; do CONFIG_CHECK="${CONFIG_CHECK} ~${i}" done + use esfq && CONFIG_CHECK="${CONFIG_CHECK} ~NET_SCH_ESFQ" linux-info_pkg_setup } @@ -31,14 +40,15 @@ src_unpack() { } src_prepare() { - sed -i 's|/etc/sysconfig/htb|/etc/htb|g' "${S}"/htb.init - epatch "${FILESDIR}"/htb.init-v0.8.5_tos.patch - use ipv6 && epatch "${FILESDIR}"/htb_0.8.5_ipv6.diff - use esfq && epatch "${FILESDIR}"/htb_0.8.5_esfq.diff - epatch "${FILESDIR}"/prio_rule.patch - epatch "${FILESDIR}"/timecheck_fix.patch - epatch "${FILESDIR}"/htb.init_find_fix.patch - sed -i -e 's:/sbin/ip:/bin/ip:g' "${S}"/htb.init # bug #474700 + default + + sed -i 's|/etc/sysconfig/htb|/etc/htb|g' "${S}"/htb.init || die + + use esfq && eapply "${FILESDIR}"/htb_0.8.5_esfq.patch + use ipv6 && eapply "${FILESDIR}"/htb_0.8.5_ipv6.patch + + # bug #474700 + sed -i -e 's:/sbin/ip:/bin/ip:g' "${S}"/htb.init || die } src_compile() { @@ -47,12 +57,14 @@ src_compile() { src_install() { dosbin htb.init + newinitd "${FILESDIR}"/htbinit.rc htbinit + keepdir /etc/htb } pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then + if [[ -z "${REPLACING_VERSIONS}" ]] ; then elog 'Run "rc-update add htbinit default" to run htb.init at startup.' elog 'Please, read carefully the htb.init documentation.' elog 'New directory to store configuration is /etc/htb.' diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest index 004d976f76ef..29a5b1b5cade 100644 --- a/net-misc/htpdate/Manifest +++ b/net-misc/htpdate/Manifest @@ -1,9 +1,9 @@ +AUX htpdate-1.2.6-ldlibs.patch 916 BLAKE2B 613e7ce001ee6507251d3cca46aaae295b4293e10b8553a49f259bd7722adff8888c10dd9de13cdce042c22b177e10a4cb04b3add97ffe4a8d8a68b8584b4a24 SHA512 c2515949555d70260c21f9cda7b6615a48e44b37c48c84bc356f42595ead0b3c21478e7265a9192e5dcebf00067bb9aa03ae9e9e3ce3145cafc80c6a3a57e435 AUX htpdate.conf 359 BLAKE2B 7bcd2aa3e818ee31796e6f1e3b060cb6c04558fbfcfbdc51cd6b8d787e3cc91ac8870ffd9b95df390bda3c90dd9e186bb6fc2629f56073a97e88fd5dc1141bd6 SHA512 28940548bb15484430cbc63d16eeb03934e6de82cb9729e85450f595712be9caf96e1cb84c55d17dd05f33661c2b657d76bfa8b40a3e0f649a0070aeb8be678b AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba97997925bd421164dd25d3820e4c7727e14389cd5372635afdf5cc8e313297679e74b3a65ab65f0c4a12b3 SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f -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 1102 BLAKE2B 1cc102fef87ec0088fda9ac44d732edc8b30a91744980a5f43882e0f47815a2222b781003705bc1ae16f8fa399beeccaaf63e913381835f3eddca87e36ec0afd SHA512 9cf645c7550fcc3f4effb0608d423c7bfbfc82da84132502cc2d3be24eaf1ff97d9cfaa748e179c9f653f7ba2c543d8040897415a1702c36f21319f38a9d9086 -EBUILD htpdate-1.2.0.ebuild 1003 BLAKE2B 1076567f66e459d86f8f94a2b27d4f9156aac796ab13722ebdd43a3cc2b028efabee917e47de7b191fe5040f9af641646dfacb5527d17eecfed8b458ba159adb SHA512 a75b5244402021cabc7966bd2128343a92ad7765340b32a9fff91580628c0563396553dbb8569260008f582491996a2d22093c42003dc15bff4ec15c5e9d14b1 -EBUILD htpdate-1.2.2.ebuild 1009 BLAKE2B 1cd2c0f415c3f296b48377549f0b4f9c1010d0ca0990183e53b6db481c83285598a63cba5be9dba902954ca059498cb9b0730fea7f001d0f937d7ddce15bbc0b SHA512 7df407fb876c2fec7afa66719f4e3daa57a5694ad03d47874372d6720bfd1032c783fbb1841cfd74edc83377e6a0bf4e06221d76e5bca82f7b757ce4127c0c12 -MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e +DIST htpdate-1.2.6.tar.gz 15083 BLAKE2B 913337f51fd26e811e33f195e463adc57e2512ba502f668f2429676d962623ea943bdb1d42ceddf6d35e7e8ba727b3f1300b34a8370ed661b3fa5b4b53ef1af7 SHA512 fe7442be5581eea0579060c02fb4ffe52151c6408d1b47afc9be049d2a8b1c8d0acd3b3481680a4b6a50f52622d47266afc0fe8dc67c5bb2a3aca2422e34f23f +EBUILD htpdate-1.2.2.ebuild 1004 BLAKE2B 5a0491ca50a095a94ff339ab6343c7dae1d359609d3d1d0ec23fa58a2bf85875359e9e50f7e7df849cf84fcc10931c6ccaf18cb8341646ee99bedee7e218ac5e SHA512 0d627e3d4aef1a2f3924382af51207802784cc5cb7c36f3e8a97a9336d5ae398652a580d97567d2ee89e4f0bb885bd3d574fa7b0f6fc0c857bc5c45cc8d900b8 +EBUILD htpdate-1.2.6.ebuild 1531 BLAKE2B 251f6e312942461d3af28f55850940baad3349c8037a7a106829eef3b902225533b2ee62c20b5e985b5c4b725d12cf41b89beed3549d08d00ce8d9a9d30def93 SHA512 a45e9f6f841bcde4ef7cd63b803ec2073b938a0c9568156859d62c2f0fd4a60ee4db6b1b5d3a9c9757df00cf9598a984427c17c290b4bb094796335849a9fa14 +EBUILD htpdate-9999.ebuild 1531 BLAKE2B 251f6e312942461d3af28f55850940baad3349c8037a7a106829eef3b902225533b2ee62c20b5e985b5c4b725d12cf41b89beed3549d08d00ce8d9a9d30def93 SHA512 a45e9f6f841bcde4ef7cd63b803ec2073b938a0c9568156859d62c2f0fd4a60ee4db6b1b5d3a9c9757df00cf9598a984427c17c290b4bb094796335849a9fa14 +MISC metadata.xml 331 BLAKE2B 499e23627372aaf68a27bf7e8b7d4dc35400c14867fcd8db0c10125669bb996c3678d348958afa13e5b36234764226af6628bdc52005963f7d4568029c355d5b SHA512 439b4865a0e8a9dd6f1848f5ccf68b813057639722b4552a4bb02c9c70ededfe115f21e9535db5b87bd88046cc85cd127df20a9c8bd50bc837716bd5ac4246ff diff --git a/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch b/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch new file mode 100644 index 000000000000..fea1d85b10bc --- /dev/null +++ b/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch @@ -0,0 +1,35 @@ +From ea14fbcd91e5575bf16bc64b7660a6d02a855d7a Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Wed, 31 Mar 2021 15:46:38 +0200 +Subject: [PATCH] Makefile: Libraries belong into LDLIBS variable + +Signed-off-by: Lars Wendler +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 21668a6..a531f90 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ PKG_CONFIG ?= pkg-config + + ifdef ENABLE_HTTPS + CFLAGS += -DENABLE_HTTPS +-LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) ++LDLIBS = $(shell $(PKG_CONFIG) --libs openssl) + endif + + INSTALL = install -c +@@ -16,7 +16,7 @@ INSTALL = install -c + all: htpdate + + htpdate: htpdate.c +- $(CC) $(CFLAGS) $(CPPFLAGS) -o htpdate htpdate.c $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o htpdate htpdate.c $(LDLIBS) + + install: all + mkdir -p $(bindir) +-- +2.31.1 + diff --git a/net-misc/htpdate/htpdate-1.0.7.ebuild b/net-misc/htpdate/htpdate-1.0.7.ebuild deleted file mode 100644 index d0e7d411480a..000000000000 --- a/net-misc/htpdate/htpdate-1.0.7.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit readme.gentoo toolchain-funcs unpacker - -DESCRIPTION="Synchronize local workstation with time offered by remote webservers" -HOMEPAGE="http://www.vervest.org/htp/" -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 x86 ~amd64-linux ~x86-linux" - -DEPEND="" -RDEPEND="" - -DOC_CONTENTS="If you would like to run htpdate as a daemon, set -appropriate http servers in /etc/conf.d/htpdate!" - -src_unpack() { - default - - cd "${S}" || die "change directory to ${S} failed" - unpacker htpdate.8.gz -} - -src_prepare() { - # Use more standard adjtimex() to fix uClibc builds. - sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die -} - -src_compile() { - emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - dosbin htpdate - doman htpdate.8 - dodoc README Changelog - - newconfd "${FILESDIR}"/htpdate.conf htpdate - newinitd "${FILESDIR}"/htpdate.init-r1 htpdate - - readme.gentoo_create_doc -} diff --git a/net-misc/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild deleted file mode 100644 index f672908fccd4..000000000000 --- a/net-misc/htpdate/htpdate-1.2.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit readme.gentoo-r1 toolchain-funcs - -DESCRIPTION="Synchronize local workstation with time offered by remote webservers" -HOMEPAGE="http://www.vervest.org/htp/" -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 x86 ~amd64-linux ~x86-linux" - -DEPEND="" -RDEPEND="" - -DOC_CONTENTS="If you would like to run htpdate as a daemon, set -appropriate http servers in /etc/conf.d/htpdate!" - -src_prepare() { - default - - # Use more standard adjtimex() to fix uClibc builds. - sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die -} - -src_compile() { - emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - dosbin htpdate - doman htpdate.8 - dodoc README Changelog - - newconfd "${FILESDIR}"/htpdate.conf htpdate - newinitd "${FILESDIR}"/htpdate.init-r1 htpdate - - readme.gentoo_create_doc -} diff --git a/net-misc/htpdate/htpdate-1.2.2.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild index 40bf07ab11b8..4869d4ad827a 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-2020 Gentoo Authors +# Copyright 1999-2021 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 ~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.6.ebuild b/net-misc/htpdate/htpdate-1.2.6.ebuild new file mode 100644 index 000000000000..033790209271 --- /dev/null +++ b/net-misc/htpdate/htpdate-1.2.6.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Synchronize local workstation with time offered by remote webservers" +HOMEPAGE="https://github.com/angeloc/htpdate" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/angeloc/htpdate.git" +else + SRC_URI="https://github.com/angeloc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" +fi +IUSE="+ssl" +LICENSE="GPL-2" +SLOT="0" + +DEPEND="ssl? ( dev-libs/openssl:0= )" +RDEPEND="${DEPEND}" +BDEPEND="ssl? ( virtual/pkgconfig )" + +DOC_CONTENTS="If you would like to run htpdate as a daemon, set +appropriate http servers in /etc/conf.d/htpdate!" + +PATCHES=( "${FILESDIR}/${PN}-1.2.6-ldlibs.patch" ) + +src_prepare() { + default + + # Use more standard adjtimex() to fix uClibc builds. + sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die + # Don't compress man pages by default + sed '/gzip/d' -i Makefile || die +} + +src_compile() { + if use ssl ; then + append-cflags -DENABLE_HTTPS + export PKG_CONFIG="$(tc-getPKG_CONFIG)" + fi + + emake CFLAGS="-Wall ${CFLAGS}" CC="$(tc-getCC)" \ + $(usex ssl 'ENABLE_HTTPS=1' '') +} + +src_install() { + emake DESTDIR="${D}" bindir='$(prefix)/sbin' install + dodoc README.md Changelog + + newconfd "${FILESDIR}"/htpdate.conf htpdate + newinitd "${FILESDIR}"/htpdate.init-r1 htpdate + + readme.gentoo_create_doc +} diff --git a/net-misc/htpdate/htpdate-9999.ebuild b/net-misc/htpdate/htpdate-9999.ebuild new file mode 100644 index 000000000000..033790209271 --- /dev/null +++ b/net-misc/htpdate/htpdate-9999.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Synchronize local workstation with time offered by remote webservers" +HOMEPAGE="https://github.com/angeloc/htpdate" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/angeloc/htpdate.git" +else + SRC_URI="https://github.com/angeloc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" +fi +IUSE="+ssl" +LICENSE="GPL-2" +SLOT="0" + +DEPEND="ssl? ( dev-libs/openssl:0= )" +RDEPEND="${DEPEND}" +BDEPEND="ssl? ( virtual/pkgconfig )" + +DOC_CONTENTS="If you would like to run htpdate as a daemon, set +appropriate http servers in /etc/conf.d/htpdate!" + +PATCHES=( "${FILESDIR}/${PN}-1.2.6-ldlibs.patch" ) + +src_prepare() { + default + + # Use more standard adjtimex() to fix uClibc builds. + sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die + # Don't compress man pages by default + sed '/gzip/d' -i Makefile || die +} + +src_compile() { + if use ssl ; then + append-cflags -DENABLE_HTTPS + export PKG_CONFIG="$(tc-getPKG_CONFIG)" + fi + + emake CFLAGS="-Wall ${CFLAGS}" CC="$(tc-getCC)" \ + $(usex ssl 'ENABLE_HTTPS=1' '') +} + +src_install() { + emake DESTDIR="${D}" bindir='$(prefix)/sbin' install + dodoc README.md Changelog + + newconfd "${FILESDIR}"/htpdate.conf htpdate + newinitd "${FILESDIR}"/htpdate.init-r1 htpdate + + readme.gentoo_create_doc +} diff --git a/net-misc/htpdate/metadata.xml b/net-misc/htpdate/metadata.xml index 95aa13f6c5ef..42f1d8fdecfc 100644 --- a/net-misc/htpdate/metadata.xml +++ b/net-misc/htpdate/metadata.xml @@ -5,4 +5,7 @@ polynomial-c@gentoo.org Lars Wendler + + angeloc/htpdate + diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index 737abae5b342..23fee3b45fd2 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1,5 +1,3 @@ -DIST httpie-2.3.0.tar.gz 1769401 BLAKE2B e9bb5ca9ebb5fde3bed66ba15c46cccff1f8d5d01841f954fe4d19be92d3282cd3c19e1fc34b42fe1c36798438aa116f5bb91147864be9d8ee37030cb7796e16 SHA512 d0c5b46075892e9d6df76c1e3b430fcd768238c7fbdeda51368dc1bc7c657efc901088ccb7f1e6fc6e4f54dde4c9bcbe626dfa926c8ca1a6bcfd12e522414505 DIST httpie-2.4.0.tar.gz 1772537 BLAKE2B 111451cc7dc353d5b586554f98ac715a3198f03e74d261944a5f021d2dcc948455500800222b323d182a2a067d0549bda7c318ab3a6c934b9a9beec64aff2db2 SHA512 44cc7ff4fe0f3d8c53a7dd750465f6b56c36f5bbac06d22b760579bd60949039e82313845699669a659ec91adc69dbeac22c06ddd63af64e6f2e0edecf3e732a -EBUILD httpie-2.3.0.ebuild 1580 BLAKE2B d21fdd15e5656af0a54d13652cdcd7c6ff4e8eb57875fe6c5200b496172d399ee566998d1d75be36fafd1e0504005e750ebab8437c7283eebf26b7a51e2e4baa SHA512 39e169d6673a8c120ee64efce8957550d43fdac6cf5fc31554ba23d69e4feda2da355d8f7dd67869e0c51b4de09ea5996f53fd238b0a957e0b876d293235640e -EBUILD httpie-2.4.0.ebuild 1579 BLAKE2B 2ee916321ac4fb4e0bacc3477b142bf1f3579a636fb9bf84ee0031f7c4bcb6e0874da3b9f1009bbaa8a83b8e4546895ba0a4b0a61a09626300efd5fe3dde67a4 SHA512 0e05c02df76810f03817fa0964474cbb6cdf7f3dffba71f911871fa58094128f4637f88e0e2018ffb183202f54666d617e00769574926118faf53b7ffdbba7a2 +EBUILD httpie-2.4.0.ebuild 1577 BLAKE2B 09c82238242dd6bc2bfede83fd47e219ca29f34ca848b660f097156f4576d65ba6a575bd08c98ccf70a8113638d73195207e7f1f2f91a9ffe6e7a18ecf47075f SHA512 68a57ce1e74b68e0245a8370531ce9382b899f0ae732412eace4988cb068aedff5eb98a2bab04c3a8c0dd16bdcd15077c435958b7035dff5081add48ad7efa93 MISC metadata.xml 749 BLAKE2B cb920766146fcc33952835a6e2fff7aeb12dff221655b53550a5158679639256529d51165dc25697ceac13113c6b34e3b174f75fb34e448c0d3121790324c06b SHA512 c3da003a8f72ab4df475211a13c35d83b0cbae2883fa7babecc3325c16ad967f80c25e6c28b35d1a120dba627a82ff629dde26aae62ad6e86494579e2e3eff3d diff --git a/net-misc/httpie/httpie-2.3.0.ebuild b/net-misc/httpie/httpie-2.3.0.ebuild deleted file mode 100644 index fb68e7636b15..000000000000 --- a/net-misc/httpie/httpie-2.3.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="ssl(+)" - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] - >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]" -BDEPEND="test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -python_test() { - local skipped_tests=() - - if has network-sandbox ${FEATURES} ; then - skipped_tests+=( - tests/test_uploads.py::test_chunked_json - tests/test_uploads.py::test_chunked_form - tests/test_uploads.py::test_chunked_stdin - tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked - tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked - ) - fi - - pytest -v ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-2.4.0.ebuild b/net-misc/httpie/httpie-2.4.0.ebuild index ee9d95b77935..0b65a23fe517 100644 --- a/net-misc/httpie/httpie-2.4.0.ebuild +++ b/net-misc/httpie/httpie-2.4.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-misc/httptype/Manifest b/net-misc/httptype/Manifest index a30a2068a6e5..00827abd2202 100644 --- a/net-misc/httptype/Manifest +++ b/net-misc/httptype/Manifest @@ -1,3 +1,3 @@ DIST httptype-1.3.9.tar.gz 15254 BLAKE2B 25b3934303101f6212abe15eaa694ab72250046f832e3be798ba04b08ba4d6c85b8d03ea8163fc742e28d8fb7f8c88abdebf58a5bc06ecde07a5185aa6340f8d SHA512 4e23bb60596bcfb0665c1ef5c0588ffc8bfe9b74bd7998577816b2e351ad55b2d8d01caf8e884e00be1f743adc31cb40264c8c55c90d9fc91ac7bf8180c1803d -EBUILD httptype-1.3.9-r1.ebuild 460 BLAKE2B 4f4965f8024b95c47c48f3fc2e2a9945f3c36ae66c77bced5cb6acacdfbed2d32d6be9f35595cdfc8048e3ddcb77460859e06480a46f9e4b223b40836b9b210f SHA512 0c21c5f53a4cf0f84628164eb62852c4d2c34a9ba852a869b3f5fea74b42b06e7f5b94b65046b983890feec7bbcb3052af72c5dd2e4ec3595adde0e5522a6c26 +EBUILD httptype-1.3.9-r1.ebuild 457 BLAKE2B 600d30ec1560b1b79c6b2e306cb94c56eaef23b187711b1b4678816a55b0e91317fedac59c36f8106d71b1fca26019abbbd53e41feb7f4a1b99e9eedb3d588e0 SHA512 db39bde1f9df4dba01caf6ea0b5fe5c6c3c02e869474df721391b4b6a07eac9a411aae553915fe144849d85ecc0f9dfc7d8b4bc248745f6fb548ca2ee662cd3f MISC metadata.xml 358 BLAKE2B 29cb9ec812dd9285f6662aec3671a5279f4aea2d76adaacdc04ef848c4de0a80eb49f62a6d52a6bccc8dcea39cd02655edb8b20b0fec4194a784fdb916648640 SHA512 60a1aaebd1648b9d6e8a36e66f894bf2c1f14988cc9fe21399d588ab3ce5359517667c47044c97b37760155a52e30475432b5b98c1bca5cb2ba57aef3ff73993 diff --git a/net-misc/httptype/httptype-1.3.9-r1.ebuild b/net-misc/httptype/httptype-1.3.9-r1.ebuild index 0065330dce82..fa20651575b5 100644 --- a/net-misc/httptype/httptype-1.3.9-r1.ebuild +++ b/net-misc/httptype/httptype-1.3.9-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Returns the http host software of a website" HOMEPAGE="http://httptype.sourceforge.net" diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest index e664db152e81..2619c5f6b423 100644 --- a/net-misc/hylafaxplus/Manifest +++ b/net-misc/hylafaxplus/Manifest @@ -1,10 +1,7 @@ AUX hylafaxplus-7.0.2-tiff-4.2.patch 423 BLAKE2B 73bd76ed5f9b4a80dce322e910f1656d8210fa7f07499519c71c078c64452cce8d9a2c7fc913419328a224107a7b37972d5bd6eae6c20b6026c6c3682e4b2947 SHA512 b3512870ba25a7f896003e68eb56e2288a304351e5bf32a15771c3bc3c39572bd0c833f02694470417aeed8a2938cae6864604e8e40d6303dc05e579a84d1dcd -AUX hylafaxplus-CVE-2020-1539x.patch 3799 BLAKE2B 017793755bc17224e41541010b9bc46db72aac0c4801f94e86a5bd88ec834db4738aa22747fb3bfaa867a2967acca35ef77f9cfb88d39a0990aef93e12381010 SHA512 7f04ac1af6bb6d2440aeb0b74aab023d47357f8e27a2bffd237e6be3b66277c54947968c7dafac1dd6a6623c833970fe22f5e9ee817582279116ca88ba655e50 AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb399f35d980d04ed54a5bb961f2fd29dbc8386ef6684fe684a8bcbd21c9cd782490546554ec90e4b2e SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621 AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c -DIST hylafax-7.0.2.tar.gz 1393586 BLAKE2B cbf99f91a0aa07783dd30e76ce8416b2933240d4bf829220909000519f9c9e14a324163707c14504848ba71e7c1ee7d98455f06bb040c2c50c1493d0138122aa SHA512 ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a -EBUILD hylafaxplus-7.0.2.ebuild 4277 BLAKE2B 15f47c1c4483d15506a90aad6911f9d49bfdc686c76069debd330e8c64fed59bddff568c5babb13ec53b92a296cd3d283f3a8240ceb89ef89bd2fd1b475ad490 SHA512 22fc577c68bba6d5bde7d4e9e1a75804fb8ad83ac34b2957947782b4557949c70c77a78fd93d2cc0c34a95a983df3ff8d11833a3de293bff7816f665f8122754 -EBUILD hylafaxplus-7.0.3.ebuild 4187 BLAKE2B 7b9632ca64f2a036b0a2af9c084ec60ae05838e5970ac8c52da528bcf9db9b54c217cfb167c5026b3f21384b30794ba23e36e89d88c6157118486c81d77ba134 SHA512 2af3df0e835067784e375e15f9b90a3e7041782c98ee3eddb84e82a1c14ed38682adb3af384c7585bdf9578b057149a1b17833501cd5c9fc1da2a0113dd378a0 +EBUILD hylafaxplus-7.0.3.ebuild 4185 BLAKE2B 6da6298d9f7f87a8836aabd06eb9e4514678b665f1eb40c0bbecc6d2e9bc037d46c090a17be3cbec0ae93db0d8b796a718f90d4106971d60ef4cb42a3db3f2f9 SHA512 9514f5377ee54fe930b96b5c5129753596a699652f19dbb8b2e51e801f0ddbb256cfe3ed0226efdfb1f17439eb8a0a1237c3f4bae29fb28995d0a835751b02a7 MISC metadata.xml 496 BLAKE2B 778816874c73db0b7958055c119ef88326993ba3dbac35086b6ebcc3f27c95b71abdec098989460e800c25407f0a7781869649639cddd8671f998d3cf9d0d615 SHA512 092154bcc54daa4db847fabc773d588ee09e6c65c540391d4bd78c4856662b348304a0116628b5142381fe9cf76c5caaf25984c1e7449f032f7c20b83b0a0bd5 diff --git a/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch b/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch deleted file mode 100644 index 6c484590c468..000000000000 --- a/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch +++ /dev/null @@ -1,110 +0,0 @@ -commit e8f8196230ae15f6f7d7104ded3e2633002506e4 -Author: faxguy -Date: Sat Jun 13 23:46:33 2020 +0000 - - Johannes Segitz reported two issues: - - 1) faxaddmodem, faxsetup, and probemodem create temporary directories in a way that is not secure due to a race condition. - - 2) The HylaFAX spool directory bin and etc subdirectories are not secure against uucp deleting and recreating scripts that root runs. - - These changes address these two issues. - - - - git-svn-id: https://svn.code.sf.net/p/hylafax/HylaFAX+@2534 5505949e-d877-4686-9e03-c53b7a51b376 - -diff --git a/CONTRIBUTORS b/CONTRIBUTORS -index 057739f..a9d4f21 100644 ---- a/CONTRIBUTORS -+++ b/CONTRIBUTORS -@@ -203,6 +203,7 @@ following for their contributions: - Travis Schafer LogSend and LogRecv modem config options, documentation fixes - Sven Schmidt - Steven Schoch faxrcvd faxinfo text parsing -+ Johannes Segitz code security audit - John Sellens - Chris Severance documentation fixes, scripting improvements - Simon -diff --git a/Makefile.in b/Makefile.in -index 1ee4d76..ec0cda7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -208,7 +208,10 @@ makeServerDirs:: - -idb hylafax.sw.server -root ${INSTALLROOT} -dir ${SPOOL} - -${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \ - -idb hylafax.sw.server -dir \ -- -root ${INSTALLROOT} -F ${SPOOL} bin client config dev etc info log recvq status -+ -root ${INSTALLROOT} -F ${SPOOL} client config dev info log recvq status -+ -${INSTALL} -u root -g root -m ${DIRMODE} \ -+ -idb hylafax.sw.server -dir \ -+ -root ${INSTALLROOT} -F ${SPOOL} bin etc - -${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 700 \ - -idb hylafax.sw.server -dir \ - -root ${INSTALLROOT} -F ${SPOOL} sendq doneq docq tmp pollq archive -diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in -index dc39917..c4d3ff1 100644 ---- a/etc/faxaddmodem.sh.in -+++ b/etc/faxaddmodem.sh.in -@@ -113,12 +113,14 @@ if [ "$euid" != "root" ]; then - fi - - # security -+o="`umask`" -+umask 077 - TMPDIR=`(mktemp -d /tmp/.faxaddmodem.XXXXXX) 2>/dev/null` -+umask "$o" - if test X$TMPDIR = X; then -- TMPDIR=/tmp/.faxaddmodem$$ -+ echo "Failed to create temporary directory. Cannot continue." -+ exit 1 - fi --@RM@ -rf $TMPDIR --(umask 077 ; mkdir $TMPDIR) || exit 1 - - SH=$SCRIPT_SH # shell for use below - CPATH=$SPOOL/etc/config # prefix of configuration file -diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in -index 556eef5..b4aae40 100644 ---- a/etc/faxsetup.sh.in -+++ b/etc/faxsetup.sh.in -@@ -922,12 +922,14 @@ if onServer; then - # - - # Setup TMPDIR before anything can trap and rm it -+ o="`umask`" -+ umask 077 - TMPDIR=`(mktemp -d /tmp/.faxsetup.XXXXXX) 2>/dev/null` -+ umask "$o" - if test x$TMPDIR = x; then -- TMPDIR=/tmp/.faxsetup$$ -+ echo "Failed to create temporary directory. Cannot continue." -+ exit 1 - fi -- $RM -rf $TMPDIR -- (umask 077 ; mkdir $TMPDIR) || exit 1 - - JUNK="etc/setup.tmp" - trap "$RM \$JUNK; $RM -r \$TMPDIR; exit 1" 1 2 15 -diff --git a/etc/probemodem.sh.in b/etc/probemodem.sh.in -index 55b5d9b..c0abf15 100644 ---- a/etc/probemodem.sh.in -+++ b/etc/probemodem.sh.in -@@ -85,12 +85,14 @@ test -f $SPOOL/etc/setup.cache || { - . $SPOOL/etc/setup.cache # common configuration stuff - . $SPOOL/etc/setup.modem # modem-specific stuff - -+o="`umask`" -+umask 077 - TMPDIR=`(mktemp -d /tmp/.probemodem.XXXXXX) 2>/dev/null` -+umask "$o" - if test X$TMPDIR = X; then -- TMPDIR=/tmp/.probemodem$$ -+ echo "Failed to create temporary directory. Cannot continue." -+ exit 1 - fi --@RM@ -fr $TMPDIR --(umask 077 ; mkdir $TMPDIR) || exit 1 - - SH=$SCRIPT_SH # shell for use below - OUT=$TMPDIR/probemodem$$ # temp file in which modem output is recorded diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild deleted file mode 100644 index 6cbf6123a4c4..000000000000 --- a/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam toolchain-funcs - -MY_PN="${PN/plus/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems" -HOMEPAGE="http://hylafax.sourceforge.net" -SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="hylafaxplus" -KEYWORDS="amd64 x86" -IUSE="html jbig lcms ldap mgetty pam" - -DEPEND=" - app-text/ghostscript-gpl - media-libs/tiff:0[jbig?] - !net-dialup/mgetty[fax] - >=sys-libs/zlib-1.1.4 - virtual/awk - virtual/jpeg:0 - virtual/mta - jbig? ( media-libs/jbigkit ) - lcms? ( media-libs/lcms ) - ldap? ( net-nds/openldap ) - mgetty? ( net-dialup/mgetty[-fax] ) - pam? ( sys-libs/pam ) -" -RDEPEND="${DEPEND} - !net-dialup/sendpage - net-mail/metamail -" - -S="${WORKDIR}/${MY_P}" - -CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax" -CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog" - -PATCHES=( - "${FILESDIR}/ldconfig-patch" - "${FILESDIR}/${PN}-CVE-2020-1539x.patch" - "${FILESDIR}/${PN}-7.0.2-tiff-4.2.patch" -) - -src_prepare() { - default - - # force it not to strip binaries - for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \ - hfaxd sendfax sendpage ; do - sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \ - "${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed" - done - - sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed" - - # Respect LDFLAGS(at least partially) - sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed" - - sed -i -e "s|-fpic|-fPIC|g" \ - configure || die -} - -src_configure() { - do_configure() { - echo ./configure --nointeractive ${1} - # eval required for quoting in ${my_conf} to work properly, better way? - eval ./configure --nointeractive ${1} || die "./configure failed" - } - local my_conf=" - --with-DIR_BIN=/usr/bin - --with-DIR_SBIN=/usr/sbin - --with-DIR_LIB=/usr/$(get_libdir) - --with-DIR_LIBEXEC=/usr/sbin - --with-DIR_LIBDATA=/usr/$(get_libdir)/fax - --with-DIR_LOCALE=/usr/share/locale - --with-DIR_LOCKS=/var/lock - --with-DIR_MAN=/usr/share/man - --with-DIR_SPOOL=/var/spool/fax - --with-DIR_HTML=/usr/share/doc/${P}/html - --with-DIR_CGI="${WORKDIR}" - --with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax - --with-PATH_IMPRIP=\"\" - --with-SYSVINIT=no - --with-REGEX=yes - --with-LIBTIFF=\"-ltiff -ljpeg -lz\" - --with-OPTIMIZER=\"${CFLAGS}\" - --with-DSO=auto - --with-HTML=$(usex html)" - - if use mgetty; then - my_conf="${my_conf} \ - --with-PATH_GETTY=/sbin/mgetty \ - --with-PATH_EGETTY=/sbin/mgetty \ - --with-PATH_VGETTY=/usr/sbin/vgetty" - else - # GETTY defaults to /sbin/agetty - my_conf="${my_conf} \ - --with-PATH_EGETTY=/bin/false \ - --with-PATH_VGETTY=/bin/false" - fi - - #--enable-pam isn't valid - use pam || my_conf="${my_conf} $(use_enable pam)" - use lcms || my_conf="${my_conf} $(use_enable lcms)" - use ldap || my_conf="${my_conf} $(use_enable ldap)" - use jbig || my_conf="${my_conf} $(use_enable jbig)" - - tc-export CC CXX AR RANLIB - - do_configure "${my_conf}" -} - -src_compile() { - # Parallel building is borked, bug #???? - emake -j1 -} - -src_install() { - dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man - dodir /var/spool /var/spool/fax - fowners uucp:uucp /var/spool/fax - fperms 0600 /var/spool/fax - dodir "/usr/share/doc/${P}/samples" - - emake DESTDIR="${D}" \ - BIN="${D}/usr/bin" \ - SBIN="${D}/usr/sbin" \ - LIBDIR="${D}/usr/$(get_libdir)" \ - LIB="${D}/usr/$(get_libdir)" \ - LIBEXEC="${D}/usr/sbin" \ - LIBDATA="${D}/usr/$(get_libdir)/fax" \ - DIR_LOCALE="${D}/usr/share/locale" \ - MAN="${D}/usr/share/man" \ - SPOOL="${D}/var/spool/fax" \ - HTMLDIR="${D}/usr/share/doc/${PF}/html" \ - install - - keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp} - keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev} - - einfo "Adding env.d entry for ${PN}" - newenvd - 99hylafaxplus <<-EOF - PATH="/var/spool/fax/bin" - CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax" - CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog" - EOF - - newconfd "${FILESDIR}/${PN}-conf" ${PN} - newinitd "${FILESDIR}/${PN}-init" ${PN} - - use pam && pamd_mimic_system ${MY_PN} auth account session - - einstalldocs - docinto samples -} diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild index af9072b4758a..a4859f2b0da8 100644 --- a/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild +++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" SLOT="0" LICENSE="hylafaxplus" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="html jbig lcms ldap mgetty pam" DEPEND=" diff --git a/net-misc/iaxmodem/Manifest b/net-misc/iaxmodem/Manifest index 26c5b0af999b..79e2aeb06e3c 100644 --- a/net-misc/iaxmodem/Manifest +++ b/net-misc/iaxmodem/Manifest @@ -3,5 +3,5 @@ AUX iaxmodem.confd 140 BLAKE2B b9fd92f75a93d289c74203bd00de8b8e3f8822f92dc9d552c AUX iaxmodem.initd 1162 BLAKE2B f4e81da09f05c56c4713ef681ffa405ea91239b87988d550ba9aca9e4f9dd3cde6b76af907802eb3cbc35c90516378cba69ee886fc8e41976ec78a123b53749f SHA512 dc3dfd7f74501a1686a3bcebcd357339bc49e87d45e40659eb87f037b27ecb3f1b9fb67d780f71d4c765188436378f13290ac58865bcea12fd2d61158cf4773b AUX iaxmodem.logrotated 164 BLAKE2B a8fd0e0189bb38505887cbb53c6e45d3d8610ec727277218aafc643d3642f40f5be7826de75571024b99bca25702ed3ef5601d56e87acefbe7bd3777e6af4bd2 SHA512 3f4734fec0ea1361f5ee58d75eb4b8cff5f557abc4a73996e40e5ed43050c79fb82da23b01412d9200f600226a5e66a220a2c56b112e0b0945c5f0ffa2d84c2d DIST iaxmodem-1.3.0.tar.gz 2483995 BLAKE2B 31329a1413781210f2c500124b7cd7c17de817f26cfebafe32813337142bba03a13b598b43dacc57abb386611f56bc19d6d2df3cf703289dbb1c9ee979be590c SHA512 3add8fe1c228ee63f12a3d23fcc8bad5405b9fa6af70cadbcdb276d4e7dfe2a90f1b7c300d35659ab0247010c2315e25a5def5715e670071226bd89271d004f4 -EBUILD iaxmodem-1.3.0-r1.ebuild 2728 BLAKE2B 003dbde0a389f24710d827ef47938b703c6b97357116613a6aef7726a70348ea5b96001955084c047689720986374d4431bd8523ba75f37f1b853b5d94dfdb50 SHA512 90b5fae853c27127b887f3536ae74c10419bc307521e4cf93075db6f3cf707208a292e2bba40a843d01a174d51edf52575c2405c3c0db00a8aee8518d4bb208f +EBUILD iaxmodem-1.3.0-r1.ebuild 2708 BLAKE2B e8e03c339c333644f21d9ed89899ae3abc78d94a3829c4ca95e81f71efa237f774dcf27415f0c86e99a93a52403187ef37b06ee9a02da7809bfc2b5c6e6669cf SHA512 25b96b3d8db37f3adfe131d8ec83a809d375803e2d9a4b0447dc2610aa9b5595e09eabd6f676a6f5f40e5d44a7328217fd538e6534005337696bc0bdd395dcf8 MISC metadata.xml 506 BLAKE2B a2607bad3a1d820a3bde59d549313a71e811e3bfad3d6a1c1688617ec298dcfef629b4df2dfab27f46d18772f5ce258d784d19eff3cfd7644d00d3642ef681d3 SHA512 a5f0f8500bd6db8c294d0a9e207786227a5d523203977e300791ea23a7d9e40d9b50f90d2f47704a1fa8eda72efff48800108adf075cc7e529fb4559f86bb2ef diff --git a/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild index af7d88a80cbe..e2c39c7b4f0f 100644 --- a/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild +++ b/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" -inherit eutils toolchain-funcs multilib +inherit toolchain-funcs multilib DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line" HOMEPAGE="https://sourceforge.net/projects/iaxmodem/" @@ -13,11 +13,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - RDEPEND="media-libs/tiff:= sys-process/procps" - DEPEND="${RDEPEND}" src_prepare() { diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest index 7162b6e6ec6d..9517b981e76d 100644 --- a/net-misc/icaclient/Manifest +++ b/net-misc/icaclient/Manifest @@ -9,6 +9,6 @@ DIST linuxx64-21.1.0.14.tar.gz 143364053 BLAKE2B 1835d597ebdf392c900862527424b14 DIST linuxx64-21.3.0.38.tar.gz 143339036 BLAKE2B 645d9518b1e47e553aae8fe90ecf0d9f9e0523adb8cfcb692f500b28c63220d05361215072ea7a3de700068dd644585fac0169099b860ba4d4a662fe9b7ff5e5 SHA512 1f004a2c154281b71b919053fdcb5ca83c93a5047a8fc8bbe3acb53b78ccac8ca446dc5aa23495a5a69ef07107d3f1b9749994dcb95c2beeee735d57afcebf20 DIST linuxx86-21.1.0.14.tar.gz 120010131 BLAKE2B 1e9380509cbbcd1849b0e306224447ad64d86717e636387eb3368eae318921b025029852c5f89a1ab1ca295d1a33ef4741468dcb00f3ffd7d442d8cf3d43a945 SHA512 7e8f6646262b2d59f08ed8a200b7fd71e029066210facba99eeb003c59ec1a543180a8e05d403aecc668b3f992b08198a567fbad86ba3a16b391afb30b453413 DIST linuxx86-21.3.0.38.tar.gz 129220087 BLAKE2B 9e85e74b34546ead052c9b9eacc59e32d5422b2afc31886d34c09596d27e4c792dd77338b936dbefb270219673e612a73908705b1d886d6f61a40e430c14b730 SHA512 354fff11dbb150e4b4e94d09dd288d1ff39b518f6d278dc33d645699d3ee0690ca93a86289921c4fc3e91d2cc5f1bbb28e4179d8672e17d02923851e22772d71 -EBUILD icaclient-21.1.0.14.ebuild 5334 BLAKE2B 60e3c38841a6a507c9649e83fe012271f9acf1b88407a8ee411a738a73e4b7b288c136682194fd1f4b4688a84609ad5ee7509deb7857432899351ae02c18c1bb SHA512 9edefe5630ada112037046543cb25aedac3354f413fea1e1e77e96941cccca98ddb56565c5fde1a27036dc8b027194060cb0ac57ee36b2d3cd0762a18971399a -EBUILD icaclient-21.3.0.38.ebuild 5324 BLAKE2B 8ddf9c90fead27e13fe35dc5797ff68aa11a7ea0fe72af0048258e3c4ae4029db335a0e4cdc30fc1131886e9a2ecf969ecd841e3fef94e8407994a84dc6ae843 SHA512 d0a7c0aec8f1b782e96865406809992f44c0288d69c9c247bbca4714712a9b64d65e2dfed746dd0add18cf011971d68e1a0920abc760e83ac577b23f661cafc2 +EBUILD icaclient-21.1.0.14.ebuild 5278 BLAKE2B 2e0e33e7a77546b986cea1ba3023389b3efe76fd7e6b8aed56e910f64fb032d2f3b29e8779d1ce87be5e75796ea2c9e28ab95cb5e1606f57eabcf649a38d1cf3 SHA512 6112710840caac528d790e42de529e382df3809dfbd59384fa8c6c6ea77f838b57ce3f7e1fa9034ac5116672cf56561e314573e3c26df0a9f66fde95fe1e421e +EBUILD icaclient-21.3.0.38.ebuild 5268 BLAKE2B ff5d296d94e5698a4cc1b332108aa610c8ff365c1264d67da0bbc2f6633f89451f5cf811161ecff7361b1c7a1307ea5998a79a55d1f31be4bfb2a277d72bb01b SHA512 79d12692ca60c860efb04ef118f7c236ea966cf34755a0cb8b101ebc74529e7706a048bdfa8eb4d5d0de5423ccfb1ee8a4bb70f5bbf61fd4c58dabf0a2908af6 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e diff --git a/net-misc/icaclient/icaclient-21.1.0.14.ebuild b/net-misc/icaclient/icaclient-21.1.0.14.ebuild index d0f5f9638ade..999a647c4264 100644 --- a/net-misc/icaclient/icaclient-21.1.0.14.ebuild +++ b/net-misc/icaclient/icaclient-21.1.0.14.ebuild @@ -3,8 +3,7 @@ EAPI=7 -# eutils inherit required for make_wrapper call -inherit desktop eutils multilib xdg-utils +inherit desktop wrapper xdg-utils DESCRIPTION="ICA Client for Citrix Presentation servers" HOMEPAGE="https://www.citrix.com/" diff --git a/net-misc/icaclient/icaclient-21.3.0.38.ebuild b/net-misc/icaclient/icaclient-21.3.0.38.ebuild index 2792d9de7463..dc2432d0c275 100644 --- a/net-misc/icaclient/icaclient-21.3.0.38.ebuild +++ b/net-misc/icaclient/icaclient-21.3.0.38.ebuild @@ -3,8 +3,7 @@ EAPI=7 -# eutils inherit required for make_wrapper call -inherit desktop eutils multilib xdg-utils +inherit desktop wrapper xdg-utils DESCRIPTION="ICA Client for Citrix Presentation servers" HOMEPAGE="https://www.citrix.com/" diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest index 10c7bf4bbe48..da2007e96685 100644 --- a/net-misc/ices/Manifest +++ b/net-misc/ices/Manifest @@ -1,5 +1,5 @@ AUX ices.initd 328 BLAKE2B c2084fe4a4885cddc5b5c449144029575889801dff93cbb41933341a07eefc39731b66d749ebec24cdf077163211e490ad8e92c66efe6c4e489b5d78a3f91a4c SHA512 55ad0dbde053d3d2b666e597b4720511c67adbd445b0c98fa1d096c400b77e1ed181b62859cdc97a071097b9abc194fea315052b35316537dac2f2d1cbf1b282 AUX ices.initd-r1 307 BLAKE2B 3dc8638cb74d79ab772c3618812fac27ab856f74e39c8e5b6a8dc211ffb842d474ff4177ab7e450f542011cbdf66d7bd1e956570cd77ae4768ee3f8375e0bfb1 SHA512 de3aa2919cb715c6036d1b993275560819528e8c6d616362e414e9bc6cf77a67393f68c1643ebfac1b43e8d3bf2ce3bde004894921d8bfdf66eb667fbaa7bae9 DIST ices-2.0.2.tar.bz2 293818 BLAKE2B d037c6ce6e5d009a12fd9d8efba321b87562a0d492a5191a93b3ff991c1252af1aaa21c41b8171d6eaa9f518712d893b187765cab5a7a9de3560231ec4315b67 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7 -EBUILD ices-2.0.2.ebuild 874 BLAKE2B 5e1af207345457c8bf52f773e1a019a9f585b307f602328bff741af237212bb4e9ed534d0a5fdfd127473c11c627c48e3d12a923aee155ebfb3a56aa4c3ec460 SHA512 66b4fffeba2a8bf562a3a60f426ae0f50f96b745f6b19e0cea65e05266dde4d3453d82cc9452d6741ef1cc535b97e49303941b89930d99a11db10be04873e812 +EBUILD ices-2.0.2.ebuild 867 BLAKE2B 6512bb7f349c3796d9cb06d9efc2627e06b7db6005f9ff283fbbccdc531775c5b7914480528be7c590f6121a83b1099ede2adbdc6c2d28d7f683ea9d3de2905c SHA512 ebd1b49c4b648638e41468a88370eedbe92e5fdc1dbff7ccfbb9e7645007d05b7f5b9e2d58864ac75e7a05bcbf254869db86add19bd439c40ef58dcfcc5ea7f3 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 diff --git a/net-misc/ices/ices-2.0.2.ebuild b/net-misc/ices/ices-2.0.2.ebuild index 823347eb42e3..02c0a2edefa3 100644 --- a/net-misc/ices/ices-2.0.2.ebuild +++ b/net-misc/ices/ices-2.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils user +inherit user DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding" HOMEPAGE="http://www.icecast.org/ices.php" diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest index 996da7615aed..5cf3e00b21a2 100644 --- a/net-misc/ipcalc/Manifest +++ b/net-misc/ipcalc/Manifest @@ -1,4 +1,4 @@ DIST ipcalc_0.42-2.debian.tar.xz 6144 BLAKE2B 7fa1e32f9c713b4f3dfa8636f9bb4b0bd70e09e3d02e71f1f2186e8e2ab381638eb33e63c24f41dfa948db11b7e877a147d22363d105ac26e98ff509d1cd0aa2 SHA512 6b7049bc5e27e22dbbca12913716757cb3f5b91d0a8f729d35a67971c763b0bea8ab65c24fe31ad43755aedb68650c1d8b3f3e770228ed6517b43e83735086ec DIST ipcalc_0.42.orig.tar.gz 25903 BLAKE2B 5abff0f234829ef84345645634f1b12287456c26a42cb65856f26ac12699d5f100a2ef432a6d19627f72d800e65257d46bc0edd8ec1bf4054dcdf843d2ee158f SHA512 4e67ccdbb7e42ced39ee8ac83e47585d400c1b0a26e74a909c2e29e7f2256e37b06855cc29f0272b71c5ff6bdd8252e2563ad89562cd8d04ce0fa032f6f3fb34 -EBUILD ipcalc-0.42_p2.ebuild 743 BLAKE2B 72361d8e3115b76158d39f9705b622bb53d102f5b1f89b06ccb4f4066cc27ed4957ee81cd8672407c71f3a0379a4424e168c497aa2e4962dfd9f9de5c935576d SHA512 2a114077d4c92ca6e66e62eea89911c9844aa9241c2e8345263c12af86dbf7142592bd669e5a9acb2371bfd9a2de031fe6f84dc68b6266f02b736f6d9b144a6c +EBUILD ipcalc-0.42_p2.ebuild 744 BLAKE2B 1970f5a491daf52fd58333c96cb069e51ab8411cabf5bf6b21d91706c385e9f6cdc3caad34e7f9737e490de4e43a9efe8fad2a203d208988d8e2716a28832d3c SHA512 0cfaa4a18837a2261005ba3ad3f62cfc524c4bdc5cc734520b2911efe0faae7812e5f652caf69e33d3df0df494f306b41178cc5142f5bea63b7a8aabe783abbc MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild index cae6e413db63..0ad1312186d1 100644 --- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild +++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild @@ -10,7 +10,7 @@ SRC_URI=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz " -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" SLOT="0" RDEPEND=">=dev-lang/perl-5.6.0" diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index f369dcde19bb..5229e7c3709a 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -8,5 +8,5 @@ DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc EBUILD iperf-2.0.14a.ebuild 856 BLAKE2B d75c7d282707edad5bcf7b8304c1820beb7dbe082f8a0203dd75857ab9ab80a741049acb671bd3383aafa936a51fcaf4cee19e98de64e71456332d6cd676e8b9 SHA512 2dfca97c4d60f56a8977279dd947fc35f0c30d8bc3c36fe308bb72de8287b5975ea20be2b11aaf1b2d858b1e3543ef759a94419e90a9ae0a304e8f852e9a1d34 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13 EBUILD iperf-3.9-r1.ebuild 969 BLAKE2B 8b4bb89b4f2f825b54095121b389dc58feea066b6810ff91b6418cc2d9e8378c7e8f4d08d1be314f89d1f9742e13ab31f87d79998c00eb83fcc442bd45d77b14 SHA512 5d72aebb10a80b24f338fd05ec99793488c9f85b4360ced32763dffcb680ff8931592545c4cc4b5f5d9157b1c92f116a5ef9d417de8c9ee98f476d73ff12fd91 -EBUILD iperf-3.99999.99999.ebuild 792 BLAKE2B f4d5f0b93ab6a55d826969d2c5431ff4f02ee69eb38dc27a761fa7488cbe531ef50643ea401e81d3d08467c28d758ddbc5ff697f181cb09500cad5f7ed8425bf SHA512 d21e2c6fe80c4daf31f20985f70dff6b857ea7bd5b0ee5e74aad61e3262aab560201b1d419a06f445ec8a0ba044f4b04a9c1a2ce99686319bc629b0ea58134e7 +EBUILD iperf-3.99999.99999.ebuild 782 BLAKE2B abb04cad62ca3ba7ee7febf4c16987b6baa8b4a3852ea2ad0d172ab8a760b0a0a8e855f07869a839606ca80bc30bb7772fe8f11a0c229d4c9d59d9334d0793f3 SHA512 21f3c744d910413ec3dd1cd480f5d90624b75fc6664b0b567155091c6aafd3d351a76866d1f6a4d0b3e33a24c3d6e21578290f73259cff707b256d6990d14e9a MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild index caa68e8e7fe4..d6be273b5569 100644 --- a/net-misc/iperf/iperf-3.99999.99999.ebuild +++ b/net-misc/iperf/iperf-3.99999.99999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools git-r3 +inherit git-r3 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" HOMEPAGE="https://github.com/esnet/iperf" diff --git a/net-misc/ipsorcery/Manifest b/net-misc/ipsorcery/Manifest index 52d1f727452d..66b03b997a6d 100644 --- a/net-misc/ipsorcery/Manifest +++ b/net-misc/ipsorcery/Manifest @@ -1,5 +1,5 @@ AUX ipsorcery-2.0.9-_BSD_SOURCE.patch 203 BLAKE2B d04a19c782186b5c966116eeb3681f9695b71190928aa6e81e152ee7c68d6f6cec66d1d46f9b6e85ed562cfdde046b05877460f98e6d0408e461ae85ec3beb0c SHA512 e3497b6d5f77288fd8627ecf610045177bd7a5db22b94ee87f91965ddfc13539736b23dc0245001f5d2726617c120d7133dc288b7fb2355d7648f83c08a06dcc AUX ipsorcery-2.0.9-gentoo.patch 756 BLAKE2B a37fc6896955a1b4e86847f027cc71320960c71e7e2eee077cc29d632c7fbfd0a60fa7456bdde1d354824e564a45ede7a18801b8ca270d1f83e465587e153e11 SHA512 9619924c02996032584c4a0975dcce9d5d9ad5945f3320b0d4cca0f0bb2d938ce07644992db794c928aa84a1e0a3d46968516b6bdb6180e547a8a13b50de6f39 DIST ipsorc-2.0.9.tar.gz 38600 BLAKE2B b773a60105e03963edeead61d93d7a28cb16683cf00fbc9d874f4de7e854127c44c9c64dc045f4228520114593cf98587e594e7946015f2f3f8ec7e9e2fdd36c SHA512 a45454d70ecd928df36aa466dc886ab470ea3200e1b252288ea96f96e3fa8742af57bfe98f42d65c7e7abb07986092c2191aadee78ac785fffda40acc5ff8d66 -EBUILD ipsorcery-2.0.9-r2.ebuild 818 BLAKE2B 1218ab4f13a718a8e316bc24d8e25f61a5f404913688c8845bca6c822d9548f951b8ec9631f0e8a05c5929f3588a00527a248b849ce7d2371845e216abe6ce18 SHA512 bdaea2cf9a372f36a866da36e29ec30e2154152cd0e4be842f9454ca7ecc901af31bde1fa83cfc94c79739899744281821ba9e3cc323a08b6d2cbcc058aa9e1b +EBUILD ipsorcery-2.0.9-r2.ebuild 846 BLAKE2B 255f76c6ebe600cc04d88dd940e262cb662eaa834d1ee95931c8ffcbe920b4649cf753a4600a52ef5a82f1dc477beb8f2a4382685a45a818ab0a6f497365e83d SHA512 748737c18bb9e9c750e8fad414d5274b2cd3c989a9937e1cf08ddbd5fa9f7fe404b69c8f3f41f05b7f3b8c43045964986086124b01ca5de4f242e550e63122a4 MISC metadata.xml 212 BLAKE2B fb59bcfbeb093c851e3e4a935d1614a10f509fd386894f9d9ade50348d9a1963e9eb482c89980f54986c79e073769212b0f9f0b4ec49d817fd252f578f292bfe SHA512 934c3c3ff6efab14f989c4b030de2bad2ce242d4402a68f90cb6e6fa9d5c3aa85cf0d6f5b92936acead641ebd9d05c870f4d5d59d1e94901c21cb9ebfa4ae685 diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild index 515c5f784c83..7d58d46dd231 100644 --- a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild +++ b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit flag-o-matic toolchain-funcs DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets" @@ -19,10 +20,11 @@ DEPEND=" x11-libs/gtk+:2= ) " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + S=${WORKDIR}/ipsorc-${PV} + PATCHES=( "${FILESDIR}"/${P}-_BSD_SOURCE.patch "${FILESDIR}"/${P}-gentoo.patch diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 2e88ed0b05cb..4c738aad747f 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -11,8 +11,8 @@ DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066 DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1 -EBUILD iputils-20190709-r1.ebuild 4988 BLAKE2B d4085aef19f926db7fe27a22d0bb4589648ee4450d53df43cd3aeab6571d15891ac9b4a363e3d4c4b7efa80f67fc54a0333a9485f386d5bb3e0ea88531df44a7 SHA512 717eb995035729ab0af20c9e48f9ccebba7ca51ce11d076aee708d381474f99311b00e6fed6eb63e1641e6ca4adce9d3178fb369a2516f32f0a260b7b09f7beb -EBUILD iputils-20200821-r2.ebuild 4412 BLAKE2B 259d4026283a3c299deff58742e4fd6b58bf2069055d7d1c50bc8de471f972b60cfe7e3f35abee7e0215a0c8a5d38955cd945f85f0a8921424c5175e05df72ca SHA512 3a75a6d267522ca25d08a45621a8201f3db7e4db7a598d6a0cd53e29e85f53e1ce71f49939863214e25d309244a0ac0ca31966e2186d886666f27b22b38470ae +EBUILD iputils-20190709-r1.ebuild 4989 BLAKE2B 2ba2eae3f7209600909fd4722b1847ff3433f3c5ccdf8d8b53eef056370e559030a970318d9cc0a7973a63f1327ad0ecbeede13f1d02e986d67a6a0a5768a551 SHA512 be66996b658845aa73e10c30e1d2df6d39f3a0155b3410952a31c26105601d7708cf458affe9969081299fb39aa6f2252542f2af515f83f28bd035ee87e7a4d3 +EBUILD iputils-20200821-r2.ebuild 4412 BLAKE2B c6db985d81b84d755ea8b4b4fb1dad8becad2080132aabb2bab84121c6ab8243e356f0b712b412857b8dbefcbdc284889d282cf80801d5fc6907a13b993df4df SHA512 0518aad44ce15c16ab886e1120fc82279eaf4c8a6c9f5910bbb33883cefc3a6f4c10540b8485f72c1008f4d1ea230747f81a1493b77d2e329ffc82586b2d1966 EBUILD iputils-20210202.ebuild 4204 BLAKE2B 8fd660bee7be03fa76bc535d9002832934014859dd97f19feff6dbf74e2c0862dac5d2821bcc52dea4d1ce65836c0a473622bb72d58e9bcca9627c91cb63ae56 SHA512 b42c8b00298a7a6e0a94151d1cd06a68a2dc8620c5e6a0180b4b61b860f3360697cb1bf8886ac2e0ed9834c0d7842b3a826a74808343e2801cdc799a270448da EBUILD iputils-99999999.ebuild 4204 BLAKE2B 8fd660bee7be03fa76bc535d9002832934014859dd97f19feff6dbf74e2c0862dac5d2821bcc52dea4d1ce65836c0a473622bb72d58e9bcca9627c91cb63ae56 SHA512 b42c8b00298a7a6e0a94151d1cd06a68a2dc8620c5e6a0180b4b61b860f3360697cb1bf8886ac2e0ed9834c0d7842b3a826a74808343e2801cdc799a270448da MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild index 45ccb52a468b..edf1a3d338d0 100644 --- a/net-misc/iputils/iputils-20190709-r1.ebuild +++ b/net-misc/iputils/iputils-20190709-r1.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 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" fi DESCRIPTION="Network monitoring tools including ping and ping6" diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild index bf2570e11292..2cb005a71580 100644 --- a/net-misc/iputils/iputils-20200821-r2.ebuild +++ b/net-misc/iputils/iputils-20200821-r2.ebuild @@ -20,7 +20,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 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" fi DESCRIPTION="Network monitoring tools including ping and ping6" diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest index f85ea9478db9..2e6e9a0a30f0 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 656 BLAKE2B 72b45e973cb7ce853d646230ffb441f602160e3ba3df7e825a8888b70e1b120d73adf9b2ba5124ac7d2ab3be0e7e4206941ec26714b713a61b9808fb020d184d SHA512 2299ca7e214507e69122c0c321f5e97db7a84f861a7d46f95fc1ce5587d0333227c578cf5df0f8276f2de80cd31458baa900f3588d0a0c2a397dee94588e87e9 +EBUILD jwhois-4.0-r1.ebuild 657 BLAKE2B 3a6afdd6c47d6821f8404f7ee25159037311fb4473e0a0547a8c644a8a67c11cd24ad3a34631f9182b8af99ca315b9944f34cef7fa85d4b0e3cd363047606c81 SHA512 6187f5c991fe6a97d7bc38fe5682423e8bbd4b910389170e26cdec3a2c6b3023e5a6fe833263e65ce3f325de86f75682790d737b207c117cb445846d2db99dc8 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 cfff28580d71..1295e7ccaa1b 100644 --- a/net-misc/jwhois/jwhois-4.0-r1.ebuild +++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,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 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/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index 60452d3cf068..2a44452ed80d 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -13,15 +13,15 @@ DIST kafka_2.12-2.5.1.tgz 61709988 BLAKE2B 4e6943058fe25da0cc9285e1e8dbe2be2ad2b DIST kafka_2.13-2.6.0.tgz 65537909 BLAKE2B 883bc22f53ae7882ff2e27a3b9b62967f4718718f8e2ee222debd5f5b36636e00b35ceb60c3fd6924905b88ef96442439198255bb8329cee1cc722364ff0810f SHA512 d884e4df7d85b4fff54ca9cd987811c58506ad7871b9ed7114bbafa6fee2e79f43d04c550eea471f508b08ea34b4316ea1e529996066fd9b93fcf912f41f6165 DIST kafka_2.13-2.6.1.tgz 65585925 BLAKE2B 639cc9ec9a3b630d01387b1fe4aa12f5e6ba66b751689d48f17af3759fbfc079616a21534eb72bb647cfee0d14ff86757d73e2ee0733d0f69548efceb90be3e3 SHA512 09ec7a39d0e11494ede7d92cf7dfec5b95c6b0218e3b096b731d85ee8c442469e66aaf369a9c6750399719e515ee1bd372d609d6b232e3358e18aa2b57c90e29 DIST kafka_2.13-2.7.0.tgz 68583422 BLAKE2B 68925221e025c2f380808da672f9ac08c19c21eaf4d3fe732051e02143dbc735082fce55cd40388b980159bfbe8b06666922852492564927c5fcc237bb3f74dc SHA512 f3dd1fd88766d9150d3d395b285bfa75f5b89a835822381490c8428e6e568889054ddb5fada1eb63613a6441989151bc7c7d6cde16a871c6674b909c4edd4e28 -EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 -EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 -EBUILD kafka-bin-2.2.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 -EBUILD kafka-bin-2.3.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 -EBUILD kafka-bin-2.4.0.ebuild 1445 BLAKE2B 7a3195fa859a082c87c53c9a635e60f7c2a17e3f1b3b86e5098c1fb4d6693de1a56502a5885c012b9a19a8ec8bb45e9fe2d5ad3bf3b3d6abed0e021f9d33b42d SHA512 0ae2805608cfda3fdcc9f1c54733e7c2e7cab2c4e385fd3bd3c78339f08be5162d7a397b0cd747b6bad5d1e6f556524dc02cbfb0cb4b7d5aa6d77a279701604c -EBUILD kafka-bin-2.4.1.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b -EBUILD kafka-bin-2.5.0.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b -EBUILD kafka-bin-2.5.1.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b -EBUILD kafka-bin-2.6.0.ebuild 1445 BLAKE2B f462939b918172f7dd31dbeaab8ecd9e4480da93ba6f2220597f158019789007ddf686029e12747669e7eae836b79a4f81dd47594d570b55ef054d5479010248 SHA512 1ae04cb30a976b1fb242856c8089e59071dd17f3278176b61d51e180c4cf0d768e9fb3331c18baa3ae32c321e156bb8bc77c5b225aedd909ad3a40521f42da6e -EBUILD kafka-bin-2.6.1.ebuild 2083 BLAKE2B 8589755fe6c9c5e702dcd59a386cbb708032b9895de712068506f089462e1e8616ab96dcb501f2a641976996668fbc1ac806b14adf2d36bcac4d5b73ba9483ad SHA512 4279bae4bc6fa1dbf90b7016561691196f0835bbb1902943754da3dc5a5b3bc62224b1f8877fa201c108dc0a7ebeced708695732526a8130f98ff6a97a4d1676 -EBUILD kafka-bin-2.7.0.ebuild 2083 BLAKE2B 8589755fe6c9c5e702dcd59a386cbb708032b9895de712068506f089462e1e8616ab96dcb501f2a641976996668fbc1ac806b14adf2d36bcac4d5b73ba9483ad SHA512 4279bae4bc6fa1dbf90b7016561691196f0835bbb1902943754da3dc5a5b3bc62224b1f8877fa201c108dc0a7ebeced708695732526a8130f98ff6a97a4d1676 +EBUILD kafka-bin-2.0.1.ebuild 1450 BLAKE2B c26f7529cf50b5aea129385bd65b64b189ae118ce6a05c14fa61b14a7f625183514cd03bfbc8057f4000e79fddde56807a82aa910cfdaa3136e04b03848b75a7 SHA512 ca38e61427b2baf0110807c82b2830df0e63e5d5615bf6c569b02e34e67529a95377ae10f3b3fc1c9c47ee9db59933b90ca473f4d5514d75f0cae4a39bbb176b +EBUILD kafka-bin-2.1.1.ebuild 1450 BLAKE2B c26f7529cf50b5aea129385bd65b64b189ae118ce6a05c14fa61b14a7f625183514cd03bfbc8057f4000e79fddde56807a82aa910cfdaa3136e04b03848b75a7 SHA512 ca38e61427b2baf0110807c82b2830df0e63e5d5615bf6c569b02e34e67529a95377ae10f3b3fc1c9c47ee9db59933b90ca473f4d5514d75f0cae4a39bbb176b +EBUILD kafka-bin-2.2.1.ebuild 1450 BLAKE2B c26f7529cf50b5aea129385bd65b64b189ae118ce6a05c14fa61b14a7f625183514cd03bfbc8057f4000e79fddde56807a82aa910cfdaa3136e04b03848b75a7 SHA512 ca38e61427b2baf0110807c82b2830df0e63e5d5615bf6c569b02e34e67529a95377ae10f3b3fc1c9c47ee9db59933b90ca473f4d5514d75f0cae4a39bbb176b +EBUILD kafka-bin-2.3.0.ebuild 1450 BLAKE2B c26f7529cf50b5aea129385bd65b64b189ae118ce6a05c14fa61b14a7f625183514cd03bfbc8057f4000e79fddde56807a82aa910cfdaa3136e04b03848b75a7 SHA512 ca38e61427b2baf0110807c82b2830df0e63e5d5615bf6c569b02e34e67529a95377ae10f3b3fc1c9c47ee9db59933b90ca473f4d5514d75f0cae4a39bbb176b +EBUILD kafka-bin-2.4.0.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a +EBUILD kafka-bin-2.4.1.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a +EBUILD kafka-bin-2.5.0.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a +EBUILD kafka-bin-2.5.1.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a +EBUILD kafka-bin-2.6.0.ebuild 1429 BLAKE2B b2138db523d0c013ecdec359a9f94085ca8e03d57a1784cb9ce0a2f60c158a89b914fffeeecd709fe3b92fd0714b09092ad2ce28f8c88b0db048088bbb42ba76 SHA512 658ff97fc57bdab8c811082cf7e8791f068ce0b34a5d86be6ab994c3b549b2db6b138a47816b38e66dabae7bfd64035f0ef5017d0704f52e09429d682df972de +EBUILD kafka-bin-2.6.1.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90 +EBUILD kafka-bin-2.7.0.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90 MISC metadata.xml 389 BLAKE2B 335c0cabaf348612feaa741673e778069f02881601f3f5aecba14cac49b065cbbd20fb1247cd035391528dc31c345ace91f43c3a38e7d083f1942a1f67bf6d3f SHA512 21cc10fb914680844252c607b5c401a87783fa4d8b7371358a6cdef8b99fb43f7dad2c9ac31af685490872a99c02941b012440ea07cea306b45303a2359d53ab diff --git a/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild index 0f799f94c22c..aaa89d5e8d9d 100644 --- a/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils user +inherit user DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="http://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild index 0f799f94c22c..aaa89d5e8d9d 100644 --- a/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils user +inherit user DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="http://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild index 0f799f94c22c..aaa89d5e8d9d 100644 --- a/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils user +inherit user DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="http://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild index 0f799f94c22c..aaa89d5e8d9d 100644 --- a/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils user +inherit user DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="http://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild index 7df42fcc92f1..2b5372ad071a 100644 --- a/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils - DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild index 4c7d84184e1f..2b5372ad071a 100644 --- a/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils - DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild index 4c7d84184e1f..2b5372ad071a 100644 --- a/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils - DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild index 4c7d84184e1f..2b5372ad071a 100644 --- a/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils - DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild index 7c0567d9f402..a014a476b4e0 100644 --- a/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils - DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild index 1e719f68e498..fb42f54f96da 100644 --- a/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit eutils - DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" diff --git a/net-misc/kafka-bin/kafka-bin-2.7.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.7.0.ebuild index 1e719f68e498..fb42f54f96da 100644 --- a/net-misc/kafka-bin/kafka-bin-2.7.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-2.7.0.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit eutils - DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest index 49770c853442..7405620f8bb6 100644 --- a/net-misc/keychain/Manifest +++ b/net-misc/keychain/Manifest @@ -1,3 +1,3 @@ DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024 -EBUILD keychain-2.8.5.ebuild 636 BLAKE2B c9c96a4ac7a8488a60e8a8ca85a68d60165cf7335432fa8af5fca0820810f6765896b69bdd58dbc0c65843a0c32727861d7e55c013f63ed4d4c5debf91ced96c SHA512 e0ff068577b86ea54a64c300e785ec60eaf6bffe8797dc39696882c40e53302f5876dd14d44240a9ee6c24aaf7ef2c39c46269086f2a95740d43d5896541282b +EBUILD keychain-2.8.5.ebuild 637 BLAKE2B 8a6dec9e1536bf5df5cd6ac2e07c816862a9ce5cd85ac40e725b3a8f7b6827a6f31eaa70981fde85d697a29e06a8e08b83bc1d9099d444a293aa63bbec52bc63 SHA512 f6f714cd2f9f55cced05171c046ad88166ee79edfd1b7cf793a6cc02687f91a54f5aa434e0b99450dab94aa2b233cfb8936e4ddd5e2c3b62498bb0d765d3bb4d MISC metadata.xml 526 BLAKE2B 7be1e9ee4eec532a83c4d429a1318a5fa75cc9960fe9b81e77f6fb352707e4ec2ca8f72b8e19cfecb10fdc318b8801dcbd48f6f507a5ea4036504a38afe6c077 SHA512 377f1fd44b93bc7e4f7b044ff58d50d941d0f2062b9755569692911a16731453ee723bdc7d5c6f6111474e3267b2be7cefb8beac2d402603e27ee4bb97bd29a2 diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild index 46f1e43d8fb0..46c5f47290f6 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="dev-lang/perl" diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest index 8a08d6d9f9da..07b77c2f6ac5 100644 --- a/net-misc/knock/Manifest +++ b/net-misc/knock/Manifest @@ -1,5 +1,7 @@ AUX knockd.confd.2 189 BLAKE2B 288c5c9e47a3001d83edd0f9d54286754fecd7d8321896370af63c0e3429a2c4004a8e99a835e558878f6b934d8c50f6ecdc5f267cd7608c59de46cfed195162 SHA512 75a483770c31f8de3744c9c3119c5cf818b9ff780bf9cffb49c1f4a78b2f384dc392218ea2a0df9fd7178a19b0b1f5a59d8a81cdb56f952cd4c8e5a91c9cf25a AUX knockd.initd.2 527 BLAKE2B 1c0e429d07d4023d34ae129c900161a9a681cd76761e953e3b6416fb3f5ad067b8f2e5c567887ccfc43adaa3b1a1f9e58bcb19ed660b118785db41aa45330107 SHA512 dc66e53bdc42487609d978a538dec26712f25c87b9a2e4a70e1a833fedfbacf3b8618f87cbe110ed54938f6620fd2e5f7a79143d7f8503927686dfa26eb9acff DIST knock-0.7.tar.gz 110791 BLAKE2B 19e63854800f4ef77199fb4005dabd749f16681068d205a924fa0bc926d2cc31a69c1f62ffa8ec335209cfa987e7db92d9332b43e971f71528f69740ced06391 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7 +DIST knock-0.8.tar.gz 377107 BLAKE2B 1397ed04b1a202db08b0bd3a8a26745cd2e8390604c9dde7d18182e7ad4ddd19da074b1b54ea1ed59b1576f3110e21bac722c90a2cd3820910bdaa0026eec395 SHA512 6511e29f604cebc4a4048f5e49c1b73db0bbe0041a88f7c8559fa1a60ea894aadb72a608c423f867a5a4dddb06d00a0713863473981e42273662a77364c260ec EBUILD knock-0.7-r1.ebuild 1093 BLAKE2B 6fa890d34f137f602cca10a1b24c6d05341a8ade371eb20ae3e241eb51072e37ca5a358085237c01f51dd141aa6fc3868c58d1e1f3994dc593861d74c4a11a35 SHA512 7d2d709aeda869f5e5191ee79c150aa7f40e7749e6c0a65be304989f4fb6f21262df7bf6d032401c5342f5bf3da7e43e10cc678a305bfb6210e9b81a70940125 +EBUILD knock-0.8.ebuild 1097 BLAKE2B 06a01626481ae89c22e6ed32d776f41cddb0fef2397202361ca035f697dc4d8ea676166971f719a83b1c516cf728b93490f788c59df1faf1f1d4cdb6f4d4fe78 SHA512 91f7d15603c1da491b54ca18059545eff93c4868b4c6b11257fa755d5f727f333fac867b8d2487814dbf9e11f3567d6b4036ecf9d888fa0936c44c75b2618f1b MISC metadata.xml 323 BLAKE2B 7686de9cbde61bea3e7014c4c2d795c57472c80ad8339c568ee91a2b8c3f21951fabdfb238e79765368e954704c322fae73e2851b01adfceedde6ba5198b52f8 SHA512 101eaef6a7379f57938957779947d799d43dac1bb045737c84d62b09000595f1d6464bb049661dab9342a1c74dcbbd10d6e37df2bf09d77b95a2aab8b3911ae2 diff --git a/net-misc/knock/knock-0.8.ebuild b/net-misc/knock/knock-0.8.ebuild new file mode 100644 index 000000000000..f4a622618980 --- /dev/null +++ b/net-misc/knock/knock-0.8.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Simple port-knocking daemon" +HOMEPAGE="https://www.zeroflux.org/projects/knock" +SRC_URI="https://www.zeroflux.org/proj/knock/files/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="+server" + +DEPEND="server? ( net-libs/libpcap )" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -e "/^AM_CFLAGS/s: -g : :" \ + -e "/dist_doc_DATA/s:COPYING::" \ + -i Makefile.in || die + + sed -e "s:/usr/sbin/iptables:/sbin/iptables:g" \ + -i knockd.conf || die +} + +src_configure() { + econf $(use_enable server knockd) +} + +src_install() { + emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install + + if use server ; then + newinitd "${FILESDIR}"/knockd.initd.2 knock + newconfd "${FILESDIR}"/knockd.confd.2 knock + fi +} + +pkg_postinst() { + if use server && ! has_version net-firewall/iptables ; then + elog "You're really encouraged to install net-firewall/iptables to" + elog "actually modify your firewall and use the example configuration." + fi +} diff --git a/net-misc/l7-protocols/Manifest b/net-misc/l7-protocols/Manifest index 2db91be5604a..7419f0ba2872 100644 --- a/net-misc/l7-protocols/Manifest +++ b/net-misc/l7-protocols/Manifest @@ -1,3 +1,3 @@ DIST l7-protocols-2009-05-28.tar.gz 142050 BLAKE2B b70a0c7267bc462fc193cb05ea16849ea064b39d358d1073884ca718b92a39b72e78d5f8cec600a8acdba48bda72dbc07f20bbee76b5f7670d09dee93e164ffc SHA512 020730d0170537213080dcefd847439a2306eea759317e4054549d12e344520e9db222ca48f74c184cb17ba5ff244270b688fb7e89ed0dd21a196e02721e4477 -EBUILD l7-protocols-2009.05.28-r1.ebuild 1737 BLAKE2B 3373e258d8373ad0fa367098ecb618904de04cbad5cfa50798078b32a6e45d07a7afd69046f04dbedd6f8a787a610d82c7c3025d9068199088b6459c63036c0f SHA512 929a4bda7b93e178a8ae9ac44fd4a6e6fc4154067eebe88aa50e0b41594f6d950b53496d397f30d02e25ac69656b154865fd57999d8a3c1e5354ed5102680f58 +EBUILD l7-protocols-2009.05.28-r1.ebuild 1723 BLAKE2B ec14f93e3aa489ce0df362ee14c81781395bea37bda174a69687db6ea3ef18f5d2c98991181ac8daff60c4471b6964410f6ceb7dbd73844e8252de47917e53c7 SHA512 7b811f81f2c12431a20fc81bbd60fbd2524b83c00f13bca6ed17f7b4436f93c65f8529e9d3d45f01e9809894086390572cba3dd84a0900200519d92197a957c4 MISC metadata.xml 641 BLAKE2B 9413688e3c6c77f48d5a3787318c03bc6769d9838a47ecce6241d950da843a0181fc963273ff4b54dfa5325c271dbac4d7d4d6f617467c2fd28baf878a706115 SHA512 c2af3723eac88c6e4fbe5dd6920ad6ed2ad2b1339965edbae5cad669b9470a0818520041b5335868fe52a9b57856f53e7088e91fd0403f73c087fea2e8c61eeb diff --git a/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild b/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild index a6f18a630b65..8fae2ce8e5f2 100644 --- a/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild +++ b/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils fixheadtails toolchain-funcs - -IUSE="" +inherit fixheadtails toolchain-funcs MY_P=${PN}-${PV//./-} DESCRIPTION="Protocol definitions of l7-filter kernel modules" HOMEPAGE="http://l7-filter.sourceforge.net/protocols https://l7-filter.clearos.com/docs/start" - SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -S=${WORKDIR}/${MY_P} src_prepare() { sed -e "s|gcc.*\-o|$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o|" \ @@ -59,6 +56,7 @@ src_install() { for dir in extra file_types malware ; do newdoc ${dir}/README README.${dir} done + rm -rf README CHANGELOG HOWTO LICENSE Makefile WANTED */README testing || die dodir /etc/l7-protocols diff --git a/net-misc/lanmap/Manifest b/net-misc/lanmap/Manifest index dc54e24c8db6..0cb5efdfae49 100644 --- a/net-misc/lanmap/Manifest +++ b/net-misc/lanmap/Manifest @@ -1,5 +1,5 @@ AUX lanmap-81-make.patch 1930 BLAKE2B 0c4ccc3173e3d5bb9babe39f6ee32f0a5c6f045cebc6d59041af24f51b906dfa4596e0a54270c49b9b6b29813af0d8a4f7f1aa98392cd61dfc2d689879a62c61 SHA512 601a570e55ce987d41106cf1c79a2564e55d8756bf8ec1cd58c63df38ebdccfece6b60d29b24f36aa828289f0762c3c54ae58b30b61355c2479c27fa9322b86c AUX lanmap-81-printf-format.patch 303 BLAKE2B 90cfcfc8d3c94e0ef1a3a929500e5d86de51e9c046987a5e68317ec5435a4bdf739a6caf3869fc334561000e0c4cb66c87c95c01c03955499986cefb931e0710 SHA512 644e269b1c3b872f66707d452129033f9f2d67ad895244b5aeb34886f1cf572482a7ad82f97f4d23ac3e652ce64f56f9bdaa8c11aa76cb5d6cac42c170f30285 DIST lanmap-2006-03-07-rev81.zip 405933 BLAKE2B 6ccf3bd502d7417a4c795ec536e6b970bf0e5c8e0666db45a80e25ced7a27e56e64aec6482cbcf6808d2ee653e7a3a5552dc7215127660cf2c7551f051c3ab9b SHA512 9216d753548fba48f4fcd18a55136a50c0dd01c87f1d5f7736319a7a71b28bd50f082a9aa94d8c426924e0fa4fb6537cd8c8cbd2a289736ede54fd4c6f4679f2 -EBUILD lanmap-81-r2.ebuild 826 BLAKE2B 8779cb8c5bedf3489677e5ec339fb9d63307d2abce70e6cd108a59ce3dc9966447a5c8d126da4dcdac5b9a37f5b9a35e53665161568bfcfb49526963177d236a SHA512 5a73d9fd50ebe21f8e629746527cc1f13689ffb5c39e8dae159ecbb9f549663f93c237e24f574d16289ec108aef8b9fef578de46fc73dea5ef49fe26d08f1bca +EBUILD lanmap-81-r2.ebuild 824 BLAKE2B 140d2531e9a8310179b7c3690b9cd1bbe7a800bcc8a6dc9d1b09103022efa68f49e34c4088e62274f30a9a24d327a20bad8525923f3066ef3355d892f7799238 SHA512 ea8ea9ae68d4bd5bda3fab0f024d548161d3707db8a539fabdfec754e1223d092baf44d6dd793611c17e210fed614add0e3d4580abc29cb63588b67506c6d45a MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-misc/lanmap/lanmap-81-r2.ebuild b/net-misc/lanmap/lanmap-81-r2.ebuild index 044049046494..eead125ec3f6 100644 --- a/net-misc/lanmap/lanmap-81-r2.ebuild +++ b/net-misc/lanmap/lanmap-81-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils toolchain-funcs + +inherit autotools epatch toolchain-funcs DESCRIPTION="lanmap sits quietly on a network and builds a picture of what it sees" HOMEPAGE="http://www.parseerror.com/lanmap" diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest index b1e15b580970..b8d702bceada 100644 --- a/net-misc/lksctp-tools/Manifest +++ b/net-misc/lksctp-tools/Manifest @@ -1,5 +1,5 @@ AUX lksctp-tools-1.0.18-autoconf-2.70.patch 2049 BLAKE2B 083525c312ec0ab05fb0bafc7c857ce4478e19aeb6ed2954ebdbf0bb28540fb5a71d20d651c7b3bed3135ec695f10e61070cd6449fb6a7eed777f5d5432587b9 SHA512 07342f740afaa09e61c8d756c318731e84402a3a92a6e5fc5011320a4f3b80bbcb4ff4ddeffe42bc2cf5f6b37ad741ede8fb7a6833c3f4de55ea2bc99f267673 AUX lksctp-tools-1.0.18-install-sctp.h.patch 335 BLAKE2B 513aca706f701591bca2e0814bcc6e7748fb4b1ffa97e8832e9fdac8dd62fd4ea5d60b2e385d5b8be0eaaa6e60b32f6ebc2f3962b43f6d6a39b14bc14eae7e08 SHA512 042611f2c2e7605e96552dc5bee79e014b9ba2db4e08fa7a5c5c821a86d22d970bfba40a477249aa6e9149a997aab1d48b133b97ec353d4ab22ed9e2de6f9096 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055 -EBUILD lksctp-tools-1.0.18-r1.ebuild 1383 BLAKE2B d87142cfa3eb95433cbb9e8fe79911d7d9587a3ddc1df43fbbed3d3a29b9d8bee73d3449e6dbb618cc5c2dd6a57f4507f44d7991e539c930411bdfb44930a3a4 SHA512 7f1de6c8041c8bb12ad28efaa5cd885d079412365c3f87761bcf57d3a517da788f2ca98192d6b3b3546e6529f13f8792a4d18f833e79113577b2a12e4f883e8e +EBUILD lksctp-tools-1.0.18-r1.ebuild 1384 BLAKE2B 4c4e222b853362a307b42edfaef2459481e2c34e8c31bd1818d9266855cd5e82ffcf5b89d0eb0f9c750636a8165398827b2066c56e6ef6f1f7519c8701f810da SHA512 552150b3a766311bcf3faa89e6e6aa859da7515b01c256de0db7d46ebf3a7be8758df9739ed1f90c6080384e91849ac1148b4264b87028a5194ef67e433e4263 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff 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 bf3050d07acf..98ec51669c88 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 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 896578cb989a..099878a6269a 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -1,23 +1,13 @@ -AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc -AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752 -AUX lldpd-1.0.2-seccomp-add-misc.patch 789 BLAKE2B 49fb6cf10946154a7573778c558b5ac5754e1f2dfa87c7011c44b9515df5d4e06d6271e21e3a0104823603a6e5644cee944354621c937fe358eba79f5f03c8d8 SHA512 bcc473debe7f45c533057ca1ecd6ab717bbeb663aaee223045239152fcf7c92c1dcf5e77c5bd0d36f0dbc08739dc8fd90bfcc7c82c8019a3508f496cf7df2d34 -AUX lldpd-1.0.3-fix-fdp-without-cdp.patch 775 BLAKE2B 900476f2bd2e6671ed9fd1eb99f727d5b153681db85e83d28baaa6fef99bbb1e408488475b6370df337742e735b6d56f53183f1cd2072c1dbc9da5fb194bd7af SHA512 bdc0f61a467c5a5d5fddc64b3e9822a94fedc7d61cce96ab3996fd2b12e418453da27f9de7879f13b0feccf1080b8559e848b113826ca0733e60b0d28cc5aacf -AUX lldpd-1.0.5-cpp.patch 617 BLAKE2B 71a520303bbde126425f6e1432407d5cc6b4f363c74a3019761433a58fdbe404e9d90836c7fce1d8caef428fa0eb874739fc1115458f8ec7a403e275311987bd SHA512 16b7669e7f0fc6403d79121db056cbd5fe2cf892aa8a23c64b5253266164fcea27cc559b8deca8a0af7e1e3b5b0baa289302e46f057fe781f3ba0f6c7042171b -AUX lldpd-1.0.5-seccomp.patch 2282 BLAKE2B 6a3cd06b65576c4f2c54636778a628960104980d3bf0b05f4164b0062c7604fb694517457f0ad13a4b83086de5219b23ca7a795b7cfb16b2baf15680e5ad7036 SHA512 6818b88d17cab0b924a3f145ce82c24ee9e3ae6a450b82413f5979cd51fb1b58fe51a9fa98e5225e0f4229bf227a029abba5f02636319b74b01394e5723ddb95 -AUX lldpd-1.0.6-seccomp.patch 779 BLAKE2B 73fe88ab41f0e110da120e07098488e8370868a818028e3d49ae397c93b131bc79914ae06e55db5e2b4fc518e0f08f446a4725871ec5411e5407527dc8767392 SHA512 0f2d35b71cf3466f16030ccb2ca9d7843d7e9563e9f1110d4d65b2004438fa58ff2a345f4831037bd6dbace0d43337b7c37126839dd36d34ea7e5bf1df0700ef +AUX lldpd-1.0.10-glibc-2.33.patch 699 BLAKE2B 55dc33fa9b9e4ca274b8c97f1c84766686e01585797404c2b71aa9f046acf356b8b3c1dd7f8e9f80693204d73b7b69059646ed46320dabd954b97b321e7f43cd SHA512 c1ef0dd52408d64860b813ea79bf64a1587d7c58e1582faf936260e640e2aedbc0c53f1b3d6a18acdfddbce161f50400f97f246a18ecdc22212f93cc97a47cc4 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0 AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054 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 -DIST lldpd-1.0.6.tar.gz 1814839 BLAKE2B d4bf30a7ae5a5de93f67ef6b06662e287a4c2eff76f157dc9b0a551b4473e0b0896e7af1cd39866f2ee0013ebdf572e762d8543a00bda0d0a1136cfedc7f2ba9 SHA512 b0930cf3202eba6bcbb7d5f941bda16ebbdde15f1839c6664c2896f92a7c2842cbe87baa32c7ce85f1d1fe012a8ceb9975a06244644a4bc3759241a4a1d058d1 +DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e848863eb5ecb11b046806b4c23afdae084ffcab8b07b93e6a111dea2c24bd2cfc81a7f1c2559a39b3b2ed8f80814f SHA512 6835bfe36cbaffb0e7f0dbc958d234b7a16787bd51d0c5423c7b775d71dc89635ab28c005e2df550c40f4ee76ab461c0c7cb2a09b011878cadaca18153485d8f DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69 -EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 0328fc61859fb18450cd5b147a7b6b73dcaf4c56820bd3c219c424dcf5626c5ae1f658985fc09df1a2083723cc2aebf2464e07e5c037cc9ad89f7d6b0ac062f5 SHA512 1e9829bf9aa96e3575841be49babbe2adfb8b22182e255b76867b4705278ebcc23efb74f7b16ad8c8cdcc3ecf320f823a67568cbf444efaeaac39b65163f55ac -EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 52583299069a44be65e63277f9920fe6bb625bc130c05802c883206f0462ec59bfb8464ef0d5f6ec63b8e6103e08cfdec3cd5967585605686b0d47701ec6cabe SHA512 1f4e29b84fa0b99cd62f0afe09a756e02fe9fd9bbc6b6f2ffd68f326265d9b6e385ddc9690c6b99cabbd49229cce3f94f93185e58b8cdecbc6fec486699ec468 -EBUILD lldpd-1.0.5-r1.ebuild 2356 BLAKE2B 9faf6d79c27053c19f25022987dbbc9a99cf66161c8d9e16d1ed98a570517417143c294dad4e7f40590031ab4d7a9001384aa1e4f1c0e88a05ed34e4bdbe5511 SHA512 a11a3320a374b9efacb62f2bbee7bc87ec8d36eff0642bb107c9fa107f03b50b7a6eeb21b46521cc88030c32e71c847f339f9ef2a4fc93b1e1b5fcb537577424 -EBUILD lldpd-1.0.6.ebuild 2322 BLAKE2B ba665c9657f5acb8667905e9e254f94dcc9fb755252d693f1c2a91eeb752e920810d165b8cf7b0b2e9f9910c05104ff0f57f3c1e10d3a7fff58a52b3503ca97e SHA512 d05b15681677e773a9dd4b9e441e4a37a091c541a7cecf073e6b36a0f8e048edea4d37b46b2e5511233ed3d830072a5b81e28d4f3594a56d51fde3254cfa41c1 -EBUILD lldpd-1.0.7.ebuild 2268 BLAKE2B 824700814c2aec26b73079dc0399a5913b32cabab16bb344088520d822b3ec1b1dbc5936b9cbf6b3a89fca886ef17528d4a4084645c81178f88c2c4e23dd13e7 SHA512 e1d9ece9bfb4bead21013713e5cfaf8e67bf7885f066c487eb75792d059bea027abae67be375c1a7ae1f79b94640371ff5c8f7d88c4e096a937f4737864647d8 +DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0 +EBUILD lldpd-1.0.10.ebuild 2326 BLAKE2B 1e76187519ffaf61aef78f797ebc8affd1346100e6a9a478cf8dbb5cc90be0ddeda49f0e587aead3a7d99ff6f40d513e6b177fc19db7ffae58ca94539c0cc836 SHA512 0a39c30bf96d95816f422b12ed54fa2beb6bb0a1a4cd5eae12eafc8461dbb98237752bf73cf118714f7f80da73546cc7668c6292dfbdbd956d32c9df24ff0475 +EBUILD lldpd-1.0.7.ebuild 2266 BLAKE2B 6d4ead882fa1b191b8e693a5adf762bf4859ca6dde3307773b703eff9443626ec833f21087db64f977c678477c3feea1d586061e7c038e92aa16d36b4c2163d1 SHA512 ea5e0b3e5d5999e9908ce6070bca40a8d4cc42de57688f1e4466661c49d5a637d74c3b82383798339b3a6b729467b000ec6d5e3339eb4ea8faaff19754aa8c67 +EBUILD lldpd-1.0.9.ebuild 2268 BLAKE2B 824700814c2aec26b73079dc0399a5913b32cabab16bb344088520d822b3ec1b1dbc5936b9cbf6b3a89fca886ef17528d4a4084645c81178f88c2c4e23dd13e7 SHA512 e1d9ece9bfb4bead21013713e5cfaf8e67bf7885f066c487eb75792d059bea027abae67be375c1a7ae1f79b94640371ff5c8f7d88c4e096a937f4737864647d8 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511 diff --git a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch deleted file mode 100644 index 987ef9a515c5..000000000000 --- a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c -index 97f4233..36184cd 100644 ---- a/src/daemon/priv-seccomp.c -+++ b/src/daemon/priv-seccomp.c -@@ -167,6 +167,8 @@ priv_seccomp_init(int remote, int child) - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvmsg), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 || - /* The following are for resolving addresses */ - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 || diff --git a/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch b/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch deleted file mode 100644 index 40cc428ec8f2..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -purN lldpd-1.0.1.orig/src/daemon/priv-seccomp.c lldpd-1.0.1/src/daemon/priv-seccomp.c ---- lldpd-1.0.1.orig/src/daemon/priv-seccomp.c 2018-06-12 07:48:04.282557213 +0200 -+++ lldpd-1.0.1/src/daemon/priv-seccomp.c 2018-06-12 07:52:26.214348537 +0200 -@@ -162,6 +162,7 @@ priv_seccomp_init(int remote, int child) - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(brk), 0)) < 0 || /* brk needed for newer libc */ - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 || diff --git a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch new file mode 100644 index 000000000000..876a9ce31cd5 --- /dev/null +++ b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch @@ -0,0 +1,12 @@ +diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c +index 6d2736a..533f6fe 100644 +--- a/src/daemon/priv-seccomp.c ++++ b/src/daemon/priv-seccomp.c +@@ -180,6 +180,7 @@ priv_seccomp_init(int remote, int child) + (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 || + (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 || + (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstat), 0)) < 0 || ++ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 || + (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(connect), 0)) < 0 || + (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(futex), 0)) < 0 || + diff --git a/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch b/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch deleted file mode 100644 index c5e6d2edb78f..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c -index fe48ad3..791b76b 100644 ---- a/src/daemon/priv-seccomp.c -+++ b/src/daemon/priv-seccomp.c -@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child) - if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */ - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), 0)) < 0 || diff --git a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch deleted file mode 100644 index 17099a2f819b..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 4e7ec8233cd185941eaa9e41785cfc53f92799b4 -Author: Vincent Bernat -Date: Tue Jan 8 17:19:15 2019 -0500 - - build: fix compilation with `--enable-fdp --disable-cdp` - - Fix #315 - -diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h -index c3ffa10..f6b03d7 100644 ---- a/src/lldpd-structs.h -+++ b/src/lldpd-structs.h -@@ -129,7 +129,7 @@ struct lldpd_dot3_power { - MARSHAL(lldpd_dot3_power); - #endif - --#ifdef ENABLE_CDP -+#if defined (ENABLE_CDP) || defined (ENABLE_FDP) - struct cdpv2_power { - u_int16_t request_id; - u_int16_t management_id; -@@ -273,7 +273,7 @@ struct lldpd_port { - struct lldpd_med_power p_med_power; - #endif - --#ifdef ENABLE_CDP -+#if defined (ENABLE_CDP) || defined (ENABLE_FDP) - struct cdpv2_power p_cdp_power; - #endif - diff --git a/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch b/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch deleted file mode 100644 index 0c3fc1964d40..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am -index 0d5f2f3..cc41a8a 100644 ---- a/src/daemon/Makefile.am -+++ b/src/daemon/Makefile.am -@@ -108,7 +108,7 @@ CLEANFILES += syscall-names.h - syscall-names.h: - $(AM_V_GEN) - $(AM_V_at)echo "static const char *syscall_names[] = {" > $@ ;\ -- echo "#include " | cpp -dM | grep '^#define __NR_' | \ -+ echo "#include " | $(CPP) -dM | grep '^#define __NR_' | \ - LC_ALL=C sed -r -n -e 's/^\#define[ \t]+__NR_([a-z0-9_]+)[ \t]+([0-9]+)(.*)/ [\2] = "\1",/p' >> $@ ;\ - echo "};" >> $@ - nodist_liblldpd_la_SOURCES += syscall-names.h diff --git a/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch b/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch deleted file mode 100644 index 4ac67afeec5f..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c -index 5a6e2ae..5cef36f 100644 ---- a/src/daemon/priv-seccomp.c -+++ b/src/daemon/priv-seccomp.c -@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child) - if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */ - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 || -@@ -163,6 +164,7 @@ priv_seccomp_init(int remote, int child) - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(brk), 0)) < 0 || /* brk needed for newer libc */ - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 || -@@ -172,6 +174,10 @@ priv_seccomp_init(int remote, int child) - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(clock_gettime), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(gettimeofday), 0)) < 0 || - /* The following are for resolving addresses */ - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 || diff --git a/net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch b/net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch deleted file mode 100644 index f0d38bd25a5a..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c -index 6d2736a..5bab871 100644 ---- a/src/daemon/priv-seccomp.c -+++ b/src/daemon/priv-seccomp.c -@@ -170,6 +170,7 @@ priv_seccomp_init(int remote, int child) - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendto), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(poll), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvmsg), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 || diff --git a/net-misc/lldpd/lldpd-1.0.10.ebuild b/net-misc/lldpd/lldpd-1.0.10.ebuild new file mode 100644 index 000000000000..416283761d45 --- /dev/null +++ b/net-misc/lldpd/lldpd-1.0.10.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd bash-completion-r1 autotools tmpfiles + +DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" +HOMEPAGE="https://vincentbernat.github.com/lldpd/" +SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/4.9.0" +KEYWORDS="~amd64 ~x86" +IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers + seccomp sonmp snmp static-libs test readline xml zsh-completion" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/lldpd + acct-user/lldpd + dev-libs/libbsd + >=dev-libs/libevent-2.1.11:= + sys-libs/readline:0= + seccomp? ( sys-libs/libseccomp:= ) + snmp? ( net-analyzer/net-snmp[extensible(+)] ) + xml? ( dev-libs/libxml2:= ) + 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-1.0.10-glibc-2.33.patch" +) + +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 + newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf +} diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild deleted file mode 100644 index 7a948e636cc0..000000000000 --- a/net-misc/lldpd/lldpd-1.0.3.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user systemd bash-completion-r1 autotools ltprune tmpfiles - -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} - virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) - ) - test? ( dev-libs/check )" - -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" - "${FILESDIR}/lldpd-1.0.3-fix-fdp-without-cdp.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 - prune_libtool_files - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild deleted file mode 100644 index 1619bcba5066..000000000000 --- a/net-misc/lldpd/lldpd-1.0.4.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils user systemd bash-completion-r1 autotools tmpfiles - -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 - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild deleted file mode 100644 index 1151f58a48b2..000000000000 --- a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd bash-completion-r1 autotools tmpfiles - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://vincentbernat.github.com/lldpd/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/4.8.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=" - acct-group/lldpd - acct-user/lldpd - dev-libs/libbsd - >=dev-libs/libevent-2.0.5:= - sys-libs/readline:0= - seccomp? ( sys-libs/libseccomp:= ) - snmp? ( net-analyzer/net-snmp[extensible(+)] ) - xml? ( dev-libs/libxml2:= ) - 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-1.0.5-seccomp.patch" - "${FILESDIR}/lldpd-1.0.5-cpp.patch" -) - -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 - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.6.ebuild b/net-misc/lldpd/lldpd-1.0.6.ebuild deleted file mode 100644 index b202dbd60a58..000000000000 --- a/net-misc/lldpd/lldpd-1.0.6.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd bash-completion-r1 autotools tmpfiles - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://vincentbernat.github.com/lldpd/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/4.9.0" -KEYWORDS="~amd64 ~x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/lldpd - acct-user/lldpd - dev-libs/libbsd - >=dev-libs/libevent-2.1.11:= - sys-libs/readline:0= - seccomp? ( sys-libs/libseccomp:= ) - snmp? ( net-analyzer/net-snmp[extensible(+)] ) - xml? ( dev-libs/libxml2:= ) - 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-1.0.6-seccomp.patch" -) - -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 - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.7.ebuild b/net-misc/lldpd/lldpd-1.0.7.ebuild index 13a686c29d3d..4310953a675c 100644 --- a/net-misc/lldpd/lldpd-1.0.7.ebuild +++ b/net-misc/lldpd/lldpd-1.0.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" LICENSE="ISC" SLOT="0/4.9.0" -KEYWORDS="~amd64 ~x86" +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 )" diff --git a/net-misc/lldpd/lldpd-1.0.9.ebuild b/net-misc/lldpd/lldpd-1.0.9.ebuild new file mode 100644 index 000000000000..13a686c29d3d --- /dev/null +++ b/net-misc/lldpd/lldpd-1.0.9.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd bash-completion-r1 autotools tmpfiles + +DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" +HOMEPAGE="https://vincentbernat.github.com/lldpd/" +SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/4.9.0" +KEYWORDS="~amd64 ~x86" +IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers + seccomp sonmp snmp static-libs test readline xml zsh-completion" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/lldpd + acct-user/lldpd + dev-libs/libbsd + >=dev-libs/libevent-2.1.11:= + sys-libs/readline:0= + seccomp? ( sys-libs/libseccomp:= ) + snmp? ( net-analyzer/net-snmp[extensible(+)] ) + xml? ( dev-libs/libxml2:= ) + 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 )" + +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 + newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf +} diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest index 42db48ec2149..20d784c029c9 100644 --- a/net-misc/megatools/Manifest +++ b/net-misc/megatools/Manifest @@ -1,3 +1,3 @@ DIST megatools-1.10.3.tar.gz 196361 BLAKE2B 49d7658714074253ab93134bd9fbb6f73a9101e362f219c4394cfe599deeb3cb2ccf01afb89db75691299271fa9dbfdf004abd6dfe26d2a0fda783282561ff51 SHA512 cf431e151f3f7e1a77fcfe07092694f861eca43ab88bb4e0d4de72f01662e9140c51891f8f5cf3cf66d3a04b64a55d57fd766c3febf2fc5cee1720558ff2079b -EBUILD megatools-1.10.3.ebuild 763 BLAKE2B 8f0fadf26889cb323e4b0e660d97ff1c5861e2cc1a361b38f58406bd5a3618728fe39dbeeb7eb716c340879223b85752a536b8897e1de2eaa99553b16b03664e SHA512 84a6d76d4c20384805105b165626445b0da1335a42491098bc7542f2e12e4129509f409832e380dc179225d12608ac9de424cdbbdc59e209dc89ec2758a08c97 +EBUILD megatools-1.10.3.ebuild 713 BLAKE2B 8241d9fbb52a77bc00a8f0b689060068df781200fd679b74ff74302a29c22774ee1cbbedeadee7990c85d4cb982b37815f28dafd36d831a108dba094d97f34ca SHA512 3fe92ee1388e6ed190b8f5eeb183967be92fe3264ca9ab43fde43ccefea6e0aab821fa327a0f743bca6b0a61d7009e8ae430a35e876cab281d7d1b76a5d94091 MISC metadata.xml 531 BLAKE2B cc1cb4fb594ec4ad7a48eb547e2d15a3f060b000596f81dcafc23d0ae50ee1a979a18f65747ace522ebaa315ecb863697280f09e9bccf01c4c695ccbf29b76ce SHA512 b6dba0febd0344a6bf61a64809b60cc67ed3ebbc48a363206ac5c86547f6da6cbf573e3e55734f6f966820ba01654109e9e0535a5434e62c461fb87866bb6c8f diff --git a/net-misc/megatools/megatools-1.10.3.ebuild b/net-misc/megatools/megatools-1.10.3.ebuild index f963f80749fb..6055ce2deca2 100644 --- a/net-misc/megatools/megatools-1.10.3.ebuild +++ b/net-misc/megatools/megatools-1.10.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils +inherit autotools DESCRIPTION="Command line tools and C library for accessing Mega cloud storage" HOMEPAGE="https://megatools.megous.com" @@ -12,18 +12,18 @@ SRC_URI="https://megatools.megous.com/builds/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="" -COMMON_DEPEND="dev-libs/glib:2 +RDEPEND=" + dev-libs/glib:2 dev-libs/openssl:0= - net-misc/curl -" -RDEPEND="${COMMON_DEPEND} net-libs/glib-networking[ssl] + net-misc/curl " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/asciidoc virtual/pkgconfig - app-text/asciidoc" +" src_prepare() { default @@ -32,7 +32,6 @@ src_prepare() { } src_configure() { - default econf \ --disable-maintainer-mode \ --disable-warnings diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 5d6db44e5242..f77e56a3d190 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -6,5 +6,5 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c -EBUILD memcached-1.6.9.ebuild 2862 BLAKE2B d3bdc627a9b86a5172b012ccdae7571be16b389e60b6592e091926cd1f43f9252975489681767a71212dbe8831e7b97ebd2aedf74beb3707ba2d3f454cdafee3 SHA512 59c4444f115d101324897805560aff909fcd6699d0d26e1de065e2a9d48517596cce2ac2b90e1998cb81a860008b03a67539d90aa59c7e2fbd6f9615f498416f +EBUILD memcached-1.6.9.ebuild 2861 BLAKE2B 766d0823415f5695f50c3ef538277ca8eaddc0c21c19680bf917acc4c2cda54f942fb4bb742fe87bc2b734f4e3d440a1db1f5f3fde8f9783b611fa4d731e47ef SHA512 f19bc943a41580db184bf036fdc517f59fe8f8418ffa7855a5066160c1427ebfb9eb73d07df62803c5f095fa01e0deba56ae1464bd462610b6f0c4f175897cff MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 diff --git a/net-misc/memcached/memcached-1.6.9.ebuild b/net-misc/memcached/memcached-1.6.9.ebuild index 21021457846f..4126566cc8e8 100644 --- a/net-misc/memcached/memcached-1.6.9.ebuild +++ b/net-misc/memcached/memcached-1.6.9.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils flag-o-matic systemd + +inherit autotools flag-o-matic systemd MY_PV="${PV/_rc/-rc}" MY_P="${PN}-${MY_PV}" @@ -14,7 +15,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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= @@ -38,9 +39,13 @@ PATCHES=( ) src_prepare() { + default + sed -i -e 's,-Werror,,g' configure.ac || die sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die + eautoreconf + use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN # Tweak upstream systemd unit to use Gentoo variables/envfile. @@ -54,7 +59,6 @@ src_prepare() { /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;}; ' \ "${S}"/scripts/memcached.service - default } src_configure() { @@ -71,10 +75,15 @@ src_compile() { # the -debug version with -DNDEBUG _WILL_ fail. append-flags -UNDEBUG -pthread emake testapp memcached-debug CFLAGS="${CFLAGS}" + filter-flags -UNDEBUG emake } +src_test() { + emake -j1 test +} + src_install() { emake DESTDIR="${D}" install dobin scripts/memcached-tool @@ -93,7 +102,3 @@ pkg_postinst() { 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/mico/Manifest b/net-misc/mico/Manifest index 9eb7fc91e423..7c101497844c 100644 --- a/net-misc/mico/Manifest +++ b/net-misc/mico/Manifest @@ -1,7 +1,7 @@ DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906 DIST mico-2.3.13-gentoo-r14.patch 136291 BLAKE2B 3416fe0fc2e0b9243d22c9cf6a0dffbf14c99846d1b064b3df6496c2d1b9021de0268d0543f566d13425d4fef29626829359deb133ce678d299627f93b0461de SHA512 3ec284442ac00bf429f633dddcaae46a83b720045bc93a177a609255957956aaccb188b0e858ac88b3d8b0c9be081501dcffabd86965b1a4b30a07d45aab0850 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 -EBUILD mico-2.3.13-r13.ebuild 4319 BLAKE2B db45a88ff03e769f00e43de8d64fa9107692a479d7fdccd5ab2bff0a34f7d230d589c09662b860bc8b3622abd85fe9180c610ee4647b29155de30c37a5681c89 SHA512 e9276cd9e5b5d4481f57a65ad932e7bdbb2d173e38ce4162640317071379139895c0ec85318f4e8e64da4b3af881b76571ca887b3db7d5a42e0a2fb35bf1bc00 -EBUILD mico-2.3.13-r14.ebuild 4319 BLAKE2B db45a88ff03e769f00e43de8d64fa9107692a479d7fdccd5ab2bff0a34f7d230d589c09662b860bc8b3622abd85fe9180c610ee4647b29155de30c37a5681c89 SHA512 e9276cd9e5b5d4481f57a65ad932e7bdbb2d173e38ce4162640317071379139895c0ec85318f4e8e64da4b3af881b76571ca887b3db7d5a42e0a2fb35bf1bc00 -EBUILD mico-9999.ebuild 4319 BLAKE2B db45a88ff03e769f00e43de8d64fa9107692a479d7fdccd5ab2bff0a34f7d230d589c09662b860bc8b3622abd85fe9180c610ee4647b29155de30c37a5681c89 SHA512 e9276cd9e5b5d4481f57a65ad932e7bdbb2d173e38ce4162640317071379139895c0ec85318f4e8e64da4b3af881b76571ca887b3db7d5a42e0a2fb35bf1bc00 -MISC metadata.xml 631 BLAKE2B bb0a1ee82b5b74160096ad9652a933f25c51f192ff30b3ae18d477aacff13a1021aa959e238b9103957ddff622b40f4ec8269b35b114d2325e3f75f90891c580 SHA512 111d8d30478b2647475b075f3c16f49b14be2bbde9e55b0b9efde42c0eaa8da128dd6801a914a898a8500d705d034d50ad05f7b41da5ec644f3c1bad12f21840 +EBUILD mico-2.3.13-r13.ebuild 4333 BLAKE2B 4648fb2603c2daa27f1cb9104e4212a67e571955334a57b22ace3ce81f9323a6d10867f2cf3b9f12b217911ca6c4bb5c9a8c429c2271e790d76057cb78645f58 SHA512 322bf79329d6dc18423dc9107112079a250ea46081749765820383b0af6f76833ee6641babb5f9e719bcffd810ed4cd91bf2456d8aaa819dccb905c34121253f +EBUILD mico-2.3.13-r14.ebuild 4333 BLAKE2B 4648fb2603c2daa27f1cb9104e4212a67e571955334a57b22ace3ce81f9323a6d10867f2cf3b9f12b217911ca6c4bb5c9a8c429c2271e790d76057cb78645f58 SHA512 322bf79329d6dc18423dc9107112079a250ea46081749765820383b0af6f76833ee6641babb5f9e719bcffd810ed4cd91bf2456d8aaa819dccb905c34121253f +EBUILD mico-9999.ebuild 4333 BLAKE2B 4648fb2603c2daa27f1cb9104e4212a67e571955334a57b22ace3ce81f9323a6d10867f2cf3b9f12b217911ca6c4bb5c9a8c429c2271e790d76057cb78645f58 SHA512 322bf79329d6dc18423dc9107112079a250ea46081749765820383b0af6f76833ee6641babb5f9e719bcffd810ed4cd91bf2456d8aaa819dccb905c34121253f +MISC metadata.xml 545 BLAKE2B 657497ee8210b82d4fec11da182a4db656c0710a4ccec2574e9f40e0acf7184a91e29c3f6e23477cb01092b2a2cf6cd14357d7a16fe7e176fbbeeabc85e2e6e9 SHA512 f8402d2a5dbed0892d5a05a657f03fd12742ea43cd5708ba64cec6033a03c765ae3cdaa8054c45dfc32b6dd3e8495378c49b1cf498703fc9042424399969f492 diff --git a/net-misc/mico/metadata.xml b/net-misc/mico/metadata.xml index 89b3f821e9ce..47e27a9250a5 100644 --- a/net-misc/mico/metadata.xml +++ b/net-misc/mico/metadata.xml @@ -1,10 +1,7 @@ - - haubi@gentoo.org - Michael Haubenwallner - + MICO is a mature, secure, robust, fully standards-compliant implementation of the CORBA standard. It is available as GNU open source diff --git a/net-misc/mico/mico-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild index 0692096b5946..52c03727f64a 100644 --- a/net-misc/mico/mico-2.3.13-r13.ebuild +++ b/net-misc/mico/mico-2.3.13-r13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then else SRC_URI=" http://www.mico.org/${P}.tar.gz - https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch + https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch " PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" @@ -44,7 +44,7 @@ BDEPEND=" if [[ ${PV} == 9999 ]]; then src_unpack() { - wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die + wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die darcs_src_unpack default } diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild index 0692096b5946..52c03727f64a 100644 --- a/net-misc/mico/mico-2.3.13-r14.ebuild +++ b/net-misc/mico/mico-2.3.13-r14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then else SRC_URI=" http://www.mico.org/${P}.tar.gz - https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch + https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch " PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" @@ -44,7 +44,7 @@ BDEPEND=" if [[ ${PV} == 9999 ]]; then src_unpack() { - wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die + wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die darcs_src_unpack default } diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild index 0692096b5946..52c03727f64a 100644 --- a/net-misc/mico/mico-9999.ebuild +++ b/net-misc/mico/mico-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then else SRC_URI=" http://www.mico.org/${P}.tar.gz - https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch + https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch " PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" @@ -44,7 +44,7 @@ BDEPEND=" if [[ ${PV} == 9999 ]]; then src_unpack() { - wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die + wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die darcs_src_unpack default } diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest index ea86c0d014c8..67d8a7a310b4 100644 --- a/net-misc/mikutter/Manifest +++ b/net-misc/mikutter/Manifest @@ -1,6 +1,6 @@ AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6bd36ad895376c7812840afe579959a122c7619ef02c209cb7dc06da1011bc95b9b8d9fe74 SHA512 bbf70ab03b994f9593ea3854d1911f23d1a78d155e6aa755b2456f138ef6f7f2ca5ad7aea477beca487dac43a2e5472ca7f2e7d1503a57aaa93f41f06cafccba DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4 -EBUILD mikutter-4.0.6.ebuild 2849 BLAKE2B f1a05119fc79ce24110179f61bf783476e94886e48e8af5addc7470a745edf081cba9785e30408a671b83a6a9dcdfd50d7d2a59f4cab616f1e009b75017165ff SHA512 74680cc443eb90919e21e9ff0c485fe8addda6d2713157d30ff816ae80d32474d41d3cbbcb3a03adc5593e7ce1100f35c83641d6e9b52e269a5307c88387d854 -EBUILD mikutter-9999.ebuild 2849 BLAKE2B f1a05119fc79ce24110179f61bf783476e94886e48e8af5addc7470a745edf081cba9785e30408a671b83a6a9dcdfd50d7d2a59f4cab616f1e009b75017165ff SHA512 74680cc443eb90919e21e9ff0c485fe8addda6d2713157d30ff816ae80d32474d41d3cbbcb3a03adc5593e7ce1100f35c83641d6e9b52e269a5307c88387d854 +EBUILD mikutter-4.0.6.ebuild 2842 BLAKE2B 3e58510c4bfbbb648fe4d635f706305052fc3e45856749f7741b36b4720ce928193822969f8489d1af2babc838a2d21d1845a3d07935027d327ff0bcdc9304b4 SHA512 6951f54995cad1162278b876b9cb7665c5154093d56dd9731184a999a8bca69aa836ccd2273ebaa4a4b80c30dcdc9936fa0c9a28d2fbd6e42ad01fdeafc060fb +EBUILD mikutter-9999.ebuild 2842 BLAKE2B 3e58510c4bfbbb648fe4d635f706305052fc3e45856749f7741b36b4720ce928193822969f8489d1af2babc838a2d21d1845a3d07935027d327ff0bcdc9304b4 SHA512 6951f54995cad1162278b876b9cb7665c5154093d56dd9731184a999a8bca69aa836ccd2273ebaa4a4b80c30dcdc9936fa0c9a28d2fbd6e42ad01fdeafc060fb MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3 diff --git a/net-misc/mikutter/mikutter-4.0.6.ebuild b/net-misc/mikutter/mikutter-4.0.6.ebuild index b42af1d0340a..64060b71b8ef 100644 --- a/net-misc/mikutter/mikutter-4.0.6.ebuild +++ b/net-misc/mikutter/mikutter-4.0.6.ebuild @@ -5,7 +5,7 @@ EAPI=7 USE_RUBY="ruby25 ruby26" -inherit eutils desktop ruby-ng +inherit desktop ruby-ng PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild index b42af1d0340a..64060b71b8ef 100644 --- a/net-misc/mikutter/mikutter-9999.ebuild +++ b/net-misc/mikutter/mikutter-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 USE_RUBY="ruby25 ruby26" -inherit eutils desktop ruby-ng +inherit desktop ruby-ng PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index 625b0e6e9e28..435e287a8387 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -1,5 +1,3 @@ -DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd -EBUILD mobile-broadband-provider-info-20190618.ebuild 471 BLAKE2B 3dd2b83a80549cac5a0249633c04de1c397d6995dbf7621655fe10dd993db3420b4e7ed30a89efb2bc0cbcebe32d7d687b92c3635da6e18880729fbf006dbfa4 SHA512 bd040faa3a25d10b21d38e558a2a3c2fd2ed95eb0f3e886c2dfb24682f18bb260b9a282bb7d8bb2d8d3f3de37053418e30a2efa43479b620bb0c80a886801f55 -EBUILD mobile-broadband-provider-info-20201225.ebuild 477 BLAKE2B 381d683d7a1a0fc9e4ad858bdeafbc8c082c233811d4c4b08d0ba395a1b918a61362acdba2f6a79b26b4912404eec692dc91fa9e77d11eee13c9ac86644c09fb SHA512 9d8cccd2c9f22d545e61fba035f8bbf7b8dd044a36086d5861f975643b842fe67bb95d036751a819dddac24ffc962544d9cd3babc2744247cd743f6d13e2cd15 +EBUILD mobile-broadband-provider-info-20201225.ebuild 474 BLAKE2B 235581dbbae3796ac350400cf94e56639e1bbadf9cb83c0c01611f21e7a500fe4d2e1026007f882784fd1717b6ee137a349b2b490bb49b17394dc2aad6250b4d SHA512 4c69ced6c245b5786c1bea67057ef4add08aa359b33241a36bb7b4b3bace97d42957595b1de52cac4ecd1e72701028422f70a422a41b1219db225a1efa084719 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 deleted file mode 100644 index 07880216c2c1..000000000000 --- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome.org - -DESCRIPTION="Database of mobile broadband service providers" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband" - -LICENSE="CC-PD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libxslt - test? ( dev-libs/libxml2 ) -" - -DOCS="README" diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild index 706d0a27443b..c3a335a2236f 100644 --- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.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/modemmanager/Manifest b/net-misc/modemmanager/Manifest index 950d630de215..68d1f385ac3b 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1,10 +1,9 @@ AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4 -DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc DIST ModemManager-1.14.8.tar.xz 2255964 BLAKE2B 8f0e4e4747b3603795b533c41949ef7180922e92b7b26348145e18ffaa38f23cccbcb6662ac912216d33b4aef805c5f7ad10aef8029ffd16eb30b331fc2ca88e SHA512 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6 -DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5 -EBUILD modemmanager-1.10.0.ebuild 3702 BLAKE2B 7b1d1e5ec167f1cc45d72e85e7a65919ff502f3e54a0a74d0227af24970f52b0bb51ffc571b458ff6e1d51cef4e5f9f0d3996c1e2864b8ded06cca6692a018e3 SHA512 283613155d8d8c791c315564482d083c9b0f60c8461c558a3192baecca36cef67f6b2de3b444d4593664f452248026422d77cbc097dfa90b5b0bfce77e0b9f0d -EBUILD modemmanager-1.14.8-r1.ebuild 3728 BLAKE2B 6fbeb336da165e87b497573d681ccbc4ae77576af94b5c3f1f47e3206d814246ce1c9f40112224fe7811653b42e269f9626c7efb7c35907a1cf2461862596467 SHA512 d749f2f2e568436a132e183adafd215bb4c74932d8618f82ea72ba041c110aef6e61fefb739cca1c94c17c49c4400a5cada03eae677766bac1d35899b88711f8 -EBUILD modemmanager-1.14.8.ebuild 3668 BLAKE2B 65dac0b989a5a1349222d59b7a42a94b545a58e158b6db4f53ba5056303e9918bf7316af02b8027d5367c2ecdb0fb9059826abe3a2b277141e9a2d9927743e05 SHA512 55b8e814d986b08b56fee65dea7afee38b9c6106240e3d72c52c8b6cb50d4335a4b58d3e3dacdf05495a1f29a99d91469f0dfbb9c636c19d96b4747fcca1a4b3 -EBUILD modemmanager-1.8.2-r1.ebuild 3702 BLAKE2B 6b166143bca2c72892dbc38147538f9cc9da01a5a677d18438597ed80115d46021c130c0d8c228cd007ace5fbbcca570fd76f26bc95e6600b9aa5096be4aadcf SHA512 f5ccf0d43cc548bfcc024b46f33b78d337910670c7eed1c5a882d47b43ca9341dce00d4f72dfdbc0bec5bd989b56d845e4269a0403ba0e9d21cbf286b7fb3c4b +DIST ModemManager-1.16.2.tar.xz 2447936 BLAKE2B aafd2bde9fe72ec837a34987a698d82f4ba2aedf778c350263f8fe937ccd4b5b9b78fc66c58a39a8729c371788ab7b7782073726dc132b8f08bd2df0a9bc2da4 SHA512 c0b095972eba6e0f3a1ad22e425b412f17d8b60f0af4d423a92fdebcb6d2801f87e6af98758f8c2dc4db3586a3a15530a318805fda312443fa6abe2265ebd6b6 +DIST ModemManager-1.16.4.tar.xz 2335908 BLAKE2B dfd3293e9b685d3b01fa3deec111aafca6f11dc27be0a69e0496036e537eecb6f51f592ce1996f47c86b5d9db2abf3c9b9a26e66e9f058ba59982caf38b28ef9 SHA512 5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506 +EBUILD modemmanager-1.14.8-r1.ebuild 3722 BLAKE2B 375cb72e7b4ff273c548817a14043b6552f74fd56a1b60432f1903616f591d039460effc0d64684d3b49ef289f1846ad3a185b323c7d2e30a1680417cc82b40d SHA512 875516a545420aa782059ec04a4b90a778fdcefa42b17b9d704126db08277235ca7251c8bf83970885844ae044cd830672a35fc898fe91ad30784d3f0bb4b17e +EBUILD modemmanager-1.16.2.ebuild 3573 BLAKE2B 3e3bafe15765b85cbb78d4e92413438bc9d2f0e7bd4a2026287425de5dde139e7e727cdd90e33b5e3031af8351780cef25deb44f613c9622a2ba674ca1fbf466 SHA512 70ca7487c3cab6b2b7ee48a07ece32d055a99b4010505482f0f04248c14e2dfdd5811ee00d2470f90d7c0ffce43639ec31c0a9656106656f44db915050f4b87b +EBUILD modemmanager-1.16.4.ebuild 3573 BLAKE2B 3e3bafe15765b85cbb78d4e92413438bc9d2f0e7bd4a2026287425de5dde139e7e727cdd90e33b5e3031af8351780cef25deb44f613c9622a2ba674ca1fbf466 SHA512 70ca7487c3cab6b2b7ee48a07ece32d055a99b4010505482f0f04248c14e2dfdd5811ee00d2470f90d7c0ffce43639ec31c0a9656106656f44db915050f4b87b MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild deleted file mode 100644 index 7f108b8d46e9..000000000000 --- a/net-misc/modemmanager/modemmanager-1.10.0.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" -SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - -IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" -REQUIRED_USE=" - ?? ( elogind systemd ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.36.0:2 - udev? ( >=dev-libs/libgudev-230:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - mbim? ( >=net-libs/libmbim-1.18.0 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.22.0:= ) - elogind? ( sys-auth/elogind ) - systemd? ( >=sys-apps/systemd-209 ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND="${RDEPEND} - policykit? ( acct-group/plugdev )" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS=" - If your USB modem shows up only as a storage device when you plug it in, - then you should install sys-apps/usb_modeswitch, which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --with-dist-version=${PVR} - --with-udev-base-dir="$(get_udevdir)" - $(use_with udev) - $(use_enable introspection) - $(use_with mbim) - $(use_with policykit polkit) - $(use_with systemd systemd-suspend-resume) - $(use_with systemd systemd-journal) - $(use_with qmi) - $(use_enable vala) - ) - if use elogind; then - local pkgconfig="$(tc-getPKG_CONFIG)" - myconf+=( - --with-systemd-suspend-resume - LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")" - LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")" - ) - fi - gnome2_src_configure "${myconf[@]}" -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - if ! use udev; then - ewarn "You have built ModemManager without udev support. You may have to teach it" - ewarn "about your modem port manually." - fi - - systemd_reenable ModemManager.service - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild index 98c1d10adb11..677d74b3a719 100644 --- a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild +++ b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta LICENSE="GPL-2+" SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" REQUIRED_USE=" diff --git a/net-misc/modemmanager/modemmanager-1.14.8.ebuild b/net-misc/modemmanager/modemmanager-1.14.8.ebuild deleted file mode 100644 index ad9e1885c1d6..000000000000 --- a/net-misc/modemmanager/modemmanager-1.14.8.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" -SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" - -IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" -REQUIRED_USE=" - ?? ( elogind systemd ) - vala? ( introspection ) -" - -DEPEND=" - >=dev-libs/glib-2.48.0:2 - udev? ( >=dev-libs/libgudev-230:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - mbim? ( >=net-libs/libmbim-1.24.0 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.26.0:= ) - elogind? ( sys-auth/elogind ) - systemd? ( >=sys-apps/systemd-209 ) -" -RDEPEND="${DEPEND} - policykit? ( acct-group/plugdev ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS=" - If your USB modem shows up only as a storage device when you plug it in, - then you should install sys-apps/usb_modeswitch, which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - local myconf=( - --disable-Werror - --disable-static - --with-dist-version=${PVR} - --with-udev-base-dir="$(get_udevdir)" - $(use_with udev) - $(use_enable introspection) - $(use_with mbim) - $(use_with policykit polkit) - $(use_with systemd systemd-suspend-resume) - $(use_with systemd systemd-journal) - $(use_with qmi) - $(use_enable vala) - ) - if use elogind; then - local pkgconfig="$(tc-getPKG_CONFIG)" - myconf+=( - --with-systemd-suspend-resume - LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")" - LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")" - ) - fi - gnome2_src_configure "${myconf[@]}" -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - if ! use udev; then - ewarn "You have built ModemManager without udev support. You may have to teach it" - ewarn "about your modem port manually." - fi - - systemd_reenable ModemManager.service - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.16.2.ebuild b/net-misc/modemmanager/modemmanager-1.16.2.ebuild new file mode 100644 index 000000000000..5642c599e4ed --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.16.2.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" +SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + vala? ( introspection ) +" + +DEPEND=" + >=dev-libs/glib-2.48.0:2 + udev? ( >=dev-libs/libgudev-230:= ) + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) + mbim? ( >=net-libs/libmbim-1.24.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection?] ) + qmi? ( >=net-libs/libqmi-1.28.0:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + policykit? ( acct-group/plugdev ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +src_prepare() { + DOC_CONTENTS=" + If your USB modem shows up only as a storage device when you plug it in, + then you should install sys-apps/usb_modeswitch, which will automatically + switch it over to USB modem mode whenever you plug it in.\n" + + if use policykit; then + DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, + add your user account to the 'plugdev' group." + fi + + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + local myconf=( + --disable-Werror + --disable-static + --with-dist-version=${PVR} + --with-udev-base-dir="$(get_udevdir)" + $(use_with udev) + $(use_enable introspection) + $(use_with mbim) + $(use_with policykit polkit) + $(use_with systemd systemd-journal) + $(use_with qmi) + $(use_enable vala) + ) + if use systemd || use elogind; then + myconf+=(--with-systemd-suspend-resume) + else + myconf+=(--without-systemd-suspend-resume) + fi + gnome2_src_configure "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + # Allow users in plugdev group full control over their modem + if use policykit; then + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules + fi + + readme.gentoo_create_doc + + newinitd "${FILESDIR}/modemmanager.initd" modemmanager +} + +pkg_postinst() { + gnome2_pkg_postinst + + # The polkit rules file moved to /usr/share + old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) + # Automatically delete the old rules.d file if the user did not change it + elog + elog "Removing old ${old_rules} ..." + rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" + ;; + * ) + elog "The ${old_rules}" + elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" + elog "If you edited ${old_rules}" + elog "without changing its behavior, you may want to remove it." + ;; + esac + fi + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + systemd_reenable ModemManager.service + + readme.gentoo_print_elog +} diff --git a/net-misc/modemmanager/modemmanager-1.16.4.ebuild b/net-misc/modemmanager/modemmanager-1.16.4.ebuild new file mode 100644 index 000000000000..5642c599e4ed --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.16.4.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" +SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + vala? ( introspection ) +" + +DEPEND=" + >=dev-libs/glib-2.48.0:2 + udev? ( >=dev-libs/libgudev-230:= ) + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) + mbim? ( >=net-libs/libmbim-1.24.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection?] ) + qmi? ( >=net-libs/libqmi-1.28.0:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + policykit? ( acct-group/plugdev ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +src_prepare() { + DOC_CONTENTS=" + If your USB modem shows up only as a storage device when you plug it in, + then you should install sys-apps/usb_modeswitch, which will automatically + switch it over to USB modem mode whenever you plug it in.\n" + + if use policykit; then + DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, + add your user account to the 'plugdev' group." + fi + + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + local myconf=( + --disable-Werror + --disable-static + --with-dist-version=${PVR} + --with-udev-base-dir="$(get_udevdir)" + $(use_with udev) + $(use_enable introspection) + $(use_with mbim) + $(use_with policykit polkit) + $(use_with systemd systemd-journal) + $(use_with qmi) + $(use_enable vala) + ) + if use systemd || use elogind; then + myconf+=(--with-systemd-suspend-resume) + else + myconf+=(--without-systemd-suspend-resume) + fi + gnome2_src_configure "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + # Allow users in plugdev group full control over their modem + if use policykit; then + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules + fi + + readme.gentoo_create_doc + + newinitd "${FILESDIR}/modemmanager.initd" modemmanager +} + +pkg_postinst() { + gnome2_pkg_postinst + + # The polkit rules file moved to /usr/share + old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) + # Automatically delete the old rules.d file if the user did not change it + elog + elog "Removing old ${old_rules} ..." + rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" + ;; + * ) + elog "The ${old_rules}" + elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" + elog "If you edited ${old_rules}" + elog "without changing its behavior, you may want to remove it." + ;; + esac + fi + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + systemd_reenable ModemManager.service + + readme.gentoo_print_elog +} diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild deleted file mode 100644 index 347bb0a5d5f0..000000000000 --- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" -SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - -IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" -REQUIRED_USE=" - ?? ( elogind systemd ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.36.0:2 - udev? ( >=dev-libs/libgudev-230:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - mbim? ( >=net-libs/libmbim-1.16.0 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.20.0:= ) - elogind? ( sys-auth/elogind ) - systemd? ( >=sys-apps/systemd-209 ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND="${RDEPEND} - policykit? ( acct-group/plugdev )" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS=" - If your USB modem shows up only as a storage device when you plug it in, - then you should install sys-apps/usb_modeswitch, which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --with-dist-version=${PVR} - --with-udev-base-dir="$(get_udevdir)" - $(use_with udev) - $(use_enable introspection) - $(use_with mbim) - $(use_with policykit polkit) - $(use_with systemd systemd-suspend-resume) - $(use_with systemd systemd-journal) - $(use_with qmi) - $(use_enable vala) - ) - if use elogind; then - local pkgconfig="$(tc-getPKG_CONFIG)" - myconf+=( - --with-systemd-suspend-resume - LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")" - LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")" - ) - fi - gnome2_src_configure "${myconf[@]}" -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - if ! use udev; then - ewarn "You have built ModemManager without udev support. You may have to teach it" - ewarn "about your modem port manually." - fi - - systemd_reenable ModemManager.service - - readme.gentoo_print_elog -} diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest index 658bc65bb6de..6fd8579bfc9d 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 1505 BLAKE2B aacf3edb966dfbd5134ecbf3a7276702e387436092c4236e60812998ce1ebc8fe1c78094f873ed15b6f47b80ab31240f3effa1e2fa920e0fe87729c29513a24a SHA512 9f2e085153c04d7b549732eaaef87e9962de449751311ed9df87e2ce675834c3cbcd8397aada2d6c18170301642ba725587eb4821c8b801e0ae83771e1af8829 -EBUILD mosh-9999.ebuild 1453 BLAKE2B b0f0c891713b3ebc5679198c7952743f5e87dc9aa093b1c61e311695f71cb928cdd7ef7b8cdc6e9befaf9b9eb2dec5a626faf011216014ce3de967d68e72f0a4 SHA512 9ed66cdcbb7e600a2c35369077942566d0b28da2dc289b58cf79d299617234b1f328e79c60fb61a8ece77c99982b73968f20903fe651c0e13ea27e7759c92eb2 +EBUILD mosh-1.3.2.ebuild 1498 BLAKE2B 64497d400bb0d99358fdf322cca7992efca5849d2634635e64361bf3de30faef545c325dcd31634c9b79f8476a1602e76c4e134233a04bd4b3914c5301051041 SHA512 5fc3cc87624c8576ae596c496f1e3d33a3201db7c0ea719580349f96dcc75304070b2042512e0800b49ddf93eaab7dbf095e0a5bbf60eb3e9a4f19d44066de70 +EBUILD mosh-9999.ebuild 1434 BLAKE2B 0c3c799994d4dc58f7fa651097382fa8b80b2c65e167313d472ae929496bb535ed3b42bfd7f94b45e43d44037623f183ac40fbad57f181bcf49ddfb0ad2e3e69 SHA512 b2fe90ab7df4448761825748f38be2c66ba9adf4d528cd081737826e61f99042d9d3ac4fc074a09cec828e72dd7ff1c36696cee9659295f2b71d4d32ae4e4c11 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 87a94b12e9cb..97c1a5af6eb3 100644 --- a/net-misc/mosh/mosh-1.3.2.ebuild +++ b/net-misc/mosh/mosh-1.3.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools bash-completion-r1 eutils +inherit autotools bash-completion-r1 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" HOMEPAGE="https://mosh.org" diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild index 97e8d3172038..35a74460f7c9 100644 --- a/net-misc/mosh/mosh-9999.ebuild +++ b/net-misc/mosh/mosh-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools bash-completion-r1 eutils git-r3 +inherit autotools bash-completion-r1 git-r3 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" HOMEPAGE="https://mosh.org" @@ -11,7 +11,6 @@ EGIT_REPO_URI="https://github.com/keithw/mosh.git" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" IUSE="+client examples libressl +mosh-hardening +server ufw +utempter" REQUIRED_USE=" diff --git a/net-misc/mstpd/Manifest b/net-misc/mstpd/Manifest index cf123801c4f2..981469359015 100644 --- a/net-misc/mstpd/Manifest +++ b/net-misc/mstpd/Manifest @@ -1,3 +1,3 @@ DIST mstpd-0.0.9.tar.gz 113711 BLAKE2B 93ff0213a634fcbbb613c79227d737c3961f4de669e0ac2c7351fa1c22842669edc652ba0deb24917a44df5a465a4e905a98e46ab7ccc7e4ebfd13039e6acfe0 SHA512 1d4a926d8437b7c41c69d2a047718181ca6245f3150e4aeb631f437edaaafe0c40b29802a6c9ea38c9f1dfb1b94149934b473f550358be10bb796295fa632e1e -EBUILD mstpd-0.0.9.ebuild 729 BLAKE2B cca9badbe108e0d74a10fb149717062f0fb1b60ae50f8fab487fae0f5b6950226a370e826698c1cc5670f1a50fe0cfa5d81f14765011fb886d7a916b24ec1470 SHA512 a428af51cd76eb9a7a498839a6a006c23fc27f02edbb9e7e95d7c280be33394a115eef6b8493f4dad66c3420e7ab706ec980374b8d583fa282dba4bc1d94d5e9 +EBUILD mstpd-0.0.9.ebuild 736 BLAKE2B 8fffe75c2423a05e796662d73f1362205968c4b009905e744096fd26c75fbf278ac22620fbae617d6c9f30e3587fe62f0273ea7249e7d75b53bf31a784958e4a SHA512 146e0dd281547766d4c4d88cb04da6bc481d0f82d315f8452b5be860c43245c14936361bed22c80793972acb076ca3b44897f5185fc27660928db25f391d5e7a MISC metadata.xml 474 BLAKE2B c41a26753e9934342a3d6050c9496adbbc1064fda59f17dc4846af609ac3a65630902bfd96d6e33e24105732af17f14e5cf2fab15bc0bab1c37f26c9a7d7a15c SHA512 8fdeee7e56e7254541b3000c238ac2290c548ac568f3e5588c2a7c0690632c8e1ee03992c4ab0e94230985f669fcc323b9aa3f84b421b45e6c4aebd6b1f2e656 diff --git a/net-misc/mstpd/mstpd-0.0.9.ebuild b/net-misc/mstpd/mstpd-0.0.9.ebuild index b2fe4865477e..06a8a8618cf3 100644 --- a/net-misc/mstpd/mstpd-0.0.9.ebuild +++ b/net-misc/mstpd/mstpd-0.0.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mstpd/mstpd/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" src_prepare() { default diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest index aa5d4feb7f88..8202627e6c36 100644 --- a/net-misc/ndisc6/Manifest +++ b/net-misc/ndisc6/Manifest @@ -4,5 +4,5 @@ AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b8 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83 DIST ndisc6-1.0.3.tar.bz2 260294 BLAKE2B cb9f302bd4d4f15effc8165dfdc686b2eda7543dd745cae43a24fea49086e3b5c58cc5b4eb14bc1a46657a15f6bd11322d5629570461f68743619deb9cd10004 SHA512 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54 -EBUILD ndisc6-1.0.3.ebuild 722 BLAKE2B dc5acf5c08f35afb55a66457ba260218c7fa14bf4fb273e428f0507fb0225c852bfaee36380fbc621bf2de3bc37e618d2d42e593502c4bf342b7ad8417e41686 SHA512 302a959eff77adc69337bc74b9b178dd0d6f4421f112f3b3e23b14763682898cbafdc6bc9eef721196cda13d85d98b7082c12a08a7a4bdaa3ff55512e2a214e2 +EBUILD ndisc6-1.0.3.ebuild 716 BLAKE2B 5190f37e286ee26677b5c2ef337c7f4bcb61b00ea33b8f4ff31c104cf889abf3d021608e0c3b058e132db410b3f7b190cd9586840623b2a4bc25ee4adf0eece7 SHA512 abdd74e1ceee5b1850dd1b2b6a27416861317dca02868f40d70e1ff19fa3c01d360a7e472008ade1cce6acfe617db18c5360575c81b5f0c8bb04b9e36c3d1dc1 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild index c75e79254c84..3f791dee1f65 100644 --- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild +++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,7 +24,8 @@ src_install() { emake DESTDIR="${D}" install newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd newconfd "${FILESDIR}"/rdnssd.conf rdnssd + exeinto /etc/rdnssd - newexe "${FILESDIR}"/resolvconf-1 resolvconf || die + newexe "${FILESDIR}"/resolvconf-1 resolvconf dodoc AUTHORS ChangeLog NEWS README } diff --git a/net-misc/ndppd/Manifest b/net-misc/ndppd/Manifest index 02620ec73dc0..9e22e95baf58 100644 --- a/net-misc/ndppd/Manifest +++ b/net-misc/ndppd/Manifest @@ -1,4 +1,4 @@ AUX ndppd.initd 323 BLAKE2B 5aeb5d7f264ef9d0ae5dd078678e52d75b9deeadc5e6c4bd336d61176fcd9d800e26a747ea392eda98bb58fe7ade34c363798e7841df3521903837e31b99f217 SHA512 4fe6632c70a02bed919391ac0dffb7d2b013a387055c8b4e5bb5f93d99e69e20f1ecf26cd7f6c59c01c14d28eec0df8ee6d1e8bad6bb227644d6ce94a1132b3e DIST ndppd-0.2.5.tar.gz 31820 BLAKE2B d16315a91d8fff9815d3ddea3f7d50f8ed5f243e15d757014acecaca7bfa74f1e35960e0c57859b7ae0780a2b2e7e7b1feb4861e7da89a5c63eb1700b6dada9b SHA512 85534594689c38c0203ad5e7c0c6373a705cbd7da7e2b0519689853a003be2fd7c953aa73529ca52d8c88bf0ce98524e39c475ea992669278090cde4a0e4ba2b -EBUILD ndppd-0.2.5.ebuild 554 BLAKE2B 751d91592fe86d4afb1439088f7d96f0c500d6aea9b54b04f9868fa662c0aa84b122c3b652a7508269fbda9aa0565a6fe3ae8eb1bfc670257f1dfbb47a2d024d SHA512 e1ddff3bad5e4deb157547d20063071ce4f45bd3040645b5d2c676576d06f22e612a91e890ae4a658be82a8aa0c76c5622a9e8fe453d831b8210f51811b13d79 +EBUILD ndppd-0.2.5.ebuild 551 BLAKE2B 3e7b6105f32868f511cdb668b73b57c14bb30eb20f78451bfb857bcfcd43185b7f8954ea28831d9bca08b8ff5a9c63d13d4b382f6bee4a59e5250dac1e6fe7f8 SHA512 d48ddaafe7f0358b37b98bbdf3eab07f85b1921f2ab6f7898917348bea8045c5f3d88b499460d9a314785e38814479ad6d03699335ecfca8403bbd2f1657e6b4 MISC metadata.xml 493 BLAKE2B 26adf62b87a9fa0ac5238da77b957a2c7ca9cd793469c0e84cff7894ad4d1a4cc165f97cf8a0141c8cd4b78e5ef6ab4e74875083e4782470c9e2931d315f7f35 SHA512 1e0fcf7d6d53fd189c46d7d413b9d7956697c7a777dc13cea0d1ef95c85105a2b4307d9b8f6d300ff39b1035dbbb8744d193cf2552187a1636eba93f09047228 diff --git a/net-misc/ndppd/ndppd-0.2.5.ebuild b/net-misc/ndppd/ndppd-0.2.5.ebuild index 22897aa596c4..3957e91d0229 100644 --- a/net-misc/ndppd/ndppd-0.2.5.ebuild +++ b/net-misc/ndppd/ndppd-0.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,8 +15,7 @@ IUSE="" DEPEND="" RDEPEND="${DEPEND}" -src_install() -{ +src_install() { emake PREFIX=/usr DESTDIR="${D}" install insinto /etc newins ndppd.conf-dist ndppd.conf diff --git a/net-misc/netdate/Manifest b/net-misc/netdate/Manifest index a32308e48492..3e856d23baba 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 473 BLAKE2B 92e3680499ffb503f7b3ae1b9a7c26df040e1511e4773e10170d884aa68ec018b638fa71705eeba4160924394da0f7997a381b58abf86465aa179ba60297bd18 SHA512 516bef64b437efacce16635bdb12c1404383f1e1be63a1978a2e00cea4a58bf047a6d47eaf5bb27382bda310eb3e5b5c82fcc62c582941ea4439527dc16d0c9c +EBUILD netdate-1.2-r1.ebuild 474 BLAKE2B cb6ec0cfad3a10868c929cd314ea58c05b48cde86e49065b6b4ce7fc5bb819cdc0ec3a988e9ef7f9d6977728068e79fd4d2ef43d1ff8cf0488548a76b7a46aab SHA512 7514876da1d319339958e067ebea9e9f5aedb4bdbb811d90f0d201ff07b07109a1b9037b3b02eee4538b395bc9173bb2918e69aa4c40570f9d5d94c9b536f77b 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 64967d98b5cd..8af8c8914d72 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-2020 Gentoo Authors +# Copyright 1999-2021 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 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 5c3b0668f731..38fd7e86b709 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -4,9 +4,9 @@ DIST netifrc-0.7.1-patches-01.tar.xz 3356 BLAKE2B 35d34456af5fcb8ac35c80db13484b DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057 DIST netifrc-0.7.2.tar.gz 84332 BLAKE2B ba379f34a7986f75f73f291ad69dff2b58036eb439ba8610f5fbddc3d1df9430e0560683477544f11bcd4fb2dd662ed09ab0797a9ce9f734f4b5dcf5db8006c8 SHA512 1d588b638331b3822e9c7ff7f6118a540f20366a662ebf4d05c4c1794536fcb5ee25b57e8cf7b631d90788883c3b405d5b9ac460443d5184216d805f956df07e DIST netifrc-0.7.3.tar.gz 84770 BLAKE2B 075440bfd81e4dedd406d9555a18f530b07a47f9268130ebcca6d43d35e9cc5f01105a3eb0ddc084a16e17912aa10e378833b1eef1defd2fc6b22f817cd220bd SHA512 a82ac6835c15763becb5845a8c8d90dfd8d6c289ea5e00b0d7ae332d3e7ad6797f0fdcbf27bb9f44ff345c98884cdfa13210c76089585b8dd9970ded5f6236d8 -EBUILD netifrc-0.7.1-r1.ebuild 2162 BLAKE2B 0cfb264306fdbc6e395db9f7ad812bf4d641ca171b5d03a35075ae42f4088f5792d2ac8774a44e541f6bf5adcddf9638b03c3e793aac032f4385428bbf0779e6 SHA512 4704087f4945899e1e729f12f8517b9e17e9eaf626ba6ef17b28dea54702b759a41b133f49d0f6aef9e782e2a2a84b3b13ef977addb28722c3fd997f3347d2ec +EBUILD netifrc-0.7.1-r1.ebuild 2163 BLAKE2B 4aa9bcf12490e3078d1e3f35a2a1986466ed8813e7ed6a103789f1b40c4fb21c0900266d0c94ee04e7f5a7476c5fae098f8a4f797714cf396a459ad7037aed50 SHA512 4f0e51fd9d543175d9851f42a24fa2d26beb73122ebef6c3b594827d682aaced4ae72b872d00fd9802e2f052600ef22caee4ad455dbd4e500ff66770a8780396 EBUILD netifrc-0.7.1-r2.ebuild 2150 BLAKE2B f59f860df7863caae5bb6dccb875ee69f07eadfe8daecc8cd2e6a950f065f066f07851e430206dda368534bf895b9adc140dd1903aefe70df8ff5f467a734e03 SHA512 b84e81bb7e9ccdb1bf0dbe9e120bffc021075ff93adf886d2a9ac6c47ce5cf2c4103dabe3735ea008becb7079fbd056ff418f514739c796f182a4b75f82ac8be EBUILD netifrc-0.7.2.ebuild 2047 BLAKE2B 64858661488665f75d13d3a5ecad330f45ed7dc6716dc7259d70053f618f0839eb25a830651af522223664be04f7e5ddce2ecfd1e0cfaa2d38691c0bd2fd2202 SHA512 fb050a6c9058eb08624c838a5d3ec5c10c0ee1f7fbd08d6a0234ebf3e8be75cef9f781372a6eecea080e6c9ab886054b384fae6b00c59e99973eaf31ee8d3618 -EBUILD netifrc-0.7.3.ebuild 2047 BLAKE2B 64858661488665f75d13d3a5ecad330f45ed7dc6716dc7259d70053f618f0839eb25a830651af522223664be04f7e5ddce2ecfd1e0cfaa2d38691c0bd2fd2202 SHA512 fb050a6c9058eb08624c838a5d3ec5c10c0ee1f7fbd08d6a0234ebf3e8be75cef9f781372a6eecea080e6c9ab886054b384fae6b00c59e99973eaf31ee8d3618 +EBUILD netifrc-0.7.3.ebuild 2039 BLAKE2B 0654285f39d568cd1c9654c4743ebd0a4c0fce156398e1e200a0c7303e0b9ced8243b25d4007854e56e69a0f140bab4c9350a04543a6da27be10625fdd7d93b0 SHA512 1344a0e56f90c5b4da2617a64b529792621ecff5fa03462c440f1556fa0dca74c01f29f5109f0895e774d42ca00a6179faa154899380b92ddd7a249531b51a06 EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5 diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild index 41edf1341cce..8e7932308d7c 100644 --- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild +++ b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 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.3.ebuild b/net-misc/netifrc/netifrc-0.7.3.ebuild index 0e9cf97453c8..5aa4ea9667c5 100644 --- a/net-misc/netifrc/netifrc-0.7.3.ebuild +++ b/net-misc/netifrc/netifrc-0.7.3.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 ~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 c8bd0ef233cf..640e4acd98a3 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 e7b58861f071144d857323597e805f08a9e57abd56cd1a62f983570559338f6d87446fea8c961114d4d2994e500323447f209be32981d111dd6cc1f3558e53c8 SHA512 028aaa009ff8b4f9d0a3a58654f0f93c159419f8432530d402f1bbaa2f20038d17bbbdd25283113496669ff743343a470d842e0b9aceb30283cbbb2728a5bc26 +EBUILD netkit-fingerd-0.17-r3.ebuild 1140 BLAKE2B 801b9e7dc0c3f28ed6d546671becb020a1e91af7c835dcfb9b90c34e9e713d179876a0515d71dd230d847a8b0011f9f4e2943f790bf65a90899920ebfae3db50 SHA512 fb48da9042f392e03f530d19231d22bbd5c8c79c01e3141b6b71ba36694aa006acfc9e5d98afa5bf2de68d5914f718d5110a2f4d60f825c66f469bbe1093a8af 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 53005490a476..a6733741c15f 100644 --- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild +++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs MY_PN="${PN/netkit/bsd}" MY_PN="${MY_PN/rd/r}" @@ -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 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-routed/Manifest b/net-misc/netkit-routed/Manifest index 4f5e4d3e4a53..0b03e2cf8181 100644 --- a/net-misc/netkit-routed/Manifest +++ b/net-misc/netkit-routed/Manifest @@ -3,5 +3,5 @@ AUX netkit-routed-0.17-time.patch 568 BLAKE2B 33d0462028efa3672d1d640ffa8da8532c AUX routed.confd 589 BLAKE2B b727efb8e8de5a4d47a68922f181e99d7fed05137aa9ab5f5908ac08ad3b96bc61ead94e7227aa3cbfdd23dbd4c29de0fca92834a18dca720384ce0ac2a33cd0 SHA512 ce7d67dbf1fd7c18bdd8154eaa4ae46ccdbf178224383a3209577cbe7292f4442b294af40e5e9e9b3d6c801982f719943a988cf19f26176a06cd7fc1444942f3 AUX routed.initd 396 BLAKE2B c44a587481c6a24115472c0a8988c991c937e8f950c1fe1a48c320b0700751f9071e26cad7be4edda7a2f57816c2c0b77888ef5639f60289e2317227d70ab279 SHA512 62cb5ae462bb9baeeb383a1ab2afd3e24407403592ea613854bc8f48def576b7fb3d4c211f138b49b3c1d3cc818fb7c08be12fb2b5b973dcb9b669c9c01800ca DIST netkit-routed_0.17.orig.tar.gz 36435 BLAKE2B cfa0ab9fcbca1369e812e02dc76524e8668b340dc70c345b038f659fd9b48979fe1c27249748d5455d636ad2cef204fd646f2967761971de0b01aed88af80778 SHA512 9dea1048af22d5bbcec0aa9722a518e81d4415c7cc3219ae13d38450b0960fb30e0b082648717336c5870fa65f921a3830aadca23d0595ca719f89f4615afbc9 -EBUILD netkit-routed-0.17-r5.ebuild 1061 BLAKE2B 55b16cec98f05df9bcae9d4d11290a3ecd3e76635dbc207e56418a30fed045552c8a3d759302dd26e9d76e9ef49bef81ea584dd2d950d68626016b73d0fdfb43 SHA512 1459f87906599a62d9a60db049e1a4288fcf0aa732f7116f8e7a9ccdcbfcf008b309fff430b5dc7352df5f275bc7b43881107cf8045c020dbc4ff1ff16b64c6a +EBUILD netkit-routed-0.17-r5.ebuild 1061 BLAKE2B a75639c2dd6811178c19b3aaa83147c3f063a2c41ddce72a698e42f45a67983298c330015e69a2ebe414cf141192a13822c9252b5b668db850ba56ff369dcc8e SHA512 298e5253fe1e9a13caa4f1d7728c6c299eb928432aa7efe291e5d7dd195399a8f15ff2b8db030df6e4098458ccdbeb69881388ec8a1ffdd10f5766cfccd1d227 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild index ffaa1e249d89..0670c06e7c2e 100644 --- a/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild +++ b/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs DESCRIPTION="Netkit - routed" HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest index aa9b55cbed54..ef057a2f6be0 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-r11.ebuild 1756 BLAKE2B fc76672decb22265ba3abae1669f04a46f4364ebb489c38095b9fbd632008fb65297eedb3d14690cc1fde7cf86e232b22135dac158aef5acbb92bc221da25767 SHA512 2a63e4b97360dd5108cf237568ef6ff64e122e172844ed264899023061f78c47363e17dcbd6dffa5c3585158eb588b1fbac77f02dd68a63b246a2d5e07bc84ae +EBUILD netkit-rsh-0.17-r11.ebuild 1757 BLAKE2B 80cacb4f88bd0cc40943649113331a251ef5f03d51b74c3177feb2197955f491d8e7ab3da2b6ec7c5f42c03b8a333373650b60a157535eb516f7b45251faeed4 SHA512 710c2554c034b08ee0768bba1c7ad92fa7feedd5d3b077a3e2e242917731670c8ac7ca06382bd62bc54e48c9bbbe34ee8138a0764731b94df314683b8ea87090 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild index 9b64b5b6e695..79affc6cedaa 100644 --- a/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild +++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild @@ -15,7 +15,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 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=" diff --git a/net-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest index 3b6fbc78ec2e..f45db805fd3a 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 1188 BLAKE2B 0857b018a3321f7d899ad32ea28c59d0ea91acf5a41bce0582c4b70b121ece8ad837ba532cb87c0dbb25e6a6c61de6d44385e1e1acde8afda789b7f94d5508d7 SHA512 6f85c1a131f99e0afbeb567484da72c6b9208da9fdc56be7aa61925b1683a62a1b5d9da42910746c3d92d57dea4597c022763b275d419b798dee94046fbe1115 +EBUILD netkit-talk-0.17-r5.ebuild 1188 BLAKE2B 00906f26fde2d873fd7c27519d9f032422a9a40d9f911a237921184f4a0fddc82137ff8798e495755c66f0a3538cb65fcf2f4dc2d07d9a708cbaa0e93261c167 SHA512 ba267b024800d6903924d80728fc9a11e7ee5e637a1af57fcb24721d2d497e7662b5eeefc5cb1ad8aeeb09c643be848b59676dad95fba1798a07da25d773f662 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 ea7d73e2763b..4ec4a5908873 100644 --- a/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild +++ b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs MY_P=netkit-ntalk-${PV} S=${WORKDIR}/netkit-ntalk-${PV} diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest index cfcdd71b0e0b..ca0b779398de 100644 --- a/net-misc/netopeer2/Manifest +++ b/net-misc/netopeer2/Manifest @@ -1,3 +1,5 @@ DIST netopeer2-1.1.53.tar.gz 169329 BLAKE2B d65b579ca47d59963a181d78ec060c8a239639e7311f9e48ab88412cfa7f30e17dabde4ad086109193fec4129f836c46fb04acb0881248fc27e6f4e6877a70af SHA512 30da532a370c44d598b37199550ae1adb65486d5bc9205e9a0213beafe16174c87628395d564c48d095503b597b0008457e0b951451472f1c414fcc705897d21 +DIST netopeer2-1.1.70.tar.gz 170883 BLAKE2B 59dbb1f82b355d807769466fc95dcac0ef0b74711f299b29cc6653183b5ffbb832d69b4247e04f38bdb9218adfabe1fff20c6f76e198ca0860808ec3910d20bd SHA512 d60c7ac861a05f8ee325013786e25e7f987f28265d66df5568ffd92ee31016a2d07f6b8256572110b9a6a5d00cb68644d1c3c3cd638f609b0f4f806e9e6cf602 EBUILD netopeer2-1.1.53.ebuild 901 BLAKE2B d16ea4b1178f7ecd1e7c0f3a37f2b042b0b8cf40b8ae891907fc37a49b0eaa43284bf3e0385df28a5c44dfaa7cbe5e2c536db613fd71768f1ffdfaf45c28ccfd SHA512 d8c6e66fd8871c7362316bad639986fbed10fab21a2ecf9db62b7f909a27fc915a6ea31e3a8b2c13673cc0b2cb7f5ee5a9d9eccdd53bc9e499aa3a9c90b76dcb +EBUILD netopeer2-1.1.70.ebuild 930 BLAKE2B 75c99ec7ec152bb695aa878fe1b3ae7d95203fe287fd86ed6251ac8d71d6ba779109130b84ddefef3aabc35351bb0ddca48a8b319b9b8be077cf553c477bef35 SHA512 3f8a5e2c1314038d985076b80afa4f0d50dce2dc243c4dbc1b2f957bdf1893cffb8eaa01bd55c2e5e4a2ec1d58b968b4084e143831b8593660ae82a14732aadb MISC metadata.xml 449 BLAKE2B e77e9d18382c642d6165e32716e8ae0c8e5964acb49249687269fcec0f678b194fa905f50458ad640c25ce7d47138b7062232d92e0649a4b5fb54487a47c4cc1 SHA512 51596d9786cae042106f29190c459161c3eadccd64b51f79e255a8a2ee470bacd1c990420d195e7b2e15e913f8ba418cf2140aa87eacfe2e8252de1e5f95a6ff diff --git a/net-misc/netopeer2/netopeer2-1.1.70.ebuild b/net-misc/netopeer2/netopeer2-1.1.70.ebuild new file mode 100644 index 000000000000..27f4dbd2ebd6 --- /dev/null +++ b/net-misc/netopeer2/netopeer2-1.1.70.ebuild @@ -0,0 +1,46 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Server for implementing NETCONF configuration management" +HOMEPAGE="https://github.com/CESNET/netopeer2" +SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/openssl:= + net-misc/curl:= + >=net-misc/sysrepo-1.4.122:= + >=net-libs/libnetconf2-1.1.43:= + net-libs/libssh:= + >=net-libs/libyang-1.0.225:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DGENERATE_HOSTKEY=OFF + -DINSTALL_MODULES=OFF + -DMERGE_LISTEN_CONFIG=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /etc/netopeer2 + doins -r scripts/. +} + +pkg_postinst() { + elog "In order to do initial server setup please" + elog "run setup scripts located in /etc/netopeer2" +} diff --git a/net-misc/netstat-nat/Manifest b/net-misc/netstat-nat/Manifest index e89f71b10e47..7fc9c9b79de3 100644 --- a/net-misc/netstat-nat/Manifest +++ b/net-misc/netstat-nat/Manifest @@ -1,4 +1,4 @@ AUX netstat-nat-1.4.10-install.patch 362 BLAKE2B 2604af1f35b07b59f697198cb046317344a8f93fece72c98383193cd1e997655e6303256aa0d76fb49ac688c461b61c1241f6c4de97f77542de5545f68b93904 SHA512 003405d6967a9f29e1776b0209dee976e8a26010a2243f095d9c9e20665adc1ca799d9987462fd6d03f5885b9ec9fd447d32e4bd569fac868c8c849ae2e599ff DIST netstat-nat-1.4.10.tar.gz 83865 BLAKE2B 4da59e3661fe4110b50f043a00d6ce36eb84360eabc2d73f801b24dbcfaffbc20fa9463157136e6ec5488102ad5f9aa5141bb797e5912ec7cb45b1188a4efe98 SHA512 2089119b26039e656fbe76701e556f7d766159c96b18968195f255e15072af37972c83a8f05edb0b767a12f0521598975673d10d8ba5e6ed6b754a927d4f069d -EBUILD netstat-nat-1.4.10.ebuild 422 BLAKE2B 804b1d18b4037f41290e5acd71089c2fabb0221f6ffe01f59b8f2b2c6c81fae5a18c94d31c651f5d16770a5db4604a6e09bf5060c40b78a9f240de5b1de3677b SHA512 2837689f4a38493cec7f00ad799e8f2eb2fb06919a404dc416eb33a90b2fad6fdd8e8377fbbe5d9fcb352ce00f445ae16a18f269ad42af712f54e7e9358bec9a +EBUILD netstat-nat-1.4.10.ebuild 459 BLAKE2B ecb7571bd6347551c586704cf6567978ed464a9188242265202926bb663a6cf0adb0ada5fb68de67a4effba1483e2a217f40286aea212aade4a4b20c9466bf5c SHA512 6cb93b525f1b3acd18f1b285e04d1e9ffc33bca301bee96f502ca2f256e3d6a0a9e81e9ce41848e202a91f945e2223257085d819d045feae9be5f10ede034ee3 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild index cc7e4cb41180..2d94fe2f5dfc 100644 --- a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild +++ b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="Display NAT connections" HOMEPAGE="http://tweegy.nl/projects/netstat-nat/index.html" @@ -12,7 +13,14 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm ppc sparc x86" +PATCHES=( + "${FILESDIR}"/${P}-install.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-install.patch + default + + mv configure.{in,ac} || die + eautoreconf } diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 1509168a5d9c..9a268ca329d1 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -3,17 +3,14 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4 AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 179dfdcdb97bfc66adbeb58ca0e0b8f95f6d1cc0687fef338bc25ac59b4dc83e20e547d419ef8cea482c6302a05bbce8279c868f00c0cb173f42ebdc6a4bdcae SHA512 ab3e96bbd88b4a5c0aac59dc8de437be78f2e77762d6bc9c99e3b1ff1d7db39a054c4fd9ba9e2f6f9907da1ef66c8af310562addaa79ecd9e9812564f609a273 -AUX networkmanager-1.26.4-iwd-fixes-pr640.patch 5730 BLAKE2B e22539fef2e4582ab156decbe26667724de181eb2349f7dcb29c41eaf9f918addb4a6e25a43e8b743e118cab56e3f69cc83e0e8ee777560c227165fad67664b9 SHA512 690d128ac153b2147f13f8596858be6e6120c0a744da1cb5e2dad5ce6ae9518565ab15a9a00612771d153ed5e13d60a42f93fae6b7ba177513c9d1bf0a4d701a AUX networkmanager-1.28.0-dhcpcd9.patch 10608 BLAKE2B fb5512d4b290ae668b41b2d1f387643e8d7c1c235ec255c292e419551c3a67a06463f43293ea75f8dd9700bde2d045e86eafe313384c22609cb8422117ac092f SHA512 7f9a2a3b7f861cc2c8e4b066449e6574ac74227b7a45ae8e9ca79c81a232d292a62216edff0620042f9556193e3841aa8cf5e8ecdbc2edfc9df0751e2d1f5303 AUX networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch 2215 BLAKE2B c6165a5e6a1c892aed98bcb14369fc1282aa5179370b3194d879fe3866e184ce99687e88b5f1dbfdaa82313b7c1b59d0949442cc539d5355c114c539a2017598 SHA512 6844e58aa7d7be3030d046b8c330ad0615152a762c689e7dda07ee46466030a078ddf81f3ce8be8c1880191ec22aedde9325dde782ec0cfb95726935fe9086e3 DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1 -DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328 -DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64 DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a77844b4f60a9815be4b6780fbefecfeffb644fd67ea65373a1895fd2102f2beec9ad141b6e9a92a1a32de646d64acd4250b62 SHA512 ab0bc39626dc55df4e122ad6e1a8086e1467f44bdd41c4491c752dca3ffb549796e0ac888041f12f661f2f6cf4142d0fce59b5135549e48a0076fafcdc45ca06 DIST NetworkManager-1.30.2.tar.xz 5302032 BLAKE2B 2fd30a09b479a4202c905ef29905d0672c0f4e07af15b0b124a626f160d150348e3d4b256386db43b91c4ac27c897f82269ede6e0f35f4b82905920494d070f2 SHA512 08482ac18814fd94bc99f0aa32de7d38c39d29c914a3080fb6df7ec2437b30f1aea1b5207edeae74ff63b9a181a4823cfa11e8884bc22ae80cb0b95f8cc3514e +DIST NetworkManager-1.30.4.tar.xz 5303420 BLAKE2B c2d81fe03f75f4afd05cac06741d9e7fb0d2892bad30462788a39d9c84afd056614e8f8d3371f15f4de7398cc40a32861814498fc36911c43bbe8e43f5053cde SHA512 ca42907d0c0fc6a981d94798a5e264dd58c7d11576a8dd52c8ef6799334af46848091d872e9cec553714766c51457cbe12c5c2017eaac63abce968823b047624 EBUILD networkmanager-1.22.10-r12.ebuild 8548 BLAKE2B 5da579ca289ff404eb75807972ccb0e1f9cd04d219e766f4942ca6dd5e83da047bcd94c27e17aefb14b194d3e759a858e1590746ee61ae87bf176d322330f4bc SHA512 f6a6f6885e2c56428c60f6b717a5f5cafe15264280a66b946756da2332f64cffca24ce4d8defc583f07880829a54d098f5435a4b86b912c67bbb17560b910405 -EBUILD networkmanager-1.26.4.ebuild 11351 BLAKE2B 0319b3fe3b67c57f48c960a777f272f8ed89cf1f43f454a3303a69214f641e102168f653fb2af88c539df7fd3f591d4fdd87230d9334460fe270d4e741e9c601 SHA512 21cdaf6a2ba186939a201a3f4ccb59d52c4b1d636eb74517b5f57748582ab448844a7edc88242f591c60403d1721b8294a9001b0a9b0f8be89c38a72c0ea58bc -EBUILD networkmanager-1.26.6.ebuild 11357 BLAKE2B 9f862a2953a1244c45165be72fc3eb842e30a555048ebbdd0487c5cc7c82c69ff0014a9f760be9c046c5bda37935b8afd9e9c977c0f920b8a15e598b15cd315a SHA512 b5fadbc8153556e16020ea3e4887571ae7c2392f4f243bd3110f8232022b87bb6f1a2c8852d7a9305e0d7d7fcfe5a1ff9573d93d80387a25296a20fb2b69c44f -EBUILD networkmanager-1.28.0-r1.ebuild 11254 BLAKE2B 1bda0067cf5074cea89c0a7ab0f007aea189531407c5f72c7da930140cab4cb54c0528dcf7c0ec2157021db1a459d9b4de957e5140310a8c7582980ce7398a6b SHA512 e173def62fbb02e654649eeeedf7c573e40e9d9fa0a6d51c907df918e4a3ed2cb55c2ca66cdac07686367f7cec316ad91bd4e9366bec1d39881b19568607e302 +EBUILD networkmanager-1.28.0-r1.ebuild 11251 BLAKE2B 031ebeea877a8959eb386b5e12041203f068df0ddb070fb0a259b3bef66890c424a868857ff2321bcdf3fba7e4bf1498e12692be26218cf44eeca1365b332ef9 SHA512 036d870f72ebb7af8ca5e795e2fe87bf434397a8c9dc7cd8fb6d7f481cc41bcb247d6c983b05215db56da5d29b6556470feb108797b4491aaaf8e5704043bb74 EBUILD networkmanager-1.30.2.ebuild 11277 BLAKE2B 4fe920d0219755d1a6f15ba31cff95f9edb9a839b7ed61ddd1c5553d4458daa5e5951731fa40edae2a54dc9f30b60c2b32dc767ef0874bebf90bc28071c5a365 SHA512 16bb51e39b73fe99e0406d500ced0d4ad844cc5f12d4991bb7aac243e2ff9ffde7706e7e611100829f9dd320f6e6e581049dd2fdf3102528abcc34ce52003f35 +EBUILD networkmanager-1.30.4.ebuild 11212 BLAKE2B 91e9a109bc1071266bf90e47f336b6cb2b43401688f701537708c41fa464a7a8d0370f5c560dea4de163cafacaa63a8ee316853caf417fbfd6b84babbfb2de29 SHA512 3d7030df1a15de73a139cb4883bf6c1e6545c42d1707788eb5fdc3cfd291d9b7b4be6878c7042b268157bc392658f3db6d0f4915ef44b886d437dd0292d91d9a MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3 diff --git a/net-misc/networkmanager/files/networkmanager-1.26.4-iwd-fixes-pr640.patch b/net-misc/networkmanager/files/networkmanager-1.26.4-iwd-fixes-pr640.patch deleted file mode 100644 index b3b63758d697..000000000000 --- a/net-misc/networkmanager/files/networkmanager-1.26.4-iwd-fixes-pr640.patch +++ /dev/null @@ -1,169 +0,0 @@ -Backport of https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/640 - ---- a/src/devices/wifi/nm-device-iwd.c -+++ b/src/devices/wifi/nm-device-iwd.c -@@ -1905,38 +1905,39 @@ schedule_periodic_scan (NMDeviceIwd *self, gboolean initial_scan) - { - NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self); - GVariant *value; -- gboolean disconnected; -+ gboolean disconnected = TRUE; - guint interval; - -- if (!priv->can_scan || priv->scan_requested) -- return; -- -- value = g_dbus_proxy_get_cached_property (priv->dbus_station_proxy, "State"); -- disconnected = nm_streq0 (get_variant_state (value), "disconnected"); -- g_variant_unref (value); -+ if (priv->can_scan) { -+ value = g_dbus_proxy_get_cached_property (priv->dbus_station_proxy, "State"); -+ disconnected = nm_streq0 (get_variant_state (value), "disconnected"); -+ g_variant_unref (value); -+ } - - /* Start scan immediately after a disconnect, mode change or -- * device UP, otherwise wait a period dependent on the current -- * state. -+ * device UP, otherwise wait 10 seconds. When connected, update -+ * AP list mainly on UI requests. - * - * (initial_scan && disconnected) override priv->scanning below - * because of an IWD quirk where a device will often be in the - * autoconnect state and scanning at the time of our initial_scan, -- * but our logic will the send it a Disconnect() causeing IWD to -+ * but our logic will then send it a Disconnect() causing IWD to - * exit autoconnect and interrupt the ongoing scan, meaning that - * we still want a new scan ASAP. - */ -- if (initial_scan && disconnected) -+ if (!priv->can_scan || !disconnected || priv->scan_requested || priv->scanning) -+ interval = -1; -+ else if (initial_scan) - interval = 0; -- else if (!priv->periodic_scan_id && !priv->scanning) -- interval = disconnected ? 10 : 20; -+ else if (!priv->periodic_scan_id) -+ interval = 10; - else - return; - - nm_clear_g_source (&priv->periodic_scan_id); -- priv->periodic_scan_id = g_timeout_add_seconds (interval, -- periodic_scan_timeout_cb, -- self); -+ -+ if (interval != (guint) -1) -+ priv->periodic_scan_id = g_timeout_add_seconds (interval, periodic_scan_timeout_cb, self); - } - - static void -@@ -2331,7 +2332,6 @@ powered_changed (NMDeviceIwd *self, gboolean new_powered) - update_aps (self); - } else { - set_can_scan (self, FALSE); -- nm_clear_g_source (&priv->periodic_scan_id); - priv->scanning = FALSE; - priv->scan_requested = FALSE; - priv->can_connect = FALSE; -@@ -2537,17 +2537,7 @@ dispose (GObject *object) - - nm_clear_g_cancellable (&priv->cancellable); - -- nm_clear_g_source (&priv->periodic_scan_id); -- -- cleanup_association_attempt (self, TRUE); -- -- g_clear_object (&priv->dbus_device_proxy); -- g_clear_object (&priv->dbus_station_proxy); -- g_clear_object (&priv->dbus_ap_proxy); -- g_clear_object (&priv->dbus_adhoc_proxy); -- g_clear_object (&priv->dbus_obj); -- -- remove_all_aps (self); -+ nm_device_iwd_set_dbus_object(self, NULL); - - G_OBJECT_CLASS (nm_device_iwd_parent_class)->dispose (object); - ---- a/src/devices/wifi/nm-iwd-manager.c -+++ b/src/devices/wifi/nm-iwd-manager.c -@@ -622,6 +622,38 @@ interface_removed (GDBusObjectManager *object_manager, GDBusObject *object, - } - } - -+static void -+object_added(GDBusObjectManager *object_manager, GDBusObject *object, gpointer user_data) -+{ -+ GList *interfaces, *iter; -+ -+ interfaces = g_dbus_object_get_interfaces(object); -+ -+ for (iter = interfaces; iter; iter = iter->next) { -+ GDBusInterface *interface = G_DBUS_INTERFACE(iter->data); -+ -+ interface_added(NULL, object, interface, user_data); -+ } -+ -+ g_list_free_full(interfaces, g_object_unref); -+} -+ -+static void -+object_removed(GDBusObjectManager *object_manager, GDBusObject *object, gpointer user_data) -+{ -+ GList *interfaces, *iter; -+ -+ interfaces = g_dbus_object_get_interfaces(object); -+ -+ for (iter = interfaces; iter; iter = iter->next) { -+ GDBusInterface *interface = G_DBUS_INTERFACE(iter->data); -+ -+ interface_removed(NULL, object, interface, user_data); -+ } -+ -+ g_list_free_full(interfaces, g_object_unref); -+} -+ - static void - connection_removed (NMSettings *settings, - NMSettingsConnection *sett_conn, -@@ -682,22 +714,6 @@ _om_has_name_owner (GDBusObjectManager *object_manager) - return !!name_owner; - } - --static void --object_added (NMIwdManager *self, GDBusObject *object) --{ -- GList *interfaces, *iter; -- -- interfaces = g_dbus_object_get_interfaces (object); -- -- for (iter = interfaces; iter; iter = iter->next) { -- GDBusInterface *interface = G_DBUS_INTERFACE (iter->data); -- -- interface_added (NULL, object, interface, self); -- } -- -- g_list_free_full (interfaces, g_object_unref); --} -- - static void - release_object_manager (NMIwdManager *self) - { -@@ -836,12 +852,16 @@ got_object_manager (GObject *object, GAsyncResult *result, gpointer user_data) - G_CALLBACK (interface_added), self); - g_signal_connect (priv->object_manager, "interface-removed", - G_CALLBACK (interface_removed), self); -+ g_signal_connect (priv->object_manager, "object-added", -+ G_CALLBACK(object_added), self); -+ g_signal_connect (priv->object_manager, "object-removed", -+ G_CALLBACK(object_removed), self); - - g_hash_table_remove_all (priv->known_networks); - - objects = g_dbus_object_manager_get_objects (object_manager); - for (iter = objects; iter; iter = iter->next) -- object_added (self, G_DBUS_OBJECT (iter->data)); -+ object_added (NULL, G_DBUS_OBJECT(iter->data), self); - - g_list_free_full (objects, g_object_unref); - diff --git a/net-misc/networkmanager/networkmanager-1.26.4.ebuild b/net-misc/networkmanager/networkmanager-1.26.4.ebuild deleted file mode 100644 index c3297962c4c4..000000000000 --- a/net-misc/networkmanager/networkmanager-1.26.4.ebuild +++ /dev/null @@ -1,348 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7,8} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" - -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - || ( nss gnutls ) - ?? ( elogind systemd ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - net-firewall/iptables ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( net-misc/dhcpcd ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= - net-misc/mobile-broadband-provider-info ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - !nss? ( gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) - ofono? ( net-misc/ofono ) - ovs? ( dev-libs/jansson ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( - dev-libs/jansson - >=net-misc/libteam-1.9 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -PATCHES=( "${FILESDIR}"/${PN}-1.26.4-iwd-fixes-pr640.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 your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - if use introspection || use test; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --with-runstatedir=/run - --disable-lto - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(multilib_native_with nmcli) - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(use_enable json json-validation) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - libnm/libnm.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - else - local targets=( - install-libLTLIBRARIES - install-libnmincludeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.26.6.ebuild b/net-misc/networkmanager/networkmanager-1.26.6.ebuild deleted file mode 100644 index 20430d588fff..000000000000 --- a/net-misc/networkmanager/networkmanager-1.26.6.ebuild +++ /dev/null @@ -1,348 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7,8} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" - -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - || ( nss gnutls ) - ?? ( elogind systemd ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - net-firewall/iptables ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( net-misc/dhcpcd ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= - net-misc/mobile-broadband-provider-info ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - !nss? ( gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) - ofono? ( net-misc/ofono ) - ovs? ( dev-libs/jansson ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( - dev-libs/jansson - >=net-misc/libteam-1.9 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -PATCHES=( "${FILESDIR}"/${PN}-1.26.4-iwd-fixes-pr640.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 your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - if use introspection || use test; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --with-runstatedir=/run - --disable-lto - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(multilib_native_with nmcli) - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(use_enable json json-validation) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - libnm/libnm.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - else - local targets=( - install-libLTLIBRARIES - install-libnmincludeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild index b3b1cd0f48cf..cd47f2d90ad0 100644 --- a/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild @@ -26,7 +26,7 @@ REQUIRED_USE=" ?? ( elogind systemd ) " -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 diff --git a/net-misc/networkmanager/networkmanager-1.30.4.ebuild b/net-misc/networkmanager/networkmanager-1.30.4.ebuild new file mode 100644 index 000000000000..7889e17ce1bd --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.30.4.ebuild @@ -0,0 +1,345 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="NetworkManager" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{7..9} ) + +inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" + +IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + bluetooth? ( modemmanager ) + iwd? ( wifi ) + vala? ( introspection ) + wext? ( wifi ) + || ( nss gnutls ) + ?? ( elogind systemd ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# gobject-introspection-0.10.3 is needed due to gnome bug 642300 +# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 +COMMON_DEPEND=" + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + policykit? ( >=sys-auth/polkit-0.106 ) + net-libs/libndp[${MULTILIB_USEDEP}] + >=net-misc/curl-7.24 + net-misc/iputils + sys-apps/util-linux[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=virtual/libudev-175:=[${MULTILIB_USEDEP}] + audit? ( sys-process/audit ) + bluetooth? ( >=net-wireless/bluez-5 ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + net-firewall/iptables ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) + elogind? ( >=sys-auth/elogind-219 ) + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + modemmanager? ( >=net-misc/modemmanager-0.7.991:0= + net-misc/mobile-broadband-provider-info ) + ncurses? ( >=dev-libs/newt-0.52.15 ) + nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + !nss? ( gnutls? ( + dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) + ofono? ( net-misc/ofono ) + ovs? ( dev-libs/jansson ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + resolvconf? ( net-dns/openresolv ) + selinux? ( sys-libs/libselinux ) + systemd? ( >=sys-apps/systemd-209:0= ) + teamd? ( + dev-libs/jansson + >=net-misc/libteam-1.9 + ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/plugdev + || ( + net-misc/iputils[arping(+)] + net-analyzer/arping + ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + ) +" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.18 + " +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc-am + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-lang/perl + dev-libs/libxslt + ) + vala? ( $(vala_depend) ) + test? ( + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]') + ) +" + +python_check_deps() { + if use introspection; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + if use test; then + has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + fi +} + +sysfs_deprecated_check() { + ebegin "Checking for SYSFS_DEPRECATED support" + + if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then + eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" + eerror "or NetworkManager will not work correctly." + eerror "See https://bugs.gentoo.org/333639 for more info." + die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" + fi + eend $? +} + +pkg_pretend() { + if use kernel_linux; then + get_version + if linux_config_exists; then + sysfs_deprecated_check + else + ewarn "Was unable to determine your kernel .config" + ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." + ewarn "See https://bugs.gentoo.org/333639 for more info." + fi + + fi +} + +pkg_setup() { + if use connection-sharing; then + if kernel_is lt 5 1; then + CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" + else + CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + fi + linux-info_pkg_setup + fi + if use introspection || use test; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + DOC_CONTENTS="To modify system network connections without needing to enter the + root password, add your user account to the 'plugdev' group." + + use vala && vala_src_prepare + gnome2_src_prepare + + sed -i \ + -e 's#/usr/bin/sed#/bin/sed#' \ + data/84-nm-drivers.rules \ + || die +} + +multilib_src_configure() { + local myconf=( + --disable-more-warnings + --disable-static + --localstatedir=/var + --with-runstatedir=/run + --disable-lto + --disable-qt + --without-netconfig + --with-dbus-sys-dir=/etc/dbus-1/system.d + $(multilib_native_with nmcli) + --with-udev-dir="$(get_udevdir)" + --with-config-plugins-default=keyfile + --with-iptables=/sbin/iptables + --with-ebpf=yes + $(multilib_native_enable concheck) + --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) + --with-crypto=$(usex nss nss gnutls) + # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option + # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. + # (There is no off switch, and we do not support upower.) + # bug #747358 + --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) + --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) + $(multilib_native_use_with audit libaudit) + $(multilib_native_use_enable bluetooth bluez5-dun) + --without-dhcpcanon + $(use_with dhclient) + $(use_with dhcpcd) + --with-config-dhcp-default=internal + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable ppp) + --without-libpsl + $(multilib_native_use_with modemmanager modem-manager-1) + $(multilib_native_use_with ncurses nmtui) + $(multilib_native_use_with ofono) + $(multilib_native_use_enable ovs) + $(multilib_native_use_enable policykit polkit) + $(multilib_native_use_with resolvconf) + $(multilib_native_use_with selinux) + $(multilib_native_use_with systemd systemd-journal) + $(multilib_native_use_enable teamd teamdctl) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable vala) + --without-valgrind + $(multilib_native_use_with wifi iwd) + $(multilib_native_use_with wext) + $(multilib_native_use_enable wifi) + ) + + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 + if use ppp; then + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) + fi + + # unit files directory needs to be passed only when systemd is enabled, + # otherwise systemd support is not disabled completely, bug #524534 + use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) + + if multilib_is_native_abi; then + # work-around man out-of-source brokenness, must be done before configure + ln -s "${S}/docs" docs || die + ln -s "${S}/man" man || die + fi + + ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + local targets=( + libnm/libnm.la + ) + emake "${targets[@]}" + fi +} + +multilib_src_test() { + if use test && multilib_is_native_abi; then + python_setup + virtx emake check + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + # Install completions at proper place, bug #465100 + gnome2_src_install completiondir="$(get_bashcompdir)" + insinto /usr/lib/NetworkManager/conf.d #702476 + doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf + else + local targets=( + install-libLTLIBRARIES + install-libnmincludeHEADERS + install-nodist_libnmincludeHEADERS + install-pkgconfigDATA + ) + emake DESTDIR="${D}" "${targets[@]}" + fi +} + +multilib_src_install_all() { + einstalldocs + ! use systemd && readme.gentoo_create_doc + + newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager + newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager + + # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts + keepdir /etc/NetworkManager/dispatcher.d + + # Provide openrc net dependency only when nm is connected + exeinto /etc/NetworkManager/dispatcher.d + newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status + sed -e "s:@EPREFIX@:${EPREFIX}:g" \ + -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die + + keepdir /etc/NetworkManager/system-connections + chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 + + # Allow users in plugdev group to modify system connections + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" + + if use iwd; then + # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir + cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf + [device] + wifi.backend=iwd + EOF + fi + + # Empty + rmdir "${ED}"/var{/lib{/NetworkManager,},} || die +} + +pkg_postinst() { + gnome2_pkg_postinst + systemd_reenable NetworkManager.service + ! use systemd && readme.gentoo_print_elog + + if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then + ewarn "The ${PN} system configuration file has moved to a new location." + ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" + ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" + ewarn + ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" + fi + + # NM fallbacks to plugin specified at compile time (upstream bug #738611) + # but still show a warning to remember people to have cleaner config file + if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then + if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then + ewarn + ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" + ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." + ewarn + fi + fi + + # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 + if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then + ewarn "You have psk-flags=1 setting in above files, you will need to" + ewarn "either reconfigure affected networks or, at least, set the flag" + ewarn "value to '0'." + fi + + if use dhclient || use dhcpcd; then + ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" + ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" + ewarn "works for you, and you're happy with, the alternative USE flags can be" + ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" + ewarn "the main.dhcp configuration option to use one of them instead of internal." + fi +} diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest index b0b0a16b8603..cd7e23589fa1 100644 --- a/net-misc/npapi-sdk/Manifest +++ b/net-misc/npapi-sdk/Manifest @@ -1,4 +1,4 @@ DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842 -EBUILD npapi-sdk-0.27.2.ebuild 398 BLAKE2B 3c055e8fd6dd54dd77ab0240a0c5eb06b1e49978b6dcbfd0ada9df96965890912885e4e53066801d534e1621983d7d99819242c2b28ac6a0ec62ed2dfd40519e SHA512 3bb0e3420518c68716ee4914f620329de1c9a26701cd435494b47a0c4137e33b153dfe5f2922d7ff177267603354ca875edcf0b98b5372728db7ac36db00e6ff -EBUILD npapi-sdk-9999.ebuild 387 BLAKE2B ab17a3761f4a41e182ef3016cf6b8b98e928c0717cf74540d34a1b8b39e56d7cadef8c7d71e397f3ccb88ab8e298451cb9ab81f8b7930530a736430e7024568a SHA512 fbef4e67de851b6027c8928c81d588239ea968fe6f20e0d74982956ee09ba15b08ea703a0e63c3d7eb9b3f0a9f317f5e52b3145fa41a9ce838c00001b49d55f3 +EBUILD npapi-sdk-0.27.2.ebuild 391 BLAKE2B 3b93c49f2caeab67b89fcc09ec4ef269b2f1a3ca757029869ed099d83ab0a5ba9b894cb2ff915014f4d1ed405ca0669d3e4f3b0c56abb915278ae197026e0a5f SHA512 bf2bf2987748a448c8335a30959141975e73bfc734096d64ccd50b7bdb709c2b64673e4eeb08d37515e06775c214dcc2f2162fc218a6db5422fd5d1727a0e88b +EBUILD npapi-sdk-9999.ebuild 368 BLAKE2B 8e62174832a639f9ad833ef01f76622fd6b5b4e85a233d710d27e71373abfb8ad6084a823d3520ee85614bf88a11186f7b3ae15b1a9d80b7967f2989c4cb5eb7 SHA512 49cf7de5a2e1e97073fff0c3323b7d366029ed10724545734f9850732d96b39257c81ebc5ab4b64495cf15a39d364c443719b1d7e975aea979794b8d6f1ac7e5 MISC metadata.xml 443 BLAKE2B 1e501dd78a1f3b7d9caea6c6d935b19d08d672fc054d50c22980df21ca536f32968a9a952aafbad1acedafc50256fe3d86db17ece531e3faa081a37cd451a5bb SHA512 2972f9d9367efdb7a37cbc28b9fcb5930b4898e367fe0d3538a0a328293aec9cd80163cfcdfb4fc42d2b676f763f88b7507c84a37212a08efa87b6a496d1287b diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild index 259bdc824cf0..a2433eefbda2 100644 --- a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild +++ b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,6 +10,5 @@ SRC_URI="https://github.com/mgorny/npapi-sdk/releases/download/${P}/${P}.tar.bz2 LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" -IUSE="" -DEPEND="virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" diff --git a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild index 30c5fda915de..c7c9e7a3f097 100644 --- a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild +++ b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,8 @@ EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" LICENSE="BSD" SLOT="0" -KEYWORDS="" -IUSE="" -DEPEND="virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 5c91c4af64cb..501c2a808428 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -21,5 +21,5 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794 -EBUILD ntp-4.2.8_p15.ebuild 4586 BLAKE2B 69f4006e6f2646861cdec4ed7d4c93a449950016ce6fbd6b686e599942020d56a2ad0900cff8b87088fdecf2646dd07a328a9ca9399c82dc63b063547c24a87a SHA512 5bad1b11f17169fb0acddf141713d34fb3273801a3a0b9d4257eee7a194e25851a333d4cc8a844cd2b2acd61d2e3c379708384bd3f6c157cd8313ed7ec151978 +EBUILD ntp-4.2.8_p15.ebuild 4571 BLAKE2B 8f8691c37086ead7fe189c484a3ba6b9f2e31c4df3d6195bc39319602d76e8a2eecac11f697b00cfde3b2e34f64d96947cbb78db0c8ed9d669f062f5ab997c89 SHA512 74c4317fa7703143fc18347f8e71a56773b1f08b5dedfcfab937e43b7a0f26cbb4548d1dea5dd3477a0050db965c414dcb223bc9b5fe2e1642275fc40df0e515 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild index dbad8c7dc8db..3ac493a3f82e 100644 --- a/net-misc/ntp/ntp-4.2.8_p15.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools toolchain-funcs flag-o-matic systemd +inherit autotools flag-o-matic systemd MY_P=${P/_p/p} DESCRIPTION="Network Time Protocol suite/programs" @@ -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 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" 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/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 2e17afa98526..80a6cdd22bef 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -4,10 +4,11 @@ AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fd AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31 AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0ec22b8d95dbb16118d7603c74a7d4c873422de65451f5ddd74b7d9aceb51714d842ef7c4a37ea638212487d6db99ebfa201b01b9654b732538c SHA512 c54b3304ca467e8434e29d312e5839c788becd8ae9068737ec9725a42f22073ea0e86355999dc6d606c12f4c733497cbe48bd49b6e150c39e6540e581df6087e AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e +AUX ntpsec-1.2.0-move-newfstatat.patch 544 BLAKE2B 877bb058fc2d06c315c086b5501181bac1a63d3e08bfd900bd3cd651b8dafaac0531357c4b9f30c51eccf17f0debd219daba2d3f115843ad77bb4b9bcdfb47fb SHA512 fe2fac5c6b6cd5c905209685c57ef3a2f2fb14f633b5cd0e73aaace0f7774f76b1cb1b07b6c94558a6bff3017c8498574d12b703495ef314eaf5f1298a9c078f AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302 DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b DIST ntpsec-1.2.0.tar.gz 2625968 BLAKE2B 23ceae5a1f241fcf5a17801fec2f15f9b9d9d64a108bebe29bdc75196303091eaf0efee7df67ce10acefb7c8dba90ce1144a0c0c5432797d7659714d162f26bb SHA512 9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71 -EBUILD ntpsec-1.1.9.ebuild 4195 BLAKE2B 87535628390d2c8a8831c0231df3a26abe9f3bc31ea95735057847b8990a0929820717fb0dd504a21e0dabca1ba0567eaa363823b2a7bb844016edf045333526 SHA512 f240a105239c6dc38dfe7ea0a482947ad0a4bc55e45bf88b46f14e95b74417582088cee3b38233617c7c5472bb41f923f64e55d740693553c51174c1fe9afdc0 -EBUILD ntpsec-1.2.0.ebuild 4321 BLAKE2B 381e3c2d4d65f28f6e2677ee42e580fdb8fafabb917c61e4406966315578ff63e17aab1fde3ce1f6fa0f0f83bb5b5300cfe85c578888c50197d4c2a5894e64f7 SHA512 2a697d316d7e15134860bb6c94b37792e50be0f87f300b0a735b01c5c6b0c4c992dd46e686eaec32b2eec54064a6aa41d22e10451da5338ccfb17099bda87f27 -EBUILD ntpsec-9999.ebuild 4054 BLAKE2B efa90bfe1f54b23675a0efcb1aae76d612232f4e459c22deeb4a1c425a3ded6d82780099eee309a49145fbfdd73a599a800266501b0526670abc8fc5bd2683ad SHA512 b38be80a59f243a86e25d6472926666a987b2c310d554f8cae9865b802e604fc4cf01a852c13bfcddae6d467e513269e888d532dbd61a25f9b9946e9444b215c +EBUILD ntpsec-1.1.9.ebuild 4202 BLAKE2B 1ebc5057450b6540711e2ea2f5b8fb931003d2a48e414cf7d3bb053ca0edecb0c1ef25a98e43d7548ac343e790c28ff1b06a5df8109aca59dac4fba4939491f0 SHA512 2cdbff26ce55200b1c27d21bca50fab17754390a30b51dd755c13448493858f103600b377cbd858c5e601d390d8aaceea9ac11db99b8ddae55b6cd3c00a42fe7 +EBUILD ntpsec-1.2.0-r1.ebuild 4445 BLAKE2B a680005d9aad4391f8df584d76484f22461168229c2ee0519f26e01a166b959b98f3ac92a9ad52ab1f9939f8eeda99ddb3931dc70c90df0f06f5067b6854f7cc SHA512 39e84d394ea3a7e849073b189c814f042387f97dfbe8387be35bf556b247194cd3962311a15346c782cb004cc95b5a186610cc6097a390473f22d81517266894 +EBUILD ntpsec-9999.ebuild 4061 BLAKE2B 8da977b7169633fe0ff502be5972399ab72207bb5b2a3a1d2a469c6b716b501f899814a1f3993a2ec1ceb796cf611cbc5ffe279d60b275465f930d99e643e040 SHA512 a3a122de2ac5e2d16c714599547d9470598f8736d3ee26b8f1adf45f91259ad31ba59feaea4b3b913217a04aae35ba0e3a4adf2bd50653eebe0b873fbc51ac87 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc diff --git a/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch b/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch new file mode 100644 index 000000000000..75453c6cb5f6 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch @@ -0,0 +1,20 @@ +diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c +index e66faaa8c..b2af654e5 100644 +--- a/ntpd/ntp_sandbox.c ++++ b/ntpd/ntp_sandbox.c +@@ -349,6 +349,7 @@ int scmp_sc[] = { + SCMP_SYS(lseek), + SCMP_SYS(membarrier), /* Needed on Alpine 3.11.3 */ + SCMP_SYS(munmap), ++ SCMP_SYS(newfstatat), + SCMP_SYS(open), + #ifdef __NR_openat + SCMP_SYS(openat), /* SUSE */ +@@ -451,7 +452,6 @@ int scmp_sc[] = { + #endif + #if defined(__aarch64__) + SCMP_SYS(faccessat), +- SCMP_SYS(newfstatat), + SCMP_SYS(renameat), + SCMP_SYS(linkat), + SCMP_SYS(unlinkat), diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild index 0f812f1ed853..0cfaff72ab52 100644 --- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild +++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -66,9 +66,9 @@ WAF_BINARY="${S}/waf" src_prepare() { default # Remove autostripping of binaries - sed -i -e '/Strip binaries/d' wscript + sed -i -e '/Strip binaries/d' wscript || die if ! use libbsd ; then - epatch "${FILESDIR}/${PN}-no-bsd.patch" + eapply "${FILESDIR}/${PN}-no-bsd.patch" fi python_copy_sources } diff --git a/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild new file mode 100644 index 000000000000..efc382f1edd9 --- /dev/null +++ b/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_REQ_USE='threads(+)' +DISTUTILS_USE_SETUPTOOLS=no + +inherit distutils-r1 flag-o-matic waf-utils systemd + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" +else + SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" + RESTRICT="mirror" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="The NTP reference implementation, refactored" +HOMEPAGE="https://www.ntpsec.org/" + +NTPSEC_REFCLOCK=( + oncore trimble truetime gpsd jjy generic spectracom + shm pps hpgps zyfer arbiter nmea neoclock modem + local) + +IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} + +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice +REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" + +# net-misc/pps-tools oncore,pps +CDEPEND="${PYTHON_DEPS} + sys-libs/libcap + dev-python/psutil[${PYTHON_USEDEP}] + libbsd? ( dev-libs/libbsd:0= ) + dev-libs/openssl:0= + seccomp? ( sys-libs/libseccomp ) +" +RDEPEND="${CDEPEND} + ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) + !net-misc/ntp + !net-misc/openntpd + acct-group/ntp + acct-user/ntp +" +DEPEND="${CDEPEND} + >=app-text/asciidoc-8.6.8 + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + sys-devel/bison + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch" + "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-1.2.0-move-newfstatat.patch" +) + +WAF_BINARY="${S}/waf" + +src_prepare() { + default + # Remove autostripping of binaries + sed -i -e '/Strip binaries/d' wscript || die + if ! use libbsd ; then + eapply "${FILESDIR}/${PN}-no-bsd.patch" + fi + # remove extra default pool servers + sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die + + python_copy_sources +} + +src_configure() { + is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin + + local string_127="" + local rclocks=""; + local CLOCKSTRING="" + + for refclock in ${NTPSEC_REFCLOCK[@]} ; do + if use rclock_${refclock} ; then + string_127+="$refclock," + fi + done + CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" + + local myconf=( + --nopyc + --nopyo + --enable-pylib ext + --refclock="${CLOCKSTRING}" + --build-epoch="$(date +%s)" + $(use doc || echo "--disable-doc") + $(use early && echo "--enable-early-droproot") + $(use gdb && echo "--enable-debug-gdb") + $(use samba && echo "--enable-mssntp") + $(use seccomp && echo "--enable-seccomp") + $(use smear && echo "--enable-leap-smear") + $(use tests && echo "--alltests") + $(use debug && echo "--enable-debug") + ) + + python_configure() { + waf-utils_src_configure "${myconf[@]}" + } + python_foreach_impl run_in_build_dir python_configure +} + +src_compile() { + unset MAKEOPTS + python_compile() { + waf-utils_src_compile + } + python_foreach_impl run_in_build_dir python_compile +} + +src_install() { + python_install() { + waf-utils_src_install + python_fix_shebang "${ED}" + } + python_foreach_impl run_in_build_dir python_install + python_foreach_impl python_optimize + + # Install heat generating scripts + use heat && dosbin "${S}"/contrib/ntpheat{,usb} + + # Install the openrc files + newinitd "${FILESDIR}"/ntpd.rc-r2 ntp + newconfd "${FILESDIR}"/ntpd.confd ntp + + # Install the systemd unit file + systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service + + # Prepare a directory for the ntp.drift file + mkdir -pv "${ED}"/var/lib/ntp + chown ntp:ntp "${ED}"/var/lib/ntp + chmod 770 "${ED}"/var/lib/ntp + keepdir /var/lib/ntp + + # Install a log rotate script + mkdir -pv "${ED}"/etc/logrotate.d + cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd + + # Install the configuration file and sample configuration + cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf + cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ + + # move doc files to /usr/share/doc/"${P}" + use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html +} + +pkg_postinst() { + einfo "If you want to serve time on your local network, then" + einfo "you should disable all the ref_clocks unless you have" + einfo "one and can get stable time from it. Feel free to try" + einfo "it but PPS probably won't work unless you have a UART" + einfo "GPS that actually provides PPS messages." +} diff --git a/net-misc/ntpsec/ntpsec-1.2.0.ebuild b/net-misc/ntpsec/ntpsec-1.2.0.ebuild deleted file mode 100644 index a5193f995902..000000000000 --- a/net-misc/ntpsec/ntpsec-1.2.0.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='threads(+)' - -inherit flag-o-matic python-r1 waf-utils systemd - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" -else - SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" - RESTRICT="mirror" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="The NTP reference implementation, refactored" -HOMEPAGE="https://www.ntpsec.org/" - -NTPSEC_REFCLOCK=( - oncore trimble truetime gpsd jjy generic spectracom - shm pps hpgps zyfer arbiter nmea neoclock modem - local) - -IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} - -LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" -SLOT="0" -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice -REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" - -# net-misc/pps-tools oncore,pps -CDEPEND="${PYTHON_DEPS} - sys-libs/libcap - dev-python/psutil[${PYTHON_USEDEP}] - libbsd? ( dev-libs/libbsd:0= ) - dev-libs/openssl:0= - seccomp? ( sys-libs/libseccomp ) -" -RDEPEND="${CDEPEND} - ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) - !net-misc/ntp - !net-misc/openntpd - acct-group/ntp - acct-user/ntp -" -DEPEND="${CDEPEND} - >=app-text/asciidoc-8.6.8 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - sys-devel/bison - rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch" - "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" -) - -WAF_BINARY="${S}/waf" - -src_prepare() { - default - # Remove autostripping of binaries - sed -i -e '/Strip binaries/d' wscript - if ! use libbsd ; then - epatch "${FILESDIR}/${PN}-no-bsd.patch" - fi - # remove extra default pool servers - sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf - python_copy_sources -} - -src_configure() { - is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin - - local string_127="" - local rclocks=""; - local CLOCKSTRING="" - - for refclock in ${NTPSEC_REFCLOCK[@]} ; do - if use rclock_${refclock} ; then - string_127+="$refclock," - fi - done - CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" - - local myconf=( - --nopyc - --nopyo - --enable-pylib ext - --refclock="${CLOCKSTRING}" - --build-epoch="$(date +%s)" - $(use doc || echo "--disable-doc") - $(use early && echo "--enable-early-droproot") - $(use gdb && echo "--enable-debug-gdb") - $(use samba && echo "--enable-mssntp") - $(use seccomp && echo "--enable-seccomp") - $(use smear && echo "--enable-leap-smear") - $(use tests && echo "--alltests") - $(use debug && echo "--enable-debug") - ) - - python_configure() { - waf-utils_src_configure "${myconf[@]}" - } - python_foreach_impl run_in_build_dir python_configure -} - -src_compile() { - unset MAKEOPTS - python_compile() { - waf-utils_src_compile - } - python_foreach_impl run_in_build_dir python_compile -} - -src_install() { - python_install() { - waf-utils_src_install - } - python_foreach_impl run_in_build_dir python_install - python_foreach_impl python_optimize - - # Install heat generating scripts - use heat && dosbin "${S}"/contrib/ntpheat{,usb} - - # Install the openrc files - newinitd "${FILESDIR}"/ntpd.rc-r2 ntp - newconfd "${FILESDIR}"/ntpd.confd ntp - - # Install the systemd unit file - systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service - - # Prepare a directory for the ntp.drift file - mkdir -pv "${ED}"/var/lib/ntp - chown ntp:ntp "${ED}"/var/lib/ntp - chmod 770 "${ED}"/var/lib/ntp - keepdir /var/lib/ntp - - # Install a log rotate script - mkdir -pv "${ED}"/etc/logrotate.d - cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd - - # Install the configuration file and sample configuration - cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf - cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ - - # move doc files to /usr/share/doc/"${P}" - use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html -} - -pkg_postinst() { - einfo "If you want to serve time on your local network, then" - einfo "you should disable all the ref_clocks unless you have" - einfo "one and can get stable time from it. Feel free to try" - einfo "it but PPS probably won't work unless you have a UART" - einfo "GPS that actually provides PPS messages." -} diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index 05e06f346200..361635d422b3 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -61,9 +61,9 @@ WAF_BINARY="${S}/waf" src_prepare() { default # Remove autostripping of binaries - sed -i -e '/Strip binaries/d' wscript + sed -i -e '/Strip binaries/d' wscript || die if ! use libbsd ; then - epatch "${FILESDIR}/${PN}-no-bsd.patch" + eapply "${FILESDIR}/${PN}-no-bsd.patch" fi python_copy_sources } diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index 1964d59d3ae6..7f96cb230c4b 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -1,5 +1,6 @@ +AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3 DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211 EBUILD nx-3.5.99.25.ebuild 3399 BLAKE2B 8374b0636f45bbce371c9d2c08f0f87b25f85248a216ca3f7213b5a663952407237e8647e4099ba749efc5f114550ef05106ca18a5e502aad8ed7eb3c8233ef0 SHA512 f14f778992a7d4bc75656a99de471505703305f4d1ec66c11ec4694821d5d8f2746aa4a84ec1f9ffd522db230669a67df9dff43d6b16f90b0d2bf0baee55aade -EBUILD nx-3.5.99.26.ebuild 3401 BLAKE2B 3f2c31ca5f62445775437c11f2cf653fe8798b347b692c48fc068819717c28b2d71e10ecf001b902d04fa0302a33755c89f7237d642ba4074915c02418b8d6fc SHA512 02e60d8f07e1a23f520cb629e80947e6911ba9f7db906b1ff10f354aaa263b326d7648819a0e033777ce7e7a41cf7dfa5b8d339f0c2b589a20476339066be4ff +EBUILD nx-3.5.99.26.ebuild 3520 BLAKE2B 1ae7719c98dddc863f54152c08936ebf27c23cb0b74b77cbc06ee47ea7ea2d0e2c11edefe4beac15a8cdf84d0c27a8e89237387b917b18fa16c0e13503142745 SHA512 44eb366461b831386e5a8869f9a2443a8d207f54fe087c93bbe75a79a9e7b721171773f63ff53889575473337374eb09edca710e0547330ab7896438980d2b7b MISC metadata.xml 332 BLAKE2B 93930f64047301f8a393899de54a0d9294c7c17385b47fec5a2e402b2904bc88ae697e5b075e1defd723d8d251fd424e790e9b37b94bc48b10b395307e3830fd SHA512 005c90731093f7fc354297e981140415e33785492a1a835a5a5b8b68506d690679d6430ff0b05f6e3ce2ac763ea13cd68a599581a6037f16ac1974e6ad9d54a4 diff --git a/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch b/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch new file mode 100644 index 000000000000..ec2925da9790 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch @@ -0,0 +1,42 @@ +From d35eba919c229cecf3c52a7dd034b9cd6b120ede Mon Sep 17 00:00:00 2001 +From: ponce +Date: Mon, 5 Apr 2021 08:44:00 +0200 +Subject: [PATCH] fix building with binutils >= 2.36. + +The l option of ar in the newer binutils versions switched +from being unused to being used to specify dependencies +so here should be safely removed +--- + nx-X11/config/cf/Imake.tmpl | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl +index 25d985d75f..de1fca937e 100644 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -1015,25 +1015,13 @@ TCLIBDIR = TclLibDir + #define ArCmdBase ar + #endif + #ifndef ArCmd +-#if HasLargeTmp || SystemV4 + #define ArCmd ArCmdBase cq +-#else +-#define ArCmd ArCmdBase clq +-#endif + #endif + #ifndef ArAddCmd +-#if HasLargeTmp || SystemV4 + #define ArAddCmd ArCmdBase ru +-#else +-#define ArAddCmd ArCmdBase rul +-#endif + #endif + #ifndef ArExtCmd +-#if HasLargeTmp || SystemV4 + #define ArExtCmd ArCmdBase x +-#else +-#define ArExtCmd ArCmdBase xl +-#endif + #endif + #ifndef BootstrapCFlags + #define BootstrapCFlags /**/ diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild index 428f571e7e72..17d9b3f5472c 100644 --- a/net-misc/nx/nx-3.5.99.26.ebuild +++ b/net-misc/nx/nx-3.5.99.26.ebuild @@ -43,6 +43,11 @@ BDEPEND=" S="${WORKDIR}/nx-libs-${PV}" +PATCHES=( + # https://github.com/ArcticaProject/nx-libs/pull/1012 + "${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch" +) + src_prepare() { default diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest index bc12e2937132..834a7a6db7a2 100644 --- a/net-misc/nxplayer/Manifest +++ b/net-misc/nxplayer/Manifest @@ -1,4 +1,4 @@ DIST nomachine-enterprise-client_5.1.24_1_i686.tar.gz 28378074 BLAKE2B a377dca915d6955d10d517754675a85a674e12088c1205adc6b99cc86685ec3551221cdd897f51f7f9da519388f9bd214c9828e530555202e1dd7506f1a02f42 SHA512 9ac3ee63a2c9dd7d6a110924a92718c7a9738e5bfbc7a3a30b2060a64c5eaeab3597e0d0532890e0e463869e47781528b6c7006d96634bf819cdd2415e35015c DIST nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz 29381273 BLAKE2B 491224421978a687a65a440ac069dfdef23cb8802872d51b1d2ae2e729696d85f082cfb6faf04e5dabf1bacb05849423003424738c755c1e043292d7b678d2f6 SHA512 18bbba7d729fd1ade04ad2d4812bd4b1bbe806036b44cbb8f9648e8bfa32008d72bc85d380fe1fc352ce92de50104fc43da030d56349502ac46a7ed6fa6afc42 -EBUILD nxplayer-5.1.24.1.ebuild 1075 BLAKE2B d4a0e827478a0d1be055e79724801cd5d3b779f04e727db79fb0434c609eaaf4a7cb78d65ccf0fd0c7c244e6ad7a57b9de68acfe3d4fcbba9ba5a4ff8bb4db44 SHA512 0a2defd467a465d57ddcf7aace9089997a236fe5a8a46e8733073532bd534f55ace6b8712ac78b52318fc5a05dd19a5fc4f83ca27475aeb4f4c0f073eb1f7a97 +EBUILD nxplayer-5.1.24.1.ebuild 1063 BLAKE2B 66dee5b3364c57df17042793998ca1137854288116247d0bba06f6aaa89bba56a966524799ed31b47192671794fd7f5954834dbb3a06cc00bfd7320e3023c6fe SHA512 1286d746464e0eab5868c05dd62987c026756fab4c41037187175b8ddf6a48c4681bcee2b56766e789d31556834036349b9dea5f1a706b3722815cb0edaca19b MISC metadata.xml 665 BLAKE2B 273027a6bd397147d76478c2822ab78a6fdd381074e34af1d410b68fbcbb12d0ca65b3f4ccbac09c7b9582630cd4345724b1b669eed16d1e94ba567d99344472 SHA512 7c07aeac4fd7ef22c8ffbb383715c0cc56643345a789cf01f9f436db667ae1ee06a3261f81137101cbdd1275ea8f3b09c440cf10e4b1b88f09e1e1a8be5db6f0 diff --git a/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild b/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild index 67c1b6331100..ea546bdea493 100644 --- a/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild +++ b/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils versionator + +inherit versionator wrapper MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)" @@ -10,30 +11,29 @@ DESCRIPTION="Client for NoMachine remote servers" HOMEPAGE="https://www.nomachine.com" SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )" +S="${WORKDIR}"/NX/etc/NX/player/packages + LICENSE="nomachine" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" RESTRICT="strip" -DEPEND="" -RDEPEND="dev-libs/glib:2 - dev-libs/openssl:0" - -S=${WORKDIR}/NX/etc/NX/player/packages +RDEPEND=" + dev-libs/glib:2 + dev-libs/openssl:0 +" QA_PREBUILT="*" -src_install() -{ +src_install() { local NXROOT=/opt/NX -# dodir /etc/NX/localhost -# echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg + #dodir /etc/NX/localhost + #echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg dodir /opt - tar xozf nxclient.tar.gz -C "${D}"/opt - tar xozf nxplayer.tar.gz -C "${D}"/opt + tar xozf nxclient.tar.gz -C "${ED}"/opt + tar xozf nxplayer.tar.gz -C "${ED}"/opt make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin } diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest index 4d962c75421a..9fa772ae6e05 100644 --- a/net-misc/ofono/Manifest +++ b/net-misc/ofono/Manifest @@ -1,4 +1,4 @@ AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241e40e88fdb92c15560f9a8744922fea9cf83114a242315de910fe849918e9e26f7b8ce63831ad SHA512 ef86f8e4d3b30d98eee5849c85fd8fd1bed0d8ac9c76bcce91440483439dbaea36e1ff3529fe8f5c1b0255a91917ab67d98513cafcae8f0031cce1bf3f133704 DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20 -EBUILD ofono-1.31.ebuild 1635 BLAKE2B 76c8b68bd663de2e0ef75eb111fd931a709c638dcd759c826dd3ecbc911873dc0efd9e6fc8845bf600ca83b7897764db938d3abab27c4036cac54b775f17bcbe SHA512 8618347d9b2609698ed832dd8428c14c498e66a747a0987a087044d8bee3b407113e381639ebf62d6f3828bb91f47d0a9c70bf773b91c1c2e9d7231f66256e93 +EBUILD ofono-1.31.ebuild 1628 BLAKE2B d7491054ed9c177b4c44620e2684d73fa0b17b301613e32a4ffbb193688f26be2f712dfab3e2f2b502e3bced6d8f7e4a5e1bc348e2cc2b1736bde68f92626770 SHA512 2520ddc1954adeb4b8602dac8df8ade38e0363c917c0633119ce069337ac0c1d11961490a8e9a64d13adb02e2442a78d5a38b8230aa94e36e2d8c35ec84a9173 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-1.31.ebuild index 444df24a6f59..58649d94fcc9 100644 --- a/net-misc/ofono/ofono-1.31.ebuild +++ b/net-misc/ofono/ofono-1.31.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils multilib systemd +inherit systemd DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon" HOMEPAGE="https://01.org/ofono" @@ -23,8 +23,8 @@ RDEPEND=">=sys-apps/dbus-1.4 udev? ( virtual/udev ) examples? ( dev-python/dbus-python ) tools? ( virtual/libusb:1 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( ChangeLog AUTHORS ) diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index 51fb34c6d1ff..ce6cf4d353a1 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -1,11 +1,6 @@ -AUX oidc-agent-3.3.1_desktop-category.patch 270 BLAKE2B ab841626749f19ecfb6f27d79224a2954633e623f306d66698d6f2d9a53047a29411c12bf572d76e273315a8d99b0f2b664604e6b0aa60efe43f74ff68261d60 SHA512 249d1a50da20e4bc37eb1c8d894bd87dc7f165b85af340ee862c72a926db521819796540fe95bb58c8494c2c8bc13ffd1c8a864ec455b81f878e9cc079872cdb -AUX oidc-agent-3.3.1_install-perms.patch 1773 BLAKE2B 8fad809127230af52849da4d496cb71a26efbd8529c67c631eeb153472c60f83a96d46e12bd263d3582c8a5c4f4bbd9841a37b3d5e750f7b24c5a205d8b6aa63 SHA512 94631b5c13d9d41dd9377740e4559f65175e6f6438d2cd108a7d3e445005443791b18cd2926e2e925a4774e6d51d1288f665461c12cc390ee60300c192972d3b -AUX oidc-agent-3.3.5_makefile-toolchain-vars.patch 1342 BLAKE2B 4d2db2bc1711bcc99b4c7c98677836f80a9fabfb824e33c4affa70eda95188e22f32fc787bbd487d5a4462fce2333119ea5d6208c56acf638c5782f2d1b509f2 SHA512 4775a28c5e29b431238b712b7baa98501be3a3b5c46fcdcfae008665374539cd5192f0af81feeb1c5822d7d46378dd66d0650a0f2cf091d4801493a6a34ac2b4 AUX oidc-agent-4.0.2_install-perms.patch 1931 BLAKE2B 9061a41dc805f98c4813f967f2e0280ed519c143551c9232bd1a3786f6e4569407744d3821845b5245751fb6bd91462d45fa6f12dcae92fcac1abd6fb5bf2f51 SHA512 f924f3e3bbcb0e427036fb2c13e9272641b340d829d19389c072faef5da6381f1470858033c78bc356bbba75b622bc0283cc4e1fba3255f80788b2d09fab5106 AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb AUX oidc-agent-4.0.2_makefile-toolchain-vars.patch 1214 BLAKE2B 2e2c78973049160a9b6210d2180bb851c11a31ce90c8c1af5f05b0d86cd7cdce572c564c4117ec23f286c72a4d701b52ec815f6f30e68c58353fe5394bd210e6 SHA512 22c561c057be1de9ba1747a0234225954ec953f2bdecb0cc05149891e6fc43fede14808dbf59e9e27e5e5e8041d22b16ba4d46e366bd5b96a2b567b2d26a0f8d -DIST oidc-agent-3.3.5.tar.gz 766803 BLAKE2B 4998820283d38e3cee76ab7c308075b74da735f6b2c05ed562c5d61006c5ba85f1c44d7e2c0bfb5e4ee60017835ecf331f8b82a45aa5d0105b7933eeec1025a0 SHA512 c58d9e61a99bf870ce4be0e4fde3faa90b8197d0714626412d162c2e09cca18df734a062b792f7fc92323b50677c64df4aeda5ee42a5ea4e44731ad0e15c8030 DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037 -EBUILD oidc-agent-3.3.5-r1.ebuild 1547 BLAKE2B 1baf0c63e4d2e54cd6c8ac1e311e81e3c04af5b27eb8fa9314ec1dba507f567b0407f07d7d3517487943f0de080f240cc84d05ae1a811cffee38f4c241df3372 SHA512 51a4f0bd8f8263bc1589cd56bdda73eb7f2232c309127dbcdc934aaf1a2c74b78c161b94ada715f91f66c2369e02f91a36ca2b37a73fec29f2f8441ec9def9a1 -EBUILD oidc-agent-4.0.2.ebuild 2137 BLAKE2B 2ee40466f628bb06d914923badd5e7d8995ea12e56276be89fbaebcd694838ca01467d0b29cca6a737aafbbf4ac8c6f2407f8b8bfaedad8134d0c551fd6fe7db SHA512 86be93a4c41c0007ecf56f9f70015e6a461e3fa106277fdf0c9c5f792881c0bf75fcb4871719323e5b5852fb2eb76312e97be58dfc4907814c4d53eb1f6f4c92 +EBUILD oidc-agent-4.0.2.ebuild 2123 BLAKE2B b6e3857511ef297bfc0b677df0b6ab343bd57c6c55ead807129e59930888f93074872359da9cbe46ce40b163ad36c50000b2df67e315aa19a815ea69abe277db SHA512 af0a22e5cca7196203c74a6edca8167ecd4b60011b52cf075a27f8bb90a91424b85613799a6401d5410e2bed8b3f5a42e122d3b97851892392ef717667af8600 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776 diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch deleted file mode 100644 index 49bfcfdb70b3..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/config/scheme_handler/oidc-gen.desktop -+++ b/config/scheme_handler/oidc-gen.desktop -@@ -5,5 +5,5 @@ - Icon=utilities-terminal - Terminal=true - Type=Application --Categories=Application;Network; -+Categories=Network; - MimeType=x-scheme-handler/edu.kit.data.oidc-agent; diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch deleted file mode 100644 index 1992ee0ef31f..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -316,7 +316,7 @@ - - ## Bash completion - $(BASH_COMPLETION_PATH)/$(AGENT): $(CONFDIR)/bash-completion/oidc-agent $(BASH_COMPLETION_PATH) -- @install -m 744 $< $@ -+ @install -m 644 $< $@ - - $(BASH_COMPLETION_PATH)/$(GEN): $(BASH_COMPLETION_PATH) - @ln -s $(AGENT) $@ -@@ -332,15 +332,15 @@ - - ## Man pages - $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - - - ## Lib -@@ -354,20 +354,20 @@ - @ln -sf $(SHARED_LIB_NAME_SO) $@ - - $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/api.h $(INCLUDE_PATH)/oidc-agent -- @install $< $@ -+ @install -m 644 $< $@ - - $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent -- @install $< $@ -+ @install -m 644 $< $@ - - $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent -- @install $< $@ -+ @install -m 644 $< $@ - - $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) -- @install $< $@ -+ @install -m 644 $< $@ - - ## scheme handler - $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop -- @install -D $< $@ -+ @install -m 644 -D $< $@ - @echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@ - - ## Xsession diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch deleted file mode 100644 index b9d526a2122e..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch +++ /dev/null @@ -1,48 +0,0 @@ -1. Support user-provided values of CC, CFLAGS and LDFLAGS -2. Do not force the use of a static version of libsodium - ---- a/Makefile -+++ b/Makefile -@@ -54,20 +54,20 @@ - endif - - # Compiler options --CC = gcc -+CC := $(CC) - # compiling flags here --CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common -+CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common - ifndef MAC_OS - CFLAGS += $(shell pkg-config --cflags libsecret-1) - endif - TEST_CFLAGS = $(CFLAGS) -I. - - # Linker options --LINKER = gcc -+LINKER := $(CC) - ifdef MAC_OS - LFLAGS = -lsodium -largp - else --LFLAGS = -l:libsodium.a -lseccomp -fno-common -+LFLAGS := $(LDFLAGS) -lsodium -lseccomp -fno-common - endif - ifdef HAS_CJSON - LFLAGS += -lcjson -@@ -81,7 +81,7 @@ - ifdef MAC_OS - CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION) - else --CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp -+CLIENT_LFLAGS = $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp - endif - ifdef HAS_CJSON - CLIENT_LFLAGS += -lcjson -@@ -478,7 +478,7 @@ - ifdef MAC_OS - @gcc -dynamiclib -fpic -Wl, -o $@ $(PIC_OBJECTS) -lc - else -- @gcc -shared -fpic -Wl,-soname,$(SONAME) -o $@ $(PIC_OBJECTS) -lc -+ @$(LINKER) -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ $(PIC_OBJECTS) -lc - endif - - .PHONY: shared_lib diff --git a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild deleted file mode 100644 index 1a5486a56b56..000000000000 --- a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic xdg-utils - -DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" -HOMEPAGE="https://github.com/indigo-dc/oidc-agent" -SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -DEPEND="app-crypt/libsecret - dev-libs/libsodium - net-libs/libmicrohttpd - sys-libs/libseccomp" -RDEPEND="${DEPEND}" -BDEPEND="test? ( dev-libs/check )" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.3.1_desktop-category.patch - "${FILESDIR}"/${PN}-3.3.1_install-perms.patch - "${FILESDIR}"/${PN}-3.3.5_makefile-toolchain-vars.patch -) - -src_compile() { - # Parallel building doesn't work - emake -j1 -} - -src_install() { - emake \ - PREFIX="${ED}" \ - BIN_AFTER_INST_PATH="/usr" \ - INCLUDE_PATH="${ED}"/usr/include \ - LIB_PATH="${ED}"/usr/$(get_libdir) \ - install - - # This file is not compatible with Gentoo and in any case, we generally - # let the users load such agents themselves. - rm -f "${ED}"/etc/X11/Xsession.d/91${PN} -} - -pkg_postinst() { - xdg_desktop_database_update - - elog - elog "You should use oidc-gen to initially generate your account configuration" - elog "before it can be loaded into oidc-agent using oidc-add. For details, please" - elog "consult the man page of oidc-gen, or full documentation at" - elog " https://indigo-dc.gitbooks.io/oidc-agent/" - elog -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild index 88d48a54d23d..31efe94451d4 100644 --- a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild +++ b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic xdg-utils +inherit xdg-utils DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" HOMEPAGE="https://github.com/indigo-dc/oidc-agent" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="test" DEPEND="app-crypt/libsecret diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest index 1abda5708623..e13c6495fa55 100644 --- a/net-misc/olsrd/Manifest +++ b/net-misc/olsrd/Manifest @@ -3,6 +3,6 @@ AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625 AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88 DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c -EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68 -EBUILD olsrd-0.9.8.ebuild 2385 BLAKE2B 80f609c1c1a297231670e734a42bb941ff5ea70f45daca826a1c1aa6cae83b9c4665ce491c7a828489425371f13e10d21f09036dd9ed75f02b14b52712b63de5 SHA512 9895cd6623c23fd5213e761803d7974681ddda924a91f9027cd8fd3ccc250764fc1d37e1da26ff4c897a689c1cde798649506ab67c66d8346fcefd30e8d542fa +EBUILD olsrd-0.9.6.1.ebuild 2243 BLAKE2B c8c1227e9cb3c445c59c37bc88f567fe0d6f931fa02c3972c9eb0288eec57eb797877d411706c01ac7782ceee55f7b8143186af0d1fff028712e668b18b39e05 SHA512 f28e2701e44d7e6b6e9a5ab1044d337a1c9a456d6c35e85986e7fec9a2df9143d2a18b27c7f3a275d42cbcb78ad6a0894c212f42415bf3b041009e2f0792ec48 +EBUILD olsrd-0.9.8.ebuild 2411 BLAKE2B 0cda86cfb22e55060a58fc5e73e73997c4db95525eb12bcc12df80587f8c5d61b74bd32c51f2869a8aaa28f9b60e96441775bf40c5b2e13343df92bd74b9af59 SHA512 3d4cfb163509c3d2c71f51c5cf6bb2a9d11af4663856e6e5193233708747c35928d82aa03b89cfdaf299b7cc1b3858994b555bf6f1a85002bc119ac2583fb04e MISC metadata.xml 243 BLAKE2B abda82f67bcaba5ce8d982effdcacbe18ac652918f14d3da341781d95cc22f48028d82571b66208263086adcece8809ee7b1f63159250de042766cd6d87efdad SHA512 703cf9330497469fc7feca884347f9b9cba7dd2f36beaf5b9901091eedad49fbd98399f1fab759d198850cffb979df1d2ed87267679afba07dba9f1f7c752226 diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1.ebuild index 1379675e09a0..8e8f409db132 100644 --- a/net-misc/olsrd/olsrd-0.9.6.1.ebuild +++ b/net-misc/olsrd/olsrd-0.9.6.1.ebuild @@ -1,18 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils multilib toolchain-funcs versionator + +inherit toolchain-funcs versionator DESCRIPTION="An implementation of the Optimized Link State Routing protocol" HOMEPAGE="http://www.olsr.org/" SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2" -SLOT="0" LICENSE="BSD LGPL-2.1" +SLOT="0" KEYWORDS="amd64 x86" IUSE="gtk pud" + DEPEND=" + virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 @@ -23,10 +26,12 @@ DEPEND=" RDEPEND=" ${DEPEND} " + PATCHES=( "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch "${FILESDIR}"/${PN}-0.9.6-gpsd.patch ) + src_prepare() { default @@ -63,6 +68,7 @@ src_compile() { OLSRD_LDFLAGS="${LDFLAGS}" \ OS=linux \ build_all + if use gtk; then emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" fi @@ -71,6 +77,7 @@ src_compile() { src_install() { emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ DESTDIR="${D}" STRIP=true install_all + if use gtk; then emake -C gui/linux-gtk \ LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild b/net-misc/olsrd/olsrd-0.9.8.ebuild index c9d51ba3119a..bede675037e3 100644 --- a/net-misc/olsrd/olsrd-0.9.8.ebuild +++ b/net-misc/olsrd/olsrd-0.9.8.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib toolchain-funcs + +inherit toolchain-funcs DESCRIPTION="An implementation of the Optimized Link State Routing protocol" HOMEPAGE="http://www.olsr.org/" SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="BSD LGPL-2.1" +SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gtk pud" + DEPEND=" gtk? ( dev-libs/glib:2 @@ -23,10 +25,13 @@ DEPEND=" RDEPEND=" ${DEPEND} " +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch "${FILESDIR}"/${PN}-0.9.6-gpsd.patch ) + src_prepare() { default @@ -56,6 +61,7 @@ src_configure() { src_compile() { tc-export PKG_CONFIG + emake \ CC="$(tc-getCC)" \ LIBDIR="/usr/$(get_libdir)/${PN}" \ @@ -63,6 +69,7 @@ src_compile() { OS=linux \ VERBOSE=1 \ build_all + if use gtk; then emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" fi @@ -76,6 +83,7 @@ src_install() { OS=linux \ STRIP=true \ install_all + if use gtk; then emake -C gui/linux-gtk \ DESTDIR="${D}" \ diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest index e00906b55e09..575433db1856 100644 --- a/net-misc/openntpd/Manifest +++ b/net-misc/openntpd/Manifest @@ -4,7 +4,7 @@ AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f0 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50 DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c8b1548203c82603b99d2c41dce012dfb2be67828cc892559f323b764cc1711202fd85bc1d5d755b5e677406b98 SHA512 200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f -EBUILD openntpd-6.2_p3-r2.ebuild 1876 BLAKE2B 19b8f6bfaed7a095ff3401fc487877ca0badaa069b37482805e8b50053b701fa1c747894d9fb4c0b6984241f430e6aca442cbf77a2f91ca8b1ff5b7be66ec36b SHA512 8aa659e9a7ebfbd917a7facf394afb552a4eef2c7ab1f248109cfad92d4931a91bc7c38b440721751c013ea5e391b5400464d519cdd16e57eff8bb65b87eafe7 +EBUILD openntpd-6.2_p3-r2.ebuild 1877 BLAKE2B e77f154de5b7d0bab501e3cd21ed1f99d27d6e569ca6c58275768d4773de7c6dfe5e15047a64d6a8b34f45e558bd00025ea292810f9c89f265a66c060d19659e SHA512 e22eadc00edfbfdf8a5b6ea81cbe21b06284cb1d967f0d5f91cd40928f8b5da2197d4493a8b245fa2731565942fc8820c1e639f5102df735aa165ec1ef1dacd8 EBUILD openntpd-6.8_p1-r1.ebuild 1763 BLAKE2B 9225ea51bb5ebaf34d3456b474d61fc29ebcaff153d3ef8d0f1945391580b312cd260aed404cc23f0b17a5c5509d0068c335dcfb08e9a6ce6e315bec7b09db6a SHA512 8bc095b4a4ba25ed0c4cde951f4d8c47693e61a0fe982627d9db8b8d865bc1a0ec660ee0c1ea99ff2d6bbc217951538a1b06e2daf8624590163ad4ca1c8115ef EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67 MISC metadata.xml 858 BLAKE2B 230d4a788c80e5fb8b0708563dfaa867965667958eaa71e83f8ead831cab11869967fee05a81f9584b3b8f095fe8e22743e25f3ba6f6fb059a2ae654a29f19de SHA512 3257f9e2f2636ce09307052c8aca002d87b771ec4981fc111128e9a04a54e74e79b306a2dfdb52cdb9a6c3278fc820be16ae62478def533288df05600496c145 diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild index b45336a7bb4e..8f65c14883e6 100644 --- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild +++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 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 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 08b819515364..448e76c41097 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -21,10 +21,14 @@ AUX openssh-8.5_p1-hpn-15.1-sctp-glue.patch 728 BLAKE2B a9e6000b45fd228fa3623ca9 AUX openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch 11238 BLAKE2B 3d16907f7330b3e30705610c10f5b5037837442df6840231073ae8d0202543b006bf9b9597df50a3173bbb823050e9c2cb5a391ed5f96c4ac2194fb1e97316a9 SHA512 d1fea164d8431282c150a513886c428f7225eb11980bd7c9cae88754d1165ec799e1ef30b17ffa38990b6c58d9626a412abd550909e34f623f311444e097baaa AUX openssh-8.5_p1-hpn-15.2-glue.patch 3856 BLAKE2B 1661bb20e523141aae3f988f5dac664ec6f3d6517512596183c9c26d051a75b8d013e0d6e7c21aabb597b5c1a7e768c429bdef70bbfe59071f6e4cbb0956960d SHA512 0439ad0f0ab6dc21dd4279c6d252884e3c2ddaba76a207b3b26c88d8a6b8d873cc08345a1a90b8046ec79d33f47395d87e52d5b44b155a186a8aa16d316b82a9 AUX openssh-8.5_p1-hpn-15.2-sctp-glue.patch 727 BLAKE2B fafb6bc3ec680327abf01a7a2f673d4be601094d518d74f5afd0c596c1d60ddfc6f31add6b5533f85bc09cf2122b9e3f7243d5d26a2d6923c88c2f6a811ea2b8 SHA512 eda1c1613e94a7b10df9cc08c87ed8a39edb3f8a160600a74780877772bbd76cc9842d5d5d68ed6a9554e1e310675a1e461d894144d514b8e482d4a1affbc9bd +AUX openssh-8.6_p1-X509-glue-13.1.patch 2701 BLAKE2B bb1ec4018e23213117bae52c83100e47818898e06890448a82371cbd2f3f96832350c2d4fb5a7455d8d97f3ddef61cfdb106b14ed9985d741f417741dffdf328 SHA512 922d7be6671cfaeac47b28dd73e57f3f20ba10c308aa5812dec965cb0a348724a7936bbbc79a2d2987762e4fa4989f9c85963f4eddab9ca103971a61925f7c47 +AUX openssh-8.6_p1-hpn-15.2-X509-glue.patch 12374 BLAKE2B adb5327ca665f2dc89517882a78299b27dcbcffd07d304be9967900a4955464cc8fb8c5fb30124a562bc3ab98922b7ef72e7119f226e42987c0ea59ca9251b5c SHA512 b68334674c7cdb78a78af1711a822913be37a8ebaf34822d16db05e884a0b3cf576647955776df018c1e61ab9ba50ddb25f9888e0d50a9042c7942b609b34274 +AUX openssh-8.6_p1-hpn-15.2-glue.patch 4773 BLAKE2B c0db810f7c6e73b307cd9f89b9c4e8a858fde9e5fcc2f39ce02dde213d632b04edf246ec84ff69511b6e74cf4ca67395763b501cb2ddb738c20f9fa48cd4a79b SHA512 8774305853029eee9b024bc1da68134e061aa7ac1087a950e23e39160e11435b0ea9787d3490cc7f1854a9608f11abda9d271fcdce28aceb7089cfa03304e585 +AUX openssh-8.6_p1-hpn-version.patch 556 BLAKE2B 26ef960db46c82ee62e6a6f1be15c2897855caa6cbd05db87d3e606ce42d03fb6e88916f0c6644f67dc008ca802617d0f63e5e8e35d1a6c6076188ba19009186 SHA512 c13d14dc496863bd6bbbf08940322a60e74fa1cc2171f81132dfd874b9371ee0edd77f75ffd606f874fa2de498b174be91da5c641029abff2d2a8503c2f0fc02 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c -AUX sshd.service 242 BLAKE2B e77eb1e0adad0641b60a59d243e911e0a6286a87acda25f3e478582068d8a7a2a12ec88e14bf2c01c7f4c2025ce2d2ce1b1273a93c096bc96da47a69878a823e SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c +AUX sshd.service 259 BLAKE2B e65ea7227658295584c3fdee3bf46f098c1c5a53a0b433e88ae8d43f0823fade25846a5f3abbacf939a13af8195a888d0ffb937e8da943478e76eea7c0e13c82 SHA512 9656ae4c045ba47ad28f983e50d1119d51c1d0a7471fe8e792d6f734a71c8d4d900431b591f2f40bb8af3a382e6215933ae32eff56de6da0f2f166d6fb855987 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03f720205f5b611365c9a48fba445962c06c7e18bdb310cdb9ffe4fc49e95f69608922d224b00c890b SHA512 423120ea2e1ac0b92575ce4eb05347483f902238dc104848e74088f49483c37d30c27364e7fe8599b3e85562159c69284ecf25a4c5394b4cfa18c5c77c6beacd DIST openssh-8.4p1+x509-12.6.diff.gz 857479 BLAKE2B ac8c3e8c1087ca571e5459c9826903410ff2d45de60151d9bd8e59da15805b75752f8f3ffc231c9f8aaa8f2b2c07a97a8296684f885e0d14b54ff5d7bc585588 SHA512 e56516b376ecc3e5464895744ce0616cf4446a891fbd3cbcb090d5f61ebc349d74f9c01e855ccd22e574dbfeec0cb2ba7daf582983010ff991243a6371cc5fe3 @@ -34,6 +38,9 @@ DIST openssh-8.5p1+x509-13.0.1.diff.gz 997005 BLAKE2B b6cdc9ba12dc642c7073463fb8 DIST openssh-8.5p1+x509-13.0.diff.gz 996872 BLAKE2B 136937e4e65e5e73d1d1b596ae6188f359daa8e95aafd57fab8cf947b59fde573ff4e6259781d1a0fd89718d14469ca4aed01bae6f37cc16df109c673fa2c73c SHA512 2276b0ac577162f7f6a56115637636a6eaaa8b3cc06e5ef053ec06e00a7c3459efe8de8dbc5f55c9f6a192534e2f7c8c7064fcdbf56d28b628bb301c5072802c DIST openssh-8.5p1-sctp-1.2.patch.xz 7692 BLAKE2B 298bf5e2004fd864bdbb6d6f354d1fbcb7052a9caaf8e39863b840a7af8e31f87790f6aa10ae84df177d450bb34a43c4a3aa87d7472e2505d727757c016ce92b SHA512 84990f95e22c90dbc4d04d47ea88b761ff1d0101018661ff2376ac2a726b5fca43f1b5f5d926ccbe1c8d0143ac36b104616bd1a6b5dcdba4addf48a5dd196e2b DIST openssh-8.5p1.tar.gz 1779733 BLAKE2B f4e4bd39e2dd275d4811e06ca994f2239ad27c804b003c74cc26f9dffae28f1b4006fc618580f0dc9c45f0b7361c24728c23688b45f41cb8a15cf6206c3f15c3 SHA512 af9c34d89170a30fc92a63973e32c766ed4a6d254bb210e317c000d46913e78d0c60c7befe62d993d659be000b828b9d4d3832fc40df1c3d33850aaa6293846f +DIST openssh-8.6p1+x509-13.1.diff.gz 1011666 BLAKE2B 0ac0cf2ff962b8ef677c49de0bb586f375f14d8964e077c10f6a88ec15734807940ab6c0277e44ebdfde0e50c2c80103cff614a6cde4d66e9986152032eeaa90 SHA512 ae4986dd079678c7b0cfd805136ff7ac940d1049fdddeb5a7c4ea2141bfcca70463b951485fb2b113bc930f519b1b41562900ced0269f5673dbdad867f464251 +DIST openssh-8.6p1-sctp-1.2.patch.xz 7696 BLAKE2B 37f9e943a1881af05d9cf2234433711dc45ca30c60af4c0ea38a1d361df02abb491fa114f3698285f582b40b838414c1a048c4f09aa4f7ae9499adb09201d2ac SHA512 ba8c4d38a3d90854e79dc18918fffde246d7609a3f1c3a35e06c0fbe33d3688ed29b0ec33556ae37d1654e1dc2133d892613ad8d1ecbdce9aaa5b9eb10dcbb7a +DIST openssh-8.6p1.tar.gz 1786328 BLAKE2B 261a0f1a6235275894d487cce37537755c86835e3a34871462fe29bfe72b49cd9a6b6a547aea4bd554f0957e110c84458cc75a5f2560717fb04804d62228562a SHA512 9854eda0b773c64c9f1f74844ce466b2b42ee8845f58ad062b73141d617af944fa4ebafdf72069f400106d2c2bd0a69c92fe805ec1fc26d4f0faadf06c3fbbe6 DIST openssh-8_3_P1-hpn-AES-CTR-14.22.diff 29963 BLAKE2B 19b82f4ff820f52dafaa5b3f09f8a0a67f318771c1c7276b9d37e4a6412052c9c53347f880f2d78981af3830432704b9ad74b375241965326530ae23ec8d74a2 SHA512 49f2778831dc768850870a1755da9cdd7d3bc83fa87069070f5a1d357ce9bdadeb2506c8ff3c6b055708da12a70e9ede7ed0e8a29fcab441abb55c9d483663be DIST openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 42783 BLAKE2B 10940c35ae6bdc33e58bc9abd9cd7a551d4ca76a175400acb872906805bd04d384f57e81049b183d7d892ce1b5f7a138e197366369fe12e5c9dc1349850b0582 SHA512 c09162b96e0ffadc59c6076507bc843e6f8f2fb372140b84181f5fb2894225b1e05a831d85ba689c35c322b5a99302b9db77c324f978f1a46a16b185b3cb28dd DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f41bf5682a37be453c175928d3ff3df09292275e6021f6108a20c02eec9d636e85ee5a8e05b7233ada180edf1209a3dc4b139d58858 SHA512 026f65c62e4c05b69661094d41bf338df608e2a9b23ef95588062e3bd68729733dae32adab783609a6eca810ccdcbddee25e7649a534c9a283a03282f73438bb @@ -43,7 +50,8 @@ DIST openssh-8_4_P1-hpn-PeakTput-15.1.diff 2429 BLAKE2B fc2140f4036ef57b70936966 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914 -EBUILD openssh-8.4_p1-r3.ebuild 17822 BLAKE2B 33429fc7138dafc13940b6956af610fc15e4d16efd2cc8b318e510365c86c96b73de3961d8506e072ca2972a0e97fa7155af457e310c307d339f451657affbec SHA512 0d37ad65c202611424972d3cb2d5cd43bc57ef2cbf96165fae3a053c45c512c59d060430155292148702df079a60f569e508fdfdccfafc2dbb8fc4c3f2aacb86 -EBUILD openssh-8.5_p1-r1.ebuild 17658 BLAKE2B f5f2bf7ecf36afcbc5a0bdcf61a85caefa03167ab15c5c7cd2096419a11a9fdb3c4c95301554ef9549af489b189d7d1dc4ea2eee131d5cd4f6bf3c751b0a0e8c SHA512 be6c52ae3057bc0961153d3d5bbe970dfa91006ca6e287f5715c0b63b6b879967d291e3386fd12f3a57e6b8e24a09d87ae5e5712a7f9aaa5421cb2b15e2ec6c7 -EBUILD openssh-8.5_p1.ebuild 17663 BLAKE2B 1657a68574452acc6e818ac81bc8590cf6575815b3bf66c5b7c0e0ef7b805300054f937b343dc7e070ebb9b7ac0f9710b9170877f307c993a6acf1fd88cde9a4 SHA512 b0cbd250227fef206edad297ba1ec103f74a65d41499798e69d3c8e38348fe072999f70f3763bf5a5f4c6c3444daea394198d78130206e8742e6e40ff8a0fcdb +EBUILD openssh-8.4_p1-r3.ebuild 17853 BLAKE2B 4635ade3f9d4fa4536ae2a48042d8e7269ac1bc670ddc70ac836be25a142b3c8beaa3bc308d60c0545637167ab7eab1d5096c2d4f2a5f5a3186a6a05cf2ad111 SHA512 22851c8ee31ab39ee89d1c1966657a4088e76c7a17ef116ed96c1ca335092f66cc07b73fbedf00dea17b4094e0c9d1ca9a58cc17a5ecb80d7b529a632b42ae1d +EBUILD openssh-8.5_p1-r1.ebuild 17680 BLAKE2B 27c0e13c9a0c52831d99d890549210d6c1f677a65428f90de2d40eba228da512626b51f319bf6493a95b5f4fbff575c9461ff99f526b011abd5e1b1c6a70500a SHA512 16e4aea7049afbf46375fd3f9ee0e2c297bb1a5b65c241e3ccfd227f9524a92009ef6cfe61db63ef9d04a5a30eba4e284f7a105f84a9a464ce0441fb0be2c2b1 +EBUILD openssh-8.5_p1.ebuild 17693 BLAKE2B e46e53dab6bc2c7440be36b557e8a157ab24009cafaeecd97c739e3e543c342e2ae264ea4e2aa2967f8009740440bb267dac96cde5daeb4b2644809afa1100be SHA512 905797f57e5df4d742a2280e502380414da9c0bf05cad789d929b764d27087aa31c07bf7fe8c5885992b1d17ba12859876d6b82188a6ef27f2a3f22fcf67a2ef +EBUILD openssh-8.6_p1-r1.ebuild 17758 BLAKE2B dd0cfd40ddb0021c3abd6c8a3df4a08e22f1fe25658487788614200c000d72c411305d673e0b859b3570206dbec4beb6f1603873963292c3df636d4a45a4fcac SHA512 087477d6203e28cf084708a61ef362acc5a9f407e3bec0574c7da91fa8fba79dea7be70b1973a1d90b18000ec62387340e17d49c8612b1444964e765c17425fd MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f diff --git a/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.1.patch b/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.1.patch new file mode 100644 index 000000000000..e23063b5db2e --- /dev/null +++ b/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.1.patch @@ -0,0 +1,72 @@ +--- a/openssh-8.6p1+x509-13.1.diff 2021-04-23 14:46:58.184683047 -0700 ++++ b/openssh-8.6p1+x509-13.1.diff 2021-04-23 15:00:08.455087549 -0700 +@@ -47728,12 +47728,11 @@ + + install-files: + $(MKDIR_P) $(DESTDIR)$(bindir) +-@@ -389,6 +366,8 @@ ++@@ -389,6 +366,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) +@@ -65001,7 +65000,7 @@ + - echo "putty interop tests not enabled" + - exit 0 + -fi +-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } +++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } + + for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do + verbose "$tid: cipher $c" +@@ -65016,7 +65015,7 @@ + - echo "putty interop tests not enabled" + - exit 0 + -fi +-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } +++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } + + for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do + verbose "$tid: kex $k" +@@ -65031,7 +65030,7 @@ + - echo "putty interop tests not enabled" + - exit 0 + -fi +-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } +++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } + + if [ "`${SSH} -Q compression`" = "none" ]; then + comp="0" +@@ -65163,9 +65162,9 @@ + + +# cross-project configuration + +if test "$sshd_type" = "pkix" ; then +-+ unset_arg='' +++ unset_arg= + +else +-+ unset_arg=none +++ unset_arg= + +fi + + + cat > $OBJ/sshd_config.i << _EOF +@@ -124084,16 +124083,6 @@ + +int asnmprintf(char **, size_t, int *, const char *, ...) + __attribute__((format(printf, 4, 5))); + void msetlocale(void); +-diff -ruN openssh-8.6p1/version.h openssh-8.6p1+x509-13.1/version.h +---- openssh-8.6p1/version.h 2021-04-16 06:55:25.000000000 +0300 +-+++ openssh-8.6p1+x509-13.1/version.h 2021-04-21 21:07:00.000000000 +0300 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_8.6" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-8.6p1/version.m4 openssh-8.6p1+x509-13.1/version.m4 + --- openssh-8.6p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-8.6p1+x509-13.1/version.m4 2021-04-21 21:07:00.000000000 +0300 diff --git a/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-X509-glue.patch b/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-X509-glue.patch new file mode 100644 index 000000000000..714dffc41712 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-X509-glue.patch @@ -0,0 +1,357 @@ +diff -ur a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff +--- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-04-23 15:31:47.247434467 -0700 ++++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-04-23 15:32:29.807508606 -0700 +@@ -3,9 +3,9 @@ + --- a/Makefile.in + +++ b/Makefile.in + @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@ +- CFLAGS_NOPIE=@CFLAGS_NOPIE@ +- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ +- PICFLAG=@PICFLAG@ ++ LD=@LD@ ++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA) ++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ + -LIBS=@LIBS@ + +LIBS=@LIBS@ -lpthread + K5LIBS=@K5LIBS@ +@@ -803,8 +803,8 @@ + ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) + { + struct session_state *state; +-- const struct sshcipher *none = cipher_by_name("none"); +-+ struct sshcipher *none = cipher_by_name("none"); ++- const struct sshcipher *none = cipher_none(); +++ struct sshcipher *none = cipher_none(); + int r; + + if (none == NULL) { +@@ -898,20 +898,20 @@ + options->fingerprint_hash = -1; + options->update_hostkeys = -1; + + options->disable_multithreaded = -1; +- options->hostbased_accepted_algos = NULL; +- options->pubkey_accepted_algos = NULL; +- options->known_hosts_command = NULL; ++ } ++ ++ /* + @@ -2467,6 +2474,10 @@ fill_default_options(Options * options) ++ options->update_hostkeys = 0; + if (options->sk_provider == NULL) + options->sk_provider = xstrdup("$SSH_SK_PROVIDER"); +- #endif + + if (options->update_hostkeys == -1) + + options->update_hostkeys = 0; + + if (options->disable_multithreaded == -1) + + options->disable_multithreaded = 0; + +- /* Expand KEX name lists */ +- all_cipher = cipher_alg_list(',', 0); ++ /* expand KEX and etc. name lists */ ++ { char *all; + diff --git a/readconf.h b/readconf.h + index 2fba866e..7f8f0227 100644 + --- a/readconf.h +@@ -950,9 +950,9 @@ + /* Portable-specific options */ + sUsePAM, + + sDisableMTAES, +- /* Standard Options */ +- sPort, sHostKeyFile, sLoginGraceTime, +- sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose, ++ /* X.509 Standard Options */ ++ sHostbasedAlgorithms, ++ sPubkeyAlgorithms, + @@ -662,6 +666,7 @@ static struct { + { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, + { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, +diff -ur a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff +--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-04-23 15:31:47.247434467 -0700 ++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-04-23 15:46:32.296026606 -0700 +@@ -157,6 +157,36 @@ + + Allan Jude provided the code for the NoneMac and buffer normalization. + + This work was financed, in part, by Cisco System, Inc., the National + + Library of Medicine, and the National Science Foundation. ++diff --git a/auth2.c b/auth2.c ++--- a/auth2.c 2021-03-15 19:30:45.404060786 -0700 +++++ b/auth2.c 2021-03-15 19:37:22.078476597 -0700 ++@@ -229,16 +229,17 @@ ++ double delay; ++ ++ digest_alg = ssh_digest_maxbytes(); ++- len = ssh_digest_bytes(digest_alg); ++- hash = xmalloc(len); +++ if (len = ssh_digest_bytes(digest_alg) > 0) { +++ hash = xmalloc(len); ++ ++- (void)snprintf(b, sizeof b, "%llu%s", ++- (unsigned long long)options.timing_secret, user); ++- if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) ++- fatal_f("ssh_digest_memory"); ++- /* 0-4.2 ms of delay */ ++- delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; ++- freezero(hash, len); +++ (void)snprintf(b, sizeof b, "%llu%s", +++ (unsigned long long)options.timing_secret, user); +++ if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) +++ fatal_f("ssh_digest_memory"); +++ /* 0-4.2 ms of delay */ +++ delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; +++ freezero(hash, len); +++ } ++ debug3_f("user specific delay %0.3lfms", delay/1000); ++ return MIN_FAIL_DELAY_SECONDS + delay; ++ } + diff --git a/channels.c b/channels.c + index b60d56c4..0e363c15 100644 + --- a/channels.c +@@ -209,14 +239,14 @@ + static void + channel_pre_open(struct ssh *ssh, Channel *c, + fd_set *readset, fd_set *writeset) +-@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c) ++@@ -2164,21 +2191,31 @@ channel_check_window(struct ssh *ssh, Channel *c) + + if (c->type == SSH_CHANNEL_OPEN && + !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) && + - ((c->local_window_max - c->local_window > + - c->local_maxpacket*3) || +-+ ((ssh_packet_is_interactive(ssh) && +-+ c->local_window_max - c->local_window > c->local_maxpacket*3) || +++ ((ssh_packet_is_interactive(ssh) && +++ c->local_window_max - c->local_window > c->local_maxpacket*3) || + c->local_window < c->local_window_max/2) && + c->local_consumed > 0) { + + u_int addition = 0; +@@ -235,9 +265,8 @@ + (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || + - (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 || + + (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 || +- (r = sshpkt_send(ssh)) != 0) { +- fatal_fr(r, "channel %i", c->self); +- } ++ (r = sshpkt_send(ssh)) != 0) ++ fatal_fr(r, "channel %d", c->self); + - debug2("channel %d: window %d sent adjust %d", c->self, + - c->local_window, c->local_consumed); + - c->local_window += c->local_consumed; +@@ -386,21 +415,45 @@ + index 69befa96..90b5f338 100644 + --- a/compat.c + +++ b/compat.c +-@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version) +- debug_f("match: %s pat %s compat 0x%08x", ++@@ -43,7 +43,7 @@ compat_datafellows(const char *version) ++ static u_int ++ compat_datafellows(const char *version) ++ { ++- int i; +++ int i, bugs = 0; ++ static struct { ++ char *pat; ++ int bugs; ++@@ -147,11 +147,26 @@ ++ if (match_pattern_list(version, check[i].pat, 0) == 1) { ++ debug("match: %s pat %s compat 0x%08x", + version, check[i].pat, check[i].bugs); +- ssh->compat = check[i].bugs; + + /* Check to see if the remote side is OpenSSH and not HPN */ +-+ /* TODO: need to use new method to test for this */ + + if (strstr(version, "OpenSSH") != NULL) { + + if (strstr(version, "hpn") == NULL) { +-+ ssh->compat |= SSH_BUG_LARGEWINDOW; +++ bugs |= SSH_BUG_LARGEWINDOW; + + debug("Remote is NON-HPN aware"); + + } + + } +- return; ++- return check[i].bugs; +++ bugs |= check[i].bugs; + } + } ++- debug("no match: %s", version); ++- return 0; +++ /* Check to see if the remote side is OpenSSH and not HPN */ +++ if (strstr(version, "OpenSSH") != NULL) { +++ if (strstr(version, "hpn") == NULL) { +++ bugs |= SSH_BUG_LARGEWINDOW; +++ debug("Remote is NON-HPN aware"); +++ } +++ } +++ if (bugs == 0) +++ debug("no match: %s", version); +++ return bugs; ++ } ++ ++ char * + diff --git a/compat.h b/compat.h + index c197fafc..ea2e17a7 100644 + --- a/compat.h +@@ -459,7 +512,7 @@ + @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh) + int nenc, nmac, ncomp; + u_int mode, ctos, need, dh_need, authlen; +- int r, first_kex_follows; ++ int r, first_kex_follows = 0; + + int auth_flag = 0; + + + + auth_flag = packet_authentication_state(ssh); +@@ -553,7 +606,7 @@ + #define MAX_PACKETS (1U<<31) + static int + ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) +-@@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) ++@@ -1317,7 +1336,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) + struct session_state *state = ssh->state; + int len, r, ms_remain; + fd_set *setp; +@@ -1035,19 +1088,6 @@ + + /* Minimum amount of data to read at a time */ + #define MIN_READ_SIZE 512 +-diff --git a/ssh-keygen.c b/ssh-keygen.c +-index cfb5f115..36a6e519 100644 +---- a/ssh-keygen.c +-+++ b/ssh-keygen.c +-@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device) +- freezero(pin, strlen(pin)); +- error_r(r, "Unable to load resident keys"); +- return -1; +-- } +-+ } +- if (nkeys == 0) +- logit("No keys to download"); +- if (pin != NULL) + diff --git a/ssh.c b/ssh.c + index 53330da5..27b9770e 100644 + --- a/ssh.c +@@ -1093,7 +1133,7 @@ + + else + + options.hpn_buffer_size = 2 * 1024 * 1024; + + +-+ if (ssh->compat & SSH_BUG_LARGEWINDOW) { +++ if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) { + + debug("HPN to Non-HPN Connection"); + + } else { + + int sock, socksize; +@@ -1335,7 +1375,29 @@ + /* Bind the socket to the desired port. */ + if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { + error("Bind to port %s on %s failed: %.200s.", +-@@ -1727,6 +1734,19 @@ main(int ac, char **av) ++@@ -1625,13 +1632,14 @@ ++ if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg), ++ sshbuf_len(server_cfg)) != 0) ++ fatal_f("ssh_digest_update"); ++- len = ssh_digest_bytes(digest_alg); ++- hash = xmalloc(len); ++- if (ssh_digest_final(ctx, hash, len) != 0) ++- fatal_f("ssh_digest_final"); ++- options.timing_secret = PEEK_U64(hash); ++- freezero(hash, len); ++- ssh_digest_free(ctx); +++ if ((len = ssh_digest_bytes(digest_alg)) > 0) { +++ hash = xmalloc(len); +++ if (ssh_digest_final(ctx, hash, len) != 0) +++ fatal_f("ssh_digest_final"); +++ options.timing_secret = PEEK_U64(hash); +++ freezero(hash, len); +++ ssh_digest_free(ctx); +++ } ++ ctx = NULL; ++ return; ++ } ++@@ -1727,6 +1735,19 @@ main(int ac, char **av) + /* Fill in default values for those options not explicitly set. */ + fill_default_server_options(&options); + +@@ -1355,7 +1417,7 @@ + /* challenge-response is implemented via keyboard interactive */ + if (options.challenge_response_authentication) + options.kbd_interactive_authentication = 1; +-@@ -2166,6 +2186,9 @@ main(int ac, char **av) ++@@ -2166,6 +2187,9 @@ main(int ac, char **av) + rdomain == NULL ? "" : "\""); + free(laddr); + +@@ -1365,7 +1427,7 @@ + /* + * We don't want to listen forever unless the other side + * successfully authenticates itself. So we set up an alarm which is +-@@ -2343,6 +2366,12 @@ do_ssh2_kex(struct ssh *ssh) ++@@ -2343,6 +2367,12 @@ do_ssh2_kex(struct ssh *ssh) + struct kex *kex; + int r; + +@@ -1405,14 +1467,3 @@ + # Example of overriding settings on a per-user basis + #Match User anoncvs + # X11Forwarding no +-diff --git a/version.h b/version.h +-index 6b4fa372..332fb486 100644 +---- a/version.h +-+++ b/version.h +-@@ -3,4 +3,5 @@ +- #define SSH_VERSION "OpenSSH_8.5" +- +- #define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_HPN "-hpn15v2" +-+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN +diff -ur a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff +--- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-04-23 15:31:47.247434467 -0700 ++++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-04-23 15:32:29.808508608 -0700 +@@ -12,9 +12,9 @@ + static long stalled; /* how long we have been stalled */ + static int bytes_per_second; /* current speed in bytes per second */ + @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update) ++ off_t bytes_left; + int cur_speed; +- int hours, minutes, seconds; +- int file_len; ++ int len; + + off_t delta_pos; + + if ((!force_update && !alarm_fired && !win_resized) || !can_output()) +@@ -30,15 +30,17 @@ + if (bytes_left > 0) + elapsed = now - last_update; + else { +-@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update) +- ++@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update) ++ buf[1] = '\0'; ++ + /* filename */ +- buf[0] = '\0'; +-- file_len = win_size - 36; +-+ file_len = win_size - 45; +- if (file_len > 0) { +- buf[0] = '\r'; +- snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s", ++- if (win_size > 36) { +++ if (win_size > 45) { ++- int file_len = win_size - 36; +++ int file_len = win_size - 45; ++ snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ", ++ file_len, file); ++ } + @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update) + (off_t)bytes_per_second); + strlcat(buf, "/s ", win_size); +@@ -63,15 +65,3 @@ + } + + /*ARGSUSED*/ +-diff --git a/ssh-keygen.c b/ssh-keygen.c +-index cfb5f115..986ff59b 100644 +---- a/ssh-keygen.c +-+++ b/ssh-keygen.c +-@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device) +- +- if (skprovider == NULL) +- fatal("Cannot download keys without provider"); +-- +- pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); +- if (!quiet) { +- printf("You may need to touch your authenticator " diff --git a/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-glue.patch new file mode 100644 index 000000000000..30c0252ccb55 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-glue.patch @@ -0,0 +1,132 @@ +diff --exclude '*.un~' -ubr a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff +--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-04-19 13:36:51.659996653 -0700 ++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-04-19 13:42:23.302377465 -0700 +@@ -536,18 +536,10 @@ + if (state->rekey_limit) + *max_blocks = MINIMUM(*max_blocks, + state->rekey_limit / enc->block_size); +-@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode) ++@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode) + return 0; + } + +-+/* this supports the forced rekeying required for the NONE cipher */ +-+int rekey_requested = 0; +-+void +-+packet_request_rekeying(void) +-+{ +-+ rekey_requested = 1; +-+} +-+ + +/* used to determine if pre or post auth when rekeying for aes-ctr + + * and none cipher switch */ + +int +@@ -561,20 +553,6 @@ + #define MAX_PACKETS (1U<<31) + static int + ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) +-@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) +- if (state->p_send.packets == 0 && state->p_read.packets == 0) +- return 0; +- +-+ /* used to force rekeying when called for by the none +-+ * cipher switch methods -cjr */ +-+ if (rekey_requested == 1) { +-+ rekey_requested = 0; +-+ return 1; +-+ } +-+ +- /* Time-based rekeying */ +- if (state->rekey_interval != 0 && +- (int64_t)state->rekey_time + state->rekey_interval <= monotime()) + @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) + struct session_state *state = ssh->state; + int len, r, ms_remain; +@@ -598,12 +576,11 @@ + }; + + typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *, +-@@ -155,6 +158,10 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); ++@@ -155,6 +158,9 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); + int ssh_packet_set_maxsize(struct ssh *, u_int); + u_int ssh_packet_get_maxsize(struct ssh *); + + +/* for forced packet rekeying post auth */ +-+void packet_request_rekeying(void); + +int packet_authentication_state(const struct ssh *); + + + int ssh_packet_get_state(struct ssh *, struct sshbuf *); +@@ -627,9 +604,9 @@ + oLocalCommand, oPermitLocalCommand, oRemoteCommand, + + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize, + + oNoneEnabled, oNoneMacEnabled, oNoneSwitch, ++ oDisableMTAES, + oVisualHostKey, + oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, +- oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, + @@ -297,6 +300,9 @@ static struct { + { "kexalgorithms", oKexAlgorithms }, + { "ipqos", oIPQoS }, +@@ -778,9 +755,9 @@ + int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ + SyslogFacility log_facility; /* Facility for system logging. */ + @@ -120,7 +124,11 @@ typedef struct { +- + int enable_ssh_keysign; + int64_t rekey_limit; ++ int disable_multithreaded; /*disable multithreaded aes-ctr*/ + + int none_switch; /* Use none cipher */ + + int none_enabled; /* Allow none cipher to be used */ + + int nonemac_enabled; /* Allow none MAC to be used */ +@@ -842,9 +819,9 @@ + /* Portable-specific options */ + if (options->use_pam == -1) + @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options) +- } +- if (options->permit_tun == -1) + options->permit_tun = SSH_TUNMODE_NO; ++ if (options->disable_multithreaded == -1) ++ options->disable_multithreaded = 0; + + if (options->none_enabled == -1) + + options->none_enabled = 0; + + if (options->nonemac_enabled == -1) +@@ -1047,17 +1024,17 @@ + Note that + diff --git a/sftp.c b/sftp.c + index fb3c08d1..89bebbb2 100644 +---- a/sftp.c +-+++ b/sftp.c +-@@ -71,7 +71,7 @@ typedef void EditLine; +- #include "sftp-client.h" +- +- #define DEFAULT_COPY_BUFLEN 32768 /* Size of buffer for up/download */ +--#define DEFAULT_NUM_REQUESTS 64 /* # concurrent outstanding requests */ +-+#define DEFAULT_NUM_REQUESTS 256 /* # concurrent outstanding requests */ ++--- a/sftp-client.c +++++ b/sftp-client.c ++@@ -65,7 +65,7 @@ typedef void EditLine; ++ #define DEFAULT_COPY_BUFLEN 32768 ++ ++ /* Default number of concurrent outstanding requests */ ++-#define DEFAULT_NUM_REQUESTS 64 +++#define DEFAULT_NUM_REQUESTS 256 + +- /* File to read commands from */ +- FILE* infile; ++ /* Minimum amount of data to read at a time */ ++ #define MIN_READ_SIZE 512 + diff --git a/ssh-keygen.c b/ssh-keygen.c + index cfb5f115..36a6e519 100644 + --- a/ssh-keygen.c +@@ -1330,9 +1307,9 @@ + + } + + } + + +- debug("Authentication succeeded (%s).", authctxt.method->name); +- } + ++ #ifdef WITH_OPENSSL ++ if (options.disable_multithreaded == 0) { + diff --git a/sshd.c b/sshd.c + index 6277e6d6..d66fa41a 100644 + --- a/sshd.c diff --git a/net-misc/openssh/files/openssh-8.6_p1-hpn-version.patch b/net-misc/openssh/files/openssh-8.6_p1-hpn-version.patch new file mode 100644 index 000000000000..6dc290d6737b --- /dev/null +++ b/net-misc/openssh/files/openssh-8.6_p1-hpn-version.patch @@ -0,0 +1,13 @@ +diff --git a/kex.c b/kex.c +index 34808b5c..88d7ccac 100644 +--- a/kex.c ++++ b/kex.c +@@ -1205,7 +1205,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, + if (version_addendum != NULL && *version_addendum == '\0') + version_addendum = NULL; + if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", +- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, ++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, + version_addendum == NULL ? "" : " ", + version_addendum == NULL ? "" : version_addendum)) != 0) { + oerrno = errno; diff --git a/net-misc/openssh/files/sshd.service b/net-misc/openssh/files/sshd.service index b5e96b3a251f..6b4da9132fad 100644 --- a/net-misc/openssh/files/sshd.service +++ b/net-misc/openssh/files/sshd.service @@ -6,6 +6,7 @@ After=syslog.target network.target auditd.service ExecStartPre=/usr/bin/ssh-keygen -A ExecStart=/usr/sbin/sshd -D -e ExecReload=/bin/kill -HUP $MAINPID +KillMode=process [Install] WantedBy=multi-user.target diff --git a/net-misc/openssh/openssh-8.4_p1-r3.ebuild b/net-misc/openssh/openssh-8.4_p1-r3.ebuild index fc00136b3125..da520e543316 100644 --- a/net-misc/openssh/openssh-8.4_p1-r3.ebuild +++ b/net-misc/openssh/openssh-8.4_p1-r3.ebuild @@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # 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 +scp sctp security-key selinux +ssl static test X X509 xmss" @@ -113,7 +113,7 @@ pkg_pretend() { 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" + die "Missing requested third party patch." fi # Make sure people who are using tcp wrappers are notified of its removal. #531156 diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild index 6ed670ff5e99..72fe6e947d10 100644 --- a/net-misc/openssh/openssh-8.5_p1-r1.ebuild +++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild @@ -33,7 +33,7 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # 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 +scp sctp security-key selinux +ssl static test X X509 xmss" @@ -112,7 +112,7 @@ pkg_pretend() { 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" + die "Missing requested third party patch." fi # Make sure people who are using tcp wrappers are notified of its removal. #531156 diff --git a/net-misc/openssh/openssh-8.5_p1.ebuild b/net-misc/openssh/openssh-8.5_p1.ebuild index ab670d15e10e..f04773b5b3a5 100644 --- a/net-misc/openssh/openssh-8.5_p1.ebuild +++ b/net-misc/openssh/openssh-8.5_p1.ebuild @@ -113,7 +113,7 @@ pkg_pretend() { 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" + die "Missing requested third party patch." fi # Make sure people who are using tcp wrappers are notified of its removal. #531156 diff --git a/net-misc/openssh/openssh-8.6_p1-r1.ebuild b/net-misc/openssh/openssh-8.6_p1-r1.ebuild new file mode 100644 index 000000000000..a09b6842fbe1 --- /dev/null +++ b/net-misc/openssh/openssh-8.6_p1-r1.ebuild @@ -0,0 +1,518 @@ +# Copyright 1999-2021 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/_} + +# PV to USE for HPN patches +#HPN_PV="${PV^^}" +HPN_PV="8.5_P1" + +HPN_VER="15.2" +HPN_PATCHES=( + ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff +) + +SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" +X509_VER="13.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} + ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} + ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# 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 +scp 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 ) +" + +# tests currently fail with XMSS +REQUIRED_USE="test? ( !xmss )" + +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-1.5.0:=[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} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +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 "Missing requested third party patch." + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_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.5_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 + + # workaround for https://bugs.gentoo.org/734984 + use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.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%.*} + + # 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 + use X509 && eapply "${FILESDIR}"/${PN}-8.6_p1-hpn-${HPN_VER}-X509-glue.patch + use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch + popd &>/dev/null || die + + eapply "${hpn_patchdir}" + + use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" + + einfo "Patching Makefile.in for HPN patch set ..." + sed -i \ + -e "/^LIBS=/ s/\$/ -lpthread/" \ + "${S}"/Makefile.in || die "Failed to patch Makefile.in" + + einfo "Patching version.h to expose HPN patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ + "${S}"/version.h || die "Failed to sed-in HPN patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) + + if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + einfo "Disabling known non-working MT AES cipher per default ..." + + cat > "${T}"/disable_mtaes.conf <<- EOF + + # HPN's Multi-Threaded AES CTR cipher is currently known to be broken + # and therefore disabled per default. + DisableMTAES yes + EOF + sed -i \ + -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ + "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" + + sed -i \ + -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ + "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" + fi + fi + + if use X509 || use sctp || use hpn ; then + einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" + + einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" + + einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." + sed -i \ + -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ + "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" + fi + + sed -i \ + -e "/#UseLogin no/d" \ + "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" + + eapply_user #473004 + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable PATH reset, trust what portage gives us #254615 + -e 's:^PATH=/:#PATH=/:' + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # The -ftrapv flag ICEs on hppa #505182 + use hppa && sed_args+=( + -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' + -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' + ) + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + # We apply the sctp patch conditionally, so can't pass --without-sctp + # unconditionally else we get unknown flag warnings. + $(use sctp && use_with sctp) + $(use_with ldns ldns "${EPREFIX}"/usr) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(usex X509 '' "$(use_with security-key security-key-builtin)") + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + if use elibc_musl; then + # stackprotect is broken on musl x86 and ppc + if use x86 || use ppc; then + myconf+=( --without-stackprotect ) + fi + + # musl defines bogus values for UTMP_FILE and WTMP_FILE + # https://bugs.gentoo.org/753230 + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # 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}" TMPDIR="${T}" \ + SUDO="" SSH_SK_PROVIDER="" \ + TEST_SSH_UNSAFE_PERMISSIONS=1 \ + 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 + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + tweak_ssh_configs + + doman contrib/ssh-copy-id.1 + dodoc CREDITS OVERVIEW README* TODO sshd_config + use hpn && dodoc HPN-README + use X509 || dodoc ChangeLog + + diropts -m 0700 + dodir /etc/skel/.ssh + + # https://bugs.gentoo.org/733802 + if ! use scp; then + rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ + || die "failed to remove scp" + fi + + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 30df8b26e523..15bc0487b530 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -11,5 +11,5 @@ AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7 DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b -EBUILD openvswitch-2.14.1.ebuild 4414 BLAKE2B c14016f321773081241d64411e160e0aef6871216021675e5ac5766bb14f19b1bca3c76830ef5f8eecd48562c5ca3b04be33f2e279fab58b741e83bb913fc136 SHA512 95042a8aa685b3a20b9b1b113f6d34c635e6fc60651cb470b9306e76c4fcdb4991ee0fcd142484fee365daec112538002290464551d7b16cc0fa6fb2c6534ead +EBUILD openvswitch-2.14.1.ebuild 4412 BLAKE2B 349b7cae8d88f157b608189086b111d5ad0af227cc15a7dce04cfb94874e19551851fd09f12c414f2884294f86a6371bf956b37d9161072c5f612ebad7a557bc SHA512 35f1ddd7393bf0a57132ef1a7f3d2c872a057eb95f33dd7bc1703147c73675a4797b9b87d6fd0314e1f75cae29282e1305b91cb0a58d4862ccea2dc1ae5db349 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36 diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild index ee149240777d..cb44e1d8be7e 100644 --- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.14.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) -inherit autotools eutils linux-info linux-mod python-r1 systemd tmpfiles +inherit autotools linux-info linux-mod python-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org" @@ -24,8 +24,8 @@ RDEPEND=" dev-python/zope-interface[${PYTHON_USEDEP}] debug? ( dev-lang/perl )" DEPEND="${RDEPEND} - sys-apps/util-linux[caps] - virtual/pkgconfig" + sys-apps/util-linux[caps]" +BDEPEND="virtual/pkgconfig" PATCHES=" "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" @@ -95,14 +95,14 @@ src_install() { sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" python_foreach_impl python_doscript utilities/"${SCRIPT}" done - rm -r "${ED%}"/usr/share/openvswitch/python || die + rm -r "${ED}"/usr/share/openvswitch/python || die fi keepdir /var/{lib,log}/openvswitch keepdir /etc/ssl/openvswitch fperms 0750 /etc/ssl/openvswitch - rm -rf "${ED%}"/var/run || die + rm -rf "${ED}"/var/run || die newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd @@ -136,10 +136,10 @@ pkg_config() { einfo "Database '${db}' already exists, doing schema migration..." einfo "(if the migration fails, make sure that ovsdb-server is not running)" ovsdb-tool convert "${db}" \ - "${EROOT%}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" + "${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" else einfo "Creating new database '${db}'..." ovsdb-tool create "${db}" \ - "${EROOT%}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" + "${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" fi } diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest index 72214a5acdca..fa1e92e041a6 100644 --- a/net-misc/pedro/Manifest +++ b/net-misc/pedro/Manifest @@ -1,5 +1,5 @@ -AUX pedro-1.6-portage.patch 713 BLAKE2B 506efa96dd6532685b56c893edf9df4d1dac1310ea4d1dd572d37c5e3f9a343eadcb080c67fd6c58ce1db215c23cb063838a785e65894c952322ca4ef0d981fa SHA512 c4ef62732f811557f12a35237ecdbc435660b3bfc45312abe43850936e12f864c21ee577a6c268256052328c9d5fb5d2fe0934adf67b406bf6146393e569c0df +AUX pedro-1.6-portage.patch 719 BLAKE2B ee8a23964e875e271624a2d0f4c06d5cd05e9d78cae4147c2e0d0701d2df816f2e9b90ca0d3919cc03d5a3c3c62bc5fe6ade08f3775b61af23d6a2fdeda67a00 SHA512 10446c0348e20e2ee946544c0947fe4373ee90b9e9ef5524d6743d7be9f13855dee06ed7e011f1d82b321fd0b8594924bf3ae6f4d0744f4d4517910f0f756875 DIST pedro-1.6.tgz 711856 BLAKE2B 5027dd438995e212889786996debb5765d49828d38ce715672e44776b5fb63db0d6bca0e72339fd5067254aed0b731d3f77656ad510d978e4f456af45d6cf008 SHA512 263f53e447d4b3baab405a1d7313fc397f8a62958957688265c7485a5697b642138636659b5515b9010341655ba8045e5d85f69a86c20baa28edc0dcff0aef42 DIST pedro-manual-1.6.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99 -EBUILD pedro-1.6.ebuild 905 BLAKE2B aa651f37af140d2439d3574236b95cf9f68039bb93cff5559c6aa8b77dc174b016dd7a0d58b577001a6b6a77bcd7f01260421c156b3e11638014faf9707096e6 SHA512 e5e402079e4b5e9ebfefb59a3ac64b77aedc2b5dd5be6735ec451bd0e34bc75d186302970752728dbc2b4d11f6e49c510908275b690c5727ded6e9eb07509b38 +EBUILD pedro-1.6.ebuild 1002 BLAKE2B 4b179803707c9b11b89073cde36b2b9498a6db08631506306fb828c8dcaa54479f9ae6d6641005a1c1ebefbda6150d4e6da6762046effbc6cbf3deddbafbe38d SHA512 04fe0bf58fd4e9e61284866b5bc1cece0f680433bcc59a7212a2bfe9bd1f64ee2137ad1e68b0eec2b1015fbee4fe8b9db7ed215db8b65184d0a4692e3fb985d2 MISC metadata.xml 238 BLAKE2B 471c25958ebf5f578ea2bc7abf38d99bd0810529255b7a3c42327d482a83d9b89c31c524907cc391b2320b3ff08b402d372498940dffc5aac5e6e4ad37e263a6 SHA512 98e2109c9261f162840c0123e9f4748fcf3eb0f07f2f4a47c30ea78b84ab1bc41dca829ad2c8b6476df49748a40fc7101e59d4ce150b28cf32415d8232e47fd7 diff --git a/net-misc/pedro/files/pedro-1.6-portage.patch b/net-misc/pedro/files/pedro-1.6-portage.patch index b72a3251b89a..9c9829129b2b 100644 --- a/net-misc/pedro/files/pedro-1.6-portage.patch +++ b/net-misc/pedro/files/pedro-1.6-portage.patch @@ -5,7 +5,7 @@ #AC_CONFIG_MACRO_DIR([m4]) -CPPFLAGS="-O2 -g `pkg-config --cflags glib-2.0`" -+CPPFLAGS="`pkg-config --cflags glib-2.0`" ++CPPFLAGS="`${PKG_CONFIG} --cflags glib-2.0`" case "${host}" in i[3456789]86-*-mingw32*) WIN32="yes" @@ -14,7 +14,7 @@ *) WIN32="no" - LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" -+ LDFLAGS="$LDFLAGS -L../lib -lpedro `pkg-config --libs glib-2.0` -lm" ++ LDFLAGS="$LDFLAGS -L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" ;; esac ac_config_files="$ac_config_files Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile" diff --git a/net-misc/pedro/pedro-1.6.ebuild b/net-misc/pedro/pedro-1.6.ebuild index 428ab0412b8a..68f35cb0e6f4 100644 --- a/net-misc/pedro/pedro-1.6.ebuild +++ b/net-misc/pedro/pedro-1.6.ebuild @@ -1,12 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 +inherit toolchain-funcs + DESCRIPTION="Pedro is a subscription/notification communications system" HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/PedroHome.html" SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/PedroFiles/${P}.tgz doc? ( mirror://gentoo/${PN}-manual-${PV}.tar.gz )" +S="${WORKDIR}"/${P} LICENSE="GPL-2" SLOT="0" @@ -14,11 +17,20 @@ KEYWORDS="amd64 ppc x86" IUSE="doc examples" RDEPEND="dev-libs/glib:2" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" -S="${WORKDIR}"/${P} +PATCHES=( + "${FILESDIR}"/${P}-portage.patch +) -PATCHES=( "${FILESDIR}/${P}-portage.patch" ) +src_configure() { + tc-export PKG_CONFIG + + default +} src_install() { default diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest index 5c81c91a48ad..e8a6dd85adac 100644 --- a/net-misc/pipes/Manifest +++ b/net-misc/pipes/Manifest @@ -1,4 +1,4 @@ AUX pipes-1.16.1-execlp.patch 603 BLAKE2B fb36b8f00c05b8f0fef930757da458d1f571ecda4487cf5641417d9a79548e28212c1a12599b69a068d55a2e5cb991de0c37b787e13516965122e949bac5db40 SHA512 ad28dab392c962fc476ca6596a0609dbee2a3f6300b27daaaae5b5e44c3c94154b682bc749697be20373b530b228d45170193e085e96bbcbfeff7190746767d7 DIST pipes-1.16.1.tar.bz2 21642 BLAKE2B c5725244f7ac0b77ff3ac3d753ff96ac7d853cd1e7cb0ab82a14decc6ad6ec94503426be712e1b9117a6e95a95939c5d9e91d9f31eb397c96182fac8f7148100 SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3 -EBUILD pipes-1.16.1-r1.ebuild 650 BLAKE2B 39fa97f601bac7358a6414f15026efb556c6cb42f7f92d864a6ba12575656c8e312243a537100dd3ac635d06f85d0fb5a5766723c15965df7f4118303c1765f9 SHA512 468e549147fee025b2e766ef3bdeba1bffe7c9075e9c2ef5cf4b1a1d1c749b9071a0c541c62eef7de039da5d9bbe322141ae6d0c3200f7ca9cae918e00f9d5a2 +EBUILD pipes-1.16.1-r1.ebuild 651 BLAKE2B 11f199ac06317585b7200b5cfa5fcaa1ac8136478dbfcfb9ca79c191b7a42f7f3b682496e45528f2aae5d3e6dfe8921fc37b509d3202f00d6ede6a42a940ee00 SHA512 269d5fd9aedf979c68397ac599484584dc66ab894fa68c6fcf596bff4cbfcb0fc7f70dceb6737f4d8ade15026c1519aa8cf78913f5e5f7f0a74cd47e2f874caa MISC metadata.xml 1243 BLAKE2B 018079999961b4720d9f6999852b0c6d90ed32d08ac9a2084659d35ccccfd9db602a5ea6540928e1dbf0f942ea06f9cc9358231a0d041eea5aa8620f6a61079b SHA512 64f85cdfbd01bc948cc78a5b0a7816d45583c861cc45144ff0b4547b704516a5151d18b19a99be58ad666f3dcbcd866c215e5a24c237c7b97a35e689841316e0 diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild index d876994479fb..11036b37088e 100644 --- a/net-misc/pipes/pipes-1.16.1-r1.ebuild +++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc s390 x86" +KEYWORDS="amd64 ppc ~s390 x86" PATCHES=( "${FILESDIR}"/${P}-execlp.patch ) diff --git a/net-misc/portfwd/Manifest b/net-misc/portfwd/Manifest index c6cd380a212f..4c14077c1a0a 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 1240 BLAKE2B 7fce7abdc342afc30e8972210a5871e439fb946459e68deaf4b0017809046721ff35931593554840bf37c5cf48d49245a89fc3a46813a985968cae80d5bc3a43 SHA512 f058a5d3070776dd6e8be703c0f32ea9072c619d6ae79b83505388dff877d012f4afba9e667be8f50e43c97634f501d884caebfbca14044e75a2bedc592e7d8f +EBUILD portfwd-0.29-r1.ebuild 1184 BLAKE2B 41846523957f05efe72e0208c0ed87a515be920b3af5ad0f5cf370e9a9945ac46929d3995b555e37dde96c4796efe502c31c7a6745d68ed0017163fcf0154b45 SHA512 fdab62a710620107e074ee13b6bb0a52a61b4a3c086d8fcba162fec0256ca25f5e932ab7b761e650b635fc3c69377b7f3ffd1a259f32638a985fd36d2cc6c456 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 f88b08f22141..c64a3293d245 100644 --- a/net-misc/portfwd/portfwd-0.29-r1.ebuild +++ b/net-misc/portfwd/portfwd-0.29-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils systemd +inherit autotools systemd DESCRIPTION="Port Forwarding Daemon" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -11,10 +11,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86" -IUSE="" - -DEPEND=">=sys-apps/sed-4" -RDEPEND="" src_prepare() { default diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest index 81d4f7906754..56739d17d540 100644 --- a/net-misc/proxychains/Manifest +++ b/net-misc/proxychains/Manifest @@ -2,6 +2,6 @@ AUX proxychains-4.12-makefile.patch 1269 BLAKE2B e52a59dd39e19c063cf37455aef0655 AUX proxychains-4.14-makefile.patch 1299 BLAKE2B 9c53f252910da0f0247c95e74856703bf257a9d7c5a4bf91cbf4574f117dd7d6dc800a1def5d772d6ab74194db92d053e759d2ae2955d5d1d11fb4598b0f0d6e SHA512 79dde568a605a085208a2cefa23780448a71b44a273ebe8f19f2ba478b33eeb29b38a478a5c2aa88dcf2352f52aefded8ac8985ccf52839e8b332bf885381203 DIST proxychains-ng-4.12.tar.xz 31816 BLAKE2B 1267cd67ca3a21737abe9e510103c35e409a4afebf30c8917b7be8a84f1bb4edc55b6ec633eb5e63682ed2f6c277a464e16adaa52c70c8bac2588cfe7b36f1a6 SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95 -EBUILD proxychains-4.12-r1.ebuild 1053 BLAKE2B 3a7efc6ab9b696cc44abef396a81c23311c674260dee94e6957c844f6dc7692b53466ca6606766ca53658b00eac1b130410e934ebaa6fb9acb4f91435c1d9526 SHA512 5ec56256c1a1ba7ef38cc47143d6a10adddde05974c14cccc0e85ca2844b103115e02a5740395a1e8b0baab2e5f1e88d48a265c34af64845c66db3887d4bb558 +EBUILD proxychains-4.12-r1.ebuild 1041 BLAKE2B bf9952a9010b02fee0c3175a3063b9b872811f663d2fa8af948aecfed71aee71f4910f49e719a73548276a31a87702b4d54bc4b3d203998b818444d304fb6070 SHA512 4952e915dc831c24e7cff9075c23409464c2023debea45c452cd711abde6575736184acc30dab88a538fa7f6ada91cf80d051ed6ecb8ae5473dc7816b0a9f71f EBUILD proxychains-4.14.ebuild 1026 BLAKE2B 5261e86fcc27ee36446426fbf70da311b20fac51930fe56614caddad3d8976a1070f989d5f9d2fe2b770737c79217c62ef4b192a92cea813552c8f33c00b7091 SHA512 f928f796cfdfcf25b06836b8b4df83bdf706ec52a6d233c4227412dfd441a8cb8ee67ecc040d114625ce0f919610055d29337a7b076146f049096fa914b98ba3 MISC metadata.xml 622 BLAKE2B 0437eff84f33578c5d27f011dddb6bacd7b645f2efcdcb612155eb30e2d49ac58b2fe5b38831eb973254c5e213b3eefed46fd9a9e3d89e8396483b9ee348b04b SHA512 8aae7373f8835661775fee0cb07a5a5fb16228e29d3f87434dc95b05f051f18c19e327595a79d447028c91edf8ae410e5a7c3c5f54a43d6283d5e32a16ee2b04 diff --git a/net-misc/proxychains/proxychains-4.12-r1.ebuild b/net-misc/proxychains/proxychains-4.12-r1.ebuild index 494570b86c0e..65dd3aabd8c7 100644 --- a/net-misc/proxychains/proxychains-4.12-r1.ebuild +++ b/net-misc/proxychains/proxychains-4.12-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs multilib +inherit toolchain-funcs MY_PN=${PN}-ng MY_P=${MY_PN}-${PV} diff --git a/net-misc/ps3mediaserver/Manifest b/net-misc/ps3mediaserver/Manifest index 1ad89b28ca11..51550d88cab9 100644 --- a/net-misc/ps3mediaserver/Manifest +++ b/net-misc/ps3mediaserver/Manifest @@ -1,5 +1,5 @@ AUX ps3mediaserver.confd 169 BLAKE2B 9406c426b73e7d4cb349146f2dd975bcdd8de177615c9b5cd7e3f39bf8e5a8917ef7db3d442bdb67decefc1fde3fc86820a9f797c76b971d30e3fe515f06e7e6 SHA512 3ecbd0a99c422f2fad3082ea70d0755d3af9aca3d426865e57fbe8669647603df90006c79064166ca6866e4e61a86f0dccfb5f8c8429476de69b91c4e6e10f37 AUX ps3mediaserver.initd 399 BLAKE2B e45d66c845f47f54217a995bfad68fe5a3bddea5b16a009f94fe610bc26f292450f554fe822fa238e95b57add60f30397328e6d5460c3b983e49e06499c7726f SHA512 bd260d16f7d4b29d922ede6531d774031f548889fdd9156dd025ec7135824362dc4026cc9577ce85733a00b3eed70a8ce96fb894ccfeb81355b818013de12406 DIST pms-1.90.1-generic-linux-unix.tar.gz 15789602 BLAKE2B 6240c4c4e21fdc0a587e26499969a0dd597ffa8a079812ef944268cc13d2437749f95d6671367baba04f52e2c7499b841e6cf845b3f8c708b756295a66ae9f76 SHA512 af5748989dff1b106ba44a952fc68b43d11a929dec56440cf11ffd6f0a0c561febce54557855bf1afc2614cfb904b5997265f0bdf4ecf45535e12bbabc0fd11f -EBUILD ps3mediaserver-1.90.1.ebuild 2079 BLAKE2B e7060191c5c5cc481cf249e6f46a1351c279db9bec09943fd2cf464e2d27d6749151946191c2285a06b215e92e323266c5d0cf54d97b84380cb4725a0f502119 SHA512 ca4752f9fc283b82548627466500c0bcd2955ec984c05809cf2b75e4a0f3d0b0708b69a51cbc946c7ea56f5df3e298d9430547ef7d3d6849991b42f6b043e42a +EBUILD ps3mediaserver-1.90.1.ebuild 2080 BLAKE2B 41ff514b117da214cbb9f096b7973542df212236911e464b56a1433bc43d78fb0d8b73b7cb0f6f2fe5d2b0982de25a301c15dad16522230e934ee5c169aad731 SHA512 b2f9d9fcee497a7b2f6ba1146178c92ef36b5d5e4f296f7ca18080c81829fff94c0768cd651722eefc701221bd3183059f34123e71a76c1a9e392bc4c1412e1a MISC metadata.xml 683 BLAKE2B eb0d168e6d9c9ec4090f8efdd98c5edaf0888e63bc31b6aab98c306d87e9e65a93175ac0e7e2b9198d8e7d53f63c3181e8d044273cc0b6ca18bc7758e12ba366 SHA512 0ac0f8a5a30436a0597b97eaee727419e6c981b7dd5edc6f5ff98178c7b025a08ad57a5884834c42fcac54445e35425d7177ce4ac9c66a2e631ad1f6637889fd diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild index c2f1136ca7c2..c084e9aaf1ed 100644 --- a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild +++ b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" -inherit eutils xdg +inherit desktop xdg DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3" HOMEPAGE="https://github.com/ps3mediaserver/ps3mediaserver" diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest index 8f8c3b27b376..b0afe115d35b 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -1,5 +1,5 @@ DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 -EBUILD putty-0.74.ebuild 1691 BLAKE2B b2574494ab74aa94a7b17f72abdf0e87a5063addfa557e1e521201b5a64db5781bc0fb0d917ccce0de931a1918d60b41be1fa7c99f9fc87b400a73cd4ea74015 SHA512 21a8d0851cede4619eec5d84463087110ed99e0feececf1d5a5582e8beff2349794cee39ce050e7f56d70c9957ac678392247721582d5ee59481ed3306999e8d -EBUILD putty-9999.ebuild 1737 BLAKE2B 7e09d4cbf3e219f2452f535ef15a1733c77b72fedf8336968b88cb4adbc6e7ab13fb4dd3bfea9150a23198d1e5d649a1a099d65da0263e8942f39ea02001e1ad SHA512 30577a60f28a9ef6fcb6e763a93d4ce624d4ba23708181eef42d8c20afc303f1c42af598808957caa80759a40d02c294eb19b16eea369ff801ef57b74d00fbe4 +EBUILD putty-0.74.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76 +EBUILD putty-9999.ebuild 1746 BLAKE2B 112f9ce331c974edf1a5e7e9dd778bed19e5072be100302fe601a92cc9456be965dc0f2cf015a4630385b8c766b12bc497ef4504ee2bbcafea9e8dfe7e812f4d SHA512 87cae42323cbc63e4a739b7eed25925ed91467a5b06fbc68721f6f7afaa7af3e23e94428d1a497a7509fb44673d101b7b6b58e7f5140fa1bd008f1f95212ffab MISC metadata.xml 1010 BLAKE2B a21ec4ee14bf1b61343ad8f504ee9ccfcf090ad6212c5ffe570b44e3443baeacb1fc3dc3080ce8611f730edf54e8a459d4669fc1bb7ca0c52b35567facab075d SHA512 1649e0d50d4f8318c2869a7e6ebb697f05c16f5e4e9bbe1b35ba38c1513c4bb14f2d4283fd3fd91fe30ab9bcf318f619d7c39ee1bcc3c476b95555e2939b2c8b diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild index 556f68aff08e..62ac436ba4c6 100644 --- a/net-misc/putty/putty-0.74.ebuild +++ b/net-misc/putty/putty-0.74.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86" SRC_URI=" - https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2 https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz " IUSE="doc +gtk gtk2 ipv6 gssapi" diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild index 5fd210bd12d5..68b02e9dd70b 100644 --- a/net-misc/putty/putty-9999.ebuild +++ b/net-misc/putty/putty-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools desktop git-r3 toolchain-funcs xdg-utils DESCRIPTION="A Free Telnet/SSH Client" HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git" -SRC_URI="https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2" +SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2" LICENSE="MIT" SLOT="0" diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest index aea15ad73e71..fdc688a0a688 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 3743 BLAKE2B de4b2186d4656912ec121b3075eb09c86806b2615ada13c4cb96c0f21e5a9546b928a46463f8d045213835ed9a50422c1a5ab338538039c068eb71b2d4545a25 SHA512 c9283d503e7af5d601e4d8970720d2cbb3551602c4d8e744e0984a6f1aeb83dac801677bc973189ce3f7a55ec3c2b2f44485f8612cb6e01376e81bf477e228b9 +EBUILD quagga-1.2.4.ebuild 3727 BLAKE2B adb398f3a831925be09e8eb0b676e8a4f2e2e807019217b7f24d701aa63cb7025a792b4594bc19f4fab190e7eebd6005300e8418822d639dcebd24b3c451c437 SHA512 35d0cf95fcc9acd36309e1dfcbbe920bfff7cc28853b54e95859b6b3784c1f86fe1658ecf100497eba7a3b92f61f070277ff19452b34dfecf797178ae2092c83 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 e3d28d13dcc8..f7021ee12883 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 +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch -inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles +inherit autotools flag-o-matic pam readme.gentoo-r1 systemd tmpfiles DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP" HOMEPAGE="https://www.quagga.net/" diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest index 1f9416e7ff9d..5c22cbbf3455 100644 --- a/net-misc/rabbitmq-server/Manifest +++ b/net-misc/rabbitmq-server/Manifest @@ -2,7 +2,5 @@ AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e5856 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457 DIST rabbitmq-server-3.8.14.tar.xz 3187648 BLAKE2B 53dc32a4b798e79d4c523f13e3d6edeaeabae251221875c464d4ae53fb5d80883807d615591cf8b7a9aae862b182637a2a0bbe1966025791560b3e8f6dab73f5 SHA512 19326fb7ce42241c22541dadd73a147d0b1e6c01d3c7748486fb1d666d76e2ba7835d2a39c200294808ef1a7af5f885fbbe8c7c2a81e561922bd6f8574e5fb91 -DIST rabbitmq-server-3.8.7.tar.xz 3074228 BLAKE2B 131e79cc97c64fb5ba8d0c4906501da34e8569cb498ec61fe16be05923e2e2787a3d4ae5291f27efa619a0988b3c98ab8109ec2c0bc2c74da48c4ddc2f5e2cd7 SHA512 0d9771576f5b0b3ee68386ad02c7b01aa9939c38ab1aa8a8e2fe5f5b494b5cd855d2a5029a74364c6bf5097e8a70ef95e325ef9a9945576344c1a33ace0998ac -EBUILD rabbitmq-server-3.8.14.ebuild 2123 BLAKE2B 7905cb8e051f91b74a6e7a0dd632df0827e1f618f57e90f6bd247edb4f6699235d1bfdd619fead56cd486a08d35b7e28fb612d60a0801f862292bd8ce635048f SHA512 1c7cb9378d87a474547514728c65f4466d12be4514ad3a1fad0ae5b1bfa1256959ca1f94bb67651b9528fe320fc361d62581a47fa172b7892da8d46f99e830ee -EBUILD rabbitmq-server-3.8.7.ebuild 2151 BLAKE2B 3c0f2aa446e78d693618127dad27b09cb26712bf555deb3b7e46c59ac199c504276ac9a9532e728dd2db449a611cadf1d0ba89b5a6d059d9f8e79a979eb62fdd SHA512 47ccea4708d114f79838f8e8e702a819a88bfd22671a0b731b9c121801becf5f65ba9fec68d21eacad8528cac26fbc6ffcaf6ebc22dd3da19766d7fd31be4e65 +EBUILD rabbitmq-server-3.8.14.ebuild 2121 BLAKE2B 6c2d0b1206638c5fea4e931b62017080989256a87bf60dbe58ab35c33a0270159b3d6f2a4ec56e00e934904c6647be4001537a7baa4328f67dd908df68797a52 SHA512 577ec6aaa235863414f26736f454771a80c544bf83150c24f0f446ea37c316439966e518de125faf2278283fbaa8cd229fe9a3244fe25c430ea231027de9f184 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701 diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild index a8a9e9eb1e3d..346526d274c4 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/ra LICENSE="GPL-2 MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" RESTRICT="test" diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild deleted file mode 100644 index 2f06c6eafea2..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{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-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="" -RESTRICT="test" - -RDEPEND=">=dev-lang/erlang-21.3[ssl] - +Date: Sun, 29 Nov 2020 09:33:54 -0800 +Subject: [PATCH] Work around glibc's lchmod() issue a better way. + +diff --git a/syscall.c b/syscall.c +index b9c3b4ef..11d10e4a 100644 +--- a/syscall.c ++++ b/syscall.c +@@ -227,27 +227,35 @@ int do_open(const char *pathname, int flags, mode_t mode) + #ifdef HAVE_CHMOD + int do_chmod(const char *path, mode_t mode) + { ++ static int switch_step = 0; + int code; + if (dry_run) return 0; + RETURN_ERROR_IF_RO_OR_LO; ++ switch (switch_step) { + #ifdef HAVE_LCHMOD +- code = lchmod(path, mode & CHMOD_BITS); +-#else +- if (S_ISLNK(mode)) { ++#include "case_N.h" ++ if ((code = lchmod(path, mode & CHMOD_BITS)) == 0 || errno != ENOTSUP) ++ break; ++ switch_step++; ++#endif ++ ++#include "case_N.h" ++ if (S_ISLNK(mode)) { + # if defined HAVE_SETATTRLIST +- struct attrlist attrList; +- uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */ ++ struct attrlist attrList; ++ uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */ + +- memset(&attrList, 0, sizeof attrList); +- attrList.bitmapcount = ATTR_BIT_MAP_COUNT; +- attrList.commonattr = ATTR_CMN_ACCESSMASK; +- code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW); ++ memset(&attrList, 0, sizeof attrList); ++ attrList.bitmapcount = ATTR_BIT_MAP_COUNT; ++ attrList.commonattr = ATTR_CMN_ACCESSMASK; ++ code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW); + # else +- code = 1; ++ code = 1; + # endif +- } else +- code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */ +-#endif /* !HAVE_LCHMOD */ ++ } else ++ code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */ ++ break; ++ } + if (code != 0 && (preserve_perms || preserve_executability)) + return code; + return 0; diff --git a/net-misc/rsync/rsync-3.2.3-r2.ebuild b/net-misc/rsync/rsync-3.2.3-r2.ebuild index 3b73247a47c9..7915974ff39e 100644 --- a/net-misc/rsync/rsync-3.2.3-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic prefix systemd +inherit prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -16,7 +16,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" S="${WORKDIR}/${P/_/}" diff --git a/net-misc/rsync/rsync-3.2.3-r3.ebuild b/net-misc/rsync/rsync-3.2.3-r3.ebuild new file mode 100644 index 000000000000..4538ef6d0eee --- /dev/null +++ b/net-misc/rsync/rsync-3.2.3-r3.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit prefix systemd toolchain-funcs + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ "${PV}" == *9999 ]] ; then + PYTHON_COMPAT=( python3_{6,7,8} ) + inherit autotools git-r3 python-any-r1 + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" +else + if [[ "${PV}" == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + fi + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" + S="${WORKDIR}/${P/_/}" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd" + +RDEPEND="acl? ( virtual/acl ) + lz4? ( app-arch/lz4 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( dev-libs/xxhash ) + zstd? ( >=app-arch/zstd-1.4 ) + >=dev-libs/popt-1.5 + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" + +if [[ "${PV}" == *9999 ]] ; then + BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +fi + +# Only required for live ebuild +python_check_deps() { + has_version "dev-python/commonmark[${PYTHON_USEDEP}]" +} + +src_prepare() { + local PATCHES=( + "${FILESDIR}/rsync-3.2.3-glibc-lchmod.patch" + ) + default + if [[ "${PV}" == *9999 ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi +} + +src_configure() { + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable ipv6) + $(use_enable lz4) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + if tc-is-cross-compiler; then + # configure check is broken when cross-compiling. + myeconfargs+=( --disable-simd ) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + exeinto /usr/share/rsync + doexe support/* + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service" +} + +pkg_postinst() { + if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with =rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index c09292830a34..370fd32ffd2b 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic prefix systemd +inherit prefix systemd toolchain-funcs DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -24,9 +24,7 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE_CPU_FLAGS_X86=" sse2" IUSE="acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd" -IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}" RDEPEND="acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) @@ -78,11 +76,8 @@ src_configure() { $(use_enable zstd) ) - if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then - # SIMD is only available for x86_64 right now - # and only on glibc (#728868) - myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) ) - else + if tc-is-cross-compiler; then + # configure check is broken when cross-compiling. myeconfargs+=( --disable-simd ) fi diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest index 194e4914c137..92dacbe0fe71 100644 --- a/net-misc/rwhoisd/Manifest +++ b/net-misc/rwhoisd/Manifest @@ -1,5 +1,5 @@ AUX rwhoisd 280 BLAKE2B 8d2e54026175bb53897e69a61abf83b5c7548acbe52555f6adbdc88a07f94a88e3486aea81dd2d3043a99b83b5bc7b4255014f3df2687d463ab60a86ef2a37b5 SHA512 cd278c6dd828d7f07c50147e5dedad7cf8c8e44926b4717fec442b91d891838b59f61dc2a51968df5b4b1dfe181958148a9a7f9e93e65fc815b69c6219dabd6d AUX rwhoisd.conf 154 BLAKE2B 1f80fde2a8ed3066c4c5b5a3a17ad735a6bef56bb897cb41bbc7d3e314803a9e3b06dc957077b28b3590435b7a18a0827f3f4554247509ea21bc0d5048b08cf2 SHA512 882d93ddf72f6a909ab6a33a6f5026e35f52ae025a9e4653cc0449c4b0ab1b2fda5799e1b44b19c620eb98337270a7a1c1eb9cff66af49832adf9726f4713bb8 DIST rwhoisd-1.5.9.6.tar.gz 491955 BLAKE2B 97587fc6a728cde58bc5049a9bf27ec1673ce7beb751aa0de7c787d08185b597e16a4920e89fa5aaabc6e7e1b5dfecedc50aaf55cbdbe7f85a43d6a125848cb9 SHA512 ab5674d9ed9f9c5fc00b2859b1336c766c546ca067ddf9d3863a0728c6d0eac11be3a9cd22dce8c25999ed8c8e5377e6da4aa1252e396d5b3c8e959794903c52 -EBUILD rwhoisd-1.5.9.6.ebuild 868 BLAKE2B 6f84c7e5497469e4910d9aa8dc89fe4356ada17339bdd3290f1bd25a64b7e2de9e90fc505325ab25b40f3d942586bde66518bcccefaa2d36daef2ce235764d3e SHA512 d070616918f5d0161053a0990951055f1faf9880158bfabfd9d657e362d40951598f64c24a54c2c9b707199d567112d51c12fc8aed8f522686975c8682647179 +EBUILD rwhoisd-1.5.9.6-r1.ebuild 829 BLAKE2B 351d8a7d3b05e3bb061413686501fb4fb3c6070a9b4a8b3c449f05d5fe16c146c514635b7b61d8afd962444324e0c34655c3715c72617fc6620e96cc2acf5521 SHA512 862ac8377adfd0dc482ff692b428d43902109f1a0d53a3eeb30a5a99a971ba218b2a93bcc80d1ac4617f6b7d3d70a316781c6c1657a1b0a1ecdf88d20b9a4c6d MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r1.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r1.ebuild new file mode 100644 index 000000000000..f76abd1d3658 --- /dev/null +++ b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +DESCRIPTION="ARIN rwhois daemon" +HOMEPAGE="http://projects.arin.net/rwhois/" +SRC_URI="https://github.com/arineng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/${PN}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + sys-devel/flex + virtual/yacc +" +RDEPEND=" + acct-group/rwhoisd + acct-user/rwhoisd +" + +src_compile() { + append-cflags -DNEW_STYLE_BIN_SORT + + emake -C common + emake -C regexp + emake -C mkdb + + default +} + +src_install() { + default + + doinitd "${FILESDIR}"/rwhoisd + newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd +} + +pkg_postinst() { + einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd." + einfo "It is highly inadvisable to run rwhoisd as root." +} diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild deleted file mode 100644 index 2362f2dd48a6..000000000000 --- a/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic user - -DESCRIPTION="ARIN rwhois daemon" -HOMEPAGE="http://projects.arin.net/rwhois/" -SRC_URI="https://github.com/arineng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - sys-devel/flex - virtual/yacc -" -S=${WORKDIR}/${P}/${PN} - -pkg_setup() { - enewgroup rwhoisd - enewuser rwhoisd -1 -1 /var/rwhoisd rwhoisd -} - -src_compile() { - append-cflags -DNEW_STYLE_BIN_SORT - - emake -C common - emake -C regexp - emake -C mkdb - - default -} - -src_install() { - default - - doinitd "${FILESDIR}"/rwhoisd - newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd -} - -pkg_postinst() { - einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd." - einfo "It is highly inadvisable to run rwhoisd as root." -} diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest index 91c1d61081ba..e8db9443ae18 100644 --- a/net-misc/rygel/Manifest +++ b/net-misc/rygel/Manifest @@ -1,3 +1,5 @@ DIST rygel-0.38.4.tar.xz 4123464 BLAKE2B b807dd7fd20c0fd77da6af49cb32399d3e83cd45f1eed121d9b16f201aff260eb4a381ec47774c638a274e83a9b4a1c10d6d317374891ffdb792217e2693fdb5 SHA512 791dcc624f90cdc77bd00e9513c15998d42979e0b3255dcfda771e1d9d718fe4a0127ba0d18e69b6f4e9259c9e691e187b69c6c55c5c35ccefaf5daf65a1f447 -EBUILD rygel-0.38.4.ebuild 2209 BLAKE2B 7e40c88afe41dadb3ecdd5469688436b015bdd5f43651f904bac5f682cc77a9e4579505861533f346d73f747251d81e5545cafcae7fb4f8cb73870c48d560006 SHA512 7d50000a2b16ecd28cb5a4f69b7e6280f741e74f5e935296008de23df9865479a0e6bead86b096514c3dac4150fbbbd20d96c407d2720acb5cf5b2038a81abc3 +DIST rygel-0.40.1.tar.xz 1693996 BLAKE2B 505b96152c0b73bda2b7c81cb742f48cfea86738ea965f07afc1532a77e2262a5c0050eab185a33a831d57fc2f3c85247bc2a02bf73eab5d0be35817e8f00aac SHA512 180f143f394d7a2697c888eef7e7c2bdb5077b4ad289eb6e3f832cc1efde5147248b46e5ad9e77615d7976de7e7d3e68d737732bf7f91f01c42e18e06d8f89bb +EBUILD rygel-0.38.4.ebuild 2210 BLAKE2B 5a42d1a38b0b1c5d035316fcff1db6329247793a80ba65a65c63016656194052cf3115a4350e330b1cd1dd426aaf4f20a704ed001e7817c7393496ca68204682 SHA512 073d660ade82096ba760306e4f59b5d8cacbddc634c9015f78aad14ae73ab53be0259ad603f1063ba169582b4e0e1271e055beed3304d38496cf0a05bc748620 +EBUILD rygel-0.40.1.ebuild 2197 BLAKE2B cd303ee282e419ba6170ef0189ac14460f32c9f29eb85549138196e4dc3880a2f5c03c3b293f08b1f7e1f12c6bb65b8b30083217235e591551127b9690125a87 SHA512 54d32e7d8563ba598e159e56bc99650420e89c5ad91cd55115dbd754aae516a76cd8734142bd1d2f6ccfd3c1544b4edfb49f59df7b755a11bfd3016f1a73aa13 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce diff --git a/net-misc/rygel/rygel-0.38.4.ebuild b/net-misc/rygel/rygel-0.38.4.ebuild index 7471a81e1649..4abd0d800fdd 100644 --- a/net-misc/rygel/rygel-0.38.4.ebuild +++ b/net-misc/rygel/rygel-0.38.4.ebuild @@ -36,7 +36,7 @@ RDEPEND=" dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) - tracker? ( app-misc/tracker:= ) + tracker? ( app-misc/tracker:0= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 diff --git a/net-misc/rygel/rygel-0.40.1.ebuild b/net-misc/rygel/rygel-0.40.1.ebuild new file mode 100644 index 000000000000..3adce2028c6b --- /dev/null +++ b/net-misc/rygel/rygel-0.40.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_MIN_API_VERSION="0.42" +inherit gnome2 meson systemd vala + +DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer" +HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" + +LICENSE="LGPL-2.1+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + >=dev-libs/libgee-0.8:0.8 + >=dev-libs/libxml2-2.7:2 + >=media-libs/gstreamer-1.12:1.0 + >=media-libs/gst-plugins-base-1.12:1.0 + media-libs/gstreamer-editing-services:1.0 + >=media-libs/gupnp-dlna-0.9.4:2.0 + >=media-libs/libmediaart-0.7:2.0[vala] + media-plugins/gst-plugins-soup:1.0 + >=net-libs/gssdp-1.1.0:0=[vala] + >=net-libs/gupnp-1.1.0:0=[vala] + >=net-libs/gupnp-av-0.12.8 + >=net-libs/libsoup-2.44:2.4 + >=sys-apps/util-linux-2.20 + x11-misc/shared-mime-info + introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) + sqlite? ( + >=dev-db/sqlite-3.5:3 + dev-libs/libunistring:= + x11-libs/gdk-pixbuf:2 + ) + tracker? ( app-misc/tracker:3= ) + transcode? ( + media-libs/gst-plugins-bad:1.0 + media-plugins/gst-plugins-twolame:1.0 + media-plugins/gst-plugins-libav:1.0 + ) + gtk? ( >=x11-libs/gtk+-3.22:3 ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + $(vala_depend) + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig +" +# Maintainer only +# app-text/docbook-xsl-stylesheets +# >=dev-lang/vala-0.36 +# dev-libs/libxslt + +src_prepare() { + vala_src_prepare + default + # Disable test triggering call to gst-plugins-scanner which causes + # sandbox issues when plugins such as clutter are installed + #sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \ + # -i tests/rygel-playbin-renderer-test.c || die + + #gnome2_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc api-docs) + -Dsystemd-user-units-dir=$(systemd_get_userunitdir) + -Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3") + -Dengines=gstreamer + -Dexamples=false + $(meson_use test tests) + -Dgstreamer=enabled + $(meson_feature gtk) + $(meson_feature introspection) + ) + meson_src_configure +} diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest index a06fc0819411..a83d05555130 100644 --- a/net-misc/s3cmd/Manifest +++ b/net-misc/s3cmd/Manifest @@ -1,3 +1,3 @@ DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6 -EBUILD s3cmd-2.1.0.ebuild 546 BLAKE2B 83fa55b319aab69d5677b656236fd689c343c034e3fff88a1df8ad7432a82e50e20e3ab8d767608dac4a0c55c2acecb236ea526d59f177a9f4e70b3023060f04 SHA512 577cb0a0b92a78c10dabad767c8574cf41b8fdf1d7d0551e41e736e0ce626ac4a8f35bcd6e0ab7d06df7470f6744a370313aea9824f28c26e8c23e73048582f4 +EBUILD s3cmd-2.1.0.ebuild 548 BLAKE2B e3ed8df8e2c54fa963b625bd9394a89dc326403470eaac824e64d6bd2b912dee1a7bc3bdc46a0a488304a86e2f472abe0ac8e6a1163df128cffc80b16e4d37e5 SHA512 da0b560f6ed2acf6d7cd00c6f8c8bbb825f32e49f25e6f05503928e0bbbec7c6803b39cae35ff17e5a75bc9a6896015a0e5d713eb1ee6c3ebb08ef730d57580b MISC metadata.xml 714 BLAKE2B 2a7000a762de00a18e30b131609496815f2f47405684af84eeb5de35d6a29762eb7be897912ef0d75e1c43d14e01ab4f552cd77cc661553556277f0ca802b12f SHA512 7107fcd23b90ed1b5cf3d454112ab5d673569da5f14cd41f9f430b643ad0837fe6d713f9584a09547c8d33dbe8e5e3352c360b25dca99dfbb8f2eaa84b4007e5 diff --git a/net-misc/s3cmd/s3cmd-2.1.0.ebuild b/net-misc/s3cmd/s3cmd-2.1.0.ebuild index bbd643709898..cafc9522fdfd 100644 --- a/net-misc/s3cmd/s3cmd-2.1.0.ebuild +++ b/net-misc/s3cmd/s3cmd-2.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,4 +20,4 @@ RDEPEND=" dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/python-magic[${PYTHON_USEDEP}]" -S="$WORKDIR/${P/_/-}" +S="${WORKDIR}/${P/_/-}" diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest index d9f28efeb0a6..74be4ad5a950 100644 --- a/net-misc/scponly/Manifest +++ b/net-misc/scponly/Manifest @@ -2,6 +2,6 @@ AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8 AUX scponly-4.8-sftp-server-path.patch 2692 BLAKE2B ead282d46cb25a6d8606fa65e538142c15dd0be82956c2c8a48c7d46cc9ec59605a4f1c10fc5235acb584945b00ee4c187391d198571d841b45225c328765b49 SHA512 86171549d894426d12eb2f8d65959d1be2e137327c135be31c762820a55256f5c4ac90a01f989c8bffd2b46b275de408912306209b5aba9a94b81dbc06ff5a24 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b -EBUILD scponly-4.8-r6.ebuild 6872 BLAKE2B 157742b3ba96711c41389bf038c112438de483145cfc30357499b3e2ddfb3cd9a1d7e5cdfa1c839cd7faaf9a0f82f938adb8f2f135ef7a6ca7ea1ba70728adb3 SHA512 a51fe4efa6d1aaf45aea4ad8c221e02f07533d5dbfff50b0bf34da73252ef5f6be80def1236611375bdbe18862dc60e5dbde24b7af3d56e664981247d34b2aa1 -EBUILD scponly-4.8-r7.ebuild 6938 BLAKE2B 44e7e4de6259a6692b9d5dc22453eea34917eecffdfc2e78da9474b5102c75bba59939496b6c80121c009966f51b99668a70853a1cf0a25c55aa425885994b88 SHA512 9ba63e00d60988b9250dbc1521d8a08323f9ccdead86025b6a85082472f2e6ec9fcf860591734c3ef47fdc58d2b5b171c35a60a0866636be8a59785560c7061f +EBUILD scponly-4.8-r6.ebuild 6863 BLAKE2B 4799a68568747249a5e10d5cf652d85a6740d3f0d322e806662836315565b2113573bc5d376e1369940c6f488948448b564690861f058e42be9e7c2ba941b459 SHA512 59b49748f350181c4d25b5f847ced5d0749e85b7f716f667ce5b83a64681b28c2991365e3ef9d9e8ebd21fab024dac2370a17ec6d914ffdcbcc3bdd11adacb43 +EBUILD scponly-4.8-r7.ebuild 6929 BLAKE2B 6acb6a90fa08450656a9edef983620e89fd0e3f30afdeb3c730d06394be0179d63f1e31f894a84c9d4c21883371518a3ba83669b0065cbfb5c3afbae5327a39f SHA512 13052ec55d53c1d8d919c4e5fb3b781be250d07ea17a9a9f226c694c3c5d3b33019643220db85e723a1bc276c9614a8efe7837b7b2de39a2d03598b1d26c9227 MISC metadata.xml 1760 BLAKE2B 0e8926cd16ce210ce1545243103305d7c2943fbb0dd41b09d819225aa67995c7c0a3e5d7cc892422480e237d8f9b89b4b95f137abf9a8ed3287c953517e296be SHA512 0a25c9484e1f10839f62d09f2eabd6cee41c70045a6d6e0e321bf6f19b414923369bc4d4aead8828835f81094459ed7230c2ddcec496677a94c276be255381e9 diff --git a/net-misc/scponly/scponly-4.8-r6.ebuild b/net-misc/scponly/scponly-4.8-r6.ebuild index c7b2b8ba88d0..8e34824af99f 100644 --- a/net-misc/scponly/scponly-4.8-r6.ebuild +++ b/net-misc/scponly/scponly-4.8-r6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib readme.gentoo-r1 toolchain-funcs user +inherit readme.gentoo-r1 toolchain-funcs user DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" HOMEPAGE="https://github.com/scponly/scponly" diff --git a/net-misc/scponly/scponly-4.8-r7.ebuild b/net-misc/scponly/scponly-4.8-r7.ebuild index 33e64c389ddb..67f6348fc896 100644 --- a/net-misc/scponly/scponly-4.8-r7.ebuild +++ b/net-misc/scponly/scponly-4.8-r7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib readme.gentoo-r1 toolchain-funcs +inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" HOMEPAGE="https://github.com/scponly/scponly" diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest index b061db633969..c4344f689988 100644 --- a/net-misc/seafile-client/Manifest +++ b/net-misc/seafile-client/Manifest @@ -1,6 +1,9 @@ AUX seafile-client-7.0.9-libressl.patch 558 BLAKE2B 92ab8e75e83a3693861e3b1c4f390fe5287140520867940b2bfa0615f65294cfc0328fd0a285c6e66941e040dc09b8164fb58ab092f5645628811227a30993fc SHA512 67cbcddb7d8610d29fcb308ebd0bc648ad0526101a2540e743232500880f276b0c07f50f20bcdf31d49f422057f99e310a84384ef47f52abe90be8ef0b8b6e6f AUX seafile-client-7.0.9-qt-5.15.patch 1036 BLAKE2B dc81224ff712d12c19dc90edb0371853dac4a7c6604f40ae2cc82fbbe59c36d91b776a0e05e31b874b6b5abad84687009d82461e708faa98a3c399b8e0acac11 SHA512 f4a06d788682ccb13ed10485a20322ec074b40dbe4f6f7b9b88f199d6fe64f2dfbaf7f9f7575bbfdd5f309eb58aa9a03453c679b56c52582cdd99ce22b9df57f +AUX seafile-client-8.0.1-glib-2.68.0.patch 530 BLAKE2B 936c032a129a65cdfaa64779f45113996f06f7a3bc155a101f312275d70c89edf0042172adbec253c13a571e0e68cd76b1d414823ccc4b975c990e5969e660c9 SHA512 c6eb836b46a3e9aefb89c7e824420695bf44994a6c668a1378598c226b45a6e894f1fe429c3957c6a6cf7463a425a01131d2caa46595d3779cb2f387187fd733 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41 DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719 -EBUILD seafile-client-8.0.1-r1.ebuild 1232 BLAKE2B 626f398d06141b00468e4196d8efbac83a4d385f239f1e8995a40a0de4676db963555cf32dec21a520fd6b050a157935a19552f894541447a8bdca70989108d2 SHA512 3f2d7544b363d21fb5743e7d178c7d48c39609d93164be51b2eb8941702bcc7361e79a7913e1b9927ac8d7b37078ab376e5498775aff932a02211d7047937f52 +DIST seafile-client-8.0.2.tar.gz 11694494 BLAKE2B 7230b17e9b85a990b87b9fae7d2d7bfc3a388ae82a777b3fa3abf8a2e88bb3ad6d73c8ff60aef34587ced6665594a71c0020c90065f6bd4fcaac79e15b41f923 SHA512 f66ea240816ec09b56bf3b121947a26bfbafeacd34c1cdb77f8244c713f0aea3f920c6eb6c3cf161034001a7d8ddb451e507acfb6f97e21ac5ebbb792da7ebf4 +EBUILD seafile-client-8.0.1-r2.ebuild 1247 BLAKE2B 4e661cbea213e41412e741bf08abc6b125c6a519fff42cbbcaf0416acd78f71dccdc879164fc91d753d03fd7cf66fe5b21dfc825fb50b0d3e0773d0e9b1dde11 SHA512 49c8b44c86ceef8ce7af89725bd85add0e46d895af8eb743e8eb43852fd937f16a14b47c10aae46ff2dad3bf3febdd9f4a45dcd7acc8a39482f8fe51f39e901e +EBUILD seafile-client-8.0.2.ebuild 1364 BLAKE2B ee1257a912d04dbaf79703dd0f6a137ac43e68568675642a72eb126a7d8f0de7bd4475cade5837162334692648faf0d4327acdd7389dce776acb5623046cbb4b SHA512 b701938134c7bf7096cc7fcc993666efdd1c782a64f11ff5fa9b1d56697cf38f916be48e07dee4135673fb2ee5575a56d90071d1178d037f8f1d498fe07e2247 MISC metadata.xml 576 BLAKE2B 2174b676e97ee6712305427fc4ffa5d11007872d943b3fada1d05d67d3c83a218c385559e4c24cf12b318e4b1eb4192cae79a33c86329c5442caf72af86c932b SHA512 1e0f7a2c1f0ea6011b55ab213d1783677307468ceb44d594ecade76c36ccdfb97ee94feb3ad8d90b451a7349b48f8372a92ff8bd669d257ddbbab77d1a75e4dc diff --git a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch b/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch new file mode 100644 index 000000000000..9b2dd42cc926 --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbf1d2f..05e8d4d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,7 @@ SET(SEAFILE_CLIENT_VERSION_MINOR 0) + SET(SEAFILE_CLIENT_VERSION_PATCH 1) + SET(PROJECT_VERSION "${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}") + ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION}) ++ADD_DEFINITIONS(-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26) + INCLUDE(FindPkgConfig) + + ## Build crash repoter on release build as default diff --git a/net-misc/seafile-client/seafile-client-8.0.1-r1.ebuild b/net-misc/seafile-client/seafile-client-8.0.1-r1.ebuild deleted file mode 100644 index b26abb8f4490..000000000000 --- a/net-misc/seafile-client/seafile-client-8.0.1-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl shibboleth test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - +Date: Thu, 4 Feb 2021 15:31:02 -0500 +Subject: [PATCH] do not set DB_DBT_READONLY (fix #82) + +it is allowed only on keys, but sks is not using any bdb functions that +might mutate keys, so it is easier to just avoid using it altogether +--- + bdb/bdb_stubs.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/bdb/bdb_stubs.c b/bdb/bdb_stubs.c +index 864f0b2..959ee27 100644 +--- a/bdb/bdb_stubs.c ++++ b/bdb/bdb_stubs.c +@@ -58,13 +58,8 @@ static void dbt_from_string(DBT *dbt, value v) { + // uninitialized stack-allocated DBT + zerob(dbt, sizeof(*dbt)); + +- // Cast away the lack of const: we set DB_DBT_READONLY to +- // indicate to bdb that it shouldn't modify this buffer + dbt->data = (void *)String_val(v); + dbt->size = string_length(v); +-#ifdef DB_DBT_READONLY +- dbt->flags = DB_DBT_READONLY; +-#endif + } + + #if OCAML_VERSION < 40600 diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild new file mode 100644 index 000000000000..12939b3ef43a --- /dev/null +++ b/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit readme.gentoo-r1 systemd toolchain-funcs + +COMMIT="591a7834dc9f1dff3d336d769a6561138a5befe7" +DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization" +HOMEPAGE="https://github.com/SKS-Keyserver/sks-keyserver" +SRC_URI="https://github.com/SKS-Keyserver/sks-keyserver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-keyserver-${COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="optimize test" +RESTRICT="!test? ( test )" + +DOC_CONTENTS="To get sks running, first build the database, +start the database, import atleast one key, then +run a cleandb. See the sks man page for more information +Typical DB_CONFIG file and sksconf has been installed +in /var/lib/sks and can be used as templates by renaming +to remove the .typical extension. The DB_CONFIG file has +to be in place before doing the database build, or the BDB +environment has to be manually cleared from both KDB and PTree. +The same applies if you are upgrading to this version with an existing KDB/Ptree, +using another version of BDB than 4.8; you need to clear the environment +using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree +Additionally a sample web interface has been installed as +web.typical in /var/lib/sks that can be used by renaming it to web +Important: It is strongly recommended to set up SKS behind a +reverse proxy. Instructions on properly configuring SKS can be +found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering" + +RDEPEND=" + acct-user/sks + acct-group/sks + >=dev-lang/ocaml-4.0:= + dev-ml/camlp4:= + dev-ml/cryptokit:= + dev-ml/num:= + sys-libs/db:5.3 +" +DEPEND="${RDEPEND} + dev-ml/findlib" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch + "${FILESDIR}"/${PN}-1.1.6_p20200624-QA-fixups.patch + "${FILESDIR}"/${PN}-1.1.6_p20200624-r1-db-hang.patch +) + +QA_FLAGS_IGNORED=( + /usr/bin/sks_add_mail +) + +src_prepare() { + cp Makefile.local.unused Makefile.local || die + sed -i \ + -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \ + -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \ + -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \ + -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \ + -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \ + Makefile.local || die + sed -i \ + -e 's:/usr/sbin/sks:/usr/bin/sks:g' \ + sks_build.sh || die + + dosym sks_build.sh /usr/bin/sks_build.bc.sh + default +} + +src_compile() { + tc-export CC CXX RANLIB + + emake dep + # sks build fails with parallel build in module Bdb + emake -j1 all + if use optimize; then + emake all.bc + fi +} + +src_test() { + ./sks unit_test || die +} + +src_install() { + if use optimize; then + emake install.bc + dosym sks.bc usr/bin/sks + dosym sks_add_mail.bc usr/bin/sks_add_mail + else + emake install + fi + + dodoc README.md + + newinitd "${FILESDIR}/sks-db.initd" sks-db + newinitd "${FILESDIR}/sks-recon.initd" sks-recon + newconfd "${FILESDIR}/sks.confd" sks + systemd_dounit "${FILESDIR}"/sks-db.service + systemd_dounit "${FILESDIR}"/sks-recon.service + + dodir "/var/lib/sks/web.typical" + + insinto /var/lib/sks + fowners sks:sks /var/lib/sks + + newins sampleConfig/DB_CONFIG DB_CONFIG.typical + newins sampleConfig/sksconf.typical sksconf.typical + insinto /var/lib/sks/web.typical + doins sampleWeb/HTML5/* + + keepdir /var/lib/sks + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if [[ -n "${REPLACING_VERSIONS}" ]]; then + einfo "Note when upgrading from versions of SKS earlier than 1.1.4" + einfo "The default values for pagesize settings have changed. To continue" + einfo "using an existing DB without rebuilding, explicit settings have to be" + einfo "added to the sksconf file." + einfo "pagesize: 4" + einfo "ptree_pagesize: 1" + fi; +} diff --git a/net-misc/sks/sks-1.1.6_p20200624.ebuild b/net-misc/sks/sks-1.1.6_p20200624.ebuild deleted file mode 100644 index bb6bc66f7636..000000000000 --- a/net-misc/sks/sks-1.1.6_p20200624.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit readme.gentoo-r1 systemd toolchain-funcs - -COMMIT="591a7834dc9f1dff3d336d769a6561138a5befe7" -DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization" -HOMEPAGE="https://github.com/SKS-Keyserver/sks-keyserver" -SRC_URI="https://github.com/SKS-Keyserver/sks-keyserver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-keyserver-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="optimize test" -RESTRICT="!test? ( test )" - -DOC_CONTENTS="To get sks running, first build the database, -start the database, import atleast one key, then -run a cleandb. See the sks man page for more information -Typical DB_CONFIG file and sksconf has been installed -in /var/lib/sks and can be used as templates by renaming -to remove the .typical extension. The DB_CONFIG file has -to be in place before doing the database build, or the BDB -environment has to be manually cleared from both KDB and PTree. -The same applies if you are upgrading to this version with an existing KDB/Ptree, -using another version of BDB than 4.8; you need to clear the environment -using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree -Additionally a sample web interface has been installed as -web.typical in /var/lib/sks that can be used by renaming it to web -Important: It is strongly recommended to set up SKS behind a -reverse proxy. Instructions on properly configuring SKS can be -found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering" - -RDEPEND=" - acct-user/sks - acct-group/sks - >=dev-lang/ocaml-4.0:= - dev-ml/camlp4:= - dev-ml/cryptokit:= - dev-ml/num:= - sys-libs/db:5.3 -" -DEPEND="${RDEPEND} - dev-ml/findlib" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch" - "${FILESDIR}/${PN}-1.1.6_p20200624-QA-fixups.patch" -) - -QA_FLAGS_IGNORED=( - /usr/bin/sks_add_mail -) - -src_prepare() { - cp Makefile.local.unused Makefile.local || die - sed -i \ - -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \ - -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \ - -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \ - -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \ - -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \ - Makefile.local || die - sed -i \ - -e 's:/usr/sbin/sks:/usr/bin/sks:g' \ - sks_build.sh || die - - dosym sks_build.sh /usr/bin/sks_build.bc.sh - default -} - -src_compile() { - tc-export CC CXX RANLIB - - emake dep - # sks build fails with parallel build in module Bdb - emake -j1 all - if use optimize; then - emake all.bc - fi -} - -src_test() { - ./sks unit_test || die -} - -src_install() { - if use optimize; then - emake install.bc - dosym sks.bc usr/bin/sks - dosym sks_add_mail.bc usr/bin/sks_add_mail - else - emake install - fi - - dodoc README.md - - newinitd "${FILESDIR}/sks-db.initd" sks-db - newinitd "${FILESDIR}/sks-recon.initd" sks-recon - newconfd "${FILESDIR}/sks.confd" sks - systemd_dounit "${FILESDIR}"/sks-db.service - systemd_dounit "${FILESDIR}"/sks-recon.service - - dodir "/var/lib/sks/web.typical" - - insinto /var/lib/sks - fowners sks:sks /var/lib/sks - - newins sampleConfig/DB_CONFIG DB_CONFIG.typical - newins sampleConfig/sksconf.typical sksconf.typical - insinto /var/lib/sks/web.typical - doins sampleWeb/HTML5/* - - keepdir /var/lib/sks - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n "${REPLACING_VERSIONS}" ]]; then - einfo "Note when upgrading from versions of SKS earlier than 1.1.4" - einfo "The default values for pagesize settings have changed. To continue" - einfo "using an existing DB without rebuilding, explicit settings have to be" - einfo "added to the sksconf file." - einfo "pagesize: 4" - einfo "ptree_pagesize: 1" - fi; -} diff --git a/net-misc/socket/Manifest b/net-misc/socket/Manifest index 8d75d7fa213d..4fca13507dc7 100644 --- a/net-misc/socket/Manifest +++ b/net-misc/socket/Manifest @@ -1,4 +1,4 @@ -AUX socket-1.5-makefile.patch 416 BLAKE2B d627d8435374b013576b91374623641420eb4b7264fd8cb2929a21400e755a482d644a079caf351dfe1b455bac99f0095cccf6dbf0d49a50b371bd57a00a8092 SHA512 615c059534f45da30ec7a584a4fa945c9ce90070a1d0f09af785667742e2c692a51e03c00c19bd60429031597dcc5054f40fe51372fa39d213812062252628d0 +AUX socket-1.5-makefile.patch 343 BLAKE2B df9b2b96003da3e81e85e7d76f1522e367f72e8d876c3967805891f3381d49e519bd8a55f9a499cf832c4b8b30a696771c5b97273117a9955882416299cc163e SHA512 dce2ccdf0e79e83c814422a03d5efdc6c14361fe2fb70d5edda13203625ae58774e2fcf302375237a92be8f41c9d481a6a82dc9dfae3038145f2199bc2dcfe6c DIST socket-1.5.tar.gz 22002 BLAKE2B d0a422611307a7298cd514584e3b4555fafce2a831b0c1ea0a99a0683ad80f7f7ab85cd627c9ac50894781df08e837f002569872a5447c7e60bc50a77b5a3998 SHA512 9503139087a65a63462571788b6710c486c7a00532bc027b87d9f4bd0c92a7e90befe8a3ec86c622bc02ff51beaec05cacfcaffb06d7c983a73c38a18bca315d -EBUILD socket-1.5.ebuild 606 BLAKE2B 26baaa799b4b2630cb91aca83bf63b79195e420d9fdd45d6a39198c9ad0278d29c713ae960188b9c20676f90184a4461769defa2be4580cad9081dee7c9b2d60 SHA512 19a7057620dc30aaca065bc1f8ff32ab00da89535b7bedc63a16ccce5b60a38bdd2efec63c4a53ba8a38180a0000667f68bf33dc307253c2cf836d896a46ed80 +EBUILD socket-1.5.ebuild 599 BLAKE2B 7b2118b29bd819132ba73e66dc1b328d24aa21dbde9b21b61a092d15784e8c362b57397be5ba40348a2d237d70edd908f7e1d1bdf9ef60d27264ad3e97ce73ee SHA512 05a6753c6822baa02830be5db4c62573d7a2223699ef6e3a1c4561130bc229e6e98f9be4fea29a2e2ff7c02e14e16413bd4a50c361f95f78cfe1de18b5b7a83e MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a diff --git a/net-misc/socket/files/socket-1.5-makefile.patch b/net-misc/socket/files/socket-1.5-makefile.patch index 7dc3e7c1f5c3..a204791ce5b5 100644 --- a/net-misc/socket/files/socket-1.5-makefile.patch +++ b/net-misc/socket/files/socket-1.5-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2008-06-27 13:57:47.000000000 +0400 -+++ Makefile 2013-02-05 00:42:25.241748516 +0400 +--- a/Makefile ++++ b/Makefile @@ -38,9 +38,8 @@ INSTALLMANPATH = $(INSTALLBASE)/man INSTALLMANMODE = 444 diff --git a/net-misc/socket/socket-1.5.ebuild b/net-misc/socket/socket-1.5.ebuild index a08430d13f1f..be38d567737b 100644 --- a/net-misc/socket/socket-1.5.ebuild +++ b/net-misc/socket/socket-1.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit base toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A shell-level interface to TCP sockets" HOMEPAGE="http://www.jnickelsen.de/socket/" @@ -12,10 +12,11 @@ SRC_URI="http://www.jnickelsen.de/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" - IUSE="examples" -PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch +) src_compile() { emake CC="$(tc-getCC)" @@ -25,6 +26,7 @@ src_install() { dobin socket doman socket.1 dodoc BLURB CHANGES README + if use examples; then docinto examples dodoc scripts/* diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index ac87fe798c02..bd295d7b9b0b 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -3,9 +3,9 @@ AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed49 DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029 DIST spice-gtk-0.38.tar.xz 796112 BLAKE2B c1542b5b76f9e23ffd1910273f358f656198829b1f615c6a8e0931a79d14920132c861facd534f4cf05f03c4f64a50f628f7daa93be581d5ac815f224b81fe16 SHA512 27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3 DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2 -EBUILD spice-gtk-0.37-r2.ebuild 3737 BLAKE2B 1b379af9d6f19b31fe90150bf455c93eb5b1130789b70040ee5e82f9a8d073593744e7a965c5d88742012f7ee27d98e04c181885ab107d77aa0903499676d33b SHA512 20952e0c0b3ce3e3d8ba329f28b01fd3f0d2fd580f6ef67aa651c026fe93ceefbd8f05b9023a85b3ddfe41bae562fdd7b59455e7d5aecee9fb9253bd566390c0 -EBUILD spice-gtk-0.38-r1.ebuild 3382 BLAKE2B 6cad1b6f314437630b29c183abe7fe93b4eed5ac70c22096d54e495d1f0ad62a750a2810207258a0a936456d3dd1c44f1907f978684278a6b628d8f1056d5f1a SHA512 5edcb316574f32a5dde19ae3abdf00ebe37d9fe632ba245912229896318e7f4bcfe19f30534eaf750d1e4aa552cfe915159c088585384ccf1526abb38b86ac7e -EBUILD spice-gtk-0.38.ebuild 2982 BLAKE2B d055699e445e617d196fc3d96439a6655ffa04c1a5470c7d075bd67dfd02c1a7ee193fe2874e633fe931c8752068b5048e4f807b6f16c7c14eb818250dd2d522 SHA512 3a16071be02e1cdcc7f6ecda433b3909594b9a65a8013d3177f21340c8114e4528dedadb835843b1e51b36219cf10ef5ce9ffec09bfeeebdac5d5cfed0e22810 -EBUILD spice-gtk-0.39.ebuild 3210 BLAKE2B 639775dd0e80c9665a89a6d3759904092d77976b48001c7cd1125e2742a8c95c68bb5182ba0062a214d446a8d8261ee6a6b13bcd168655e12ad7d4d4758a0e0f SHA512 3d4c065247a0bb85f7d9466c413c3a86d866d4fcd9232c537136bb33d4c10b251bfb445203172da9d3ae064157c77f8734707b5c6e26d83b00bc79ec22c82903 -EBUILD spice-gtk-9999.ebuild 3235 BLAKE2B 5926310e84c13cfc0814c2eb08c2bfccbfe69afd7ed06f5d2d8ea4d818150578b60431d479b58b702bddbcf9b4cbbca2ac6e4ac907a2352fb32a0bd2e4e14bac SHA512 f3a3ab3053219df825ad1ac6a88be816ebd72521a626d11b9f034657e9c8b42652e7d8f16c17ecebab7d79d0952f58701b1ebfebb136745565bdf4a397fd6e6f +EBUILD spice-gtk-0.37-r2.ebuild 3730 BLAKE2B fd8dd740dfdc323ab8da9a3ccd4245a2c4257c0a1c79a67fe91519ba39cd306be2f266a5b221b0b21bbb9da297cdfe734c2cb0d6716ffdbfe6bd231d6a096a96 SHA512 1514529f8cc4ff1082e3cb98cf8ab54443855571f3b73225b4eb0b4f8f4cbb576cbdc97d95a61552feff6df3aa99e6f097a46f3c4f021aabad17c46d5a3859e1 +EBUILD spice-gtk-0.38-r1.ebuild 3375 BLAKE2B c18ed8b85f039d6613fc6b7c1d56ae8bf7229c8dbdce7d9d973cf60eff649136e7a684120d32a90edca93f396de75e17f735c9f1818930c4d4f10c12889077b9 SHA512 96ab0bfe1bc2cf1e8f7719bf8864fd26607692fa97044de047d16b0c4be702a198d1f6c93b77fbc5f20dfbf5c31ffeb9e315230e718a1ad18a124b987be287b3 +EBUILD spice-gtk-0.38.ebuild 2975 BLAKE2B f81803e8ce6ac576fb11dbba82195a708fc21326afc8d334dc4ac5d80516ae3a37c8a14003df1c0a7bdfa3387a17a83ed3b2f2e1f95c59f08bff0015d4c00cbb SHA512 ed3f83278010c8bf91ce8fb84223d80e10189c5b8d7a618eecf9da36be6519e70c90cac6996491fc4cb46e9d62a6e082a4b8d30c546ad6cc096e76c290ea68aa +EBUILD spice-gtk-0.39.ebuild 3203 BLAKE2B ee149484cd6e551ba20e017ca85b361fdffcdc7c6e6652135fe1b4522055268134b06129f7b84fca6461ea889a34bf30af8d94d6ff694f143aa37707b4795c2e SHA512 c09c8018fe739d944539579348d72f9525101ba97b30cc44cef04025c43424a1170093e7e57a3f8d17e976dd7b94db5bd2b81a67309217e67fc688e109cdfe2c +EBUILD spice-gtk-9999.ebuild 3228 BLAKE2B 6cfa7973c47fd8059d811465157cc6f2884f3c43c64742a16f8ab9588dc8f5e3c95281d4a6925c5e36daf7b7857746915d55eaed1841972359324bd67541a568 SHA512 2c9bd55a68f855aedc1e2a33798bcbe995e8425f81bae8885b801f371d4d46a111f353e9842442be59a5d6d456fdd62495c3ec0cfb3b69744d940a33e030bfb2 MISC metadata.xml 785 BLAKE2B b9448548d4a31423a95447eda043cf100df88fe9264889c2909442b64b54cc2d055c9faa8fa7698a161df5c838b1b38e1b1bd6d5c7b4d76ff67d33b48203cac9 SHA512 c5bf0dfd74d054fdef09eb86a98aadfa9c28fa1c2986b01a61c66151542c574db79710332ff0ccad45635278f57f7636d294ec3d0d2523a4cdc8a7c4cbbdddd0 diff --git a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild index 81b35c5ba82c..8b92c78b052e 100644 --- a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ GCONF_DEBUG="no" VALA_MIN_API_VERSION="0.14" VALA_USE_DEPEND="vapigen" -inherit autotools desktop eutils xdg-utils vala readme.gentoo-r1 +inherit autotools desktop xdg-utils vala readme.gentoo-r1 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" diff --git a/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild index 0102b373e378..e2a11534e5c6 100644 --- a/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ VALA_USE_DEPEND="vapigen" PYTHON_COMPAT=( python3_{7..9} ) -inherit desktop eutils meson python-any-r1 readme.gentoo-r1 vala xdg-utils +inherit desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" diff --git a/net-misc/spice-gtk/spice-gtk-0.38.ebuild b/net-misc/spice-gtk/spice-gtk-0.38.ebuild index f370fa8c0e7b..ea531cd612cf 100644 --- a/net-misc/spice-gtk/spice-gtk-0.38.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.38.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 VALA_MIN_API_VERSION="0.14" VALA_USE_DEPEND="vapigen" -inherit desktop eutils meson readme.gentoo-r1 vala xdg-utils +inherit desktop meson readme.gentoo-r1 vala xdg-utils DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" diff --git a/net-misc/spice-gtk/spice-gtk-0.39.ebuild b/net-misc/spice-gtk/spice-gtk-0.39.ebuild index 8f9a666c3e7f..a4abdb1a7e2c 100644 --- a/net-misc/spice-gtk/spice-gtk-0.39.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.39.ebuild @@ -8,7 +8,7 @@ VALA_USE_DEPEND="vapigen" PYTHON_COMPAT=( python3_{7..9} ) -inherit desktop eutils meson python-any-r1 readme.gentoo-r1 vala xdg-utils +inherit desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild index c507c8b5b368..a231b185d2cf 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ VALA_USE_DEPEND="vapigen" PYTHON_COMPAT=( python3_{7..9} ) -inherit desktop eutils git-r3 meson python-any-r1 readme.gentoo-r1 vala xdg-utils +inherit desktop git-r3 meson python-any-r1 readme.gentoo-r1 vala xdg-utils DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" diff --git a/net-misc/sshrc/Manifest b/net-misc/sshrc/Manifest index 105cbcbd0128..3486c3a25b09 100644 --- a/net-misc/sshrc/Manifest +++ b/net-misc/sshrc/Manifest @@ -1,5 +1,5 @@ DIST sshrc-0.6.1.tar.gz 3701 BLAKE2B 36cdd0d4dcc80ea1884533f71e6090a6cb393dc1131a6d78fddc43c37e0597aee2da8b92789a59100ad6941d8c17e6ccbf796d73ec704df45aa768cfc6bf36a7 SHA512 69e0919bdef0ec6fb187814f1a0dd360b331dc4c0fc047f7767399944eccb949c172682331e6ebe940c275f0a2b6293a66a6018e12351f566638eed1ac362d64 DIST sshrc-0.6.2.tar.gz 4410 BLAKE2B 982ae3f0a6d3727699cc3cd7ddc20304ad1330b165f7450047f7d3b236ba7f3b297223d88c6ce8e00d0db97d3193c4547d7a10d51e8feb3bb639b6276865a8e8 SHA512 79dd964c5ed825b38aa775d35df6adc0857817c418fa4ae1971378f062536035bd66e4faa0fb84f66504f09c7e6368355f8c57036bea8d269b4d9084af95ddc4 -EBUILD sshrc-0.6.1.ebuild 508 BLAKE2B 382be296afff6d8c5e4c50d39fc24363afa4d77de0c40e0860d7771b5897a761332f9d6c7e0e1bc0371e3acc5b7c558d3a2212d182d3e80255beac209a82b046 SHA512 76035a2894f49e02366e587ba66e4c0ede86fbffc41a908106eca9b4b2777d1f7786df4e210573d7956d6c7c97b79e14bfb58f4d9b4a3bff571c4d4440c16ce5 -EBUILD sshrc-0.6.2.ebuild 503 BLAKE2B 678fe7cbac5f64e689bc21c83a79b757d38adf98eccbb8289d8c460012b99156d97eda76f4762d24248b37225b7dfd06c1e1f63fa79197a222d49d2aa87e2eef SHA512 aeed92acfc893a0e3fbd86fc616bb52f427c46d912cb58835bdbaa8b9f2e3ccac3b2ae133ea4fa9759ac6879e3d63e06b878a67c3a1a054df0a2c1e1588fa709 +EBUILD sshrc-0.6.1.ebuild 505 BLAKE2B d6d94b78b9bec6dd9b6ee3a13c67a9f91dbbaa54c32aef56721af8d414c8d99a184a69bedab2c661d36dc635cde577d9faba06a77f561cc09b5555719301699e SHA512 c9f8c0bc6768c9bddc80902724778126562c0b153a46b7501cd95b6434e49371d28d243d9aeb305a95eb9967b24c4caeff3ec020efb1b27b900de48786ef1a7f +EBUILD sshrc-0.6.2.ebuild 503 BLAKE2B 0d80a37e41c6ba933cdbc98d5fd335dd3bb239c7a8c757ea8ffd13b0fbbd1f769aac2285b689c8e8269bbe2c21b4bbf0dc77f5affb94eed06150d06eba97f308 SHA512 612b91b203bb91b22daf27cdedf0274bf22c9800c74a3e58a182506f5c78992e1804846ea657be4c47d54fccc7dddfd98f4f9c3d3e63f555016420f2798e4cf6 MISC metadata.xml 716 BLAKE2B f0f7b3faca4f541bc30e93a0e9833d719fc12cd7c1e670c7406007606db6f733aa64f39817f0d130216933f9f00c1a71784fcaf0ba1db44838bfbc0f69d5038b SHA512 7681bd1c60566700b72a64092e9059eba124b142b5b6b35bf06e921309364b63041284cd497ee186ad82e308e7b9ce6036ce343b41a6b16c7c2ac506e768de02 diff --git a/net-misc/sshrc/sshrc-0.6.1.ebuild b/net-misc/sshrc/sshrc-0.6.1.ebuild index 9d32fba7974f..8c14f3f0ac1f 100644 --- a/net-misc/sshrc/sshrc-0.6.1.ebuild +++ b/net-misc/sshrc/sshrc-0.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,8 +17,7 @@ RDEPEND=" mosh? ( net-misc/mosh:0[client] ) " -src_install() -{ +src_install() { dobin sshrc use mosh && dobin moshrc } diff --git a/net-misc/sshrc/sshrc-0.6.2.ebuild b/net-misc/sshrc/sshrc-0.6.2.ebuild index f88910912dc5..5880e7d09dce 100644 --- a/net-misc/sshrc/sshrc-0.6.2.ebuild +++ b/net-misc/sshrc/sshrc-0.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,8 +17,7 @@ RDEPEND=" mosh? ( net-misc/mosh:0[client] ) " -src_install() -{ +src_install() { dobin sshrc use mosh && dobin moshrc } diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest index dbb8a3e39bfc..101f187c1323 100644 --- a/net-misc/sstp-client/Manifest +++ b/net-misc/sstp-client/Manifest @@ -1,7 +1,5 @@ AUX sstp-client-1.0.12-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd26dd05c91aed7a787e4240a7e10a8e81f1f74d732299731500033551331e23d8927fa9519f52214c6e8949bbd3f8f6c558dfa7 SHA512 a7bef85e7be5a90a0820317d6aa87ab6e26f97caea9e47c6e678fdc8cd1c25b1a8f11c9e2ccb93f99950da39076253b435156edd4b7dfbb606db2fe58eef66e2 AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919729d5316ec78a9d6d4de4092afb615bbd731557e033b55d400a3fa8c0fac83a2732e3cc8212c0c16a067bfb01041d2ab2f0fc3c233847 SHA512 00d1b0ad75aa75417cf87210802c48164a715eddd7a1f53e8956e524387eb170078471d67fab32e3b25990b1b44fa415b153bf22fdf8b3c90385627c8f0075e4 -DIST sstp-client-1.0.10.tar.gz 3012713 BLAKE2B 6b924c9fef4df26a9aa93dd5670cae4dbfe020f2c1bfc955f88f229414b5295864c25637bddf3b80d522dd514a4f3042522f9615fe660165b4417d6ea832e4bf SHA512 8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7 DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f -EBUILD sstp-client-1.0.10-r1.ebuild 1420 BLAKE2B cb9b8c161923f4ff3d193788b4e520a739f30bb37a01ede3d31ae2ece04c06f7b59bd9956bec6cb998854d544b3baca226c62d970eff750f42c8327fb9bdbf3f SHA512 009fe28e314d9450e2b6b4f44671396cd9edbd219c04281d960a4387f3669f530106a32f31311512f68fd8f6713be0695b542c84f1f46e28c9df86fe24901844 -EBUILD sstp-client-1.0.12.ebuild 1323 BLAKE2B 523d5bb199731c93af80ba3392a838c81884f059c8aac60e206159c94fe07f5dca9a52f25a8da64731a14368e36eed500b8425f290758eadd03fbf2702793bc6 SHA512 b9b48275716bb750d07b652ab8f02f3544965d2787ecc96fadcd2bd02b621d042bc5f129b62095b8bf9e703ae3c831d4f46465d8c06b2284dfae03cfe6860409 +EBUILD sstp-client-1.0.12-r1.ebuild 1325 BLAKE2B 0965f2f89c3905ba02070d0a9fdec51b154e54a37d8c520067ae6f646af38a0ce534437aad6e11a2432ee6d4b5623d53272c4e4521adcd8cd8232cf197d055fe SHA512 e953a85ad8a62922b246bae364095c2894fad0d4355f5bcf14c8c84812d054317ece4c67af445d065f9bc1f288a6f62da66b4a845aad81d602b5c88fc635c2fc MISC metadata.xml 248 BLAKE2B 0170675aa541587a716c3683adf2383e443a45bcf2538380f3a4003ebb1e1af8c878dcb47792b835c8ff299f484a18bbc68cf7a0e058d8bb8d39d4767778c69c SHA512 5836901dac3fc4a340424cc221c2742fc9dde2c234c2cbc0d1cd9c45a8f9192c7658f49a5d5dae5221c2aa0cfed34ff0642ab0519e495991bf47fc4dd6d4a1f7 diff --git a/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild b/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild deleted file mode 100644 index 9bf1d84c1aca..000000000000 --- a/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools linux-info multilib user - -DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" -HOMEPAGE="http://sstp-client.sourceforge.net/" -SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="static" - -RDEPEND=">=dev-libs/libevent-2.0.10 - dev-libs/openssl:0 - net-dialup/ppp:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -CONFIG_CHECK="~NETFILTER_NETLINK" -DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING ) - -pkg_setup() { - enewgroup sstpc - enewuser sstpc -1 -1 -1 sstpc -} - -src_prepare() { - # set proper examples dir, --docdir overriding in src_configure does not work - sed -i -e "/^docdir/s:@PACKAGE@:${PF}/examples:" Makefile.am || die 'sed on Makefile.am failed' - - default - eautoreconf -} - -src_configure() { - local PPPD_VER="$(best_version net-dialup/ppp)" - PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - econf \ - --enable-ppp-plugin \ - --enable-group=sstpc \ - --enable-user=sstpc \ - --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \ - --with-runtime-dir="/run/sstpc" \ - $(use_enable static) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild b/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild new file mode 100644 index 000000000000..9fb40250d367 --- /dev/null +++ b/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info + +DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" +HOMEPAGE="http://sstp-client.sourceforge.net/" +SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="static" + +DEPEND=" + dev-libs/libevent:= + dev-libs/openssl:0= + net-dialup/ppp:= +" +RDEPEND=" + ${DEPEND} + acct-group/sstpc + acct-user/sstpc +" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~NETFILTER_NETLINK" + +PATCHES=( + "${FILESDIR}/${P}-remove-network-test.patch" + "${FILESDIR}/${P}-fix-example.patch" +) + +DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local PPPD_VER="$(best_version net-dialup/ppp)" + PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + + local myeconfargs=( + --enable-ppp-plugin + --enable-group=sstpc + --enable-user=sstpc + --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" + --with-runtime-dir="/run/sstpc" + $(use_enable static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/net-misc/sstp-client/sstp-client-1.0.12.ebuild b/net-misc/sstp-client/sstp-client-1.0.12.ebuild deleted file mode 100644 index 767cbdd4709c..000000000000 --- a/net-misc/sstp-client/sstp-client-1.0.12.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools linux-info user - -DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" -HOMEPAGE="http://sstp-client.sourceforge.net/" -SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="static" - -RDEPEND=">=dev-libs/libevent-2.0.10 - dev-libs/openssl:0= - net-dialup/ppp:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -CONFIG_CHECK="~NETFILTER_NETLINK" - -PATCHES=( "${FILESDIR}/${P}-remove-network-test.patch" - "${FILESDIR}/${P}-fix-example.patch" -) -DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING ) - -pkg_setup() { - enewgroup sstpc - enewuser sstpc -1 -1 -1 sstpc -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local PPPD_VER="$(best_version net-dialup/ppp)" - PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - econf \ - --enable-ppp-plugin \ - --enable-group=sstpc \ - --enable-user=sstpc \ - --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \ - --with-runtime-dir="/run/sstpc" \ - $(use_enable static) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 5a5cd36e79cc..78502260a509 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,7 +1,7 @@ DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6 DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9 -EBUILD streamlink-1.3.1-r1.ebuild 2058 BLAKE2B f43e659ac11c6388902ba5b2d479cd455c6c52b83933607a18386db54152bb9fa45071e179bc1d49bd6f6fe5c0e38b6ebaf3352ac5959af1ca34a80322eee456 SHA512 d7abf73e5cf4d81010d7d7f8db63be8fc48374423ed56e5a196380f00df830a9bf6313f9c9963d5395ccedc02a7026d2a3d98daa0e5d03f520350766ed82ebae -EBUILD streamlink-2.0.0.ebuild 1856 BLAKE2B bbebf7fabc1da685dc8c678419d262507ac39cabf96ab671a7bb7b094af6881241e399a448488cb81e300acd724aecdc9122c68d38dc0cd58fa2989c60caaa84 SHA512 5b97c8bd5a5a80f695110d475d6b81bd6cfdae55e4c2f5c94c793d71052c2741adfb1da83a9ae7a438e69ab6f1bd9de2516fb87a52824e0e724049ff41c37460 -EBUILD streamlink-9999.ebuild 1856 BLAKE2B bbebf7fabc1da685dc8c678419d262507ac39cabf96ab671a7bb7b094af6881241e399a448488cb81e300acd724aecdc9122c68d38dc0cd58fa2989c60caaa84 SHA512 5b97c8bd5a5a80f695110d475d6b81bd6cfdae55e4c2f5c94c793d71052c2741adfb1da83a9ae7a438e69ab6f1bd9de2516fb87a52824e0e724049ff41c37460 +EBUILD streamlink-1.3.1-r1.ebuild 2060 BLAKE2B d3e2cb738d52fb3cb03e0adb0a15f2422335200fd1d83788a9113a2ad4ec761d3022d0884d67486d515ad237230d7fff2ac80f6fbbac501e8c0f072177fe18a3 SHA512 1d2f6d2adc441298e75402170b40a6d1baacf9097b566cb030f919b8362b9beb82dcd8f9b1bb3decc9e3da595309fb3ef786d4c26ab2ef3ebece333372a37ab3 +EBUILD streamlink-2.0.0.ebuild 1864 BLAKE2B f2bedcafea2b70bf26914e9f21016cb581da9da8256f4a20b748ae5fa12ee6f19288f78c372c9a5195e525eadcb9a7330bf1d2aaaaf5f988aed9787ff92fb241 SHA512 1cf95eb03042e94a745bd21abe5f84dbfda25a1a875d0042368cd46f41ad8b6d68956bc5338c9cca7fb3ebaec057bbc53bfa45a36ab4c0176ff75ecb6ae68719 +EBUILD streamlink-9999.ebuild 1864 BLAKE2B f2bedcafea2b70bf26914e9f21016cb581da9da8256f4a20b748ae5fa12ee6f19288f78c372c9a5195e525eadcb9a7330bf1d2aaaaf5f988aed9787ff92fb241 SHA512 1cf95eb03042e94a745bd21abe5f84dbfda25a1a875d0042368cd46f41ad8b6d68956bc5338c9cca7fb3ebaec057bbc53bfa45a36ab4c0176ff75ecb6ae68719 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672 diff --git a/net-misc/streamlink/streamlink-1.3.1-r1.ebuild b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild index 966e93d0e0a0..bc7367b7878f 100644 --- a/net-misc/streamlink/streamlink-1.3.1-r1.ebuild +++ b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ PYTHON_REQ_USE='xml(+),threads(+)' DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 $GIT_ECLASS +inherit distutils-r1 ${GIT_ECLASS} DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" HOMEPAGE="https://streamlink.github.io/" diff --git a/net-misc/streamlink/streamlink-2.0.0.ebuild b/net-misc/streamlink/streamlink-2.0.0.ebuild index 0e7bde597406..22a91c1cf0a9 100644 --- a/net-misc/streamlink/streamlink-2.0.0.ebuild +++ b/net-misc/streamlink/streamlink-2.0.0.ebuild @@ -13,7 +13,7 @@ PYTHON_REQ_USE='xml(+),threads(+)' DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 $GIT_ECLASS +inherit distutils-r1 ${GIT_ECLASS} DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" HOMEPAGE="https://streamlink.github.io/" @@ -55,7 +55,7 @@ BDEPEND=" src_prepare() { distutils-r1_src_prepare if [[ ${PV} != 9999* ]]; then - mv ${WORKDIR}/streamlink.1-${PV}.man ${WORKDIR}/streamlink.1 || die + mv "${WORKDIR}"/streamlink.1-${PV}.man "${WORKDIR}"/streamlink.1 || die fi } @@ -71,6 +71,6 @@ python_test() { python_install_all() { distutils-r1_python_install_all if [[ ${PV} != 9999* ]]; then - doman ${WORKDIR}/streamlink.1 + doman "${WORKDIR}"/streamlink.1 fi } diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild index 0e7bde597406..22a91c1cf0a9 100644 --- a/net-misc/streamlink/streamlink-9999.ebuild +++ b/net-misc/streamlink/streamlink-9999.ebuild @@ -13,7 +13,7 @@ PYTHON_REQ_USE='xml(+),threads(+)' DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 $GIT_ECLASS +inherit distutils-r1 ${GIT_ECLASS} DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" HOMEPAGE="https://streamlink.github.io/" @@ -55,7 +55,7 @@ BDEPEND=" src_prepare() { distutils-r1_src_prepare if [[ ${PV} != 9999* ]]; then - mv ${WORKDIR}/streamlink.1-${PV}.man ${WORKDIR}/streamlink.1 || die + mv "${WORKDIR}"/streamlink.1-${PV}.man "${WORKDIR}"/streamlink.1 || die fi } @@ -71,6 +71,6 @@ python_test() { python_install_all() { distutils-r1_python_install_all if [[ ${PV} != 9999* ]]; then - doman ${WORKDIR}/streamlink.1 + doman "${WORKDIR}"/streamlink.1 fi } diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 751678514066..f2d5290f1c47 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,15 +1,6 @@ -AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f3565063887d8ef01b8379539fb7bb6a70d00e80809a203dd3a263de6c96012f5357b7e059044f0ca34 SHA512 c35855a20ca29d5277eaa597763db434ec069bc96e91bc7c2bbe3357c72ce792b84f653c59842cd2921cce810005cb79717fa4e728840766aff51656033585d6 -AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4 -AUX stunnel-r1 1462 BLAKE2B 3acccb347c008ce5e8eb1cbd72d9125edd452ce5f607a819cffe72618a77c4a1d9b3702851e6e13cc236532b536144acf564cec3f1811563452dc02be0b8f992 SHA512 b5d33a9beb056bf6c9571296cb2a30e2aaa48b9841adb7ac3e40881f261f7ba999acf95ded81f2185d6a51ff8a21f79bdcbb0f3ab2e635c93279f33fc74f249f AUX stunnel-r2 1652 BLAKE2B 7a1ee4d81b51583fcc2138b09999bd8ee66f03305f477ea6929eab43384a153f088c5703818aa99fe6f0cca40f177328ea916d64d410ec37bf68638e443aac90 SHA512 cd4bc2bd38df267cac979587e36cee878d60ce4a7b1c11ba72323b6955d30ce927bacd125b2a9ef329ca1c69d882af68abaae1412cd5c12f727178a8f466e6fc AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb -DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac -DIST stunnel-5.55.tar.gz 986873 BLAKE2B feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa SHA512 278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a -DIST stunnel-5.56.tar.gz 981163 BLAKE2B eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b SHA512 db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece -EBUILD stunnel-5.50-r1.ebuild 2793 BLAKE2B 87996eed3f6e6fb325a600bc8e7cd34b9ba2cf0f979b9e6d0c91f771965358714ec8d0ba4f8b2cb143f3147f14253b706a16c9c05ece2a4ab0dd01806bad51e7 SHA512 3cb233f32648e69a92db145594597e774435851e71f5f3927351736ff0fc123b9bf0418a21501734e12a2999f518e8ec24bd0176d9bddb884bf5707539b036c5 -EBUILD stunnel-5.55.ebuild 2765 BLAKE2B f8a63ca21c9fff727e3721fd1ea3fc44e23a419aed884a663e2a2b7d3a14581a849d901a262add9db245de5908afe24a5494a018da3b084c63daa898cf9fd120 SHA512 a19a57aa6b5d025b75e01822400ab3db74799dbc1c39d326a2893505212045142ac309314fb98ce735796c021aea67d7676537fa917953dffe231bf396c0d4ea -EBUILD stunnel-5.56-r1.ebuild 2893 BLAKE2B f4aee0f03135570820eaba95ee982e020448b46cbb4b0e43116c3db8511ebd67d7437f7e007323378ca4f9a785bbb6d46de2af289269cac117fed20020367efb SHA512 d6fadc2ec6e948e84a690587b198a7f66c1987d480261c4dce0cd074d7eeaec353969564ef1001e6ca179171121719b8635eeefb9e0d875db3b14ff00ecdb8c0 -EBUILD stunnel-5.58.ebuild 2934 BLAKE2B 21f16685547deb293812396babf174f67b473f52febb75b2e028d340ca2a49a858ebe357004ffde28b6bd7733a9a0f646ee79ba9866f577de4bccaf373f0ed5c SHA512 f27d3de9167d5aafbd4d57f57b81dace624adec109beebb4c010544ef2a95946edeab6bc463751e5ecd2943a91fb22ca954a2e5734b8a1e31b7eee1e17596d85 +EBUILD stunnel-5.58.ebuild 2919 BLAKE2B 035703b6f9da38617d26983d620087ef1fbf6393580f844dce372d90becf5535ca9297ec29c163f660d4e12ddbd9e56b1223150606f4f1eaca0b7101c5739987 SHA512 c53676354bf7cb298ddba2c5a6daae87d32682be026cba197fe1899b1903c7b7635760ea9290192c9e632359b6dfb4b6614abf6401532f84b95b586fd0b93c6a MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362 diff --git a/net-misc/stunnel/files/stunnel b/net-misc/stunnel/files/stunnel deleted file mode 100644 index 13887f911332..000000000000 --- a/net-misc/stunnel/files/stunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -SERVICENAME=${SVCNAME#*.} -SERVICENAME=${SERVICENAME:-stunnel} -STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf} - -depend() { - need net - before logger -} - -get_config() { - if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then - eerror "You need to create ${STUNNEL_CONFIGFILE} first." - return 1 - fi - CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - [ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}" - PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid} -} - -start() { - get_config || return 1 - checkpath -d -m 0775 -o root:stunnel /run/stunnel - if [ "$(dirname ${PIDFILE})" != "/run" ]; then - checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE}) - fi - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \ - --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} ${STUNNEL_OPTIONS} - eend $? "Failed to start ${SVCNAME}" -} - -stop() { - get_config || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} - eend $? "Failed to stop ${SVCNAME}" -} diff --git a/net-misc/stunnel/files/stunnel-5.50-libressl.patch b/net-misc/stunnel/files/stunnel-5.50-libressl.patch deleted file mode 100644 index 4481220c268d..000000000000 --- a/net-misc/stunnel/files/stunnel-5.50-libressl.patch +++ /dev/null @@ -1,228 +0,0 @@ -diff --git a/src/ctx.c b/src/ctx.c -index cd59f4e..b41be1b 100644 ---- a/src/ctx.c -+++ b/src/ctx.c -@@ -118,7 +118,7 @@ NOEXPORT void sslerror_log(unsigned long, char *); - - /**************************************** initialize section->ctx */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - typedef long unsigned SSL_OPTIONS_TYPE; - #else - typedef long SSL_OPTIONS_TYPE; -@@ -126,7 +126,7 @@ typedef long SSL_OPTIONS_TYPE; - - int context_init(SERVICE_OPTIONS *section) { /* init TLS context */ - /* create TLS context */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - if(section->option.client) - section->ctx=SSL_CTX_new(TLS_client_method()); - else /* server mode */ -@@ -437,7 +437,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) { - /**************************************** initialize OpenSSL CONF */ - - NOEXPORT int conf_init(SERVICE_OPTIONS *section) { --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *cctx; - NAME_LIST *curr; - char *cmd, *param; -@@ -1247,7 +1247,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { - - c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli); - if(c) { --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl); - #else - int state=SSL_get_state((SSL *)ssl); -diff --git a/src/options.c b/src/options.c -index 103ea6c..756e48c 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -75,7 +75,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *); - NOEXPORT void sni_free(SERVICE_OPTIONS *); - #endif /* !defined(OPENSSL_NO_TLSEXT) */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int str_to_proto_version(const char *); - #else /* OPENSSL_VERSION_NUMBER<0x10100000L */ - NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *); -@@ -3048,7 +3048,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr, - break; - } - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - - /* sslVersion */ - switch(cmd) { -@@ -3621,7 +3621,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) { - - /**************************************** modern TLS version handling */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - - NOEXPORT int str_to_proto_version(const char *name) { - if(!strcasecmp(name, "all")) -diff --git a/src/prototypes.h b/src/prototypes.h -index aaf50fc..01343bf 100644 ---- a/src/prototypes.h -+++ b/src/prototypes.h -@@ -223,7 +223,7 @@ typedef struct service_options_struct { - #if OPENSSL_VERSION_NUMBER>=0x009080dfL - long unsigned ssl_options_clear; - #endif /* OpenSSL 0.9.8m or later */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - int min_proto_version, max_proto_version; - #else /* OPENSSL_VERSION_NUMBER<0x10100000L */ - SSL_METHOD *client_method, *server_method; -@@ -663,7 +663,7 @@ int getnameinfo(const struct sockaddr *, socklen_t, - #define USE_OS_THREADS - #endif - --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - - #ifdef USE_OS_THREADS - -@@ -711,7 +711,7 @@ typedef enum { - - extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS]; - --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - /* Emulate the OpenSSL 1.1 locking API for older OpenSSL versions */ - CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void); - int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *); -diff --git a/src/ssl.c b/src/ssl.c -index ad06cb5..0b45769 100644 ---- a/src/ssl.c -+++ b/src/ssl.c -@@ -39,7 +39,7 @@ - #include "prototypes.h" - - /* global OpenSSL initialization: compression, engine, entropy */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, - void *from_d, int idx, long argl, void *argp); - #else -@@ -114,7 +114,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { - #endif - #endif - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, - void *from_d, int idx, long argl, void *argp) { - #else -@@ -177,7 +177,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global TLS settings */ - - #ifndef OPENSSL_NO_COMP - --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - NOEXPORT int COMP_get_type(const COMP_METHOD *meth) { - return meth->type; -diff --git a/src/sthreads.c b/src/sthreads.c -index 412a31a..e12a330 100644 ---- a/src/sthreads.c -+++ b/src/sthreads.c -@@ -97,14 +97,16 @@ unsigned long stunnel_thread_id(void) { - - #endif /* USE_WIN32 */ - --#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L -+#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L) || \ -+ defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT void threadid_func(CRYPTO_THREADID *tid) { - CRYPTO_THREADID_set_numeric(tid, stunnel_thread_id()); - } - #endif - - void thread_id_init(void) { --#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L -+#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L) || \ -+ defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_THREADID_set_callback(threadid_func); - #endif - #if OPENSSL_VERSION_NUMBER<0x10000000L || !defined(OPENSSL_NO_DEPRECATED) -@@ -115,7 +117,7 @@ void thread_id_init(void) { - /**************************************** locking */ - - /* we only need to initialize locking with OpenSSL older than 1.1.0 */ --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - - #ifdef USE_PTHREAD - -@@ -224,7 +226,7 @@ NOEXPORT int s_atomic_add(int *val, int amount, CRYPTO_RWLOCK *lock) { - - CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS]; - --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - - #ifdef USE_OS_THREADS - -@@ -334,7 +336,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) { - - void locking_init(void) { - size_t i; --#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L -+#if defined(USE_OS_THREADS) && \ -+ (OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)) - size_t num; - - /* initialize the OpenSSL static locking */ -diff --git a/src/tls.c b/src/tls.c -index 9616df3..b89c61e 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -41,7 +41,7 @@ - volatile int tls_initialized=0; - - NOEXPORT void tls_platform_init(); --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT void free_function(void *); - #endif - -@@ -52,7 +52,7 @@ void tls_init() { - tls_platform_init(); - tls_initialized=1; - ui_tls=tls_alloc(NULL, NULL, "ui"); --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_set_mem_functions(str_alloc_detached_debug, - str_realloc_detached_debug, str_free_debug); - #else -@@ -184,7 +184,7 @@ TLS_DATA *tls_get() { - - /**************************************** OpenSSL allocator hook */ - --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT void free_function(void *ptr) { - /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */ - /* unfortunately, OpenSSL provides no file:line information here */ -diff --git a/src/verify.c b/src/verify.c -index b4b5115..0457ce0 100644 ---- a/src/verify.c -+++ b/src/verify.c -@@ -346,7 +346,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) { - cert=X509_STORE_CTX_get_current_cert(callback_ctx); - subject=X509_get_subject_name(cert); - --#if OPENSSL_VERSION_NUMBER<0x10100006L -+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER) - #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs - #endif - /* modern API allows retrieving multiple matching certificates */ diff --git a/net-misc/stunnel/files/stunnel-r1 b/net-misc/stunnel/files/stunnel-r1 deleted file mode 100644 index 11530eabe720..000000000000 --- a/net-misc/stunnel/files/stunnel-r1 +++ /dev/null @@ -1,51 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" -SERVICENAME=${SVCNAME#*.} -SERVICENAME=${SERVICENAME:-stunnel} -STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf} - -depend() { - need net - before logger -} - -get_config() { - if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then - eerror "You need to create ${STUNNEL_CONFIGFILE} first." - return 1 - fi - CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - [ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}" - PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid} -} - -start() { - get_config || return 1 - checkpath -d -m 0775 -o root:stunnel /run/stunnel - if [ "$(dirname ${PIDFILE})" != "/run" ]; then - checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE}) - fi - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \ - --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} ${STUNNEL_OPTIONS} - eend $? "Failed to start ${SVCNAME}" -} - -stop() { - get_config || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --exec /usr/bin/stunnel \ - --pidfile ${PIDFILE} - eend $? "Failed to stop ${SVCNAME}" -} - -reload() { - get_config || return 1 - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --pidfile ${PIDFILE} --name stunnel - eend $? -} diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild deleted file mode 100644 index 462a59083c99..000000000000 --- a/net-misc/stunnel/stunnel-5.50-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit ssl-cert multilib systemd user tmpfiles - -DESCRIPTION="TLS/SSL - Port Wrapper" -HOMEPAGE="https://www.stunnel.org/index.html" -SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz - http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha" -IUSE="ipv6 libressl selinux stunnel3 tcpd" - -DEPEND="tcpd? ( sys-apps/tcp-wrappers ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -RDEPEND="${DEPEND} - stunnel3? ( dev-lang/perl ) - selinux? ( sec-policy/selinux-stunnel )" - -RESTRICT="test" - -pkg_setup() { - enewgroup stunnel - enewuser stunnel -1 -1 -1 stunnel -} - -src_prepare() { - # Hack away generation of certificate - sed -i -e "s/^install-data-local:/do-not-run-this:/" \ - tools/Makefile.in || die "sed failed" - - # bug 656420 - eapply "${FILESDIR}"/${P}-libressl.patch - - echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel - - eapply_user -} - -src_configure() { - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable ipv6) \ - $(use_enable tcpd libwrap) \ - --with-ssl="${EPREFIX}"/usr \ - --disable-fips -} - -src_install() { - emake DESTDIR="${D}" install - rm -rf "${ED}"/usr/share/doc/${PN} - rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ - "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 - use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 - - # The binary was moved to /usr/bin with 4.21, - # symlink for backwards compatibility - dosym ../bin/stunnel /usr/sbin/stunnel - - dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog - docinto html - dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ - tools/importCA.html - - insinto /etc/stunnel - doins "${FILESDIR}"/stunnel.conf - newinitd "${FILESDIR}"/stunnel-r1 stunnel - - doenvd "${T}"/20stunnel - - systemd_dounit "${S}/tools/stunnel.service" - newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf -} - -pkg_postinst() { - if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then - install_cert /etc/stunnel/stunnel - chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - fi - - einfo "If you want to run multiple instances of stunnel, create a new config" - einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " - einfo "\'pid= \' with a unique filename." -} diff --git a/net-misc/stunnel/stunnel-5.55.ebuild b/net-misc/stunnel/stunnel-5.55.ebuild deleted file mode 100644 index 9744f7b8a26f..000000000000 --- a/net-misc/stunnel/stunnel-5.55.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit ssl-cert multilib systemd user tmpfiles - -DESCRIPTION="TLS/SSL - Port Wrapper" -HOMEPAGE="https://www.stunnel.org/index.html" -SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz - http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6 selinux stunnel3 tcpd" - -DEPEND="dev-libs/openssl:0= - tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND="${DEPEND} - stunnel3? ( dev-lang/perl ) - selinux? ( sec-policy/selinux-stunnel )" - -RESTRICT="test" - -pkg_setup() { - enewgroup stunnel - enewuser stunnel -1 -1 -1 stunnel -} - -src_prepare() { - # Hack away generation of certificate - sed -i -e "s/^install-data-local:/do-not-run-this:/" \ - tools/Makefile.in || die "sed failed" - - echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel - - eapply_user -} - -src_configure() { - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable ipv6) \ - $(use_enable tcpd libwrap) \ - --with-ssl="${EPREFIX}"/usr \ - --disable-fips -} - -src_install() { - emake DESTDIR="${D}" install - rm -rf "${ED}"/usr/share/doc/${PN} - rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ - "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 - use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 - - # The binary was moved to /usr/bin with 4.21, - # symlink for backwards compatibility - dosym ../bin/stunnel /usr/sbin/stunnel - - dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog - docinto html - dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ - tools/importCA.html - - insinto /etc/stunnel - doins "${FILESDIR}"/stunnel.conf - newinitd "${FILESDIR}"/stunnel-r1 stunnel - - doenvd "${T}"/20stunnel - - systemd_dounit "${S}/tools/stunnel.service" - newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf -} - -pkg_postinst() { - if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then - install_cert /etc/stunnel/stunnel - chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - fi - - einfo "If you want to run multiple instances of stunnel, create a new config" - einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " - einfo "\'pid= \' with a unique filename." -} diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild b/net-misc/stunnel/stunnel-5.56-r1.ebuild deleted file mode 100644 index 485343478d77..000000000000 --- a/net-misc/stunnel/stunnel-5.56-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit ssl-cert multilib systemd tmpfiles - -DESCRIPTION="TLS/SSL - Port Wrapper" -HOMEPAGE="https://www.stunnel.org/index.html" -SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz - http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6 selinux stunnel3 tcpd" - -DEPEND="dev-libs/openssl:0= - tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND=" - acct-user/stunnel - acct-group/stunnel - ${DEPEND} - stunnel3? ( dev-lang/perl ) - selinux? ( sec-policy/selinux-stunnel )" - -RESTRICT="test" - -src_prepare() { - # Hack away generation of certificate - sed -i -e "s/^install-data-local:/do-not-run-this:/" \ - tools/Makefile.in || die "sed failed" - - echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel - - eapply_user -} - -src_configure() { - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable ipv6) \ - $(use_enable tcpd libwrap) \ - --with-ssl="${EPREFIX}"/usr \ - --disable-fips -} - -src_install() { - emake DESTDIR="${D}" install - rm -rf "${ED}"/usr/share/doc/${PN} - rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ - "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 - use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 - - # The binary was moved to /usr/bin with 4.21, - # symlink for backwards compatibility - dosym ../bin/stunnel /usr/sbin/stunnel - - dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md - docinto html - dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ - tools/importCA.html - - insinto /etc/stunnel - doins "${FILESDIR}"/stunnel.conf - newinitd "${FILESDIR}"/stunnel-r1 stunnel - - doenvd "${T}"/20stunnel - - systemd_dounit "${S}/tools/stunnel.service" - newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf -} - -pkg_postinst() { - if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then - install_cert /etc/stunnel/stunnel - chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - fi - - einfo "If you want to run multiple instances of stunnel, create a new config" - einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " - einfo "\'pid= \' with a unique filename. For openrc make a symlink from the" - einfo "stunnel init script to \'stunnel.name\' and use that to start|stop" - einfo "your custom instance" -} diff --git a/net-misc/stunnel/stunnel-5.58.ebuild b/net-misc/stunnel/stunnel-5.58.ebuild index 2fcb74bea807..611d402d15cf 100644 --- a/net-misc/stunnel/stunnel-5.58.ebuild +++ b/net-misc/stunnel/stunnel-5.58.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib ssl-cert systemd tmpfiles +inherit ssl-cert systemd tmpfiles DESCRIPTION="TLS/SSL - Port Wrapper" HOMEPAGE="https://www.stunnel.org/index.html" @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6 selinux stunnel3 tcpd" DEPEND=" diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest index df7fa1893611..404a207dd274 100644 --- a/net-misc/suite3270/Manifest +++ b/net-misc/suite3270/Manifest @@ -1,3 +1,3 @@ DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b -EBUILD suite3270-4.0_p13.ebuild 2047 BLAKE2B cc106c4b4dede80f90badd68c15af7a2f50f206b0a379964dd90d3e194ace955c4f4a5d3249e5ffc70f353f1c846e264dd4971611c2d85cfc55d6d8e505947fd SHA512 7d8c5b87687af30241b7fe2d5add68e942eb05225d3d9f3b475d85f36c973ce9a7f7b26f416b5b545bca02fb9b485e63d309d997ed706e2109fe30d3353f1633 +EBUILD suite3270-4.0_p13.ebuild 2048 BLAKE2B d80986faad81ef67e87e2b04c08501597b52038a3b2c9d1acc036e7b60771dae0b7fbf87778362c243c461b17122f43d493e45b90a0306b3b350048613ecc9be SHA512 7f3b6c7fe32ff609f6ac04bc07ed1f2db932ab3dbc8cf8f5a33a296e1dc45fddc122900be2cea3b5ce307106b564a64cc07b78dc1a51f613c47f471af9221292 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45 diff --git a/net-misc/suite3270/suite3270-4.0_p13.ebuild b/net-misc/suite3270/suite3270-4.0_p13.ebuild index 3c7df279e0b3..abd0aab0e1a6 100644 --- a/net-misc/suite3270/suite3270-4.0_p13.ebuild +++ b/net-misc/suite3270/suite3270-4.0_p13.ebuild @@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc s390 sparc x86" +KEYWORDS="amd64 ppc ~s390 sparc x86" IUSE="cjk doc ncurses ssl tcl X" RDEPEND="ssl? ( dev-libs/openssl:0= ) diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest index 3e939ada74e5..2420bc807f17 100644 --- a/net-misc/sysrepo/Manifest +++ b/net-misc/sysrepo/Manifest @@ -1,3 +1,5 @@ DIST sysrepo-1.4.104.tar.gz 673855 BLAKE2B 4b3a032538d469bb87d7975e559b329a2d0e1b7d805fda393de47d2be759ab0c37b6d8a7ada6058ec11ba636fb71f358c3e8af4c7a9064859eef9c319566d0de SHA512 a3d518cc2d9c808333906ea3123b09abacb4f83f430e621167577112b95280b389bf19fa0aa47a4e74fca469420d12d585d2ab9c0d63a06e6db087f49817bfb6 +DIST sysrepo-1.4.122.tar.gz 679974 BLAKE2B 3161eb8635c3ea7a0168b1a0eb3250da7e8c134030e5c5443d492cb708f095f9af12f08257a7d0b86a084b121754a8f19fa408de5afc32ce82d92bb4c6c7a535 SHA512 ccd603913b0f31f26f990dba8430ad6c1033546cd764396c43cc6667919b486924fc2d2fade77eee9ef7a3329aae2ceaf4acc578613a0c7c1d2a53d3cbf2944c EBUILD sysrepo-1.4.104.ebuild 734 BLAKE2B 1119853e40e1e6cbbaf815cad96fe5e4350215ae2038aebb1f933e263ca54796df9e322ea4cc3e54aa8d32184272575f659de0dcabdd3424962393ef7549b2db SHA512 8481d00488d91c59146b8c10f9fdb0d3a2b076befd44d238d73db13ba209e790124c3bdd49a34a088783e39d8c6b54817c47830101fb73c905048f367acaf908 +EBUILD sysrepo-1.4.122.ebuild 744 BLAKE2B 1a454ac7c1229846a414c8ad34bf80fe5b9cdc7c961a0d89654d78e98f98759837e742f3363fe1db50fad2115dcf0049e1eff4ed903c69b6edbd8e3375437214 SHA512 7478c4704c9c8a8dfea9595a7db500cf257425247fb9fad32a573f70f6ea9db0af9bd12f04b1a3d9a196c9a5e82c1dcea24e4575eed51089636d85a54990cf28 MISC metadata.xml 448 BLAKE2B 798011f819ee97c46422d54b813c029e04c3d6e093710b0e3f1c12b7b0dd7d5b36d5dc83910f33436a1a8d93b548286bc49d5c5510779494cad33e02ffca0dc6 SHA512 f98a83cb700cff73e694f8c70f8bb6de64304cb589c2871f4f4f794890a5178019ece7d4fbef4487508b3d5856dd29d009c70c7fe1cc9ba29b3084d85605c1ba diff --git a/net-misc/sysrepo/sysrepo-1.4.122.ebuild b/net-misc/sysrepo/sysrepo-1.4.122.ebuild new file mode 100644 index 000000000000..8a6de6d35aeb --- /dev/null +++ b/net-misc/sysrepo/sysrepo-1.4.122.ebuild @@ -0,0 +1,39 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="YANG-based configuration and operational state data store" +HOMEPAGE="https://www.sysrepo.org" +SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=">=net-libs/libyang-1.0.225:=" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen[dot] )" + +src_configure() { + local mycmakeargs=( + -DENABLE_TESTS=$(usex test) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + + use doc && dodoc -r doc/. +} diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest index 92916c24ad06..0eb98dc00719 100644 --- a/net-misc/teamviewer/Manifest +++ b/net-misc/teamviewer/Manifest @@ -1,5 +1,8 @@ AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8 DIST teamviewer_15.15.5_amd64.tar.xz 13264432 BLAKE2B 8f23c036b79c7ee7cbef1181825b5605afd77f22d0565e5359c928bd4014759c3ad56255d8e76ba75d3084c8a9bed98fcdd08f20e502c2906e6eaf6dd952a7b4 SHA512 e42cccb74c08ef1badcd4b78016078a9f6f3b69b700e4c64d6eae927fa4b748c11288ef5cc50aa962eabd17679479ececf8750e8c34f6361758da903e555a334 DIST teamviewer_15.15.5_i386.tar.xz 13751236 BLAKE2B 32d8f6494c72b51feef54e2d5dd1096aee83c283a1d07680f428bd4321ede9975d1ee4e7cd55718f9250d54304d17887b98ae6e62617e7022ec78384fdde5a16 SHA512 315e6fcaa6d40aab17c47ac4eee6d894be3731ae7d0242e2b11bae279627de04540f8d46908826d53b6a6d275769c19a420c6f30e9869a734e87cb7d6832bfba -EBUILD teamviewer-15.15.5.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d +DIST teamviewer_15.17.6_amd64.tar.xz 13763464 BLAKE2B 5dde0947470611bd67bd8913355c965c0e206d2bd5243e27a4fa742e4fc2d3e0849132a6b2527d453c1f8aa2026cb65897bc2a3c83b493914aa8bd69b1d408d7 SHA512 1775e1fb1c35eceb9df1ec12fb5d7a6e7e9df739a211b99561f67665834bbea2bb80af4547841b73be386cae184861d0f40423936d38f9a2055ee30edd4095c0 +DIST teamviewer_15.17.6_i386.tar.xz 14394028 BLAKE2B 4a5f7f72887c4ba391ae444eaba2c7c474b40fc0bfbe0c7745b4c925fbf7626862de162f49f115e41ccc0858cf7d6d813eadf0940d64217a6964b4d83526b0ad SHA512 f7b7a999069cb036b2b528651fb0737ca0dbcbe3b8283ca8281dd9c08f33b1aa44b7689c63816686538213cd10939dcc69510512ab61829ba7d4d7c6789709ba +EBUILD teamviewer-15.15.5.ebuild 4027 BLAKE2B 8c597b6b34f440ce5fed8e6fab07d57fd6e70d9a78392e435a0133e7d6f6f4bc51e99fc80598f632eab8d0713fe153a4d4984b51cecbabff04744ac952d7f7a3 SHA512 87a8087b5e4de9fe6b618abc1effdc6abcff605214ff90d804324353f0a9c6e9fdb29fae1a02315fd5a0ba3843b2e004285ab0350ef1b361295c1794714da239 +EBUILD teamviewer-15.17.6-r1.ebuild 4042 BLAKE2B 43fc88ba97e92ee98398d072d926e7b344dc904996f424270fb558d2edbac287724df3c082461ce8eee8411f0c54a676ff1f069e784a100f7f912363b187fc21 SHA512 949265ca6c08ad52e503563b7be381a42e800474a3def791fe49411770b4a788941b4b2a22413ed407f21d0f521511dddda75baecd490d89494d95ce7843f52b MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/net-misc/teamviewer/teamviewer-15.15.5.ebuild b/net-misc/teamviewer/teamviewer-15.15.5.ebuild index 4636957e3f98..f1cc5dc99df9 100644 --- a/net-misc/teamviewer/teamviewer-15.15.5.ebuild +++ b/net-misc/teamviewer/teamviewer-15.15.5.ebuild @@ -14,9 +14,7 @@ SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${ LICENSE="TeamViewer MIT" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" -DEPEND="sys-apps/sed" RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 diff --git a/net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild b/net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild new file mode 100644 index 000000000000..c9a4dd15708f --- /dev/null +++ b/net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_MAJOR="$(ver_cut 1)" +MY_P="${PN}${MY_MAJOR}" +inherit desktop systemd xdg + +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_${MY_MAJOR}x/${PN}_${PV}_amd64.tar.xz ) + x86? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_i386.tar.xz )" + +LICENSE="TeamViewer MIT" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" + +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#8332956 + +RESTRICT="bindist mirror" + +# Silence QA messages +QA_PREBUILT="opt/${MY_P}/*" + +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_P}" # 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 + local exe + 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 + + local size + for size in 16 24 32 48 256; do + newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png teamviewer.png + done + + dodoc -r doc + + # Make docs available in expected location + dosym ../../usr/share/doc/${PF}/doc ${dst}/doc + + # We need to keep docs uncompressed, bug #778617 + docompress -x /usr/share/doc/${PF}/* + + keepdir /etc/${MY_P} + dosym ../../etc/${MY_P} ${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_P} + dosym ../../var/log/${MY_P} ${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 ${MY_MAJOR}" teamviewer +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + + 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#8332956" + fi +} diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest index c6fed1b4e641..ec2896b5c4a4 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 1155 BLAKE2B d007be6245d920f1e4ad2ea2984be70976758b9564bb0039bf04588bc8d86ebb3a2a2a216177e142e5eb6e5cbd0c3c4830322796381ca78f8c3fcf9fecd77e80 SHA512 7e8ea5c158caa1cce767c0ba8b4110e2b2d00f7a48977139b35e6544e954f32c9e5bd733cfbbbc7fa97f630752b816770a3bc2ab04f54e9334e0599015345d3e +EBUILD telnet-bsd-1.2-r1.ebuild 1157 BLAKE2B 254e4b0ad2c2e24a9a2fa5f3ef20a0157939208f4da5e5967b1efa01f77bfaeee6b2793003d952eb9a638756269c6f17836e70959cb4e79ab6f10bf351af2c10 SHA512 53e1c91543ad0bfe1459515afeb536e95dc4040f7a1365f05a3645c2d7cf94d2f353697eb8e3225c82c341e6f518e2d8d9559ee8c9d511304ea9925e1b8bd927 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 ba2df695c456..f2de7105394a 100644 --- a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild +++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils autotools toolchain-funcs + +inherit autotools epatch toolchain-funcs DESCRIPTION="Telnet and telnetd ported from OpenBSD with IPv6 support" HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/" @@ -10,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 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/tipcutils/Manifest b/net-misc/tipcutils/Manifest index 866482b50155..d5daf38ff844 100644 --- a/net-misc/tipcutils/Manifest +++ b/net-misc/tipcutils/Manifest @@ -1,3 +1,3 @@ DIST tipcutils-2.0.3.tar.gz 166337 BLAKE2B 70a06e0f71550123da9b10cc9330e89e2f0722614f00ab93d229baa78f189b3ae03a9aa70722245886e6dee4b9ebf9f95b9ecc06c4c552096afdf54cf28fab0c SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec -EBUILD tipcutils-2.0.3.ebuild 449 BLAKE2B 8dd589c389b293bf4c9c79bb5069d5e3a3c1ef2f261808637634072a6d8dcc3bdda71705ff6f0cf5b6a9c310b2b0eca2d4de9e01c7f3f15042a1620e4f966f1c SHA512 6b805810c2ccfdbacfff7015e09956dee32be3ae598f5eaa15ceeadef794cba1b7781eedcc0bd935d0ea86bfa0664eff08de6bf95d7dc1471ebed3adc3acd715 +EBUILD tipcutils-2.0.3.ebuild 398 BLAKE2B 649cbeee11c9342a93121a7b40d7520dd325327bd7a128c66a663aefba6714380221f98cc4d50260fa4847df1b2a32310588b6cb4d6aef919b95bda63055fac0 SHA512 b7d2265876a9076d956d49cee9724cf736c93cb1f0d2e22d08bd56c1dcc12600e785f2deef42b00a9e7510ccc40df1043ff9f208f45d8463f58a063f40ecef06 MISC metadata.xml 241 BLAKE2B eb3c33457610df6ba6f6698f73504e0ce94c5538fc2432c3b2555b4c8e0f6a1b9d2c54806aba3a5aff5f74c2f62f2b8a4151a6f214282b666041cfaf1fe788b2 SHA512 ff2c5ffaf00fa30dd4ed38f986992dfd88a006a63a07c836efbd00dc682f5ad708c8640007c4e8b7b4aab46a7dbcbfbca501aae31f8c73936b7ca9143fafe4a8 diff --git a/net-misc/tipcutils/tipcutils-2.0.3.ebuild b/net-misc/tipcutils/tipcutils-2.0.3.ebuild index 9ae8f0d29192..11ef103ecf46 100644 --- a/net-misc/tipcutils/tipcutils-2.0.3.ebuild +++ b/net-misc/tipcutils/tipcutils-2.0.3.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=7 DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)" HOMEPAGE="http://tipc.sourceforge.net" @@ -16,7 +14,3 @@ KEYWORDS="~amd64 ~x86" DEPEND=">=sys-kernel/linux-headers-2.6.39" DOCS=( README ) - -src_prepare() { - epatch_user -} diff --git a/net-misc/udpxy/Manifest b/net-misc/udpxy/Manifest index 8db8f8a2cca6..4e325ebaed91 100644 --- a/net-misc/udpxy/Manifest +++ b/net-misc/udpxy/Manifest @@ -2,5 +2,5 @@ AUX udpxy.confd 1196 BLAKE2B 78326f508631bf0c83380ef7c7fd7768212b4efb6fcccd6a33e AUX udpxy.initd 357 BLAKE2B 9a697e689787d0e560dc452d1cf8df42d2ecb3007cb107cbe42c1b68b891939eb5a5142aa8df499d1908908990a358d32c0392a06d0ee8a9c5f1580345e1bccf SHA512 0fbd4235e585d3d23e238e30060a3968ad17090a3232ca6ef316115ec98b8ae1528f8da757bc3e1dde1ce529ba159463f4814b0f13ef3c3f88b74164e389f379 AUX udpxy.service 182 BLAKE2B 278fc90835dffc38142dad570a6a6898d39b8a622bc69a2f2b53d913303e58f4d1c15909d25754ec0f263097d250788d70324e3b9fbaf4ed1e51fd4ee7b27e9e SHA512 b9d32158657ec27362e9dea4704757a91543eff4b15aa0d256c934ae119545053ee21f32c87e0da85fc30c53bd807de19a26593cd63472edd5819601fd2b0ac9 DIST udpxy.1.0.23-7-prod.tar.gz 77591 BLAKE2B b1bbe71a5104db7e74710c2f9a7f3e0a43ecb4bf13bc6ae2cd02d71059e2ed2f78aafda348858de54ce57da7b1bfef60aae7819ebd1bf6907ac9183f3c3b7725 SHA512 5bd37822f1d861b3828339175b7daebbf3ccb3969e808a319d3d3f054afbf7769d5f2705d25780a76819b3b7963af3a81af7d71556ba61274141142167907a23 -EBUILD udpxy-1.0.23.7-r2.ebuild 779 BLAKE2B 74e0f8bee579e8ed0a646d25912f90e41a1176fa6a005ca0f482a1b48ed92db1e177c188e61b7fe67f740552b005ea0a02f9efe27968785247630a22171bdccc SHA512 bc37b4d0184fb943217bda25be7a32906c9ccc007148a3d0f844d3696d0e2d766a392f1c1b4832e397487cc710cbe32da5a8f1701ccb531607efab186151affb +EBUILD udpxy-1.0.23.7-r2.ebuild 735 BLAKE2B 47af5069b3c352cb646d03af9ab09dbcea606bc93a78e86e30dbf519bdf9a78a537f55a22e6c862a5812ae5d2cf0e147f725f332d29bc8d3d97a98e40668c8d1 SHA512 9d14e7f1b9c65e143177463ab993beb97685d64f92188de03e621fe2f3be5b493e9287e551131765de444ababa580bf83ea081ac810abac35f5cc5f657923d57 MISC metadata.xml 247 BLAKE2B 69a36917942ca9f4fd06674f7729501b7adfb5a6aa8bf896009e7ae6207621a7f3badce46aa52b8fc1ae31e7320c96db3ff6904fd2b552ef939d4098a89998f1 SHA512 56a7183705aa925bc656b1dcf564cad1074bf122c8c00b6436fba46e321110c3f6fd8f1a3f75fff04323f2ea334d24f772699d2061366dabc7d7cb8ef6f625f9 diff --git a/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild b/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild index 8d67b7f4467f..73364f910479 100644 --- a/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild +++ b/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils systemd toolchain-funcs versionator +EAPI=7 -MY_PV=$(replace_version_separator 3 -) +inherit systemd toolchain-funcs + +MY_PV=$(ver_rs 3 -) DESCRIPTION="Small daemon to relay multicast UDP traffic to client's TCP (HTTP) connection" HOMEPAGE="https://sourceforge.net/projects/udpxy/" SRC_URI="http://www.udpxy.com/download/1_23/${PN}.${MY_PV}-prod.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -S="${WORKDIR}/${PN}-${MY_PV}" - src_prepare() { - eapply_user + default + tc-export CC } @@ -27,7 +28,7 @@ src_install() { doman doc/en/*.1 dodoc CHANGES README - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - systemd_dounit "${FILESDIR}/${PN}.service" + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service } diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index fa2450f284ce..4e36fd8ed24c 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1,13 +1,7 @@ AUX unison-2.48.15_p4-ocaml-4.08.patch 1942 BLAKE2B 18cd8c18e0c30156fd3e36aaa987a9ad033ff321edd4f911006bfec958d70884f3575536cfe543e8da0fc10448193bb3514936bab95f3c71c96b75b4f4048c0e SHA512 802b333418513df59fbbf956620f1576141763a898d320a3be06d35d5ad8adf38c13e9bc9dd38cae05f2d7a25c07a3fcc709ace66c6a92d728c25a42688494e9 AUX unison-2.48.4-Makefile-dep.patch 542 BLAKE2B b32665bd2562c84aae1a801648c9324a0fafe39fb7d7d6be0b6bc52cdcd2f8282cfcde97fe2682b1d41656f65f1df9e32adc03660ef2c5c6a9394709c3d1e838 SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394 -DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec SHA512 658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78 -DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68 -DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9 -DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703 SHA512 c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6 -EBUILD unison-2.48.15_p4-r2.ebuild 2998 BLAKE2B 3477822b9772652c245d6047e29ecdf70522f7668e9fb2e29e9556afdaf26dd96635983bf182ea5b2b56a0cd56b4bdae06ac0f2be399d1dd616d0e936fd346e5 SHA512 a6d3fb96a29e5156e7519f3f62a07622e1333b530afbfa1fa5cbf11524f5e9e8aa7df63af589d949bb904d8ab1fd6840d970fc27496f72033da2e9291d89c6c7 -EBUILD unison-2.51.3_p20201024.ebuild 2772 BLAKE2B 4e1973839a992c1af50332b8f84c6a7d5d03c1962af8f4a9c183551f1247bc1890d85aa7651d71a12f96134e63e367c00f79bd2917322c8cd278afbc852b4daa SHA512 086fd563d0f74661d710ab07ead1c73ea7702b4fe427336a5da39d8c4d3b4e2fcbf2f25fa7c65e0ddb895b13e0fca3dd381825b2fac41da8e32bf20c01569e2d -EBUILD unison-2.51.3_p20201127.ebuild 2756 BLAKE2B 3699033422041cf1bf5e626637f9ede038f474884564b921269e6bb996d0b725a09c52ffee6f9246a29b11433b7ea16212f6559184f2da21c129f71f5759962e SHA512 8e0ff13147e90eb51a9c49ed3b6020a288838490c8e6ccc11b5f9a2e75511d872d1a5bd84bd4242a1e1a73fb0ed7e633bed149a4ad25e8d94cd0ee46e3f1dc61 +EBUILD unison-2.51.3_p20201127.ebuild 2753 BLAKE2B c300a654c3792614c7ad0270f836a681402c9b732fced8ae92a2c77c8265b3247b4ad99ff880385f17a58364cd6733a06408caa9b5be78b763d38a09f4c0d270 SHA512 38ff7179995980b833e18a35b5e7e9827774391c87f6af88be639e3e0871ab15bd74a0c5e41b607d43e22e9ccbbf495c179a89293cb3a538cf69a54fd22e16cb EBUILD unison-2.51.4_rc2.ebuild 2651 BLAKE2B 15f2abf27b02e733927caa6730f7ab1d5bb5181bd5b43c6bda4adc883b6524b030b64be790578783d057c4c0e2840a5fc6683ee95c53fdb17efe6d217ffe0d58 SHA512 588a30ea2cb26ffcc14c4bc00aadafde4b3df7729518e98bb215c969519d5abb76ed1e0142fd9c9090f485b393cf162d46e7312b080b15d8840d357bdcf33345 MISC metadata.xml 450 BLAKE2B 55d917828a118580b283b301e205453121b52d46495f02f5f488f71b325b3d290ffb768c3c89b2fc685f6dd6e87e37dc91b387d8b9d0f872681f70c7afeafe57 SHA512 fcc876158d2c94e56aae6a3d78df3e3b13b0d0a5d100513fe5f980c11c06d1fb055d5b943fcd4b01063343c80d78c328f23a82d73cccd65159b5306b35dac502 diff --git a/net-misc/unison/unison-2.48.15_p4-r2.ebuild b/net-misc/unison/unison-2.48.15_p4-r2.ebuild deleted file mode 100644 index 1f9bb1d55d0b..000000000000 --- a/net-misc/unison/unison-2.48.15_p4-r2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop xdg-utils - -# Use the docs for the last 'normal' release -DOC_P="${PN}-2.48.4" -DESCRIPTION="Two-way cross-platform file synchronizer" -HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" -SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV/_p/v}.tar.gz -> ${P/_p/v}.tar.gz" -# No manual.pdf or manual.html available for this version -SRC_URI+=" doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.pdf - https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.html ) -" - -LICENSE="GPL-2" -SLOT="$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="debug doc gtk +ocamlopt threads" - -# Upstream, for this version, has explicitly disabled test with marker -# "Skipping some tests -- remove me!". Given the potentially destructive nature -# of those tests, let's not try to run them (they're re-enabled in subsequent -# releases). -RESTRICT="test !ocamlopt? ( strip )" - -# ocaml version so we are sure it has ocamlopt use flag -DEPEND="=x11-misc/imake-1.0.8-r1" src_configure() { econf --libexecdir=/usr/"$(get_libdir)"/misc \ --disable-installing-app-defaults - xmkmf || die "xmkmf failed" + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die "xmkmf failed" } src_compile() { diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest index 92072c6a7515..fa998e9f2d15 100644 --- a/net-misc/x2goserver/Manifest +++ b/net-misc/x2goserver/Manifest @@ -4,7 +4,7 @@ AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c DIST x2goserver-4.1.0.2.tar.gz 138053 BLAKE2B 5281f05d8531ace6e9228faf5c73590b17e4f743ab6a01779bcf0252c2c34d4525919ae71deef190bf835713be2f43d25fa41fd5c82e99280f0dc77927af7006 SHA512 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672 DIST x2goserver-4.1.0.3.tar.gz 141581 BLAKE2B 79401a146e8a18451d6521f4b9556b2f22746bd752f39dc45764bacca085f2bb66a92327aaeb292979ce43ffbde24541e492cec814f1f8a535614cbdc2dc3ebd SHA512 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a -EBUILD x2goserver-4.1.0.2.ebuild 2603 BLAKE2B 6d7c418547ce8ebeb4c226e1e90d18d329bfd679c8fe6c09d6fa967e0ffeb89d04257154e192d3e7a8585443ad8818730e0a490074ba9e0b4bf05bee50df53df SHA512 2b918aa2920ce522d89657cd297a9dc40e6cff579cd700d338c9957c23cf9ca57855a8b6fd806054905a4636bd27591afa5348787dd568e02c68e5a298c6917e -EBUILD x2goserver-4.1.0.3-r1.ebuild 2536 BLAKE2B 42a7874b734b197bd40afe674fbb09466449324a32954a6b87c737d1a27c3cdcde3df39be206b4ae1abdafc0dcb2f042a3673f7a683f8d1aee561e4813cba49a SHA512 48a87eda1e576821193059d52627a9936e4487def7c6279b8ad23ab4d4e8e79235d110a0cc28d005d5bda333fbb4e200e5439bc9a29d42d5403a319f18a44aff -EBUILD x2goserver-4.1.0.3.ebuild 2700 BLAKE2B fb10e4e31f889a17ddf491ec3b156cec3b5d34a72b141177597a2815ffefbc07519f86de5fbf1ac4883173826c7bb2d27d8461ebb2e5e13ca0ec7f7aa6bf9f44 SHA512 c721b7bb63e22a3bebf746ebe9aad94dab2d0ef888b4cc1b860e130385e27948f23f0b5f586def00a97dc0842d0725ccb13bf820f7afef06b1b90ca33d88a796 +EBUILD x2goserver-4.1.0.2.ebuild 2593 BLAKE2B 4a996297ca35b0306bd1057565099a511f78fc47095b780718327785349d241fdbae42ba02da49f1643251a1bbe20d7a8f9c8ce5a6c39ce2d0a1748790872969 SHA512 11e50cf4858d7363b27b6000f92111fc70be01d986b2452d600dfe2f71c435764ceee9de3d4050ce65924ec1c03f6d97d576bd8058ec5cb9d216318156267bca +EBUILD x2goserver-4.1.0.3-r1.ebuild 2526 BLAKE2B bcf8660139ec8f5a3f0b890201d2b8a0547a683fd7538700759f120f686d73a79a9a78bf7d69e10c97769a207693eca1ff74af014225277e869ecf2ac17574bc SHA512 b4f5094d66f77d2424f2f7913ed65b582f15ab6752941dbdf0938d2233bcfcff97acd6b20496dc9173a6e710cc9ac3528195f19a2f7932c495f4760bfe693c54 +EBUILD x2goserver-4.1.0.3.ebuild 2690 BLAKE2B 50641b4a750a3026657805e966292d4ec4122450e4702cd4ba661e6b33a2a265423e1a5830f03db6fc3d87c5e44023ff972b0b9406952ced3c6e8e61215b33cb SHA512 b271f0d8bede6fa5d39697f20ff0970964aef86fd8a2a16b7580536d0555be2a0a8bdace517380c4f3dbbdacef297451d640ad064f898724b705d725eeea76ce MISC metadata.xml 346 BLAKE2B 0b995b0163615cb9c993c9ebdfd75d144052fcb65fed6d5f2e3cdaceaedaf8d4c7b6dfdf32e98a1f0c1cfae022617f216f73845177f5e9f904a77f043b78e851 SHA512 860975e20db2fefc93338ee5c21a2491f56c4f96924788098c94c9dcd0faebec15fdc7f06c04c571bae291a47ac6be4980799057d56ef33afefec3d878260c2e diff --git a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild index 63bc43289678..ca896382fcee 100644 --- a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild +++ b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit multilib systemd toolchain-funcs user xdg +inherit systemd toolchain-funcs user xdg DESCRIPTION="The X2Go server" HOMEPAGE="http://www.x2go.org" @@ -39,7 +39,7 @@ RDEPEND="dev-lang/perl:= PATCHES=( "${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch "${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch - ) +) pkg_setup() { # Force the group creation, #479650 diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild index dd16386ea11f..7e6f6226496a 100644 --- a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild +++ b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib systemd toolchain-funcs xdg +inherit systemd toolchain-funcs xdg DESCRIPTION="The X2Go server" HOMEPAGE="http://www.x2go.org" @@ -41,7 +41,7 @@ RDEPEND="acct-user/x2gouser PATCHES=( "${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch "${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch - ) +) src_prepare() { default diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild index 01bc3f6c2225..84cebf81ce7e 100644 --- a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild +++ b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib systemd toolchain-funcs user xdg +inherit systemd toolchain-funcs user xdg DESCRIPTION="The X2Go server" HOMEPAGE="http://www.x2go.org" @@ -39,7 +39,7 @@ RDEPEND="dev-lang/perl:= PATCHES=( "${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch "${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch - ) +) pkg_setup() { # Force the group creation, #479650 diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest index f5df245bc5c8..219990cb7e39 100644 --- a/net-misc/yandex-disk/Manifest +++ b/net-misc/yandex-disk/Manifest @@ -1,4 +1,4 @@ DIST yandex-disk-0.1.5.1039-1.fedora.i386.rpm 4556176 BLAKE2B 5ade043c21a13e678ca11b3074fb1392b99f461ef5a7bd7205b3d6ea984b20dec0ba086adb8b881eaf52888f04cf371dd63ce73432c3f82f31c895e03f31f073 SHA512 3c323e6aaa5fa669ef7efa80e4b899cd732a6b29235d81f635dce67d0ff59dafd01da8d9ea7b040242882f0e5e153f7cd623f4b993dfc390bc0a18d2811c1719 DIST yandex-disk-0.1.5.1039-1.fedora.x86_64.rpm 4743384 BLAKE2B 626a7e921567640b88d33fd426cc230bb92846a252b0960c51da9367f300b8622104db14c8788749e0f5cb484dffd9c9407994568449be769c24d2730cd0936a SHA512 9128d59f426de44b8c953d61ad07ffe886b5e864c5f20ba7ab1a69a47ab3269e5d4e39f4b92675f0ccaea43db1711184892a5e3178694bc453bc96e932045fa9 -EBUILD yandex-disk-0.1.5.1039_p1.ebuild 1153 BLAKE2B da725706243e2c36ec30aa864bf2526a0c49d6834ee9b497631c3ae0135e5fd8f8123b9672e0fa9cb6ca7d88ba243d8e099141c45e4a148fb51c465ac1007ecc SHA512 e416818e1425d5c406dde505bab8aafe5e416cc4f7f0154064c122245b70d79e24671d7afdc6a36d6d8460fe4444b1e66d78addb632114e6237966194e0aa000 +EBUILD yandex-disk-0.1.5.1039_p1.ebuild 1146 BLAKE2B 488fcb76c4e137c1b97efe853ac75954ac841896db78e4ff1ea8d9b20eaec60819ba84f7f154917465a8a289a2ca3a8cd3e67d35faa5c8eb07020f7f64f991c2 SHA512 e40388863bdb78add11b34e1d5b37122577eb69502126f919f13d2aa320bfba7a875b59d38956e65478c2e0271dbf1d477eec4c0385427818e17a91a2c916944 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild index 8f1d7906f160..1943426e7658 100644 --- a/net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild +++ b/net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit bash-completion-r1 eutils rpm +inherit bash-completion-r1 rpm MY_P="${PN}-${PV/_p/-}" diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest index 1c75b19f239d..72f53c3100bb 100644 --- a/net-misc/you-get/Manifest +++ b/net-misc/you-get/Manifest @@ -1,5 +1,7 @@ DIST you-get-0.4.1432.tar.gz 149854 BLAKE2B 227fc950dfdfdbcf899a06db37e0b4e9060e7f82bfbae8a8081a6930827d32f59cc0ec32c0c2166f46d55b958930cafdb4bd1e81d46b7326ca759c58e4e68cd3 SHA512 aef856c86f574470ffbe0ebcb056b63f08663c514a68fc3953a2c10497df44d5f76fa19c593c1c02559effd13f32c82bd52738d033b6cd0bd7b1e8f8c418b680 DIST you-get-0.4.1500.tar.gz 157365 BLAKE2B 4b55a6950c3134792807eedc6e7ba47cae68e909fd29b34d59c289761828814df07bebb8bfe12f7ff0a42e32d0e6cecd770c152ca79ad199ce19f464bdf66ed9 SHA512 133977bfc24b4bd1abd50fcc252d9d75fe166ebe1c02897d0b6720f479a6f9f6368c84d8e9beba2d0c1dedff7a632c67062ee61098f07e5f5ed27c827fbea73a -EBUILD you-get-0.4.1432.ebuild 522 BLAKE2B bc0ebe9d6f4ee322866b53646416a619df32b821cd41ae079ebd1c2908d15e32b09b5d0fa53366aad84b3572805ef81371c773a4633969bb483bbc10a5b72080 SHA512 00e8bd8d8af3c4dc371e271d92c3260d1dbb7f6c4a5fd6e6767459f10b668b8a0b2a8914f15379bc0a98ebf656dceeaf0e0babd79afc488e11911d58a924aaec -EBUILD you-get-0.4.1500.ebuild 513 BLAKE2B c6d455aacb337efc0856dc54aaf5ffb85889d7f2e50ce02ce7860566559eafcab2a4c57433822d006a957e6c075f9ca08918f1e1649abf1f79f4fba2ecfb800b SHA512 7aeab9d0eb92bd90ab3b6096d294fe27c43e43924edf350e6704eeea58b1590af236638df2c35a7ed4c24b264ff72602dfee069da822aff5c52335b24f4d5346 -MISC metadata.xml 330 BLAKE2B 8eb53ce51d204266891fc05de500db3eab2f9db0078f99ad42ea44c76922239ed93a211ebf489ad7b01c6ac8ce11e1b535d8bec14a8489caf0355d294dc49e4a SHA512 f00ef67900d38db89f07d57a78d697c61368e8c475025eec4a647b32ce5b9cab54ccce7bcb8fc7b6500c9a3d4cb8cb183b423021aa4332250ea16e9a6777652c +DIST you-get-0.4.1520.tar.gz 164979 BLAKE2B 063c3a3d14c5430de49fc5ba4e70302048287dad812aef8ba9d2bc67d2089b6f1bcfe4e0db3edf9e1dd0621549104594c8df56acfe8567bd87fb22b9d8ec617d SHA512 fc211753110ffcd39412da82ee11b9a32d98fb9f6caee5ac94732d75c615a8e8439bac247564036b1359bf61422704089e6fca206367f5c7e8fc1f7ec3aff454 +EBUILD you-get-0.4.1432.ebuild 519 BLAKE2B 804b2a951e210bf25f7c5e00fe68cecd9adb72d951b794eb69ec53b867b5e1ccd3ad4279f6a3704b917ef24f6112814412e13207bc9439437f027797fa1349e8 SHA512 dd07cf0556a842c0a00fbde2602779c59f7f80045a3958a9e2a7a2ba11241cf7fa75c39e75cb03fea55417e73ac012c47a360b0293990de884e654522655e789 +EBUILD you-get-0.4.1500.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c +EBUILD you-get-0.4.1520.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c +MISC metadata.xml 355 BLAKE2B 634db21b0e450020e42fa7576e04a3015f624b4d9ba3fe4d185897142d81497eecc14ffd35283e7903efb67a02368bbf1b27d507123675169abf0ab627c0b1bd SHA512 1dd99e270059527e7230eeffb8779664977af2f9000a1e4fc2025e377602ba4a1a3f6f8def34eb3854a9284638717eea469581cba61ab0ddf374272be62d7520 diff --git a/net-misc/you-get/metadata.xml b/net-misc/you-get/metadata.xml index 822511e9f314..eee90476e382 100644 --- a/net-misc/you-get/metadata.xml +++ b/net-misc/you-get/metadata.xml @@ -5,6 +5,7 @@ dlan@gentoo.org Yixun Lan + soimort/you-get diff --git a/net-misc/you-get/you-get-0.4.1432.ebuild b/net-misc/you-get/you-get-0.4.1432.ebuild index b45976499dfc..797f88273bf6 100644 --- a/net-misc/you-get/you-get-0.4.1432.ebuild +++ b/net-misc/you-get/you-get-0.4.1432.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=(python{3_7,3_8}) +PYTHON_COMPAT=( python{3_7,3_8} ) DISTUTILS_USE_SETUPTOOLS=rdepend -inherit eutils distutils-r1 +inherit distutils-r1 -DESCRIPTION="utility to download media contents from the web" +DESCRIPTION="Utility to download media contents from the web" HOMEPAGE="http://www.soimort.org/you-get" SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86" -REQUIRED_USE=${PYTHON_REQUIRED_USE} +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} diff --git a/net-misc/you-get/you-get-0.4.1500.ebuild b/net-misc/you-get/you-get-0.4.1500.ebuild index ed354ce45d2b..93636c539412 100644 --- a/net-misc/you-get/you-get-0.4.1500.ebuild +++ b/net-misc/you-get/you-get-0.4.1500.ebuild @@ -3,19 +3,19 @@ EAPI=7 -PYTHON_COMPAT=(python3_{7,8,9}) +PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_USE_SETUPTOOLS=rdepend -inherit eutils distutils-r1 +inherit distutils-r1 -DESCRIPTION="utility to download media contents from the web" +DESCRIPTION="Utility to download media contents from the web" HOMEPAGE="https://you-get.org" SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -REQUIRED_USE=${PYTHON_REQUIRED_USE} +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} diff --git a/net-misc/you-get/you-get-0.4.1520.ebuild b/net-misc/you-get/you-get-0.4.1520.ebuild new file mode 100644 index 000000000000..93636c539412 --- /dev/null +++ b/net-misc/you-get/you-get-0.4.1520.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Utility to download media contents from the web" +HOMEPAGE="https://you-get.org" +SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + media-video/ffmpeg +" diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 4b7774cc9b23..bfb1090bf7eb 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,6 +1,8 @@ -DIST youtube-dl-2021.03.14.tar.gz 3306486 BLAKE2B 6c5705319e405e4bb098c72b696d41ba655f6e38884012b00da0a5f66a68ac49e34b1906cf22c5444ba62aed4f74d93517b81471b9ddebdc1ee72b3ae190a3a9 SHA512 12f08eaa8a4ba3598ab9caa1c313982e62168a4e4afa3f613f7dee0efef3bcfee701ffd525f1dd1ba1da66aa71bcfd8bed91fa64a8c7473aca6b9e6a09282a70 -DIST youtube-dl-2021.03.25.tar.gz 3313712 BLAKE2B 323ef3e1eda1549500cbea29bcbb55821b5ed6730d65100d6fdd95be4a5d98bb155a519c47fc42883889fcb03bda559edfbd52e38d999fa7fc19ad2aefb7f902 SHA512 77b3beb907081fd682c69d280ddc69610ef59d264b089597481cb4f57dfbac5abc90b54b38bc3691817e0f7a6a3df35b59035f49d5d22e461db87086081f426c -EBUILD youtube-dl-2021.03.14.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609 -EBUILD youtube-dl-2021.03.25.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358 +DIST youtube-dl-2021.04.07.tar.gz 3324661 BLAKE2B c560b6b07bc3ba0c9b7233a634bfae617f604ed5e019e22aefc90e9221a8cd358b937f727b706bba6e9bb6f0a18a8ebd28d5c1f0be383d9dca2c692266cdf222 SHA512 aabf6a1ceefe9101c710bbb45b91e6253a1256343513d841f7901d2be32521a001dac15f5bf13ac94beaf4638dce691f2a157a6172d89047ce2248d06bcafbf8 +DIST youtube-dl-2021.04.17.tar.gz 3331721 BLAKE2B 6b7be0fcb85222d287848cfa40da1dee3f689c59388bbc5d32c335b54cbd0e5ec54c86caf358418641c429d37ae28575858486d4db798d72225a4f5c6e064ac8 SHA512 cb8c76063fc3bd66d07995a669fcf29e5b766c4deb05c9d82fc9795ac3a090a4ae2ee152f150208eae22b93157c286c615044f8f5b0a47798266ab219b49632e +DIST youtube-dl-2021.04.26.tar.gz 3333530 BLAKE2B cffa09f91a1bbfc5962177133711ec1fce4760ef4a073c01daede2cdc168a10cfd868ca536903127f5a3214aece1c111d1dae23739aac86e765d7ff21903c884 SHA512 d187b537fc71ca8e0c9422404f14bab20f66ee9ea10af40d94e9216a79d6b78c1c535600308d18905c34ede0934dbf4f642f58125e898130ce536bc053aa2a10 +EBUILD youtube-dl-2021.04.07.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609 +EBUILD youtube-dl-2021.04.17.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358 +EBUILD youtube-dl-2021.04.26.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623 diff --git a/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild deleted file mode 100644 index d787a3f3be53..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{7..9}) - -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -S=${WORKDIR}/${PN} - -LICENSE="public-domain" -KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -SLOT="0" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] -" - -distutils_enable_tests nose - -src_prepare() { - sed -i -e '/flake8/d' Makefile || die - distutils-r1_src_prepare -} - -python_test() { - emake offlinetest -} - -python_install_all() { - doman youtube-dl.1 - - newbashcomp youtube-dl.bash-completion youtube-dl - - insinto /usr/share/zsh/site-functions - newins youtube-dl.zsh _youtube-dl - - insinto /usr/share/fish/vendor_completions.d - doins youtube-dl.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" - elog - elog "youtube-dl works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." - elog "On some sites - most notably YouTube - videos can be retrieved in" - elog "a higher quality format without sound. youtube-dl will detect whether" - elog "ffmpeg is present and 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 youtube-dl 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-2021.03.25.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.25.ebuild deleted file mode 100644 index 9b024e43dbba..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2021.03.25.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{7..9}) - -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -S=${WORKDIR}/${PN} - -LICENSE="public-domain" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -SLOT="0" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] -" - -distutils_enable_tests nose - -src_prepare() { - sed -i -e '/flake8/d' Makefile || die - distutils-r1_src_prepare -} - -python_test() { - emake offlinetest -} - -python_install_all() { - doman youtube-dl.1 - - newbashcomp youtube-dl.bash-completion youtube-dl - - insinto /usr/share/zsh/site-functions - newins youtube-dl.zsh _youtube-dl - - insinto /usr/share/fish/vendor_completions.d - doins youtube-dl.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" - elog - elog "youtube-dl works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." - elog "On some sites - most notably YouTube - videos can be retrieved in" - elog "a higher quality format without sound. youtube-dl will detect whether" - elog "ffmpeg is present and 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 youtube-dl 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-2021.04.07.ebuild b/net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild new file mode 100644 index 000000000000..d787a3f3be53 --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) + +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" +S=${WORKDIR}/${PN} + +LICENSE="public-domain" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +SLOT="0" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] +" + +distutils_enable_tests nose + +src_prepare() { + sed -i -e '/flake8/d' Makefile || die + distutils-r1_src_prepare +} + +python_test() { + emake offlinetest +} + +python_install_all() { + doman youtube-dl.1 + + newbashcomp youtube-dl.bash-completion youtube-dl + + insinto /usr/share/zsh/site-functions + newins youtube-dl.zsh _youtube-dl + + insinto /usr/share/fish/vendor_completions.d + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "youtube-dl works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." + elog "On some sites - most notably YouTube - videos can be retrieved in" + elog "a higher quality format without sound. youtube-dl will detect whether" + elog "ffmpeg is present and 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 youtube-dl 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-2021.04.17.ebuild b/net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild new file mode 100644 index 000000000000..9b024e43dbba --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) + +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" +S=${WORKDIR}/${PN} + +LICENSE="public-domain" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +SLOT="0" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] +" + +distutils_enable_tests nose + +src_prepare() { + sed -i -e '/flake8/d' Makefile || die + distutils-r1_src_prepare +} + +python_test() { + emake offlinetest +} + +python_install_all() { + doman youtube-dl.1 + + newbashcomp youtube-dl.bash-completion youtube-dl + + insinto /usr/share/zsh/site-functions + newins youtube-dl.zsh _youtube-dl + + insinto /usr/share/fish/vendor_completions.d + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "youtube-dl works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." + elog "On some sites - most notably YouTube - videos can be retrieved in" + elog "a higher quality format without sound. youtube-dl will detect whether" + elog "ffmpeg is present and 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 youtube-dl 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-2021.04.26.ebuild b/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild new file mode 100644 index 000000000000..9b024e43dbba --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) + +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" +S=${WORKDIR}/${PN} + +LICENSE="public-domain" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +SLOT="0" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] +" + +distutils_enable_tests nose + +src_prepare() { + sed -i -e '/flake8/d' Makefile || die + distutils-r1_src_prepare +} + +python_test() { + emake offlinetest +} + +python_install_all() { + doman youtube-dl.1 + + newbashcomp youtube-dl.bash-completion youtube-dl + + insinto /usr/share/zsh/site-functions + newins youtube-dl.zsh _youtube-dl + + insinto /usr/share/fish/vendor_completions.d + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "youtube-dl works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." + elog "On some sites - most notably YouTube - videos can be retrieved in" + elog "a higher quality format without sound. youtube-dl will detect whether" + elog "ffmpeg is present and 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 youtube-dl to embed thumbnails from the metadata into the" + elog "resulting MP4 files, consider installing media-video/atomicparsley" +} diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest index dc3f166f5757..d4e26b8f9a20 100644 --- a/net-misc/youtube-viewer/Manifest +++ b/net-misc/youtube-viewer/Manifest @@ -1,4 +1,4 @@ DIST youtube-viewer-3.7.4.tar.gz 281921 BLAKE2B dac2cbf76f3d0939f79fa875652680e197f41bf09769585894147dfe433db72a94d59309237f5ce5398753a39e2cf2cf83ae3f4f6987f5a4b49d806de2598e2c SHA512 4584821fb0ae3ec7e5f9c3b2e887b1fa158fb74a82be07698277e12d3762fd3b8f0557baddb9e08fe485f322b44b91adc2feaaba46227e0c519a516b54bbc4e8 -EBUILD youtube-viewer-3.7.4-r2.ebuild 2496 BLAKE2B 8f68df730d535d31a435c332022ac90eb02f990b49942fe1780b32c76108a131bfede4d6f9e44f54ff87a9caab742324e54a2c93c41a56643637ae853825ac5f SHA512 e1b1d03160e0021dd2b139a2c53725f5f469b39c21f0a2450fa681ea646e19f08e36b9d6caadd45e14c4f8bc429ff178cd3048d077b5cb0a615a57b79997d1f2 -EBUILD youtube-viewer-9999.ebuild 2258 BLAKE2B d7a281333c56a1057b610436a20cc779b794759b2bc4656187920c5d87c91ca2360f87156f8bfd1e9db7821480efcd9a8daf7bdd082c019f0690b0539f86be9f SHA512 240f495d4aa0e541c13e23bf2f468291097c3a76225d79567ad9074a0b5ec4044ae48af5c0f4eece10fdd090a0c35a5ad20a70295611f889bedfc698effe290a +EBUILD youtube-viewer-3.7.4-r2.ebuild 2465 BLAKE2B 7bd7face6338cb201f3e6d3779413d75373af37dd129c83bef8e66d7d54aef2a8fd7873eaa0cadfb9f29a0ef34ea2124b081edee81006462ac33d0697b99ad6f SHA512 90407c01407fbe73ff6b7c5f6cc30cf530dfbce44e95245e19081998adcc6e9d5d72036639e5738b70ca3b55157b4c7432f6c3d4a5fec5bcce2ea3696af5a364 +EBUILD youtube-viewer-9999.ebuild 2227 BLAKE2B 3cfa57bad848a00756d9a814d0dacc5783f8fbc6cbd313549e495c9e4bfee0d9cc423ef7811ca2fc16aedfaa65cc3930a90b9995f5885d661485791894f5d926 SHA512 546705ec108a0a97b48cfaad4bafd5219977d68b25c614ced52119ad8b5b93cf8a62899fc56fc064e4714dbef8ef6d8f1a706c8880f14eba7dfbcbced042bd49 MISC metadata.xml 847 BLAKE2B 212670f9fc51ecba97d723572602f0e38021712746db20248e084549c0d574388bcf94139a1bed4cd2255dace6fdfd2e2dd31103ef88144b4bd6b9f740085bd9 SHA512 84ca1c094706ebbf570e9eed2d8142f80b0eea012eeda6f972ab99bd17c802babee5a5a5109ddbfe2837e0c6faacf30dfdd4d54d95e23099966f83f485d1893d diff --git a/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild index 8d782d9fcc96..6faf46013802 100644 --- a/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild +++ b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -70,7 +70,6 @@ src_install() { 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 diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild index 3115b5726ecf..13c11cedfdb8 100644 --- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild +++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -73,7 +73,6 @@ src_install() { 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 diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index 4bfb4fa01fcb..2b92555692e4 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -4,5 +4,7 @@ AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad695 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701 DIST zerotier-1.6.3.tar.gz 16020606 BLAKE2B d958ac3276b34b0b99dcce7178ca08a7ac398831172103bb26ddb32814f9043103c9cde6e55853a20d090c1b239746c65cd70de3b9e498dc174baaf6ca403a66 SHA512 56052a9cd50f2a754ba8979fec9b7ba6caf54d83582428b1b43d8b54e5caf388adccbb955fcb9c3fd5b3d7ebde7663023ca4a9a3805b877c3063fa72e23cbed0 -EBUILD zerotier-1.6.3.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f -MISC metadata.xml 482 BLAKE2B 20cfeda377f02fe4f2f86119bf088ad0b7e4d5384b482988ec440991b91e6cfd4192a7404c38d53740b545f1d084c9c248a9ada603cace307815bb6fd6de5469 SHA512 f3ab7f82955ef27184446a8e657e9b6f52d473ccc7f3dc74f7945d4840c77c75d1b1f12162ae9fc74bbec067baeccc75f79fab98638682bb107911afdfe069d9 +DIST zerotier-1.6.4.tar.gz 16021448 BLAKE2B b45219c2e54f3e789fb970fc8cd9d26ce6175c9737f02838efd11c07223ca49c10480935319292e609cb24bef46aaf7f5eebc8335e84af642d25e87ea5a8e163 SHA512 b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c +EBUILD zerotier-1.6.3.ebuild 1804 BLAKE2B e5851370c3b941b2dd21c549b2d13722c5a360b7dbfe589f8d7ce2870fdb33cafd7116c0cdf2a547ce4a03854bb901af1bc91012766b8e5175728c41dbf40391 SHA512 a4d3fe66fd5907ad48e950c25cda57ebc01ab0d89f8d1891c0eaa6acfaa6468891f2129538b5fce4090bf8760b589d00f00609536b5e768d0a98faae074f7bd3 +EBUILD zerotier-1.6.4.ebuild 1804 BLAKE2B e5851370c3b941b2dd21c549b2d13722c5a360b7dbfe589f8d7ce2870fdb33cafd7116c0cdf2a547ce4a03854bb901af1bc91012766b8e5175728c41dbf40391 SHA512 a4d3fe66fd5907ad48e950c25cda57ebc01ab0d89f8d1891c0eaa6acfaa6468891f2129538b5fce4090bf8760b589d00f00609536b5e768d0a98faae074f7bd3 +MISC metadata.xml 419 BLAKE2B af49a92adbb888788fc7a22cd56115cbc8f6c5f17c65bd38536b40a838e016fb2a69ab4cb317f5844739d0d91174c35b88606cc50dfdf99218f2646260e64adb SHA512 d453ad4f2c1ed868044277eed6fe229c6bcb2d61d154e63b49466ba452897e936ba2e4ad78ae3ffb37a352f07f9f2b01eb803e107ecc00b45bc65ceef2a19c5e diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml index f7fa88e2deea..a757cc011a38 100644 --- a/net-misc/zerotier/metadata.xml +++ b/net-misc/zerotier/metadata.xml @@ -8,6 +8,5 @@ Use Clang compiler instead of GCC - Enable ARM32 neon-salsa2012-asm code diff --git a/net-misc/zerotier/zerotier-1.6.3.ebuild b/net-misc/zerotier/zerotier-1.6.3.ebuild index fdfc4d61007e..fc017b010fc9 100644 --- a/net-misc/zerotier/zerotier-1.6.3.ebuild +++ b/net-misc/zerotier/zerotier-1.6.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.ta LICENSE="BSL-1.1" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="clang neon" +IUSE="clang cpu_flags_arm_neon" S="${WORKDIR}/ZeroTierOne-${PV}" @@ -56,7 +56,7 @@ pkg_setup() { else tc-export CXX CC fi - use neon || export ZT_DISABLE_NEON=1 + use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 } src_compile() { diff --git a/net-misc/zerotier/zerotier-1.6.4.ebuild b/net-misc/zerotier/zerotier-1.6.4.ebuild new file mode 100644 index 000000000000..fc017b010fc9 --- /dev/null +++ b/net-misc/zerotier/zerotier-1.6.4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic llvm systemd toolchain-funcs + +HOMEPAGE="https://www.zerotier.com/" +DESCRIPTION="A software-based managed Ethernet switch for planet Earth" +SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="clang cpu_flags_arm_neon" + +S="${WORKDIR}/ZeroTierOne-${PV}" + +RDEPEND=" + dev-libs/json-glib + net-libs/libnatpmp + net-libs/miniupnpc:= + clang? ( >=sys-devel/clang-6:* )" + +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.6-respect-ldflags.patch" + "${FILESDIR}/${PN}-1.4.6-add-armv7a-support.patch" +) + +DOCS=( README.md AUTHORS.md ) + +LLVM_MAX_SLOT=11 + +llvm_check_deps() { + if use clang ; then + if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then + ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." + return 1 + fi + + if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then + ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." + return 1 + fi + + einfo "Will use LLVM slot ${LLVM_SLOT}!" + fi +} + +pkg_setup() { + if use clang && ! tc-is-clang ; then + export CC=${CHOST}-clang + export CXX=${CHOST}-clang++ + else + tc-export CXX CC + fi + use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 +} + +src_compile() { + append-ldflags -Wl,-z,noexecstack + emake CXX="${CXX}" STRIP=: one +} + +src_test() { + emake selftest + ./zerotier-selftest || die +} + +src_install() { + default + # remove pre-zipped man pages + rm "${ED}"/usr/share/man/{man1,man8}/* || die + + newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + doman doc/zerotier-{cli.1,idtool.1,one.8} +} diff --git a/net-misc/zssh/Manifest b/net-misc/zssh/Manifest index 52ed34a68628..427d345605bc 100644 --- a/net-misc/zssh/Manifest +++ b/net-misc/zssh/Manifest @@ -1,4 +1,4 @@ AUX zssh-1.5a-gentoo-include.diff 321 BLAKE2B 3daa9a3da6a58f90d176d0d68c054055f349530618179215ed5bfa49fc4262b0bc4d7d72608ca3b3050ec9ce870f23b8665c8f9e36fc18459044ab0ddb27e3e8 SHA512 e26c32832f537311f6804936a2ca88daf403ec5e8d263f3a84f29fadae68b0d35a514c97348867bbab584cbc845b1dfc5fb83fda7edad0714091e11165b965a2 DIST zssh-1.5c.tgz 344964 BLAKE2B 35b41125ec7a49cae741666516b17e3f0b22b159d0fc2b490565e8eaef366bb4b418895ad028822647a4b946577b2ef9dc588e9dbfe657ce7c1c8300207ca603 SHA512 799ce3bbea5e94a800f61e6c38879746a579992396304861b7584b6bad967214b811b6bf9aecb36d9d60a15857377cb2fee80b495ad69778903fc45593efeebd -EBUILD zssh-1.5c-r1.ebuild 890 BLAKE2B bd4b6c34c2d4e5ccde331b8eef5a8146c5a6d0b17d80ab67001eed4e0c37f75ead5fee601ff61558c8303d53a3d8a169b965518d93cab749960569e5f0657661 SHA512 55af914818508272aaa017ba5bdbb5f425335818b58c571bce269581a8f8cf66440d869e9fcd6f6f83d962590e9d532a23c5cdccb5a01456c5091f3a30ef9b84 +EBUILD zssh-1.5c-r1.ebuild 890 BLAKE2B ff027f975af25894c6257e51eaad9f34650252f4bced649e144d850df72ee4964b61ec4a6201eb92e95a83314cfe66cc7de19b0fc318f954b180c62c790081ec SHA512 121537bf3389b34b337a9e49363fbb8912d5d21d63a9d156f4c967b17d9b2a96e19ac74f841115cebae27cf6c2fc1840b518dff57b059bf40a6bae286c6d46fa MISC metadata.xml 429 BLAKE2B a25d3fb63a716299bd1df42df578ebb6aca4a82725acdff2530dce16383f6e464d6adbef6beec7bf687c1dfecce6daaa6897c385d02896552e321ef6240fd123 SHA512 dd4d5ff90a156df887316a4c6915cf23dd670ae81dfb8549fb7c2ec70bb2dd02cb1e039b9e262091673f25d4dcb728d5a1e5fff1322cba6dec358affb73d75ca diff --git a/net-misc/zssh/zssh-1.5c-r1.ebuild b/net-misc/zssh/zssh-1.5c-r1.ebuild index 6ba687af4f6f..c17f7e9ef792 100644 --- a/net-misc/zssh/zssh-1.5c-r1.ebuild +++ b/net-misc/zssh/zssh-1.5c-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs DESCRIPTION="An ssh wrapper enabling zmodem up/download in ssh" HOMEPAGE="http://zssh.sourceforge.net/" diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest index 8924ff3a1d0f..21733b857047 100644 --- a/net-misc/zsync/Manifest +++ b/net-misc/zsync/Manifest @@ -1,5 +1,5 @@ AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d -EBUILD zsync-0.6.2-r1.ebuild 1093 BLAKE2B 6425939e085ccfcc592d97959ed189aca9f08c08a474b106b8af4f793977fc45274c2fbfb1ff0a1f41961a069cd26c169b6012e574055332da91a4f18c668d1c SHA512 ce58ab2a8b00c1fd8def2b0da99ab3cff1eb9147d058552e1adfcdb932ceb5bbe30d7ac482c619c0cf7e30d15877f5c05f60c9860d795bc7071d9910196aa812 +EBUILD zsync-0.6.2-r1.ebuild 1093 BLAKE2B 85dadd36b2625900b338e192331bae71a1b9cc3ab3c7b54c7c842bf3b85170a9830b4863aaeac6040f5319cf2dec7eca3cff405c5d3349097e9014667829ae92 SHA512 5f526a4e1ed4c2a6ec6c26a603f1396400a6ab7daf6454f8aa9c129ca8e883ca23281a1ab09ab26b954135ef4de112918af2a890a71cf7ba7ad303f201366f18 MISC metadata.xml 1248 BLAKE2B da1ebc159e8f07cf0237017bf86cda2dc162472539ea5b8777c0f9f12384e6728eabbf0dc0d87823c5480b6a905eb533042ef2ca9ec1b83a52f6cb9e4082bc58 SHA512 ee5763e3797b34d9b70bdada81f187c7d61cf155a0c207b6b70067a1407770dcdd2f7cce93f796fc022bed0577935d216e57f3260cf1a2a0a23672dbd610c04a diff --git a/net-misc/zsync/zsync-0.6.2-r1.ebuild b/net-misc/zsync/zsync-0.6.2-r1.ebuild index 45f3f2729a6e..70575e7f4895 100644 --- a/net-misc/zsync/zsync-0.6.2-r1.ebuild +++ b/net-misc/zsync/zsync-0.6.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils +inherit autotools epatch ZLIB_PV=1.2.3 ZLIB_P="zlib-${ZLIB_PV}" -- cgit v1.2.3